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

fix_bug_lwm2m: add authorizer to lh server

Browse Source
This commit is contained in:
nick 2025-03-28 19:19:06 +02:00
parent ea4886726a
commit aec9fc68f4
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/LwM2mCredentialsSecurityInfoValidator.java
View File

@ -88,7 +88,7 @@ public class LwM2mCredentialsSecurityInfoValidator {
} }
TbLwM2MSecurityInfo securityInfo = resultSecurityStore[0]; TbLwM2MSecurityInfo securityInfo = resultSecurityStore[0];
if (securityInfo.getSecurityMode() == null) { if (securityInfo != null && securityInfo.getSecurityMode() == null) {
throw new LwM2MAuthException(); throw new LwM2MAuthException();
} }
return securityInfo; return securityInfo;

1
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportService.java
View File

@ -125,6 +125,7 @@ public class DefaultLwM2mTransportService implements LwM2MTransportService {
/* Set securityStore with new registrationStore */ /* Set securityStore with new registrationStore */
builder.setSecurityStore(securityStore); builder.setSecurityStore(securityStore);
builder.setRegistrationStore(registrationStore); builder.setRegistrationStore(registrationStore);
builder.setAuthorizer(authorizer);
// Create Californium Endpoints Provider: // Create Californium Endpoints Provider:

2
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
View File

@ -141,7 +141,7 @@ public class LwM2mClientContextImpl implements LwM2mClientContext {
} }
oldSession = client.getSession(); oldSession = client.getSession();
TbLwM2MSecurityInfo securityInfo = securityStore.getTbLwM2MSecurityInfoByEndpoint(client.getEndpoint()); TbLwM2MSecurityInfo securityInfo = securityStore.getTbLwM2MSecurityInfoByEndpoint(client.getEndpoint());
if (securityInfo.getSecurityMode() != null) { if (securityInfo != null && securityInfo.getSecurityMode() != null) {
if (SecurityMode.X509.equals(securityInfo.getSecurityMode())) { if (SecurityMode.X509.equals(securityInfo.getSecurityMode())) {
securityStore.registerX509(registration.getEndpoint(), registration.getId()); securityStore.registerX509(registration.getEndpoint(), registration.getId());
} }