Merge branch 'develop' of github.com:OpenIotOrg/openiot into develop

Author: hylkevds

modules/lsm-light/lsm-light.server/src/main/java/org/openiot/lsm/http/SecurityInitializer.java

@@ -226,7 +226,7 @@ private List<LSMRegisteredServiceImpl> createDefaultServices() {
 		defaultService.setEvaluationOrder(0);
 		defaultService.setIgnoreAttributes(true);
 		defaultService.setName("Service Manager");
-		String casPrefix = props.getProperty(CAS_PREFIX, "https://localhost:8443/openiot-cas");
+		String casPrefix = props.getProperty(CAS_PREFIX, "https://localhost:8443/openiot-cas").trim();
 		if (casPrefix.endsWith("/") && casPrefix.length() > 1)
 			casPrefix = casPrefix.substring(0, casPrefix.length() - 1);
 		defaultService.setServiceId(casPrefix + "/services/j_acegi_cas_security_check");
@@ -266,7 +266,7 @@ private List<LSMRegisteredServiceImpl> createDefaultServices() {
 		userManagementService.setEvaluationOrder(0);
 		userManagementService.setIgnoreAttributes(false);
 		userManagementService.setName(props.getProperty(SECURITY_MANAGEMENT_KEY, "openiot-security-manager-app"));
-		String mgmtAppPrefix = props.getProperty(MGMT_PREFIX, "http://localhost:8080/security.management");
+		String mgmtAppPrefix = props.getProperty(MGMT_PREFIX, "http://localhost:8080/security.management").trim();
 		if (mgmtAppPrefix.endsWith("/") && mgmtAppPrefix.length() > 1)
 			mgmtAppPrefix = mgmtAppPrefix.substring(0, mgmtAppPrefix.length() - 1);
 		userManagementService.setServiceId(mgmtAppPrefix + "/callback?client_name=CasOAuthWrapperClient");
@@ -325,7 +325,7 @@ private List<LSMRegisteredServiceImpl> createDefaultServices() {
 		reqDefService.setEvaluationOrder(0);
 		reqDefService.setIgnoreAttributes(false);
 		reqDefService.setName(props.getProperty(REQ_DEF_KEY, "requestDefinitionUI"));
-		String reqDefPrefix = props.getProperty(REQ_DEF_PREFIX, "http://localhost:8080/ui.requestDefinition");
+		String reqDefPrefix = props.getProperty(REQ_DEF_PREFIX, "http://localhost:8080/ui.requestDefinition").trim();
 		if (reqDefPrefix.endsWith("/") && reqDefPrefix.length() > 1)
 			reqDefPrefix = reqDefPrefix.substring(0, reqDefPrefix.length() - 1);
 		reqDefService.setServiceId(reqDefPrefix + "/callback?client_name=CasOAuthWrapperClient");
@@ -342,7 +342,7 @@ private List<LSMRegisteredServiceImpl> createDefaultServices() {
 		reqPresService.setEvaluationOrder(0);
 		reqPresService.setIgnoreAttributes(false);
 		reqPresService.setName(props.getProperty(REQ_PRES_KEY, "requestPresentationUI"));
-		String reqPresPrefix = props.getProperty(REQ_PRES_PREFIX, "http://localhost:8080/ui.requestPresentation");
+		String reqPresPrefix = props.getProperty(REQ_PRES_PREFIX, "http://localhost:8080/ui.requestPresentation").trim();
 		if (reqPresPrefix.endsWith("/") && reqPresPrefix.length() > 1)
 			reqPresPrefix = reqPresPrefix.substring(0, reqPresPrefix.length() - 1);
 		reqPresService.setServiceId(reqPresPrefix + "/callback?client_name=CasOAuthWrapperClient");
@@ -359,7 +359,7 @@ private List<LSMRegisteredServiceImpl> createDefaultServices() {
 		schemaEditorService.setEvaluationOrder(0);
 		schemaEditorService.setIgnoreAttributes(false);
 		schemaEditorService.setName(props.getProperty(SCHEMA_EDITOR_KEY, "schemaEditor"));
-		String schemaEditorPrefix = props.getProperty(SCHEMA_EDITOR_PREFIX, "http://localhost:8080/sensorschema");
+		String schemaEditorPrefix = props.getProperty(SCHEMA_EDITOR_PREFIX, "http://localhost:8080/sensorschema").trim();
 		if (schemaEditorPrefix.endsWith("/") && schemaEditorPrefix.length() > 1)
 			schemaEditorPrefix = schemaEditorPrefix.substring(0, schemaEditorPrefix.length() - 1);
 		schemaEditorService.setServiceId(schemaEditorPrefix + "/callback?client_name=CasOAuthWrapperClient");

modules/lsm-light/lsm-light.server/src/main/java/org/openiot/lsm/utils/SecurityUtil.java

@@ -102,6 +102,8 @@ public static boolean hasPermission(String perm, ServletContext context, String
 	public static synchronized OAuthorizationCredentials login(ServletContext context) {
 		OAuthorizationCredentials credentials = (OAuthorizationCredentials) context.getAttribute(CREDENTIALS);
 		if (credentials == null) {
+			//log out the user if necessary
+			acUtil.logout();
 			logger.debug("Logging into CAS by username {}", username);
 			credentials = acUtil.login(username, password);
 			logger.debug("Credentials obtained after logging in is {}", credentials);

modules/scheduler/scheduler.core/src/main/java/org/openiot/scheduler/core/utils/SecurityUtil.java

@@ -103,6 +103,8 @@ public static synchronized OAuthorizationCredentials login() {
 		if (credentials != null) {
 			logger.debug("Credentials found in context. Aborting login process.");
 		} else {
+			//log out the user if necessary
+			acUtil.logout();
 			logger.debug("Logging into CAS by username {}", username);
 			OAuthorizationCredentials creds = acUtil.login(username, password);
 			logger.debug("Credentials obtained after logging in is {}", creds);

modules/sdum/sdum.core/src/main/java/org/openiot/sdum/core/utils/SecurityUtil.java

@@ -102,6 +102,8 @@ public static synchronized OAuthorizationCredentials login() {
 		if (credentials != null) {
 			logger.debug("Credentials found in context. Aborting login process.");
 		} else {
+			//log out the user if necessary
+			acUtil.logout();
 			logger.debug("Logging into CAS by username {}", username);
 			OAuthorizationCredentials creds = acUtil.login(username, password);
 			logger.debug("Credentials obtained after logging in is {}", creds);