Delete 'src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/workspace/WsUtil.java'
removed hard-coded fallback
This commit is contained in:
parent
6b2e211455
commit
9ec6960eb8
|
|
@ -1,127 +0,0 @@
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package org.gcube.portlets.user.workspaceexplorerapp.server.workspace;
|
|
||||||
|
|
||||||
import javax.servlet.http.HttpSession;
|
|
||||||
|
|
||||||
import org.gcube.common.storagehubwrapper.server.StorageHubWrapper;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
|
|
||||||
// TODO: Auto-generated Javadoc
|
|
||||||
/**
|
|
||||||
* The Class WsUtil.
|
|
||||||
*
|
|
||||||
* @author Francesco Mangiacrapa at ISTI-CNR Pisa (Italy)
|
|
||||||
* Apr 9, 2020
|
|
||||||
*/
|
|
||||||
public class WsUtil {
|
|
||||||
|
|
||||||
public static final Logger logger = LoggerFactory.getLogger(WsUtil.class);
|
|
||||||
public static final String ENVIRONMENT_VARIABLE_SCOPE_NAME = "EnvironmentVariableScope";
|
|
||||||
public static final String ENVIRONMENT_VARIABLE_TOKEN_NAME = "EnvironmentVariableAppToken";
|
|
||||||
public static final String SESSION_SCOPE = "session_scope";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the storage hub wrapper.
|
|
||||||
*
|
|
||||||
* @param httpSession the http session
|
|
||||||
* @return the storage hub wrapper
|
|
||||||
* @throws Exception the exception
|
|
||||||
*/
|
|
||||||
private static StorageHubWrapper getStorageHubWrapper(HttpSession httpSession) throws Exception {
|
|
||||||
|
|
||||||
try {
|
|
||||||
String scope = getScope(httpSession);
|
|
||||||
String applicationToken = getApplicationToken(httpSession);
|
|
||||||
|
|
||||||
if(applicationToken==null || applicationToken.isEmpty()) {
|
|
||||||
String token = "9b397e7a-c683-44dc-b65b-53725b98f7e5-98187548";
|
|
||||||
applicationToken = token;
|
|
||||||
// TODO
|
|
||||||
logger.warn("\n\n\nALERT!!!! FALLBACK DETECTED TO INSTANCE THE SHUB\n\n");
|
|
||||||
logger.warn("Calling the " + StorageHubWrapper.class.getSimpleName() +
|
|
||||||
" by token: " + token.substring(0, 10) +" MASKED TOKEN" +
|
|
||||||
" by using the scope: " + scope);
|
|
||||||
logger.warn("\n\n\n HAVE TO REMOVE THIS CODE!!!\n\n\n");
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return new StorageHubWrapper(scope, applicationToken, false, false, false);
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.error("Error when instancing the storageHub wrapper", e);
|
|
||||||
throw new Exception("Error on inizializing the StorageHub wrapper. Please contact the support!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the workpace.
|
|
||||||
*
|
|
||||||
* @param httpSession the http session
|
|
||||||
* @return the workpace
|
|
||||||
* @throws Exception the exception
|
|
||||||
*/
|
|
||||||
public static org.gcube.common.storagehubwrapper.server.tohl.Workspace getWorkspace(HttpSession httpSession) throws Exception {
|
|
||||||
|
|
||||||
try {
|
|
||||||
StorageHubWrapper wrapper = getStorageHubWrapper(httpSession);
|
|
||||||
return wrapper.getWorkspace();
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.error("Error on getting the Workspace", e);
|
|
||||||
throw new Exception("Error on getting the Workspace");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the scope.
|
|
||||||
*
|
|
||||||
* @param httpSession the http session
|
|
||||||
* @return the scope
|
|
||||||
*/
|
|
||||||
public static String getScope(HttpSession httpSession) {
|
|
||||||
String scope = (String) httpSession.getAttribute(SESSION_SCOPE);
|
|
||||||
logger.info("Variable " + SESSION_SCOPE + " read from httpsession is: " + scope);
|
|
||||||
|
|
||||||
if (scope == null) {
|
|
||||||
logger.info("Variable " + SESSION_SCOPE + " is null reading from web.xml context");
|
|
||||||
String variableScopeName = httpSession.getServletContext()
|
|
||||||
.getInitParameter(ENVIRONMENT_VARIABLE_SCOPE_NAME);
|
|
||||||
logger.info("Found param-value '" + variableScopeName
|
|
||||||
+ "' from web context, reading its value from ENVIRONMENT");
|
|
||||||
scope = System.getenv(variableScopeName);
|
|
||||||
logger.info("Value of " + variableScopeName + " from ENVIRONMENT is: " + scope);
|
|
||||||
}
|
|
||||||
|
|
||||||
httpSession.setAttribute(ENVIRONMENT_VARIABLE_SCOPE_NAME, scope);
|
|
||||||
return scope;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the application token.
|
|
||||||
*
|
|
||||||
* @param httpSession the http session
|
|
||||||
* @return the application token
|
|
||||||
*/
|
|
||||||
public static String getApplicationToken(HttpSession httpSession) {
|
|
||||||
|
|
||||||
String appToken = null;
|
|
||||||
String appTokenEnvVarName = null;
|
|
||||||
try {
|
|
||||||
logger.info("Reading " + ENVIRONMENT_VARIABLE_TOKEN_NAME + " from web.xml context");
|
|
||||||
appTokenEnvVarName = httpSession.getServletContext()
|
|
||||||
.getInitParameter(ENVIRONMENT_VARIABLE_TOKEN_NAME);
|
|
||||||
logger.info("Found param-value '" + appTokenEnvVarName
|
|
||||||
+ "' from web context, reading its value from ENVIRONMENT");
|
|
||||||
appToken = System.getenv(appTokenEnvVarName);
|
|
||||||
logger.info("Value of " + appTokenEnvVarName + " from ENVIRONMENT is: " + appToken);
|
|
||||||
|
|
||||||
}catch (Exception e) {
|
|
||||||
logger.error("Error on reading the ENV VARIABLE '"+appTokenEnvVarName+"' from ENVIRONMENT");
|
|
||||||
}
|
|
||||||
|
|
||||||
return appToken;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue