syncing commit, should be reset and recomitted ci skip

Author: 00oskpet

args/jsse/learn_jsse_client_ecdhe_cert_ra

@@ -0,0 +1,44 @@
+state-fuzzer-client
+
+# SUT config
+-port
+${sul.port}
+-startWait
+2000
+-responseWait
+200
+-protocol
+DTLS12
+-cmd
+${fuzzer.dir}/modules/jdk-${jsse.version}/bin/java -jar ${suts.dir}/jsse-${jsse.version}-dtls-clientserver.jar -client -port ${sul.port} -hostname localhost -keyLocation ${keystore}/rsa2048.jks -keyPassword password -trustLocation ${keystore}/rsa2048.jks -trustPassword password -threadStarterIpPort localhost:${fuzzer.port} -operation FULL
+-adapterPort
+${fuzzer.port}
+-processTrigger
+START
+
+# learning config
+##### LearnerConfig #####
+-learningAlgorithm
+RaLambda
+-equivalenceAlgorithms
+IO_RANDOM_WALK
+-logQueries
+-alphabet
+${alphabets.clients}/jsse_ecdhe_cert.xml
+-maxDepthRA
+10
+-probNewDataValue
+0.5
+-seed
+7
+-randLength
+10
+-equivalenceQueryBound
+20000
+-output
+output/jsse-${jsse.version}_client_ecdhe_cert
+-ceReruns
+3
+-skipNonDetTests
+-timeLimit
+P2D

src/main/java/se/uu/it/dtlsfuzzer/MainRA.java

