Skip to content

Commit

Permalink
#1027: Rewrite BootstrapDiscover Tests to use BootstrapTaskProvider
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbernard31
sbernard31 committed Jun 10, 2021
1 parent a75a173 commit 9d95875
Showing 1 changed file with 62 additions and 55 deletions.
117 changes: 62 additions & 55 deletions ...c/test/java/org/eclipse/leshan/integration/tests/util/BootstrapIntegrationTestHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import java.security.spec.ECPrivateKeySpec;
import java.security.spec.ECPublicKeySpec;
import java.security.spec.KeySpec;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
Expand All @@ -56,25 +57,24 @@
import org.eclipse.leshan.core.request.ContentFormat;
import org.eclipse.leshan.core.request.Identity;
import org.eclipse.leshan.core.response.BootstrapDiscoverResponse;
import org.eclipse.leshan.core.response.LwM2mResponse;
import org.eclipse.leshan.core.util.Hex;
import org.eclipse.leshan.server.bootstrap.BootstrapConfig;
import org.eclipse.leshan.server.bootstrap.BootstrapConfig.ACLConfig;
import org.eclipse.leshan.server.bootstrap.BootstrapConfig.ServerConfig;
import org.eclipse.leshan.server.bootstrap.BootstrapConfig.ServerSecurity;
import org.eclipse.leshan.server.bootstrap.BootstrapConfigStore;
import org.eclipse.leshan.server.bootstrap.BootstrapFailureCause;
import org.eclipse.leshan.server.bootstrap.BootstrapHandler;
import org.eclipse.leshan.server.bootstrap.BootstrapHandlerFactory;
import org.eclipse.leshan.server.bootstrap.BootstrapConfigStoreTaskProvider;
import org.eclipse.leshan.server.bootstrap.BootstrapSession;
import org.eclipse.leshan.server.bootstrap.BootstrapSessionManager;
import org.eclipse.leshan.server.bootstrap.DefaultBootstrapHandler;
import org.eclipse.leshan.server.bootstrap.BootstrapTaskProvider;
import org.eclipse.leshan.server.bootstrap.DefaultBootstrapSession;
import org.eclipse.leshan.server.bootstrap.DefaultBootstrapSessionManager;
import org.eclipse.leshan.server.bootstrap.LwM2mBootstrapRequestSender;
import org.eclipse.leshan.server.californium.bootstrap.LeshanBootstrapServer;
import org.eclipse.leshan.server.californium.bootstrap.LeshanBootstrapServerBuilder;
import org.eclipse.leshan.server.model.StandardBootstrapModelProvider;
import org.eclipse.leshan.server.security.BootstrapSecurityStore;
import org.eclipse.leshan.server.security.EditableSecurityStore;
import org.eclipse.leshan.server.security.SecurityChecker;
import org.eclipse.leshan.server.security.SecurityInfo;

