Refactor integration tests to be able to test several transports

eclipse-leshan · May 4, 2023 · ab207af · ab207af
1 parent 25e1aca
commit ab207af
Show file tree

Hide file tree

Showing 74 changed files with 8,247 additions and 6,851 deletions.
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/TimeoutException.java b/leshan-core/src/main/java/org/eclipse/leshan/core/request/exception/TimeoutException.java
@@ -17,13 +17,14 @@
 
 public class TimeoutException extends Exception {
 
+    // TODO COAP and DTLS handshake are maybe not so good abstraction.
     public enum Type {
         RESPONSE_TIMEOUT, COAP_TIMEOUT, DTLS_HANDSHAKE_TIMEOUT
     }
 
     private static final long serialVersionUID = -8966041387554358975L;
 
-    private Type type;
+    private final Type type;
 
     public TimeoutException(Type type, String message, Object... args) {
         super(String.format(message, args));

diff --git a/...-tests/src/test/java/org/eclipse/leshan/integration/tests/BootstrapConfigTestBuilder.java b/...-tests/src/test/java/org/eclipse/leshan/integration/tests/BootstrapConfigTestBuilder.java
@@ -0,0 +1,217 @@
+/*******************************************************************************
+ * Copyright (c) 2023 Sierra Wireless and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v20.html
+ * and the Eclipse Distribution License is available at
+ *    http://www.eclipse.org/org/documents/edl-v10.html.
+ *
+ * Contributors:
+ *     Sierra Wireless - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.leshan.integration.tests;
+
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.util.List;
+
+import org.eclipse.leshan.core.SecurityMode;
+import org.eclipse.leshan.core.endpoint.Protocol;
+import org.eclipse.leshan.core.node.LwM2mPath;
+import org.eclipse.leshan.core.request.ContentFormat;
+import org.eclipse.leshan.integration.tests.util.LeshanTestBootstrapServer;
+import org.eclipse.leshan.integration.tests.util.LeshanTestServer;
+import org.eclipse.leshan.server.bootstrap.BootstrapConfig;
+import org.eclipse.leshan.server.bootstrap.BootstrapConfig.ACLConfig;
+import org.eclipse.leshan.server.bootstrap.BootstrapConfig.OscoreObject;
+import org.eclipse.leshan.server.bootstrap.BootstrapConfig.ServerConfig;
+import org.eclipse.leshan.server.bootstrap.BootstrapConfig.ServerSecurity;
+
+public class BootstrapConfigTestBuilder {
+
+    private final BootstrapConfig bsConfig;
+
+    public BootstrapConfigTestBuilder() {
+        bsConfig = new BootstrapConfig();
+        bsConfig.autoIdForSecurityObject = false;
+        bsConfig.contentFormat = null;
+    }
+
+    public BootstrapConfigTestBuilder adding(Protocol protocol, LeshanTestBootstrapServer bootstrapServer) {
+        return adding(protocol, bootstrapServer, 0);
+    }
+
+    public BootstrapConfigTestBuilder adding(Protocol protocol, LeshanTestBootstrapServer bootstrapServer,
+            int bootstrapInstanceId) {
+
+        // security for BS server
+        ServerSecurity bsSecurity = new ServerSecurity();
+        bsSecurity.bootstrapServer = true;
+        bsSecurity.uri = bootstrapServer.getEndpoint(protocol).getURI().toString();
+        bsSecurity.securityMode = SecurityMode.NO_SEC;
+        bsConfig.security.put(0, bsSecurity);
+        return this;
+    }
+
+    public BootstrapConfigTestBuilder adding(Protocol protocol, LeshanTestBootstrapServer bootstrapServer,
+            String pskIdentity, byte[] psk) {
+
+        // security for BS server
+        ServerSecurity bsSecurity = new ServerSecurity();
+        bsSecurity.bootstrapServer = true;
+        bsSecurity.uri = bootstrapServer.getEndpoint(protocol).getURI().toString();
+        bsSecurity.securityMode = SecurityMode.PSK;
+        bsSecurity.publicKeyOrId = pskIdentity.getBytes();
+        bsSecurity.secretKey = psk;
+        bsConfig.security.put(0, bsSecurity);
+        return this;
+    }
+
+    public BootstrapConfigTestBuilder adding(Protocol protocol, LeshanTestBootstrapServer bootstrapServer,
+            PublicKey clientPublicKey, PrivateKey clientPrivateKey, PublicKey serverPublicKey) {
+
+        // security for BS server
+        ServerSecurity bsSecurity = new ServerSecurity();
+        bsSecurity.bootstrapServer = true;
+        bsSecurity.uri = bootstrapServer.getEndpoint(protocol).getURI().toString();
+        bsSecurity.securityMode = SecurityMode.RPK;
+        bsSecurity.publicKeyOrId = clientPublicKey.getEncoded();
+        bsSecurity.secretKey = clientPrivateKey.getEncoded();
+        bsSecurity.serverPublicKey = serverPublicKey.getEncoded();
+        bsConfig.security.put(0, bsSecurity);
+        return this;
+    }
+
+    public BootstrapConfigTestBuilder adding(Protocol protocol, LeshanTestBootstrapServer bootstrapServer,
+            OscoreObject oscore) {
+        // security for BS server
+        ServerSecurity bsSecurity = new ServerSecurity();
+        bsSecurity.bootstrapServer = true;
+        bsSecurity.uri = bootstrapServer.getEndpoint(protocol).getURI().toString();
+        bsSecurity.securityMode = SecurityMode.NO_SEC;
+        bsConfig.security.put(0, bsSecurity);
+
+        // add oscore
+        bsSecurity.oscoreSecurityMode = 0;
+        bsConfig.oscore.put(0, oscore);
+
+        return this;
+    }
+
+    public BootstrapConfigTestBuilder adding(Protocol protocol, LeshanTestServer server) {
+
+        // security for DM server
+        ServerSecurity dmSecurity = new ServerSecurity();
+        dmSecurity.uri = server.getEndpoint(protocol).getURI().toString();
+        dmSecurity.serverId = 2222;
+        dmSecurity.securityMode = SecurityMode.NO_SEC;
+        bsConfig.security.put(1, dmSecurity);
+
+        // DM server
+        ServerConfig dmConfig = new ServerConfig();
+        dmConfig.shortId = 2222;
+        bsConfig.servers.put(0, dmConfig);
+        return this;
+    }
+
+    public BootstrapConfigTestBuilder adding(Protocol protocol, LeshanTestServer server, String pskIdentity,
+            byte[] psk) {
+
+        // security for DM server
+        ServerSecurity dmSecurity = new ServerSecurity();
+        dmSecurity.uri = server.getEndpoint(protocol).getURI().toString();
+        dmSecurity.serverId = 2222;
+        dmSecurity.securityMode = SecurityMode.PSK;
+        dmSecurity.publicKeyOrId = pskIdentity.getBytes();
+        dmSecurity.secretKey = psk;
+        bsConfig.security.put(1, dmSecurity);
+
+        // DM server
+        ServerConfig dmConfig = new ServerConfig();
+        dmConfig.shortId = 2222;
+        bsConfig.servers.put(0, dmConfig);
+        return this;
+    }
+
+    public BootstrapConfigTestBuilder adding(Protocol protocol, LeshanTestServer server, PublicKey clientPublicKey,
+            PrivateKey clientPrivateKey, PublicKey serverPublicKey) {
+
+        // security for DM server
+        ServerSecurity dmSecurity = new ServerSecurity();
+        dmSecurity.uri = server.getEndpoint(protocol).getURI().toString();
+        dmSecurity.serverId = 2222;
+        dmSecurity.securityMode = SecurityMode.RPK;
+        dmSecurity.publicKeyOrId = clientPublicKey.getEncoded();
+        dmSecurity.secretKey = clientPrivateKey.getEncoded();
+        dmSecurity.serverPublicKey = serverPublicKey.getEncoded();
+        bsConfig.security.put(1, dmSecurity);
+
+        // DM server
+        ServerConfig dmConfig = new ServerConfig();
+        dmConfig.shortId = 2222;
+        bsConfig.servers.put(0, dmConfig);
+        return this;
+    }
+
+    public BootstrapConfigTestBuilder adding(Protocol protocol, LeshanTestServer server, OscoreObject oscore) {
+
+        // security for DM server
+        ServerSecurity dmSecurity = new ServerSecurity();
+        dmSecurity.uri = server.getEndpoint(protocol).getURI().toString();
+        dmSecurity.serverId = 2222;
+        dmSecurity.securityMode = SecurityMode.NO_SEC;
+        bsConfig.security.put(1, dmSecurity);
+
+        // add oscore
+        dmSecurity.oscoreSecurityMode = 1;
+        bsConfig.oscore.put(1, oscore);
+
+        // DM server
+        ServerConfig dmConfig = new ServerConfig();
+        dmConfig.shortId = 2222;
+        bsConfig.servers.put(0, dmConfig);
+        return this;
+    }
+
+    public BootstrapConfigTestBuilder using(ContentFormat contentFormat) {
+        bsConfig.contentFormat = contentFormat;
+        return this;
+    }
+
+    public BootstrapConfigTestBuilder usingAutoIdForSecurityObject() {
+        bsConfig.autoIdForSecurityObject = true;
+        return this;
+    }
+
+    public BootstrapConfig build() {
+        return bsConfig;
+    }
+
+    public static BootstrapConfigTestBuilder givenBootstrapConfig() {
+        return new BootstrapConfigTestBuilder();
+    }
+
+    public BootstrapConfigTestBuilder deleting(int... objectIdToDelete) {
+        for (int id : objectIdToDelete) {
+            bsConfig.toDelete.add(new LwM2mPath(id).toString());
+        }
+        return this;
+    }
+
+    public BootstrapConfigTestBuilder deletingAll() {
+        bsConfig.toDelete.add("/");
+        return this;
+    }
+
+    public BootstrapConfigTestBuilder adding(List<ACLConfig> acls) {
+        for (int i = 0; i < acls.size(); i++) {
+            bsConfig.acls.put(i, acls.get(i));
+        }
+        return this;
+    }
+
+}