@@ -10,7 +10,7 @@ public class MainRA {
 
     public static void main(String args[]) throws IOException, XMLStreamException {
         Security.addProvider(new BouncyCastleProvider());
-        MultiBuilder mb = new MultiBuilder();
+        MultiBuilderRA mb = new MultiBuilderRA();
         // String[] parentLoggers = {Main.class.getPackageName()};
 
         CommandLineParser<?> commandLineParser = new CommandLineParser<>(mb, mb, mb, mb);

src/main/java/se/uu/it/dtlsfuzzer/MultiBuilderRA.java

@@ -3,7 +3,7 @@
 import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.alphabet.AlphabetBuilder;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.alphabet.AlphabetBuilderStandard;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.alphabet.xml.AlphabetSerializerXml;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.config.LearnerConfigStandard;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.config.LearnerConfigRA;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.statistics.RegisterAutomatonWrapper;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulBuilder;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulWrapper;
@@ -90,13 +90,13 @@ public StateFuzzerRA<ParameterizedSymbol, TlsExecutionContextRA> build(
 
         @Override
         public StateFuzzerClientConfig buildClientConfig() {
-                return new StateFuzzerClientConfigStandard(new LearnerConfigStandard(), new TlsSulClientConfig(),
+                return new StateFuzzerClientConfigStandard(new LearnerConfigRA(), new TlsSulClientConfig(),
                                 new TestRunnerConfigStandard(), new TimingProbeConfigStandard());
         }
 
         @Override
         public StateFuzzerServerConfig buildServerConfig() {
-                return new StateFuzzerServerConfigStandard(new LearnerConfigStandard(), new TlsSulServerConfig(),
+                return new StateFuzzerServerConfigStandard(new LearnerConfigRA(), new TlsSulServerConfig(),
                                 new TestRunnerConfigStandard(), new TimingProbeConfigStandard());
         }
 

src/main/java/se/uu/it/dtlsfuzzer/components/sul/core/TlsSulRA.java

@@ -12,7 +12,6 @@
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.Mapper;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.config.MapperConfig;
 import com.github.protocolfuzzing.protocolstatefuzzer.utils.CleanupTasks;
-import de.learnlib.ralib.data.DataValue;
 import de.learnlib.ralib.words.OutputSymbol;
 import de.learnlib.ralib.words.PSymbolInstance;
 import de.rub.nds.tlsattacker.core.config.Config;
@@ -34,6 +33,7 @@
 import se.uu.it.dtlsfuzzer.components.sul.core.config.TlsSulClientConfig;
 import se.uu.it.dtlsfuzzer.components.sul.core.config.TlsSulConfig;
 import se.uu.it.dtlsfuzzer.components.sul.mapper.DtlsMapperComposer;
+import se.uu.it.dtlsfuzzer.components.sul.mapper.OutputBuilderWrapper;
 import se.uu.it.dtlsfuzzer.components.sul.mapper.TlsExecutionContext;
 import se.uu.it.dtlsfuzzer.components.sul.mapper.TlsExecutionContextRA;
 import se.uu.it.dtlsfuzzer.components.sul.mapper.TlsInputTransformer;
@@ -290,8 +290,9 @@ private PSymbolInstance executeInput(PSymbolInstance input) {
         // power.
         DtlsInput convertedInput = (DtlsInput) inputTransformer.fromTransformedInput(input.getBaseSymbol());
 
-        DataValue<?> value = input.getParameterValues()[0];
-        convertedInput.setEpoch((Integer) value.getId());
+    // FIXME: enable parameters when no parameter learning is "working".
+        //DataValue<?> value = input.getParameterValues()[0];
+        //convertedInput.setEpoch((Integer) value.getId());
 
         // There seems to be no DtlsOutput with an epoch field so for now outputs have
         // no parameters.
@@ -316,7 +317,7 @@ private TlsOutput executeInput(TlsInput in) {
         }
 
         TlsExecutionContext mealyContext = new TlsExecutionContext(sulConfig, context.getState());
-
+    LOGGER.debug("mealycontext: {}", mealyContext);
         TlsOutput output = mapperComposer.execute(in, mealyContext);
 
         context = new TlsExecutionContextRA(sulConfig, mealyContext.getState());
@@ -380,7 +381,9 @@ public void setDynamicPortProvider(DynamicPortProvider dynamicPortProvider) {
 
     @Override
     public Mapper<PSymbolInstance, PSymbolInstance, TlsExecutionContextRA> getMapper() {
-        throw new RuntimeException("The mapper is of the wrong type, let's hope no one asks for it.");
+        // Make a new wrapper instanace for now, depending on how heavily it is used it
+        // might be worth to make this a class variable.
+        return new OutputBuilderWrapper(outputBuilder);
     }
 
     @Override

src/main/java/se/uu/it/dtlsfuzzer/components/sul/mapper/OutputBuilderWrapper.java

@@ -0,0 +1,42 @@
+package se.uu.it.dtlsfuzzer.components.sul.mapper;
+
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.Mapper;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.abstractsymbols.OutputBuilder;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.abstractsymbols.OutputChecker;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.mapper.config.MapperConfig;
+import de.learnlib.ralib.words.PSymbolInstance;
+import se.uu.it.dtlsfuzzer.components.sul.mapper.symbols.outputs.TlsOutputBuilderRA;
+
+public class OutputBuilderWrapper implements Mapper<PSymbolInstance, PSymbolInstance, TlsExecutionContextRA> {
+
+    TlsOutputBuilderRA outputBuilder;
+
+    public OutputBuilderWrapper(TlsOutputBuilderRA outputBuilder) {
+        this.outputBuilder = outputBuilder;
+    }
+
+    @Override
+    public PSymbolInstance execute(PSymbolInstance input, TlsExecutionContextRA context) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'execute'");
+    }
+
+    @Override
+    public MapperConfig getMapperConfig() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getMapperConfig'");
+    }
+
+    @Override
+    public OutputBuilder<PSymbolInstance> getOutputBuilder() {
+        // TODO Auto-generated method stub
+        return outputBuilder;
+    }
+
+    @Override
+    public OutputChecker<PSymbolInstance> getOutputChecker() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getOutputChecker'");
+    }
+
+}

src/main/resources/log4j2.xml

@@ -13,7 +13,7 @@
         <Logger name="com.github.protocolfuzzing.protocolstatefuzzer" level="info" additivity="false">
             <AppenderRef ref="ConsoleAppender" />
         </Logger>
-        <Root level="info">
+        <Root level="debug">
             <AppenderRef ref="ConsoleAppender" />
         </Root>
     </Loggers>