/**
Expand All @@ -89,6 +89,30 @@ public class BootstrapIntegrationTestHelper extends SecureIntegrationTestHelper
public volatile DefaultBootstrapSession lastBootstrapSession;
public volatile BootstrapDiscoverResponse lastDiscoverAnswer;

private class TestBootstrapSessionManager extends DefaultBootstrapSessionManager {

public TestBootstrapSessionManager(BootstrapSecurityStore bsSecurityStore,
BootstrapTaskProvider tasksProvider) {
super(bsSecurityStore, new SecurityChecker(), tasksProvider, new StandardBootstrapModelProvider());
}

public TestBootstrapSessionManager(BootstrapSecurityStore bsSecurityStore, BootstrapConfigStore configStore) {
super(bsSecurityStore, new SecurityChecker(), new BootstrapConfigStoreTaskProvider(configStore),
new StandardBootstrapModelProvider());
}

@Override
public BootstrapSession begin(BootstrapRequest request, Identity clientIdentity) {
assertThat(request.getCoapRequest(), instanceOf(Request.class));
return super.begin(request, clientIdentity);
}

@Override
public void end(BootstrapSession bsSession) {
lastBootstrapSession = (DefaultBootstrapSession) bsSession;
}
}

public BootstrapIntegrationTestHelper() {
super();

Expand Down Expand Up @@ -122,72 +146,55 @@ public BootstrapIntegrationTestHelper() {

private LeshanBootstrapServerBuilder createBootstrapBuilder(BootstrapSecurityStore securityStore,
BootstrapConfigStore bootstrapStore) {
if (bootstrapStore == null) {
bootstrapStore = unsecuredBootstrapStore();
}

if (securityStore == null) {
securityStore = dummyBsSecurityStore();
}

LeshanBootstrapServerBuilder builder = new LeshanBootstrapServerBuilder();
builder.setLocalAddress(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
builder.setLocalSecureAddress(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
builder.setPrivateKey(bootstrapServerPrivateKey);
builder.setPublicKey(bootstrapServerPublicKey);
builder.setSecurityStore(securityStore);
builder.setSessionManager(new DefaultBootstrapSessionManager(securityStore, bootstrapStore) {

@Override
public BootstrapSession begin(BootstrapRequest request, Identity clientIdentity) {
assertThat(request.getCoapRequest(), instanceOf(Request.class));
return super.begin(request, clientIdentity);
}

@Override
public void end(BootstrapSession bsSession) {
lastBootstrapSession = (DefaultBootstrapSession) bsSession;
}
});

return builder;
}

public void createBootstrapServer(BootstrapSecurityStore securityStore, BootstrapConfigStore bootstrapStore) {
bootstrapServer = createBootstrapBuilder(securityStore, bootstrapStore).build();
LeshanBootstrapServerBuilder builder = createBootstrapBuilder(securityStore, bootstrapStore);
if (bootstrapStore == null) {
bootstrapStore = unsecuredBootstrapStore();
}

if (securityStore == null) {
securityStore = dummyBsSecurityStore();
}
builder.setSecurityStore(securityStore);
builder.setSessionManager(new TestBootstrapSessionManager(securityStore, bootstrapStore));
bootstrapServer = builder.build();
}

public void createBootstrapServer(BootstrapSecurityStore securityStore, BootstrapConfigStore bootstrapStore,
final BootstrapDiscoverRequest request) {
LeshanBootstrapServerBuilder builder = createBootstrapBuilder(securityStore, bootstrapStore);

if (bootstrapStore == null) {
bootstrapStore = unsecuredBootstrapStore();
}
if (securityStore == null) {
securityStore = dummyBsSecurityStore();
}
// start bootstrap session by a bootstrap discover request
builder.setBootstrapHandlerFactory(new BootstrapHandlerFactory() {

BootstrapConfigStoreTaskProvider taskProvider = new BootstrapConfigStoreTaskProvider(bootstrapStore) {
@Override
public BootstrapHandler create(LwM2mBootstrapRequestSender sender, BootstrapSessionManager sessionManager) {
return new DefaultBootstrapHandler(sender, sessionManager) {

@Override
protected void startBootstrap(final BootstrapSession session) {
send(session, request, new SafeResponseCallback<BootstrapDiscoverResponse>(session) {

@Override
public void safeOnResponse(BootstrapDiscoverResponse response) {
lastDiscoverAnswer = response;
sendRequest(session, sessionManager.getFirstRequest(session));
}
}, new SafeErrorCallback(session) {
@Override
public void safeOnError(Exception e) {
stopSession(session, BootstrapFailureCause.INTERNAL_SERVER_ERROR);
}
});
}
};
public Tasks getTasks(BootstrapSession session, List<LwM2mResponse> previousResponses) {
if (previousResponses == null) {
Tasks tasks = new Tasks();
tasks.requestsToSend = new ArrayList<>();
tasks.requestsToSend.add(request);
tasks.last = false;
return tasks;
} else {
lastDiscoverAnswer = (BootstrapDiscoverResponse) previousResponses.get(0);
return super.getTasks(session, previousResponses);
}
}
});

};
builder.setSecurityStore(securityStore);
builder.setSessionManager(new TestBootstrapSessionManager(securityStore, taskProvider));
bootstrapServer = builder.build();
}

Expand Down

0 comments on commit 9d95875

Please sign in to comment.