At client side OSCORE instance linked to BS Server must not be deleted.

leshan-client-core/src/main/java/org/eclipse/leshan/client/resource/ObjectEnabler.java

@@ -366,44 +366,105 @@ public BootstrapDeleteResponse doDelete(ServerIdentity identity, BootstrapDelete
         if (request.getPath().isRoot() || request.getPath().isObject()) {
             if (id == LwM2mId.SECURITY) {
                 // For security object, we clean everything except bootstrap Server account.
+
+                // Get bootstrap account and store removed instances ids
                 Entry<Integer, LwM2mInstanceEnabler> bootstrapServerAccount = null;
                 int[] instanceIds = new int[instances.size()];
                 int i = 0;
                 for (Entry<Integer, LwM2mInstanceEnabler> instance : instances.entrySet()) {
                     if (ServersInfoExtractor.isBootstrapServer(instance.getValue())) {
                         bootstrapServerAccount = instance;
                     } else {
-                        // store instance ids
+                        // Store instance ids
                         instanceIds[i] = instance.getKey();
                         i++;
                     }
                 }
+                // Clear everything
                 instances.clear();
+
+                // Put bootstrap account again
                 if (bootstrapServerAccount != null) {
                     instances.put(bootstrapServerAccount.getKey(), bootstrapServerAccount.getValue());
                 }
+
                 fireInstancesRemoved(instanceIds);
                 return BootstrapDeleteResponse.success();
-            } else {
-                instances.clear();
-                // fired instances removed
-                int[] instanceIds = new int[instances.size()];
-                int i = 0;
-                for (Entry<Integer, LwM2mInstanceEnabler> instance : instances.entrySet()) {
-                    instanceIds[i] = instance.getKey();
-                    i++;
+            } else if (id == LwM2mId.OSCORE) {
+                // For OSCORE object, we clean everything except OSCORE object link to bootstrap Server account.
+
+                // Get bootstrap account
+                LwM2mObjectInstance bootstrapInstance = ServersInfoExtractor.getBootstrapSecurityInstance(
+                        getLwm2mClient().getObjectTree().getObjectEnabler(LwM2mId.SECURITY));
+                // Get OSCORE instance ID associated to it
+                Integer bootstrapOscoreInstanceId = bootstrapInstance != null
+                        ? ServersInfoExtractor.getOscoreSecurityMode(bootstrapInstance)
+                        : null;
+
+                // if bootstrap server use OSCORE,
+                // search the OSCORE instance for this ID and store removed instances ids
+                if (bootstrapOscoreInstanceId != null) {
+                    Entry<Integer, LwM2mInstanceEnabler> bootstrapServerOscore = null;
+                    int[] instanceIds = new int[instances.size()];
+                    int i = 0;
+                    for (Entry<Integer, LwM2mInstanceEnabler> instance : instances.entrySet()) {
+                        if (bootstrapOscoreInstanceId.equals(instance.getKey())) {
+                            bootstrapServerOscore = instance;
+                        } else {
+                            // Store instance ids
+                            instanceIds[i] = instance.getKey();
+                            i++;
+                        }
+                    }
+
+                    // Clear everything
+                    instances.clear();
+
+                    // Put bootstrap OSCORE instance again
+                    if (bootstrapServerOscore != null) {
+                        instances.put(bootstrapServerOscore.getKey(), bootstrapServerOscore.getValue());
+                    }
+                    fireInstancesRemoved(instanceIds);
+                    return BootstrapDeleteResponse.success();
                 }
-                fireInstancesRemoved(instanceIds);
+                // else delete everything.
+            }
 
-                return BootstrapDeleteResponse.success();
+            // In all other cases, just delete everything
+            instances.clear();
+            // fired instances removed
+            int[] instanceIds = new int[instances.size()];
+            int i = 0;
+            for (Entry<Integer, LwM2mInstanceEnabler> instance : instances.entrySet()) {
+                instanceIds[i] = instance.getKey();
+                i++;
             }
+            fireInstancesRemoved(instanceIds);
+
+            return BootstrapDeleteResponse.success();
         } else if (request.getPath().isObjectInstance()) {
             if (id == LwM2mId.SECURITY) {
                 // For security object, deleting bootstrap Server account is not allowed
                 LwM2mInstanceEnabler instance = instances.get(request.getPath().getObjectInstanceId());
                 if (ServersInfoExtractor.isBootstrapServer(instance)) {
                     return BootstrapDeleteResponse.badRequest("bootstrap server can not be deleted");
                 }
+            } else if (id == LwM2mId.OSCORE) {
+                // For OSCORE object, deleting instance linked to Bootstrap account is not allowed
+
+                // Get bootstrap instance
+                LwM2mObjectInstance bootstrapInstance = ServersInfoExtractor.getBootstrapSecurityInstance(
+                        getLwm2mClient().getObjectTree().getObjectEnabler(LwM2mId.SECURITY));
+                // Get OSCORE instance ID associated to it
+                Integer bootstrapOscoreInstanceId = bootstrapInstance != null
+                        ? ServersInfoExtractor.getOscoreSecurityMode(bootstrapInstance)
+                        : null;
+
+                if (bootstrapOscoreInstanceId != null
+                        && bootstrapOscoreInstanceId.equals(request.getPath().getObjectInstanceId())) {
+                    return BootstrapDeleteResponse
+                            .badRequest("OSCORE instance linked to bootstrap server can not be deleted");
+                }
             }
             if (null != instances.remove(request.getPath().getObjectInstanceId())) {
                 fireInstancesRemoved(request.getPath().getObjectInstanceId());

leshan-client-core/src/main/java/org/eclipse/leshan/client/servers/ServersInfoExtractor.java

@@ -214,6 +214,19 @@ public static DmServerInfo getDMServerInfo(Map<Integer, LwM2mObjectEnabler> obje
         return info.deviceManagements.get(shortID);
     }
 
+    public static LwM2mObjectInstance getBootstrapSecurityInstance(LwM2mObjectEnabler securityEnabler) {
+        LwM2mObject securities = (LwM2mObject) securityEnabler.read(SYSTEM, new ReadRequest(SECURITY)).getContent();
+        if (securities != null) {
+            for (LwM2mObjectInstance instance : securities.getInstances().values()) {
+                if (isBootstrapServer(instance)) {
+                    return instance;
+                }
+            }
+        }
+
+        return null;
+    }
+
     public static ServerInfo getBootstrapServerInfo(Map<Integer, LwM2mObjectEnabler> objectEnablers) {
         ServersInfo info = getInfo(objectEnablers);
         if (info == null)
@@ -368,6 +381,14 @@ public static boolean isBootstrapServer(LwM2mInstanceEnabler instance) {
         return (Boolean) isBootstrap.getValue();
     }
 
+    public static boolean isBootstrapServer(LwM2mObjectInstance instance) {
+        LwM2mResource resource = instance.getResource(SEC_BOOTSTRAP);
+        if (resource == null) {
+            return false;
+        }
+        return (Boolean) resource.getValue();
+    }
+
     // OSCORE related methods below
 
     public static Integer getOscoreSecurityMode(LwM2mObjectInstance securityInstance) {