Update SIFIS-HOME (#87)

Update commit hash, patch, args and server learned model
protocol-fuzzing · Feb 23, 2024 · 1aaec56 · 1aaec56
1 parent d64daa1
commit 1aaec56
Show file tree

Hide file tree

Showing 16 changed files with 134 additions and 125 deletions.
diff --git a/experiments/args/sifis-home/client_phase_1 b/experiments/args/sifis-home/client_phase_1
@@ -18,7 +18,11 @@ W_METHOD,WP_METHOD
 
 ##### EdhocMapperConfig #####
 -protocolVersion
-v16
+v22
+
+-combinedMessageVersion
+v07
+
 ## Mapper Auth ##
 
 -mapCredType
@@ -58,7 +62,7 @@ light
 -processDir
 ${models.clients}/sifis-home
 -cmd
-java -cp edhoc-applications.jar se.sics.edhocapps.Phase1Client
+java -cp edhoc-applications.jar se.sics.edhocapps.Phase1Client -server coap://localhost:5683 1q
 -startWait
 50
 

diff --git a/experiments/args/sifis-home/client_phase_2 b/experiments/args/sifis-home/client_phase_2
@@ -18,7 +18,11 @@ W_METHOD,WP_METHOD
 
 ##### EdhocMapperConfig #####
 -protocolVersion
-v16
+v22
+
+-combinedMessageVersion
+v07
+
 ## Mapper Auth ##
 
 -mapCredType
@@ -58,7 +62,7 @@ light
 -processDir
 ${models.clients}/sifis-home
 -cmd
-java -cp edhoc-applications.jar se.sics.edhocapps.Phase2Client
+java -cp edhoc-applications.jar se.sics.edhocapps.Phase2Client -server coap://localhost:5683 1q
 -startWait
 50
 

diff --git a/experiments/args/sifis-home/client_phase_3 b/experiments/args/sifis-home/client_phase_3
@@ -18,7 +18,11 @@ W_METHOD,WP_METHOD
 
 ##### EdhocMapperConfig #####
 -protocolVersion
-v16
+v22
+
+-combinedMessageVersion
+v07
+
 ## Mapper Auth ##
 
 -mapCredType
@@ -58,7 +62,7 @@ light
 -processDir
 ${models.clients}/sifis-home
 -cmd
-java -cp edhoc-applications.jar se.sics.edhocapps.Phase3Client
+java -cp edhoc-applications.jar se.sics.edhocapps.Phase3Client -server coap://localhost:5683 1q
 -startWait
 50
 

diff --git a/experiments/args/sifis-home/client_phase_4 b/experiments/args/sifis-home/client_phase_4
@@ -18,7 +18,11 @@ W_METHOD,WP_METHOD
 
 ##### EdhocMapperConfig #####
 -protocolVersion
-v16
+v22
+
+-combinedMessageVersion
+v07
+
 ## Mapper Auth ##
 
 -mapCredType
@@ -58,7 +62,7 @@ light
 -processDir
 ${models.clients}/sifis-home
 -cmd
-java -cp edhoc-applications.jar se.sics.edhocapps.Phase4Client
+java -cp edhoc-applications.jar se.sics.edhocapps.Phase4Client -server coap://localhost:5683 1q
 -startWait
 50
 

diff --git a/experiments/args/sifis-home/server_phase_1 b/experiments/args/sifis-home/server_phase_1
@@ -17,7 +17,11 @@ W_METHOD,WP_METHOD
 
 ##### EdhocMapperConfig #####
 -protocolVersion
-v16
+v22
+
+-combinedMessageVersion
+v07
+
 ## Mapper Auth ##
 
 -mapCredType
@@ -64,9 +68,9 @@ ${models.servers}/sifis-home
 -cmd
 java -cp edhoc-applications.jar se.sics.edhocapps.Phase1Server
 -startWait
-600
+400
 
 
 ##### EdhocSulServerConfig #####
 -connect
-localhost:5683
+localhost:5694
diff --git a/experiments/args/sifis-home/server_phase_2 b/experiments/args/sifis-home/server_phase_2
@@ -17,7 +17,11 @@ W_METHOD,WP_METHOD
 
 ##### EdhocMapperConfig #####
 -protocolVersion
-v16
+v22
+
+-combinedMessageVersion
+v07
+
 ## Mapper Auth ##
 
 -mapCredType
@@ -64,9 +68,9 @@ ${models.servers}/sifis-home
 -cmd
 java -cp edhoc-applications.jar se.sics.edhocapps.Phase2Server
 -startWait
-600
+400
 
 
 ##### EdhocSulServerConfig #####
 -connect
-localhost:5683
+localhost:5695
diff --git a/experiments/args/sifis-home/server_phase_3 b/experiments/args/sifis-home/server_phase_3
@@ -17,7 +17,11 @@ W_METHOD,WP_METHOD
 
 ##### EdhocMapperConfig #####
 -protocolVersion
-v16
+v22
+
+-combinedMessageVersion
+v07
+
 ## Mapper Auth ##
 
 -mapCredType
@@ -64,9 +68,9 @@ ${models.servers}/sifis-home
 -cmd
 java -cp edhoc-applications.jar se.sics.edhocapps.Phase3Server
 -startWait
-600
+400
 
 
 ##### EdhocSulServerConfig #####
 -connect
-localhost:5683
+localhost:5696
diff --git a/experiments/args/sifis-home/server_phase_4 b/experiments/args/sifis-home/server_phase_4
@@ -17,7 +17,11 @@ W_METHOD,WP_METHOD
 
 ##### EdhocMapperConfig #####
 -protocolVersion
-v16
+v22
+
+-combinedMessageVersion
+v07
+
 ## Mapper Auth ##
 
 -mapCredType
@@ -64,9 +68,9 @@ ${models.servers}/sifis-home
 -cmd
 java -cp edhoc-applications.jar se.sics.edhocapps.Phase4Server
 -startWait
-600
+400
 
 
 ##### EdhocSulServerConfig #####
 -connect
-localhost:5683
+localhost:5697
diff --git a/experiments/models/patches/sifis-home.patch b/experiments/models/patches/sifis-home.patch
@@ -1,43 +1,8 @@
 diff --git a/edhoc-applications/pom.xml b/edhoc-applications/pom.xml
-index bf7f930..89a9812 100644
+index 859e3a5..f6c81d9 100644
 --- a/edhoc-applications/pom.xml
 +++ b/edhoc-applications/pom.xml
-@@ -45,13 +45,27 @@
- 			<version>0.2.1</version>
- 		</dependency>
- 		<!-- Rikard: Disabled these dependencies. They should instead be imported 
--			from the Californium-extended code (see README). <dependency> <groupId>org.eclipse.californium</groupId> 
--			<artifactId>californium-core</artifactId> <version>3.1.0-SNAPSHOT</version> 
--			</dependency> <dependency> <groupId>org.eclipse.californium</groupId> <artifactId>cf-edhoc</artifactId> 
--			<version>3.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.californium</groupId> 
--			<artifactId>cf-oscore</artifactId> <version>3.1.0-SNAPSHOT</version> </dependency> 
--			<dependency> <groupId>org.eclipse.californium</groupId> <artifactId>element-connector</artifactId> 
--			<version>3.1.0-SNAPSHOT</version> </dependency> -->
-+			from the Californium-extended code (see README). -->
-+		<dependency>
-+			<groupId>org.eclipse.californium</groupId>
-+			<artifactId>californium-core</artifactId>
-+			<version>3.1.0-SNAPSHOT</version>
-+		</dependency>
-+		<dependency>
-+			<groupId>org.eclipse.californium</groupId>
-+			<artifactId>cf-edhoc</artifactId>
-+			<version>3.1.0-SNAPSHOT</version>
-+		</dependency>
-+		<dependency>
-+			<groupId>org.eclipse.californium</groupId>
-+			<artifactId>cf-oscore</artifactId>
-+			<version>3.1.0-SNAPSHOT</version>
-+		</dependency>
-+		<dependency>
-+			<groupId>org.eclipse.californium</groupId>
-+			<artifactId>element-connector</artifactId>
-+			<version>3.1.0-SNAPSHOT</version>
-+		</dependency>
- 		<dependency> <!-- Rikard: Added for WebSocket -->
- 			<groupId>org.glassfish.tyrus</groupId>
- 			<artifactId>tyrus-client</artifactId>
-@@ -84,6 +98,14 @@
+@@ -134,6 +134,14 @@
  					<target>1.8</target>
  				</configuration>
  			</plugin>
@@ -49,86 +14,98 @@ index bf7f930..89a9812 100644
 +					</descriptorRefs>
 +				</configuration>
 +			</plugin>
- 		</plugins>
- 	</build>
- </project>
+ 			<plugin>
+ 				<groupId>org.apache.maven.plugins</groupId>
+ 				<artifactId>maven-dependency-plugin</artifactId>
 diff --git a/edhoc-applications/src/main/java/se/sics/edhocapps/Phase1Client.java b/edhoc-applications/src/main/java/se/sics/edhocapps/Phase1Client.java
-index 968116c..638d6a2 100644
+index 828d86e..fcfae4c 100644
 --- a/edhoc-applications/src/main/java/se/sics/edhocapps/Phase1Client.java
 +++ b/edhoc-applications/src/main/java/se/sics/edhocapps/Phase1Client.java
-@@ -320,11 +320,14 @@ public class Phase1Client {
+@@ -401,13 +401,16 @@ public class Phase1Client {
+ 		}
 
- 			Scanner scanner = new Scanner(System.in);
- 			String command = "";
-+			String commands = "1q";
+ 		// Command line interface
+-		Scanner scanner = new Scanner(System.in);
++		//Scanner scanner = new Scanner(System.in);
+ 		String command = "";
++		String commands = args[args.length - 1];
 
- 			while (!command.equals("q")) {
+ 		while (!command.equals("q")) {
 
- 				System.out.println("Enter command: ");
--				command = scanner.next();
-+				//command = scanner.next();
-+				command = String.valueOf(commands.charAt(0));
-+				commands = commands.substring(1);
+ 			System.out.println("Enter command: ");
+-			command = scanner.next();
++			//command = scanner.next();
++			command = String.valueOf(commands.charAt(0));
++			commands = commands.substring(1);
 
- 				if (command.equals("q")) {
- 					break;
+ 			if (command.equals("q")) {
+ 				break;
 diff --git a/edhoc-applications/src/main/java/se/sics/edhocapps/Phase2Client.java b/edhoc-applications/src/main/java/se/sics/edhocapps/Phase2Client.java
-index 89fef9e..40cbcb6 100644
+index 2b92693..438897d 100644
 --- a/edhoc-applications/src/main/java/se/sics/edhocapps/Phase2Client.java
 +++ b/edhoc-applications/src/main/java/se/sics/edhocapps/Phase2Client.java
-@@ -320,11 +320,14 @@ public class Phase2Client {
+@@ -402,13 +402,16 @@ public class Phase2Client {
+ 		}
 
- 			Scanner scanner = new Scanner(System.in);
- 			String command = "";
-+			String commands = "1q";
+ 		// Command line interface
+-		Scanner scanner = new Scanner(System.in);
++		//Scanner scanner = new Scanner(System.in);
+ 		String command = "";
++		String commands = args[args.length - 1];
 
- 			while (!command.equals("q")) {
+ 		while (!command.equals("q")) {
 
- 				System.out.println("Enter command: ");
--				command = scanner.next();
-+				//command = scanner.next();
-+				command = String.valueOf(commands.charAt(0));
-+				commands = commands.substring(1);
+ 			System.out.println("Enter command: ");
+-			command = scanner.next();
++			//command = scanner.next();
++			command = String.valueOf(commands.charAt(0));
++			commands = commands.substring(1);
 
- 				if (command.equals("q")) {
- 					break;
+ 			if (command.equals("q")) {
+ 				break;
 diff --git a/edhoc-applications/src/main/java/se/sics/edhocapps/Phase3Client.java b/edhoc-applications/src/main/java/se/sics/edhocapps/Phase3Client.java
-index dfb667c..9d38821 100644
+index 68c9660..2730e80 100644
 --- a/edhoc-applications/src/main/java/se/sics/edhocapps/Phase3Client.java
 +++ b/edhoc-applications/src/main/java/se/sics/edhocapps/Phase3Client.java
-@@ -320,11 +320,14 @@ public class Phase3Client {
+@@ -401,13 +401,16 @@ public class Phase3Client {
+ 		}
 
- 			Scanner scanner = new Scanner(System.in);
- 			String command = "";
-+			String commands = "1q";
+ 		// Command line interface
+-		Scanner scanner = new Scanner(System.in);
++		//Scanner scanner = new Scanner(System.in);
+ 		String command = "";
++		String commands = args[args.length - 1];
 
- 			while (!command.equals("q")) {
+ 		while (!command.equals("q")) {
 
- 				System.out.println("Enter command: ");
--				command = scanner.next();
-+				//command = scanner.next();
-+				command = String.valueOf(commands.charAt(0));
-+				commands = commands.substring(1);
+ 			System.out.println("Enter command: ");
+-			command = scanner.next();
++			//command = scanner.next();
++			command = String.valueOf(commands.charAt(0));
++			commands = commands.substring(1);
 
- 				if (command.equals("q")) {
- 					break;
+ 			if (command.equals("q")) {
+ 				break;
 diff --git a/edhoc-applications/src/main/java/se/sics/edhocapps/Phase4Client.java b/edhoc-applications/src/main/java/se/sics/edhocapps/Phase4Client.java
-index 77f6557..4f67671 100644
+index 60635d7..c53e18e 100644
 --- a/edhoc-applications/src/main/java/se/sics/edhocapps/Phase4Client.java
 +++ b/edhoc-applications/src/main/java/se/sics/edhocapps/Phase4Client.java
-@@ -320,11 +320,14 @@ public class Phase4Client {
+@@ -401,13 +401,16 @@ public class Phase4Client {
+ 		}
 
- 			Scanner scanner = new Scanner(System.in);
- 			String command = "";
-+			String commands = "1q";
+ 		// Command line interface
+-		Scanner scanner = new Scanner(System.in);
++		//Scanner scanner = new Scanner(System.in);
+ 		String command = "";
++		String commands = args[args.length - 1];
 
- 			while (!command.equals("q")) {
+ 		while (!command.equals("q")) {
 
- 				System.out.println("Enter command: ");
--				command = scanner.next();
-+				//command = scanner.next();
-+				command = String.valueOf(commands.charAt(0));
-+				commands = commands.substring(1);
+ 			System.out.println("Enter command: ");
+-			command = scanner.next();
++			//command = scanner.next();
++			command = String.valueOf(commands.charAt(0));
++			commands = commands.substring(1);
 
- 				if (command.equals("q")) {
- 					break;
+ 			if (command.equals("q")) {
+ 				break;
diff --git a/experiments/saved_results/servers/sifis-home_phase_1/hyp2.dot b/experiments/saved_results/servers/sifis-home_phase_1/hyp2.dot
@@ -15,7 +15,7 @@ digraph g {
 	s1 -> s0 [label="EDHOC_MESSAGE_2 / EDHOC_ERROR_MESSAGE"];
 	s1 -> s0 [label="EDHOC_MESSAGE_3 / COAP_EMPTY_MESSAGE"];
 	s1 -> s0 [label="EDHOC_MESSAGE_4 / EDHOC_ERROR_MESSAGE"];
-	s1 -> s0 [label="EDHOC_ERROR_MESSAGE / TIMEOUT"];
+	s1 -> s0 [label="EDHOC_ERROR_MESSAGE / COAP_EMPTY_MESSAGE"];
 	s1 -> s0 [label="EDHOC_MESSAGE_3_OSCORE_APP / OSCORE_APP_MESSAGE"];
 	s1 -> s1 [label="OSCORE_APP_MESSAGE / COAP_ERROR_MESSAGE"];
 	s1 -> s1 [label="COAP_APP_MESSAGE / COAP_ERROR_MESSAGE"];