Introduce useOldContentFormat parameter for sifis-home server

protocol-fuzzing · Dec 30, 2024 · 2a14f0b · 2a14f0b
1 parent 7b6a7ca
commit 2a14f0b
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 2 deletions.
diff --git a/experiments/args/sifis-home/server_phase_1 b/experiments/args/sifis-home/server_phase_1
@@ -22,6 +22,8 @@ v22
 -combinedMessageVersion
 v07
 
+-useOldContentFormat
+
 ## Mapper Auth ##
 
 -mapCredType

diff --git a/experiments/args/sifis-home/server_phase_2 b/experiments/args/sifis-home/server_phase_2
@@ -22,6 +22,8 @@ v22
 -combinedMessageVersion
 v07
 
+-useOldContentFormat
+
 ## Mapper Auth ##
 
 -mapCredType

diff --git a/experiments/args/sifis-home/server_phase_3 b/experiments/args/sifis-home/server_phase_3
@@ -22,6 +22,8 @@ v22
 -combinedMessageVersion
 v07
 
+-useOldContentFormat
+
 ## Mapper Auth ##
 
 -mapCredType

diff --git a/experiments/args/sifis-home/server_phase_4 b/experiments/args/sifis-home/server_phase_4
@@ -22,6 +22,8 @@ v22
 -combinedMessageVersion
 v07
 
+-useOldContentFormat
+
 ## Mapper Auth ##
 
 -mapCredType

diff --git a/...otocolfuzzing/edhocfuzzer/components/sul/core/protocol/messages/EdhocProtocolMessage.java b/...otocolfuzzing/edhocfuzzer/components/sul/core/protocol/messages/EdhocProtocolMessage.java
@@ -40,6 +40,7 @@ public EdhocProtocolMessage(MessageProcessorPersistent messageProcessorPersisten
             contentFormat = Constants.APPLICATION_EDHOC_CBOR_SEQ;
         }
     }
+
     public byte[] getPayload() {
         return payload;
     }
@@ -48,7 +49,15 @@ public int getMessageCode() {
         return messageCode;
     }
 
-    public int getContentFormat() {
+    public int getContentFormat(boolean oldVersion) {
+        if (oldVersion) {
+            return switch (contentFormat) {
+                case Constants.APPLICATION_EDHOC_CBOR_SEQ -> 65000;
+                case Constants.APPLICATION_CID_EDHOC_CBOR_SEQ -> 65001;
+                default -> contentFormat;
+            };
+        }
+
         return contentFormat;
     }
 

diff --git a/...om/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/EdhocMapperConfig.java b/...om/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/config/EdhocMapperConfig.java
@@ -64,6 +64,9 @@ public class EdhocMapperConfig extends MapperConfigStandard {
     @Parameter(names = "-disableContentFormat", description = "Do not add CoAP Content-Format in sending messages")
     protected boolean disableContentFormat = false;
 
+    @Parameter(names = "-useOldContentFormat", description = "Use the old CoAP Content-Format (6500x) in sending messages")
+    protected boolean useOldContentFormat = false;
+
     @Parameter(names = "-enableSessionReset", description = "Reset to default old session data, when Initiator mapper "
             + "sends a message to start a new session. Reset does not affect a Responder mapper")
     protected boolean enableSessionReset = false;
@@ -156,6 +159,10 @@ public boolean useContentFormat() {
         return !disableContentFormat;
     }
 
+    public boolean useOldContentFormat() {
+        return useOldContentFormat;
+    }
+
     public boolean useSessionReset() {
         return enableSessionReset;
     }
@@ -248,6 +255,7 @@ public void printRunDescriptionSelf(PrintWriter printWriter) {
         printWriter.println("App Message Payload To Coap Client: " + getAppMessagePayloadToCoapClient());
         printWriter.println("Coap Error As Edhoc Error: " + isCoapErrorAsEdhocError());
         printWriter.println("use Content Format: " + useContentFormat());
+        printWriter.println("use Old Content Format: " + useOldContentFormat());
         printWriter.println("use Session Reset: " + useSessionReset());
         printWriter.println("use CX Correlation: " + useCXCorrelation());
         printWriter.println("Own Connection Id: " + this.ownConnectionId);

diff --git a/...om/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/mappers/EdhocInputMapper.java b/...om/github/protocolfuzzing/edhocfuzzer/components/sul/mapper/mappers/EdhocInputMapper.java
@@ -29,7 +29,9 @@ protected void sendMessage(ProtocolMessage message, ExecutionContext context) {
 
         // enable or disable content format
         EdhocMapperConfig edhocMapperConfig = (EdhocMapperConfig) mapperConfig;
-        int contentFormat = edhocMapperConfig.useContentFormat() ? edhocProtocolMessage.getContentFormat() : MediaTypeRegistry.UNDEFINED;
+        int contentFormat = edhocMapperConfig.useContentFormat() ?
+            edhocProtocolMessage.getContentFormat(edhocMapperConfig.useOldContentFormat()) :
+            MediaTypeRegistry.UNDEFINED;
 
         edhocMapperConnector.send(edhocProtocolMessage.getPayload(), edhocProtocolMessage.getPayloadType(),
                 edhocProtocolMessage.getMessageCode(), contentFormat);