Skip to content

Commit

Permalink
LeshanClient: Add initial trust store support.
Browse files Browse the repository at this point in the history 
Trust store is needed for initial bootstrapping and for certificate usage modes
where configured trust store is utilized.

Signed-off-by: Vesa Jääskeläinen <dachaac@gmail.com>
  • Loading branch information
@dachaac
dachaac committed Oct 19, 2020
1 parent b10b19e commit 99577c1
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 7 deletions.
10 changes: 10 additions & 0 deletions ...t-cf/src/main/java/org/eclipse/leshan/client/californium/CaliforniumEndpointsManager.java
View file
Expand Up @@ -60,16 +60,26 @@ public class CaliforniumEndpointsManager implements EndpointsManager {
protected CoapEndpoint currentEndpoint;

protected Builder dtlsConfigbuilder;
protected List<Certificate> trustStore;
protected NetworkConfig coapConfig;
protected InetSocketAddress localAddress;
protected CoapServer coapServer;
protected EndpointFactory endpointFactory;

public CaliforniumEndpointsManager(InetSocketAddress localAddress, NetworkConfig coapConfig,
Builder dtlsConfigBuilder, EndpointFactory endpointFactory) {
this(localAddress, coapConfig, dtlsConfigBuilder, null, endpointFactory);
}

/**
* @since 2.0
*/
public CaliforniumEndpointsManager(InetSocketAddress localAddress, NetworkConfig coapConfig,
Builder dtlsConfigBuilder, List<Certificate> trustStore, EndpointFactory endpointFactory) {
this.localAddress = localAddress;
this.coapConfig = coapConfig;
this.dtlsConfigbuilder = dtlsConfigBuilder;
this.trustStore = trustStore;
this.endpointFactory = endpointFactory;
}

Expand Down
17 changes: 14 additions & 3 deletions leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/LeshanClient.java
View file
Expand Up @@ -16,6 +16,7 @@
package org.eclipse.leshan.client.californium;

import java.net.InetSocketAddress;
import java.security.cert.Certificate;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ScheduledExecutorService;
Expand Down Expand Up @@ -83,6 +84,16 @@ public LeshanClient(String endpoint, InetSocketAddress localAddress,
EndpointFactory endpointFactory, RegistrationEngineFactory engineFactory,
Map<String, String> additionalAttributes, Map<String, String> bsAdditionalAttributes,
LwM2mNodeEncoder encoder, LwM2mNodeDecoder decoder, ScheduledExecutorService sharedExecutor) {
this(endpoint, localAddress, objectEnablers, coapConfig, dtlsConfigBuilder, null, endpointFactory,
engineFactory, additionalAttributes, bsAdditionalAttributes, encoder, decoder, sharedExecutor);
}

/** @since 2.0 */
public LeshanClient(String endpoint, InetSocketAddress localAddress,
List<? extends LwM2mObjectEnabler> objectEnablers, NetworkConfig coapConfig, Builder dtlsConfigBuilder, List<Certificate> trustStore,
EndpointFactory endpointFactory, RegistrationEngineFactory engineFactory,
Map<String, String> additionalAttributes, Map<String, String> bsAdditionalAttributes,
LwM2mNodeEncoder encoder, LwM2mNodeDecoder decoder, ScheduledExecutorService sharedExecutor) {

Validate.notNull(endpoint);
Validate.notEmpty(objectEnablers);
Expand All @@ -91,7 +102,7 @@ public LeshanClient(String endpoint, InetSocketAddress localAddress,
objectTree = createObjectTree(objectEnablers);
observers = createClientObserverDispatcher();
bootstrapHandler = createBoostrapHandler(objectTree);
endpointsManager = createEndpointsManager(localAddress, coapConfig, dtlsConfigBuilder, endpointFactory);
endpointsManager = createEndpointsManager(localAddress, coapConfig, dtlsConfigBuilder, trustStore, endpointFactory);
requestSender = createRequestSender(endpointsManager, sharedExecutor);
engine = engineFactory.createRegistratioEngine(endpoint, objectTree, endpointsManager, requestSender,
bootstrapHandler, observers, additionalAttributes, bsAdditionalAttributes, sharedExecutor);
Expand Down Expand Up @@ -178,8 +189,8 @@ protected CoapResource createBootstrapResource(RegistrationEngine engine, Bootst
}

protected CaliforniumEndpointsManager createEndpointsManager(InetSocketAddress localAddress,
NetworkConfig coapConfig, Builder dtlsConfigBuilder, EndpointFactory endpointFactory) {
return new CaliforniumEndpointsManager(localAddress, coapConfig, dtlsConfigBuilder, endpointFactory);
NetworkConfig coapConfig, Builder dtlsConfigBuilder, List<Certificate> trustStore, EndpointFactory endpointFactory) {
return new CaliforniumEndpointsManager(localAddress, coapConfig, dtlsConfigBuilder, trustStore, endpointFactory);
}

protected CaliforniumLwM2mRequestSender createRequestSender(CaliforniumEndpointsManager endpointsManager,
Expand Down
21 changes: 17 additions & 4 deletions ...an-client-cf/src/main/java/org/eclipse/leshan/client/californium/LeshanClientBuilder.java
View file
Expand Up @@ -16,6 +16,7 @@
package org.eclipse.leshan.client.californium;

import java.net.InetSocketAddress;
import java.security.cert.Certificate;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ScheduledExecutorService;
Expand Down Expand Up @@ -61,6 +62,7 @@ public class LeshanClientBuilder {

private NetworkConfig coapConfig;
private Builder dtlsConfigBuilder;
private List<Certificate> trustStore;

private LwM2mNodeEncoder encoder;
private LwM2mNodeDecoder decoder;
Expand Down Expand Up @@ -156,6 +158,15 @@ public LeshanClientBuilder setDtlsConfig(DtlsConnectorConfig.Builder config) {
return this;
}

/**
* Set optional trust store for verifying X.509 server certificates.
* @param trustStore List of trusted CA certificates
*/
public LeshanClientBuilder setTrustStore(List<Certificate> trustStore) {
this.trustStore = trustStore;
return this;
}

/**
* Advanced setter used to create custom CoAP endpoint.
* <p>
Expand Down Expand Up @@ -309,7 +320,7 @@ protected Connector createSecuredConnector(DtlsConnectorConfig dtlsConfig) {
}

return createLeshanClient(endpoint, localAddress, objectEnablers, coapConfig, dtlsConfigBuilder,
endpointFactory, engineFactory, additionalAttributes, encoder, decoder, executor);
this.trustStore, endpointFactory, engineFactory, additionalAttributes, encoder, decoder, executor);
}

/**
Expand All @@ -326,6 +337,7 @@ protected Connector createSecuredConnector(DtlsConnectorConfig dtlsConfig) {
* client.
* @param coapConfig The coap config used to create {@link CoapEndpoint} and {@link CoapServer}.
* @param dtlsConfigBuilder The dtls config used to create the {@link DTLSConnector}.
* @param trustStore The optional trust store for verifying X.509 server certificates.
* @param endpointFactory The factory which will create the {@link CoapEndpoint}.
* @param engineFactory The factory which will create the {@link RegistrationEngine}.
* @param additionalAttributes Some extra (out-of-spec) attributes to add to the register request.
Expand All @@ -337,10 +349,11 @@ protected Connector createSecuredConnector(DtlsConnectorConfig dtlsConfig) {
*/
protected LeshanClient createLeshanClient(String endpoint, InetSocketAddress localAddress,
List<? extends LwM2mObjectEnabler> objectEnablers, NetworkConfig coapConfig, Builder dtlsConfigBuilder,
EndpointFactory endpointFactory, RegistrationEngineFactory engineFactory,
List<Certificate> trustStore, EndpointFactory endpointFactory, RegistrationEngineFactory engineFactory,
Map<String, String> additionalAttributes, LwM2mNodeEncoder encoder, LwM2mNodeDecoder decoder,
ScheduledExecutorService sharedExecutor) {
return new LeshanClient(endpoint, localAddress, objectEnablers, coapConfig, dtlsConfigBuilder, endpointFactory,
engineFactory, additionalAttributes, bsAdditionalAttributes, encoder, decoder, executor);
return new LeshanClient(endpoint, localAddress, objectEnablers, coapConfig, dtlsConfigBuilder, trustStore,
endpointFactory, engineFactory, additionalAttributes, bsAdditionalAttributes, encoder, decoder,
executor);
}
}

0 comments on commit 99577c1

Please sign in to comment.