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

lwm2m: refactoring by commit in PR

Browse Source
This commit is contained in:
nickAS21 2022-01-17 15:49:53 +02:00
parent 175984a411
commit b1855cfea2
2 changed files with 9 additions and 9 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/bootstrap/secure/TbLwM2MDtlsBootstrapCertificateVerifier.java
View File

@ -128,7 +128,7 @@ public class TbLwM2MDtlsBootstrapCertificateVerifier implements NewAdvancedCerti
try { try {
securityInfo = bsSecurityStore.getX509ByEndpoint(sha3Hash); securityInfo = bsSecurityStore.getX509ByEndpoint(sha3Hash);
} catch (LwM2MAuthException e) { } catch (LwM2MAuthException e) {
log.trace("Failed find security info: {}", sha3Hash, e); log.trace("Failed to find security info: {}", sha3Hash, e);
} }
} }
ValidateDeviceCredentialsResponse msg = securityInfo != null ? securityInfo.getMsg() : null; ValidateDeviceCredentialsResponse msg = securityInfo != null ? securityInfo.getMsg() : null;

16
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MBootstrapSecurityStore.java
View File

@ -68,9 +68,9 @@ public class LwM2MBootstrapSecurityStore implements BootstrapSecurityStore {
} }
@Override @Override
public Iterator<SecurityInfo> getAllByEndpoint(String endPoint) { public Iterator<SecurityInfo> getAllByEndpoint(String endpoint) {
TbLwM2MSecurityInfo store = lwM2MCredentialsSecurityInfoValidator.getEndpointSecurityInfoByCredentialsId(endPoint, BOOTSTRAP); TbLwM2MSecurityInfo store = lwM2MCredentialsSecurityInfoValidator.getEndpointSecurityInfoByCredentialsId(endpoint, BOOTSTRAP);
SecurityInfo securityInfo = this.addValueToStore(store, endPoint); SecurityInfo securityInfo = this.addValueToStore(store, endpoint);
return securityInfo == null ? null : Collections.singletonList(store.getSecurityInfo()).iterator(); return securityInfo == null ? null : Collections.singletonList(store.getSecurityInfo()).iterator();
} }
@ -162,7 +162,7 @@ public class LwM2MBootstrapSecurityStore implements BootstrapSecurityStore {
} }
} }
}); });
return validBs.get() & validLw.get(); return validBs.get() && validLw.get();
} }
public TransportProtos.SessionInfoProto getSessionByEndpoint(String endpoint) { public TransportProtos.SessionInfoProto getSessionByEndpoint(String endpoint) {
@ -177,7 +177,7 @@ public class LwM2MBootstrapSecurityStore implements BootstrapSecurityStore {
return bootstrapConfigStore.getAll().get(endpoint); return bootstrapConfigStore.getAll().get(endpoint);
} }
public SecurityInfo addValueToStore(TbLwM2MSecurityInfo store, String endPoint) { public SecurityInfo addValueToStore(TbLwM2MSecurityInfo store, String endpoint) {
/* add value to store from BootstrapJson */ /* add value to store from BootstrapJson */
SecurityInfo securityInfo = null; SecurityInfo securityInfo = null;
if (store != null && store.getBootstrapCredentialConfig() != null && store.getSecurityMode() != null) { if (store != null && store.getBootstrapCredentialConfig() != null && store.getSecurityMode() != null) {
@ -199,11 +199,11 @@ public class LwM2MBootstrapSecurityStore implements BootstrapSecurityStore {
} }
} }
for (String config : bootstrapConfigStore.getAll().keySet()) { for (String config : bootstrapConfigStore.getAll().keySet()) {
if (config.equals(endPoint)) { if (config.equals(endpoint)) {
bootstrapConfigStore.remove(config); bootstrapConfigStore.remove(config);
} }
} }
bootstrapConfigStore.add(endPoint, bsConfigNew); bootstrapConfigStore.add(endpoint, bsConfigNew);
} catch (InvalidConfigurationException e) { } catch (InvalidConfigurationException e) {
if (e.getMessage().contains("Psk identity") && e.getMessage().contains("already used for this bootstrap server")) { if (e.getMessage().contains("Psk identity") && e.getMessage().contains("already used for this bootstrap server")) {
log.trace("Invalid Bootstrap Configuration", e); log.trace("Invalid Bootstrap Configuration", e);
@ -215,4 +215,4 @@ public class LwM2MBootstrapSecurityStore implements BootstrapSecurityStore {
} }
return securityInfo; return securityInfo;
} }
} }