dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lwm2m: backEnd: add Error securityConfig if not Device or Profile

Browse Source
This commit is contained in:
nickAS21 2020-12-26 22:29:37 +02:00
parent 9df5be790a
commit 9731fb614b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/secure/LwM2mInMemorySecurityStore.java
View File

@ -17,6 +17,7 @@ package org.thingsboard.server.transport.lwm2m.server.secure;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.eclipse.leshan.core.util.Hex;
import org.eclipse.leshan.server.californium.LeshanServer; import org.eclipse.leshan.server.californium.LeshanServer;
import org.eclipse.leshan.server.registration.Registration; import org.eclipse.leshan.server.registration.Registration;
import org.eclipse.leshan.server.security.InMemorySecurityStore; import org.eclipse.leshan.server.security.InMemorySecurityStore;
@ -69,7 +70,8 @@ public class LwM2mInMemorySecurityStore extends InMemorySecurityStore {
readLock.lock(); readLock.lock();
try { try {
String registrationId = this.getByRegistrationId(endPoint, null); String registrationId = this.getByRegistrationId(endPoint, null);
return (registrationId != null && sessions.size() > 0 && sessions.get(registrationId) != null) ? sessions.get(registrationId).getInfo() : this.add(endPoint); SecurityInfo info = (registrationId != null && sessions.size() > 0 && sessions.get(registrationId) != null) ? sessions.get(registrationId).getInfo() : this.add(endPoint);
return info;
} finally { } finally {
readLock.unlock(); readLock.unlock();
} }
@ -182,7 +184,15 @@ public class LwM2mInMemorySecurityStore extends InMemorySecurityStore {
} else { } else {
if (store.getSecurityMode() == NO_SEC.code && profileUuid != null) if (store.getSecurityMode() == NO_SEC.code && profileUuid != null)
sessions.put(identity, new LwM2MClient(identity, null, null, store.getMsg(), null, null, profileUuid)); sessions.put(identity, new LwM2MClient(identity, null, null, store.getMsg(), null, null, profileUuid));
else log.error("Registration failed: FORBIDDEN/profileUuid [{}] , endpointId: [{}]", profileUuid, identity); else {
log.error("Registration failed: FORBIDDEN/profileUuid/device [{}] , endpointId: [{}]", profileUuid, identity);
/**
* Return Error securityInfo
*/
byte[] preSharedKey = Hex.decodeHex("0A0B".toCharArray());
SecurityInfo info = SecurityInfo.newPreSharedKeyInfo("error", "error_identity", preSharedKey);
return info;
}
} }
return store.getSecurityInfo(); return store.getSecurityInfo();
} }