Skip to content
Snippets Groups Projects
Commit 3c2a89e3 authored by Tulio Ribeiro's avatar Tulio Ribeiro
Browse files

Fixed CryptoUtil.java at getSharedSecret function. 

The value of CHALLENGE_RESPONSE_SECRET needs to be the value of "-alias" option from keytool, as follow:

keytool -genkey -alias AliasChallengeResponse -keystore key.jceks -keypass "PassWord" -storepass "PassWord" -storetype JCEKS

Main changes:

CHALLENGE_RESPONSE_SECRET = "AliasChallengeResponse"; -> hard coded.
parent 9a56cd6c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/java/net/floodlightcontroller/simpleft/FT.java
+ 17
− 145
View file @ 3c2a89e3
......@@ -6,54 +6,36 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import net.floodlightcontroller.core.FloodlightContext;
import net.floodlightcontroller.core.IFloodlightProviderService;
import net.floodlightcontroller.core.IOFMessageListener;
import net.floodlightcontroller.core.IOFSwitch;
import net.floodlightcontroller.core.module.FloodlightModuleContext;
import net.floodlightcontroller.core.module.FloodlightModuleException;
import net.floodlightcontroller.core.module.IFloodlightModule;
import net.floodlightcontroller.core.module.IFloodlightService;
import net.floodlightcontroller.core.util.SingletonTask;
import net.floodlightcontroller.storage.IStorageSourceService;
import net.floodlightcontroller.threadpool.IThreadPoolService;
import net.floodlightcontroller.threadpool.ThreadPool;
import org.projectfloodlight.openflow.protocol.OFMessage;
import org.projectfloodlight.openflow.protocol.OFType;
import org.sdnplatform.sync.IStoreClient;
import org.sdnplatform.sync.IStoreListener;
import org.sdnplatform.sync.ISyncService;
import org.sdnplatform.sync.ISyncService.Scope;
import org.sdnplatform.sync.Versioned;
import org.sdnplatform.sync.error.SyncException;
import org.sdnplatform.sync.error.UnknownStoreException;
import org.sdnplatform.sync.internal.SyncManager;
import org.sdnplatform.sync.internal.config.IClusterConfigProvider;
import org.sdnplatform.sync.internal.config.Node;
import org.sdnplatform.sync.internal.config.PropertyCCProvider;
import org.sdnplatform.sync.internal.config.SyncStoreCCProvider;
import org.sdnplatform.sync.internal.remote.RemoteSyncManager;
import org.sdnplatform.sync.internal.store.IStore;
import org.sdnplatform.sync.internal.util.CryptoUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import net.floodlightcontroller.core.FloodlightContext;
import net.floodlightcontroller.core.IFloodlightProviderService;
import net.floodlightcontroller.core.IOFMessageListener;
import net.floodlightcontroller.core.IOFSwitch;
import net.floodlightcontroller.core.internal.Controller;
import net.floodlightcontroller.core.module.FloodlightModuleContext;
import net.floodlightcontroller.core.module.FloodlightModuleException;
import net.floodlightcontroller.core.module.IFloodlightModule;
import net.floodlightcontroller.core.module.IFloodlightService;
import net.floodlightcontroller.core.util.SingletonTask;
import net.floodlightcontroller.debugcounter.IDebugCounterService;
import net.floodlightcontroller.debugcounter.MockDebugCounterService;
import net.floodlightcontroller.debugevent.IDebugEventService;
import net.floodlightcontroller.debugevent.MockDebugEventService;
import net.floodlightcontroller.devicemanager.internal.DeviceManagerImpl;
import net.floodlightcontroller.devicemanager.internal.DeviceSyncRepresentation;
import net.floodlightcontroller.storage.IStorageSourceListener;
import net.floodlightcontroller.storage.IStorageSourceService;
import net.floodlightcontroller.threadpool.IThreadPoolService;
import net.floodlightcontroller.threadpool.ThreadPool;
public class FT implements
IOFMessageListener,
IFloodlightModule,
......@@ -62,9 +44,7 @@ IStoreListener<String>
private ISyncService syncService;
private IStoreClient<String, Object> storeClient;
private IStoreListener<String> storeListener;
private IClusterConfigProvider clusterProvider;
protected FloodlightModuleContext[] moduleContexts;
protected SyncManager[] syncManagers;
protected final static ObjectMapper mapper = new ObjectMapper();
......@@ -136,92 +116,7 @@ IStoreListener<String>
this.syncService = context.getServiceImpl(ISyncService.class);
threadPoolService = context.getServiceImpl(IThreadPoolService.class);
/*
tp = new ThreadPool();
//tp = new ThreadPool();
syncManagers = new SyncManager[2];
moduleContexts = new FloodlightModuleContext[2];
nodes = new ArrayList<Node>();
nodes.add(new Node("192.168.1.131", 6642, (short)1, (short)1));
nodes.add(new Node("192.168.1.131", 6643, (short)2, (short)2));
try {
nodeString = mapper.writeValueAsString(nodes);
} catch (JsonProcessingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
logger.info("INIT FT: {}",nodeString);
//moduleContexts[0] = new FloodlightModuleContext();
moduleContexts[0] = context;
logger.info("moduleContexts: {}",moduleContexts[0]);
tp = new ThreadPool();
syncManagers[0] = new SyncManager();
RemoteSyncManager remoteSyncManager = new RemoteSyncManager();
moduleContexts[0].addService(IThreadPoolService.class, tp);
moduleContexts[0].addConfigParam(remoteSyncManager, "persistenceEnabled", "false");
moduleContexts[0].addConfigParam(remoteSyncManager, "configProviders",
SyncStoreCCProvider.class.getName());
moduleContexts[0].addConfigParam(remoteSyncManager, "nodes", nodeString);
moduleContexts[0].addConfigParam(remoteSyncManager, "thisNode", "0");
moduleContexts[0].addConfigParam(remoteSyncManager, "authScheme", "CHALLENGE_RESPONSE");
moduleContexts[0].addConfigParam(remoteSyncManager, "keyStorePath",
"/etc/floodlight/mykey.jceks");
moduleContexts[0].addConfigParam(remoteSyncManager, "keyStorePassword", "passwd");
tp.init(moduleContexts[0]);
remoteSyncManager.init(moduleContexts[0]);
tp.startUp(moduleContexts[0]);
remoteSyncManager.startUp(moduleContexts[0]);
try {
remoteSyncManager.registerStore("NIB",Scope.GLOBAL);
} catch (SyncException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
*/
/*for(int i = 0; i < 2; i++) {
moduleContexts[i] = new FloodlightModuleContext();
moduleContexts[i] = context;
syncManagers[i] = new SyncManager();
moduleContexts[i].addService(IThreadPoolService.class, tp);
moduleContexts[i].addConfigParam(syncManagers[i], "configProviders",
SyncStoreCCProvider.class.getName());
moduleContexts[i].addConfigParam(syncManagers[i], "nodes", nodeString);
moduleContexts[i].addConfigParam(syncManagers[i], "thisNode", ""+i);
moduleContexts[i].addConfigParam(syncManagers[i], "persistenceEnabled", "false");
moduleContexts[i].addConfigParam(syncManagers[i], "authScheme", "CHALLENGE_RESPONSE");
moduleContexts[i].addConfigParam(syncManagers[i], "keyStorePath",
"/etc/floodlight/mykey.jceks");
moduleContexts[i].addConfigParam(syncManagers[i], "keyStorePassword", "passwd");
tp.init(moduleContexts[i]);
syncManagers[i].init(moduleContexts[i]);
tp.startUp(moduleContexts[i]);
syncManagers[i].startUp(moduleContexts[i]);
syncManagers[i].registerStore("global", Scope.GLOBAL);
syncManagers[i].registerStore("local", Scope.LOCAL);
logger.info("I: {}",i);
}*/
}
@Override
......@@ -253,10 +148,7 @@ IStoreListener<String>
e.printStackTrace();
}
ScheduledExecutorService ses = threadPoolService.getScheduledExecutor();
testTask = new SingletonTask(ses, new Runnable() {
int counter=0;
......@@ -265,34 +157,14 @@ IStoreListener<String>
Random r = new Random();
try {
//storeClient.put("NIB", new String("vl:"+r.nextInt(1000)));
storeClient.put("NIB", new String(""+counter++));
storeClient.put("NIB", new String("vl:"+r.nextInt(1000)));
//storeClient.put("NIB", new String(""+counter++));
} catch (SyncException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
/*try {
Versioned<Object> vObj = storeClient.get("NIB");
logger.info("Versioned: {}",vObj);
} catch (SyncException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}*/
// IStoreClient<String, Object> storeCliAux;
//
// try {
// storeCliAux = syncService.getStoreClient("NIB", String.class, Object.class);
// storeCliAux.put("k1", new String("r:"+r.nextInt(200)));
//
// } catch (SyncException e) {
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
testTask.reschedule(4, TimeUnit.SECONDS);
}
});
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment