@ -17,15 +17,12 @@ package org.thingsboard.server.transport.lwm2m.bootstrap.store;
import lombok.extern.slf4j.Slf4j ; import lombok.extern.slf4j.Slf4j ;
import org.eclipse.leshan.core.link.Link ; import org.eclipse.leshan.core.link.Link ;
import org.eclipse.leshan.core.node.LwM2mObject ;
import org.eclipse.leshan.core.node.LwM2mPath ; import org.eclipse.leshan.core.node.LwM2mPath ;
import org.eclipse.leshan.core.request.BootstrapDeleteRequest ; import org.eclipse.leshan.core.request.BootstrapDeleteRequest ;
import org.eclipse.leshan.core.request.BootstrapDiscoverRequest ; import org.eclipse.leshan.core.request.BootstrapDiscoverRequest ;
import org.eclipse.leshan.core.request.BootstrapDownlinkRequest ; import org.eclipse.leshan.core.request.BootstrapDownlinkRequest ;
import org.eclipse.leshan.core.request.BootstrapReadRequest ;
import org.eclipse.leshan.core.request.ContentFormat ; import org.eclipse.leshan.core.request.ContentFormat ;
import org.eclipse.leshan.core.response.BootstrapDiscoverResponse ; import org.eclipse.leshan.core.response.BootstrapDiscoverResponse ;
import org.eclipse.leshan.core.response.BootstrapReadResponse ;
import org.eclipse.leshan.core.response.LwM2mResponse ; import org.eclipse.leshan.core.response.LwM2mResponse ;
import org.eclipse.leshan.server.bootstrap.BootstrapConfig ; import org.eclipse.leshan.server.bootstrap.BootstrapConfig ;
import org.eclipse.leshan.server.bootstrap.BootstrapConfigStore ; import org.eclipse.leshan.server.bootstrap.BootstrapConfigStore ;
@ -33,7 +30,6 @@ import org.eclipse.leshan.server.bootstrap.BootstrapSession;
import org.eclipse.leshan.server.bootstrap.BootstrapUtil ; import org.eclipse.leshan.server.bootstrap.BootstrapUtil ;
import org.eclipse.leshan.server.bootstrap.InvalidConfigurationException ; import org.eclipse.leshan.server.bootstrap.InvalidConfigurationException ;
import java.math.BigInteger ;
import java.util.ArrayList ; import java.util.ArrayList ;
import java.util.Arrays ; import java.util.Arrays ;
import java.util.HashMap ; import java.util.HashMap ;
@ -43,14 +39,18 @@ import java.util.Map;
import java.util.Set ; import java.util.Set ;
import java.util.TreeMap ; import java.util.TreeMap ;
import java.util.concurrent.ConcurrentHashMap ; import java.util.concurrent.ConcurrentHashMap ;
import java.util.concurrent.atomic.AtomicReference ;
import java.util.concurrent.locks.Lock ; import java.util.concurrent.locks.Lock ;
import java.util.concurrent.locks.ReadWriteLock ; import java.util.concurrent.locks.ReadWriteLock ;
import java.util.concurrent.locks.ReentrantReadWriteLock ; import java.util.concurrent.locks.ReentrantReadWriteLock ;
import java.util.stream.Collectors ;
import static org.eclipse.leshan.core.model.ResourceModel.Type.OPAQUE ; import static org.eclipse.leshan.core.LwM2mId.ACCESS_CONTROL ;
import static org.eclipse.leshan.core.LwM2mId.SECURITY ;
import static org.eclipse.leshan.core.LwM2mId.SERVER ;
import static org.eclipse.leshan.server.bootstrap.BootstrapUtil.toWriteRequest ; import static org.eclipse.leshan.server.bootstrap.BootstrapUtil.toWriteRequest ;
import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.BOOTSTRAP_DEFAULT_SHORT_ID_0 ; import static org.thingsboard.server.common.data.device.credentials.lwm2m.Lwm2mServerIdentifier.LWM2M_SERVER_MAX ;
import static org.thingsboard.server.common.data.device.credentials.lwm2m.Lwm2mServerIdentifier.PRIMARY_LWM2M_SERVER ;
import static org.thingsboard.server.common.data.device.credentials.lwm2m.Lwm2mServerIdentifier.isLwm2mServer ;
@Slf4j @Slf4j
public class LwM2MBootstrapConfigStoreTaskProvider implements LwM2MBootstrapTaskProvider { public class LwM2MBootstrapConfigStoreTaskProvider implements LwM2MBootstrapTaskProvider {
@ -77,11 +77,11 @@ public class LwM2MBootstrapConfigStoreTaskProvider implements LwM2MBootstrapTask
@Override @Override
public Tasks getTasks ( BootstrapSession session , List < LwM2mResponse > previousResponse ) { public Tasks getTasks ( BootstrapSession session , List < LwM2mResponse > previousResponse ) {
// BootstrapConfig config = store.get(session.getEndpoint(), session.getClientTransportData().getIdentity(), session);
// BootstrapConfig config = store.get(session.getEndpoint(), session.getClientTransportData().getIdentity(), session);
BootstrapConfig config = store . get ( session ) ; BootstrapConfig configNew = store . get ( session ) ;
if ( config = = null ) { if ( configNew = = null ) {
return null ; return null ;
} }
if ( previousResponse = = null & & shouldStartWithDiscover ( config ) ) { if ( previousResponse = = null & & shouldStartWithDiscover ( configNew ) ) {
Tasks tasks = new Tasks ( ) ; Tasks tasks = new Tasks ( ) ;
tasks . requestsToSend = new ArrayList < > ( 1 ) ; tasks . requestsToSend = new ArrayList < > ( 1 ) ;
tasks . requestsToSend . add ( new BootstrapDiscoverRequest ( ) ) ; tasks . requestsToSend . add ( new BootstrapDiscoverRequest ( ) ) ;
@ -96,47 +96,27 @@ public class LwM2MBootstrapConfigStoreTaskProvider implements LwM2MBootstrapTask
tasks . supportedObjects = this . supportedObjects ; tasks . supportedObjects = this . supportedObjects ;
// handle bootstrap discover response
// handle bootstrap discover response
if ( previousResponse ! = null ) { if ( previousResponse ! = null ) {
if ( previousResponse . get ( 0 ) instanceof BootstrapDiscoverResponse ) { if ( previousResponse . get ( 0 ) instanceof BootstrapDiscoverResponse discoverResponse ) {
BootstrapDiscoverResponse discoverResponse = ( BootstrapDiscoverResponse ) previousResponse . get ( 0 ) ;
if ( discoverResponse . isSuccess ( ) ) { if ( discoverResponse . isSuccess ( ) ) {
this . initAfterBootstrapDiscover ( discoverResponse ) ; this . initAfterBootstrapDiscover ( discoverResponse ) ;
findSecurityInstanceId ( discoverResponse . getObjectLinks ( ) , session . getEndpoint ( ) ) ; /// Short Server Ids - in old config
} else { findInstancesIdOldByServerId ( discoverResponse , session . getEndpoint ( ) ) ;
log . warn ( log . warn (
"Bootstrap Discover return error {} : to continue bootstrap session without autoIdForSecurityObject mode. {}" , "Bootstrap server instance successfully found in Security Object (0) in response {}. Continuing bootstrap session. Session: {}" ,
discoverResponse , session ) ; discoverResponse , session ) ;
} } else {
if ( this . lwM2MBootstrapSessionClients . get ( session . getEndpoint ( ) ) . getSecurityInstances ( ) . get ( BOOTSTRAP_DEFAULT_SHORT_ID_0 ) = = null ) { log . warn (
log . error ( "Unable to find bootstrap server instance in Security Object (0) in response {}. Continuing bootstrap session with autoIdForSecurityObject mode, ignoring information from discoverResponse. Session: {}" ,
"Unable to find bootstrap server instance in Security Object (0) in response {}: unable to continue bootstrap session with autoIdForSecurityObject mode. {}" ,
discoverResponse , session ) ; discoverResponse , session ) ;
return null ;
}
tasks . requestsToSend = new ArrayList < > ( 1 ) ;
tasks . requestsToSend . add ( new BootstrapReadRequest ( "/1" ) ) ;
tasks . last = false ;
return tasks ;
}
BootstrapReadResponse readResponse = ( BootstrapReadResponse ) previousResponse . get ( 0 ) ;
Integer bootstrapServerIdOld = null ;
if ( readResponse . isSuccess ( ) ) {
findServerInstanceId ( readResponse , session . getEndpoint ( ) ) ;
if ( this . lwM2MBootstrapSessionClients . get ( session . getEndpoint ( ) ) . getSecurityInstances ( ) . size ( ) > 0 & & this . lwM2MBootstrapSessionClients . get ( session . getEndpoint ( ) ) . getServerInstances ( ) . size ( ) > 0 ) {
bootstrapServerIdOld = this . findBootstrapServerId ( session . getEndpoint ( ) ) ;
} }
} else {
log . warn (
"Bootstrap ReadResponse return error {} : to continue bootstrap session without find Server Instance Id. {}" ,
readResponse , session ) ;
} }
// create requests from config
// create requests from config
tasks . requestsToSend = this . toRequests ( config , tasks . requestsToSend = this . toRequests ( configNew ,
config . contentFormat ! = null ? config . contentFormat : session . getContentFormat ( ) , configNew . contentFormat ! = null ? configNew . contentFormat : session . getContentFormat ( ) , session . getEndpoint ( ) ) ;
bootstrapServerIdOld , session . getEndpoint ( ) ) ;
} else { } else {
// create requests from config
// create requests from config
tasks . requestsToSend = BootstrapUtil . toRequests ( config , tasks . requestsToSend = BootstrapUtil . toRequests ( configNew ,
config . contentFormat ! = null ? config . contentFormat : session . getContentFormat ( ) ) ; configNew . contentFormat ! = null ? configNew . contentFormat : session . getContentFormat ( ) ) ;
} }
return tasks ; return tasks ;
} }
@ -148,81 +128,57 @@ public class LwM2MBootstrapConfigStoreTaskProvider implements LwM2MBootstrapTask
/ * * / * *
* "Short Server ID" : This Resource MUST be set when the Bootstrap - Server Resource has a value of ' false ' . * "Short Server ID" : This Resource MUST be set when the Bootstrap - Server Resource has a value of ' false ' .
* The values ID : 0 and ID : 65535 values MUST NOT be used for identifying the LwM2M Server . * "Short Lwm2m Server ID" :
* "Short Server ID" :
* - Link Instance ( lwm2m Server ) hase linkParams with key = "ssid" value = "shortId" ( ver lvm2m = 1 . 1 ) . * - Link Instance ( lwm2m Server ) hase linkParams with key = "ssid" value = "shortId" ( ver lvm2m = 1 . 1 ) .
* - Link Instance ( bootstrap Server ) hase not linkParams with key = "ssid" ( ver lvm2m = 1 . 0 ) . * The values ID : 0 values MUST NOT be used for identifying the LwM2M Server only BS .
* / * /
protected void findSecurityInstanceId ( Link [ ] objectLinks , String endpoint ) { protected void findInstancesIdOldByServerId ( BootstrapDiscoverResponse discoverResponses , String endpoint ) {
log . info ( "Object after discover: [{}]" , objectLinks ) ; log . info ( "Object after discover: [{}]" , Arrays . toString ( discoverResponses . getObjectLinks ( ) ) ) ;
for ( Link link : objectLinks ) { for ( Link link : discoverResponses . getObjectLinks ( ) ) {
if ( link . getUriReference ( ) . startsWith ( "/0/" ) ) { LwM2mPath path = new LwM2mPath ( link . getUriReference ( ) ) ;
try { if ( path . isObjectInstance ( ) ) {
LwM2mPath path = new LwM2mPath ( link . getUriReference ( ) ) ; int lwm2mShortServerId = 0 ;
if ( path . isObjectInstance ( ) ) { if ( path . getObjectId ( ) = = 0 ) {
if ( link . getAttributes ( ) . get ( "ssid" ) ! = null ) { if ( link . getAttributes ( ) . get ( "ssid" ) ! = null ) {
int serverId = Integer . parseInt ( link . getAttributes ( ) . get ( "ssid" ) . getCoreLinkValue ( ) ) ; lwm2mShortServerId = Integer . parseInt ( link . getAttributes ( ) . get ( "ssid" ) . getCoreLinkValue ( ) ) ;
if ( ! lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . containsKey ( serverId ) ) { if ( validateLwm2mShortServerId ( lwm2mShortServerId ) ) {
lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . put ( serverId , path . getObjectInstanceId ( ) ) ; this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . putIfAbsent ( lwm2mShortServerId , path . getObjectInstanceId ( ) ) ;
} else { } else {
log . error ( "Invalid lwm2mSecurityInstance by [{}]" , path . getObjectInstanceId ( ) ) ; log . error ( "Invalid lwm2mSecurityInstance [{}] by short server id [{}]" , path . getObjectInstanceId ( ) , lwm2mShortServerId ) ;
} }
lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . put ( serverId , path . getObjectInstanceId ( ) ) ; } else {
this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . putIfAbsent ( null , path . getObjectInstanceId ( ) ) ;
}
} else if ( path . getObjectId ( ) = = 1 ) {
if ( link . getAttributes ( ) . get ( "ssid" ) ! = null ) {
lwm2mShortServerId = Integer . parseInt ( link . getAttributes ( ) . get ( "ssid" ) . getCoreLinkValue ( ) ) ;
if ( validateLwm2mShortServerId ( lwm2mShortServerId ) ) {
this . lwM2MBootstrapSessionClients . get ( endpoint ) . getServerInstances ( ) . putIfAbsent ( lwm2mShortServerId , path . getObjectInstanceId ( ) ) ;
} else { } else {
if ( ! this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . containsKey ( 0 ) ) { log . error ( "Invalid lwm2mServerInstance [{}] by short server id [{}]" , path . getObjectInstanceId ( ) , lwm2mShortServerId ) ;
this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . put ( BOOTSTRAP_DEFAULT_SHORT_ID_0 , path . getObjectInstanceId ( ) ) ;
} else {
log . error ( "Invalid bootstrapSecurityInstance by [{}]" , path . getObjectInstanceId ( ) ) ;
}
} }
} }
} catch ( Exception e ) {
// ignore if this is not a LWM2M path
log . error ( "Invalid LwM2MPath starting by \"/0/\"" ) ;
} }
} }
} }
} }
protected void findServerInstanceId ( BootstrapReadResponse readResponse , String endpoint ) {
try {
( ( LwM2mObject ) readResponse . getContent ( ) ) . getInstances ( ) . values ( ) . forEach ( instance - > {
var shId = OPAQUE . equals ( instance . getResource ( 0 ) . getType ( ) ) ? new BigInteger ( ( byte [ ] ) instance . getResource ( 0 ) . getValue ( ) ) . intValue ( ) : instance . getResource ( 0 ) . getValue ( ) ;
int shortId ;
if ( shId instanceof Long ) {
shortId = ( ( Long ) shId ) . intValue ( ) ;
} else {
shortId = ( int ) shId ;
}
this . lwM2MBootstrapSessionClients . get ( endpoint ) . getServerInstances ( ) . put ( shortId , instance . getId ( ) ) ;
} ) ;
} catch ( Exception e ) {
log . error ( "Failed find Server Instance Id. " , e ) ;
}
}
protected Integer findBootstrapServerId ( String endpoint ) {
Integer bootstrapServerIdOld = null ;
Map < Integer , Integer > filteredMap = this . lwM2MBootstrapSessionClients . get ( endpoint ) . getServerInstances ( ) . entrySet ( )
. stream ( ) . filter ( x - > ! this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . containsKey ( x . getKey ( ) ) )
. collect ( Collectors . toMap ( Map . Entry : : getKey , Map . Entry : : getValue ) ) ;
if ( filteredMap . size ( ) > 0 ) {
bootstrapServerIdOld = filteredMap . keySet ( ) . stream ( ) . findFirst ( ) . get ( ) ;
}
return bootstrapServerIdOld ;
}
public BootstrapConfigStore getStore ( ) { public BootstrapConfigStore getStore ( ) {
return this . store ; return this . store ;
} }
private void initAfterBootstrapDiscover ( BootstrapDiscoverResponse response ) { private void initAfterBootstrapDiscover ( BootstrapDiscoverResponse response ) {
Link [ ] links = response . getObjectLinks ( ) ; Link [ ] links = response . getObjectLinks ( ) ;
AtomicReference < String > verDefault = new AtomicReference < > ( "1.0" ) ;
Arrays . stream ( links ) . forEach ( link - > { Arrays . stream ( links ) . forEach ( link - > {
LwM2mPath path = new LwM2mPath ( link . getUriReference ( ) ) ; LwM2mPath path = new LwM2mPath ( link . getUriReference ( ) ) ;
if ( ! path . isRoot ( ) & & path . getObjectId ( ) < 3 ) { if ( path . isRoot ( ) ) {
if ( link . hasAttribute ( ) & & link . getAttributes ( ) . get ( "lwm2m" ) ! = null ) {
verDefault . set ( link . getAttributes ( ) . get ( "lwm2m" ) . getValue ( ) . toString ( ) ) ;
}
} else if ( path . getObjectId ( ) < = ACCESS_CONTROL ) {
if ( path . isObject ( ) ) { if ( path . isObject ( ) ) {
String ver = link . getAttributes ( ) . get ( "ver" ) ! = null ? link . getAttributes ( ) . get ( "ver" ) . getCoreLinkValue ( ) : "1.0" ; String ver = ( link . hasAttribute ( ) & & link . getAttributes ( ) . get ( "ver" ) ! = null ) ? link . getAttributes ( ) . get ( "ver" ) . getCoreLinkValue ( ) : verDefault . get ( ) ;
this . supportedObjects . put ( path . getObjectId ( ) , ver ) ; this . supportedObjects . put ( path . getObjectId ( ) , ver ) ;
} }
} }
@ -230,94 +186,124 @@ public class LwM2MBootstrapConfigStoreTaskProvider implements LwM2MBootstrapTask
} }
public List < BootstrapDownlinkRequest < ? extends LwM2mResponse > > toRequests ( BootstrapConfig bootstrapConfig , / * * Map < serverId ( "Short Server ID" ) , InstanceId > = > LwM2MBootstrapClientInstanceIds
* 1 ) Both
* - ( Short ) Server ID = = null bs )
* SECURITY = 0 ; InstanceId = 0
* - Short Server ID = = 1 - 65534 lwm2m )
* SECURITY = 0 ; InstanceId = 1
* SERVER = 1 ; InstanceId = 0
* 2 ) Only BS Server
* - Short Server ID = = null bs )
* SECURITY = 0 ; InstanceId = 0
* 3 ) Only Lwm2m Server
* - Short Server ID = = 1 - 65534 lwm2m )
* SECURITY = 0 ; InstanceId = 0
* SERVER = 1 ; InstanceId = 0
* * /
public List < BootstrapDownlinkRequest < ? extends LwM2mResponse > > toRequests ( BootstrapConfig bootstrapConfigNew ,
ContentFormat contentFormat , ContentFormat contentFormat ,
Integer bootstrapServerIdOld ,
String endpoint ) { String endpoint ) {
Integer bootstrapSecurityInstanceId = this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . get ( null ) = = null ?
- 2 : this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . get ( null ) ;
List < BootstrapDownlinkRequest < ? extends LwM2mResponse > > requests = new ArrayList < > ( ) ; List < BootstrapDownlinkRequest < ? extends LwM2mResponse > > requests = new ArrayList < > ( ) ;
Set < String > pathsDelete = new HashSet < > ( ) ; Set < String > pathsDelete = new HashSet < > ( ) ;
List < BootstrapDownlinkRequest < ? extends LwM2mResponse > > requestsWrite = new ArrayList < > ( ) ; ConcurrentHashMap < String , BootstrapDownlinkRequest < ? extends LwM2mResponse > > requestsWrite = new ConcurrentHashMap < > ( ) ;
boolean isBsServer = false ;
boolean isLwServer = false ; /// handle security & handle
/** Map<serverId ("Short Server ID"), InstanceId> */ // bootstrap Security new - There can only be one instance of bootstrap at a time.
Map < Integer , Integer > instances = new HashMap < > ( ) ; /// bs: handle security only
Integer bootstrapServerIdNew = null ; for ( BootstrapConfig . ServerSecurity security : new TreeMap < > ( bootstrapConfigNew . security ) . values ( ) ) {
// handle security
if ( security . bootstrapServer & & bootstrapSecurityInstanceId > - 1 ) {
int lwm2mSecurityInstanceId = 0 ; // delete old bootstrap Security
int bootstrapSecurityInstanceId = this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . get ( BOOTSTRAP_DEFAULT_SHORT_ID_0 ) ; String path = "/" + SECURITY + "/" + bootstrapSecurityInstanceId ;
for ( BootstrapConfig . ServerSecurity security : new TreeMap < > ( bootstrapConfig . security ) . values ( ) ) { pathsDelete . add ( path ) ;
if ( security . bootstrapServer ) { security . serverId = null ;
requestsWrite . add ( toWriteRequest ( bootstrapSecurityInstanceId , security , contentFormat ) ) ; requestsWrite . put ( path , toWriteRequest ( bootstrapSecurityInstanceId , security , contentFormat ) ) ;
isBsServer = true ;
bootstrapServerIdNew = security . serverId ;
instances . put ( security . serverId , bootstrapSecurityInstanceId ) ;
} else {
if ( lwm2mSecurityInstanceId = = bootstrapSecurityInstanceId ) {
lwm2mSecurityInstanceId + + ;
}
requestsWrite . add ( toWriteRequest ( lwm2mSecurityInstanceId , security , contentFormat ) ) ;
instances . put ( security . serverId , lwm2mSecurityInstanceId ) ;
isLwServer = true ;
if ( ! isBsServer & & this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . containsKey ( security . serverId ) & &
lwm2mSecurityInstanceId ! = this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . get ( security . serverId ) ) {
pathsDelete . add ( "/0/" + this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . get ( security . serverId ) ) ;
}
/ * *
* If there is an instance in the serverInstances with serverId which we replace in the securityInstances
* /
// find serverId in securityInstances by id (instance)
Integer serverIdOld = null ;
for ( Map . Entry < Integer , Integer > entry : this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . entrySet ( ) ) {
if ( entry . getValue ( ) . equals ( lwm2mSecurityInstanceId ) ) {
serverIdOld = entry . getKey ( ) ;
}
}
if ( ! isBsServer & & serverIdOld ! = null & & this . lwM2MBootstrapSessionClients . get ( endpoint ) . getServerInstances ( ) . containsKey ( serverIdOld ) ) {
pathsDelete . add ( "/1/" + this . lwM2MBootstrapSessionClients . get ( endpoint ) . getServerInstances ( ) . get ( serverIdOld ) ) ;
}
lwm2mSecurityInstanceId + + ;
} }
} }
// handle server
for ( Map . Entry < Integer , BootstrapConfig . ServerConfig > server : bootstrapConfig . servers . entrySet ( ) ) { / * * lwm2m servers : Multiple instances of lwm2m servers can run simultaneously by SHORT_ID
int securityInstanceId = instances . get ( server . getValue ( ) . shortId ) ; if update - > delete and write by InstanceId
requestsWrite . add ( toWriteRequest ( securityInstanceId , server . getValue ( ) , contentFormat ) ) ; if new - > only write with InstanceIdMax + +
if ( ! isBsServer ) { * /
/** Delete instance if bootstrapServerIdNew not equals bootstrapServerIdOld or securityInstanceBsIdNew not equals serverInstanceBsIdOld */
if ( bootstrapServerIdNew ! = null & & server . getValue ( ) . shortId = = bootstrapServerIdNew & & /// lwm2m server: handle security & server
( bootstrapServerIdNew ! = bootstrapServerIdOld | | securityInstanceId ! = this . lwM2MBootstrapSessionClients . get ( endpoint ) . getServerInstances ( ) . get ( bootstrapServerIdOld ) ) ) { //max Lwm2m Security instance old id if new
pathsDelete . add ( "/1/" + this . lwM2MBootstrapSessionClients . get ( endpoint ) . getServerInstances ( ) . get ( bootstrapServerIdOld ) ) ; int lwm2mSecurityInstanceIdMax = - 1 ;
/** Delete instance if serverIdNew is present in serverInstances and securityInstanceIdOld by serverIdNew not equals serverInstanceIdOld */ for ( Integer shortId : this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . keySet ( ) ) {
} else if ( this . lwM2MBootstrapSessionClients . get ( endpoint ) . getServerInstances ( ) . containsKey ( server . getValue ( ) . shortId ) & & if ( isLwm2mServer ( shortId ) ) {
securityInstanceId ! = this . lwM2MBootstrapSessionClients . get ( endpoint ) . getServerInstances ( ) . get ( server . getValue ( ) . shortId ) ) { lwm2mSecurityInstanceIdMax = Math . max (
pathsDelete . add ( "/1/" + this . lwM2MBootstrapSessionClients . get ( endpoint ) . getServer Instances ( ) . get ( server . getValue ( ) . s hortId ) ) ; this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . get ( shortId ) ,
} lwm2mSecurityInstanceIdMax ) ;
} }
} }
// handle acl
//max Lwm2m Server instance old id if new
for ( Map . Entry < Integer , BootstrapConfig . ACLConfig > acl : bootstrapConfig . acls . entrySet ( ) ) { int lwm2mServerInstanceIdMax = - 1 ;
requestsWrite . add ( toWriteRequest ( acl . getKey ( ) , acl . getValue ( ) , contentFormat ) ) ; for ( Integer shortId : this . lwM2MBootstrapSessionClients . get ( endpoint ) . getServerInstances ( ) . keySet ( ) ) {
if ( isLwm2mServer ( shortId ) ) {
lwm2mServerInstanceIdMax = Math . max (
this . lwM2MBootstrapSessionClients . get ( endpoint ) . getServerInstances ( ) . get ( shortId ) ,
lwm2mServerInstanceIdMax ) ;
}
} }
// handle delete
// Lwm2m update or new
if ( isBsServer & & isLwServer ) { for ( BootstrapConfig . ServerSecurity security : new TreeMap < > ( bootstrapConfigNew . security ) . values ( ) ) {
requests . add ( new BootstrapDeleteRequest ( "/0" ) ) ; if ( ! security . bootstrapServer ) {
requests . add ( new BootstrapDeleteRequest ( "/1" ) ) ; // Security
} else { Integer secureInstanceId = this . lwM2MBootstrapSessionClients . get ( endpoint ) . getSecurityInstances ( ) . get ( security . serverId ) ;
pathsDelete . forEach ( pathDelete - > requests . add ( new BootstrapDeleteRequest ( pathDelete ) ) ) ; if ( secureInstanceId ! = null ) {
pathsDelete . add ( "/" + SECURITY + "/" + secureInstanceId ) ;
requestsWrite . put ( "/" + SECURITY + "/" + secureInstanceId , toWriteRequest ( secureInstanceId , security , contentFormat ) ) ;
} else {
secureInstanceId = + + lwm2mSecurityInstanceIdMax ;
if ( bootstrapSecurityInstanceId . equals ( secureInstanceId ) ) {
secureInstanceId = + + lwm2mSecurityInstanceIdMax ;
}
requestsWrite . put ( "/" + SECURITY + "/" + secureInstanceId , toWriteRequest ( secureInstanceId , security , contentFormat ) ) ;
}
Integer serverInstanceId = this . lwM2MBootstrapSessionClients . get ( endpoint ) . getServerInstances ( ) . get ( security . serverId ) ;
if ( serverInstanceId ! = null ) {
pathsDelete . add ( "/" + SERVER + "/" + serverInstanceId ) ;
} else {
serverInstanceId = + + lwm2mServerInstanceIdMax ;
}
Integer finalServerInstanceId = serverInstanceId ;
new TreeMap < > ( bootstrapConfigNew . servers ) . values ( ) . stream ( )
. filter ( server - > server . shortId = = security . serverId )
. findFirst ( )
. ifPresent ( server - >
requestsWrite . put (
"/" + SERVER + "/" + finalServerInstanceId ,
toWriteRequest ( finalServerInstanceId , server , contentFormat )
)
) ;
}
} }
// handle write
if ( requestsWrite . size ( ) > 0 ) { /// handle acl
requests . addAll ( requestsWrite ) ; for ( Map . Entry < Integer , BootstrapConfig . ACLConfig > acl : bootstrapConfigNew . acls . entrySet ( ) ) {
requestsWrite . put ( "/" + ACCESS_CONTROL + "/" + acl . getKey ( ) , toWriteRequest ( acl . getKey ( ) , acl . getValue ( ) , contentFormat ) ) ;
}
/// handle delete
pathsDelete . forEach ( pathDelete - > requests . add ( new BootstrapDeleteRequest ( pathDelete ) ) ) ;
/// handle write
if ( ! requestsWrite . isEmpty ( ) ) {
requests . addAll ( requestsWrite . values ( ) ) ;
} }
return ( requests ) ; return ( requests ) ;
} }
private void initSupportedObjectsDefault ( ) { private void initSupportedObjectsDefault ( ) {
this . supportedObjects = new HashMap < > ( ) ; this . supportedObjects = new HashMap < > ( ) ;
this . supportedObjects . put ( 0 , "1.1" ) ; this . supportedObjects . put ( SECURITY , "1.1" ) ;
this . supportedObjects . put ( 1 , "1.1" ) ; this . supportedObjects . put ( SERVER , "1.1" ) ;
this . supportedObjects . put ( 2 , "1.0" ) ; this . supportedObjects . put ( ACCESS_CONTROL , "1.0" ) ;
}
private boolean validateLwm2mShortServerId ( int id ) {
return id > = PRIMARY_LWM2M_SERVER . getId ( ) & & id < = LWM2M_SERVER_MAX . getId ( ) ;
} }
@Override @Override
Viacheslav Klimov
11 months ago
GitHub