gCubeSystem
/
authorization-client
16
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/Common/authorization-common-client@131606 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Lucio Lelii 2016-09-22 08:44:15 +00:00
parent 9748b7af14
commit 0355825fb4
5 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/gcube/common/authorization/client/proxy/AuthorizationEntryCache.java
View File

@ -1,6 +1,5 @@
package org.gcube.common.authorization.client.proxy; package org.gcube.common.authorization.client.proxy;
import org.gcube.common.authorization.client.Constants;
import org.gcube.common.authorization.library.AuthorizationEntry; import org.gcube.common.authorization.library.AuthorizationEntry;
public class AuthorizationEntryCache { public class AuthorizationEntryCache {
@ -17,7 +16,7 @@ public class AuthorizationEntryCache {
return entry; return entry;
} }
public boolean isValid(){ public boolean isValid(long timeToLive){
return (System.currentTimeMillis()-Constants.TIME_TO_LIVE_CACHE_IN_MILLIS)<this.creationDate; return (System.currentTimeMillis()-timeToLive)<this.creationDate;
} }
} }

3
src/main/java/org/gcube/common/authorization/client/proxy/AuthorizationProxy.java
View File

@ -6,6 +6,7 @@ import java.util.Map;
import org.gcube.common.authorization.client.exceptions.ObjectNotFound; import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
import org.gcube.common.authorization.library.AuthorizationEntry; import org.gcube.common.authorization.library.AuthorizationEntry;
import org.gcube.common.authorization.library.enpoints.AuthorizationEndpoint; import org.gcube.common.authorization.library.enpoints.AuthorizationEndpoint;
import org.gcube.common.authorization.library.enpoints.EndpointsContainer;
import org.gcube.common.authorization.library.policies.Policy; import org.gcube.common.authorization.library.policies.Policy;
import org.gcube.common.authorization.library.provider.ContainerInfo; import org.gcube.common.authorization.library.provider.ContainerInfo;
import org.gcube.common.authorization.library.provider.ServiceInfo; import org.gcube.common.authorization.library.provider.ServiceInfo;
@ -15,7 +16,7 @@ public interface AuthorizationProxy {
AuthorizationEndpoint getEndpoint(int infrastructureHash); AuthorizationEndpoint getEndpoint(int infrastructureHash);
void setEndpoint(Map<Integer,AuthorizationEndpoint> endpoints); void setEndpoint(EndpointsContainer endpoints);
AuthorizationEntry get(String token) throws ObjectNotFound, Exception; AuthorizationEntry get(String token) throws ObjectNotFound, Exception;

47
src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java
View File

@ -11,9 +11,9 @@ import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.WeakHashMap;
import org.gcube.common.authorization.client.Binder; import org.gcube.common.authorization.client.Binder;
import org.gcube.common.authorization.client.Constants; import org.gcube.common.authorization.client.Constants;
@ -23,6 +23,7 @@ import org.gcube.common.authorization.library.Policies;
import org.gcube.common.authorization.library.QualifiersList; import org.gcube.common.authorization.library.QualifiersList;
import org.gcube.common.authorization.library.enpoints.AuthorizationEndpoint; import org.gcube.common.authorization.library.enpoints.AuthorizationEndpoint;
import org.gcube.common.authorization.library.enpoints.AuthorizationEndpointScanner; import org.gcube.common.authorization.library.enpoints.AuthorizationEndpointScanner;
import org.gcube.common.authorization.library.enpoints.EndpointsContainer;
import org.gcube.common.authorization.library.policies.Policy; import org.gcube.common.authorization.library.policies.Policy;
import org.gcube.common.authorization.library.provider.ContainerInfo; import org.gcube.common.authorization.library.provider.ContainerInfo;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
@ -35,11 +36,12 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
private static Logger log = LoggerFactory.getLogger(AuthorizationProxy.class); private static Logger log = LoggerFactory.getLogger(AuthorizationProxy.class);
private static Map<String, AuthorizationEntryCache> cache = Collections.synchronizedMap(new WeakHashMap<String, AuthorizationEntryCache>()); private static Map<String, AuthorizationEntryCache> cache = Collections.synchronizedMap(new HashMap<String, AuthorizationEntryCache>());
private Map<Integer, AuthorizationEndpoint> endpoints; private static EndpointsContainer endpoints;
public DefaultAuthorizationProxy() { public DefaultAuthorizationProxy() {
if (endpoints==null)
endpoints = AuthorizationEndpointScanner.endpoints(); endpoints = AuthorizationEndpointScanner.endpoints();
} }
@ -54,7 +56,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
String methodPath = "/token/service"; String methodPath = "/token/service";
int infrastructureHash = Utils.getInfrastructureHashFromToken(SecurityTokenProvider.instance.get()); int infrastructureHash = Utils.getInfrastructureHashFromToken(SecurityTokenProvider.instance.get(), endpoints.getDefaultInfrastructure());
StringBuilder callUrl = new StringBuilder(getInternalEnpoint(infrastructureHash)).append(methodPath); StringBuilder callUrl = new StringBuilder(getInternalEnpoint(infrastructureHash)).append(methodPath);
@ -125,7 +127,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
String methodPath = String.format("/apikey?qualifier=%s",apiQualifier); String methodPath = String.format("/apikey?qualifier=%s",apiQualifier);
int infrastructureHash = Utils.getInfrastructureHashFromToken(SecurityTokenProvider.instance.get()); int infrastructureHash = Utils.getInfrastructureHashFromToken(SecurityTokenProvider.instance.get(), endpoints.getDefaultInfrastructure());
StringBuilder callUrl = new StringBuilder(getInternalEnpoint(infrastructureHash)).append(methodPath); StringBuilder callUrl = new StringBuilder(getInternalEnpoint(infrastructureHash)).append(methodPath);
@ -157,7 +159,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
public Map<String, String> retrieveApiKeys() throws Exception{ public Map<String, String> retrieveApiKeys() throws Exception{
String methodPath = "/apikey/"; String methodPath = "/apikey/";
int infrastructureHash = Utils.getInfrastructureHashFromToken(SecurityTokenProvider.instance.get()); int infrastructureHash = Utils.getInfrastructureHashFromToken(SecurityTokenProvider.instance.get(), endpoints.getDefaultInfrastructure());
StringBuilder callUrl = new StringBuilder(getInternalEnpoint(infrastructureHash)).append(methodPath); StringBuilder callUrl = new StringBuilder(getInternalEnpoint(infrastructureHash)).append(methodPath);
@ -172,7 +174,6 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
try(InputStream stream = (InputStream)connection.getContent();){ try(InputStream stream = (InputStream)connection.getContent();){
QualifiersList entries = (QualifiersList)Binder.getContext().createUnmarshaller().unmarshal(stream); QualifiersList entries = (QualifiersList)Binder.getContext().createUnmarshaller().unmarshal(stream);
//cache.put(token, new AuthorizationEntryCache(entry));
return entries.getQualifiers(); return entries.getQualifiers();
} }
} }
@ -210,19 +211,25 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
result.append(line); result.append(line);
token = result.toString(); token = result.toString();
} }
return Utils.addInfrastructureHashToToken(token, infrastructureHash); return Utils.addInfrastructureHashToToken(token, infrastructureHash);
} }
@Override @Override
public AuthorizationEntry get(String token) throws ObjectNotFound, Exception{ public AuthorizationEntry get(String token) throws ObjectNotFound, Exception{
if (cache.containsKey(token) && cache.get(token).isValid()) String realToken = Utils.getRealToken(token);
return cache.get(token).getEntry(); int infrastructureHashFromToken = Utils.getInfrastructureHashFromToken(token, endpoints.getDefaultInfrastructure());
AuthorizationEndpoint endpoint = getEndpoint(infrastructureHashFromToken);
if (cache.containsKey(realToken) && cache.get(realToken).isValid(endpoint.getClientCacheValidity())){
log.trace("valid entry found in cache for token {}, returning it",String.format("%s********",realToken.substring(0, token.length()-8)));
return cache.get(realToken).getEntry();
} else
log.trace("invalid entry found in cache for token {}, contacting auth service",String.format("%s********",token.substring(0, token.length()-8)));
final String methodPath = "/token/"; final String methodPath = "/token/";
StringBuilder callUrl = new StringBuilder(getInternalEnpoint(Utils.getInfrastructureHashFromToken(token))) StringBuilder callUrl = new StringBuilder(getInternalEnpoint(infrastructureHashFromToken))
.append(methodPath).append(Utils.getRealToken(token)); .append(methodPath).append(realToken);
URL url = new URL(callUrl.toString()); URL url = new URL(callUrl.toString());
HttpURLConnection connection = makeRequest(url, "GET", false); HttpURLConnection connection = makeRequest(url, "GET", false);
@ -233,17 +240,17 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
try(InputStream stream = (InputStream)connection.getContent();){ try(InputStream stream = (InputStream)connection.getContent();){
AuthorizationEntry entry = (AuthorizationEntry)Binder.getContext().createUnmarshaller().unmarshal(stream); AuthorizationEntry entry = (AuthorizationEntry)Binder.getContext().createUnmarshaller().unmarshal(stream);
//cache.put(token, new AuthorizationEntryCache(entry)); if (entry!=null) cache.put(realToken, new AuthorizationEntryCache(entry));
return entry; return entry;
} }
} }
@Override @Override
public void addPolicies(List<Policy> policies) throws Exception { public void addPolicies(List<Policy> policies) throws Exception {
final String methodPath = "/policyManager"; final String methodPath = "/policyManager";
StringBuilder callUrl = new StringBuilder(getInternalEnpoint(Utils.getInfrastructureHashFromToken(SecurityTokenProvider.instance.get()))).append(methodPath); StringBuilder callUrl = new StringBuilder(getInternalEnpoint(Utils.getInfrastructureHashFromToken(SecurityTokenProvider.instance.get(), endpoints.getDefaultInfrastructure()))).append(methodPath);
URL url = new URL(callUrl.toString()); URL url = new URL(callUrl.toString());
HttpURLConnection connection = makeRequest(url, "POST", true); HttpURLConnection connection = makeRequest(url, "POST", true);
@ -261,7 +268,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
@Override @Override
public void removePolicies(long... ids) throws Exception { public void removePolicies(long... ids) throws Exception {
final String methodPath = "/policyManager/"; final String methodPath = "/policyManager/";
StringBuilder callUrl = new StringBuilder(getInternalEnpoint(Utils.getInfrastructureHashFromToken(SecurityTokenProvider.instance.get()))).append(methodPath); StringBuilder callUrl = new StringBuilder(getInternalEnpoint(Utils.getInfrastructureHashFromToken(SecurityTokenProvider.instance.get(), endpoints.getDefaultInfrastructure()))).append(methodPath);
List<Long> errorIds = new ArrayList<Long>(); List<Long> errorIds = new ArrayList<Long>();
for (long id: ids){ for (long id: ids){
URL url = new URL(callUrl.toString()+id); URL url = new URL(callUrl.toString()+id);
@ -302,14 +309,14 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
@Override @Override
public AuthorizationEndpoint getEndpoint(int infrastructureHash) { public AuthorizationEndpoint getEndpoint(int infrastructureHash) {
if (!this.endpoints.containsKey(infrastructureHash)) if (!endpoints.getEndpoints().containsKey(infrastructureHash))
throw new RuntimeException("Authorization Endpoint not found for the required infrastructure"); throw new RuntimeException("Authorization Endpoint not found for the required infrastructure");
return this.endpoints.get(infrastructureHash); return endpoints.getEndpoints().get(infrastructureHash);
} }
@Override @Override
public void setEndpoint(Map<Integer,AuthorizationEndpoint> endpoints) { public void setEndpoint(EndpointsContainer newEndpoints) {
this.endpoints = endpoints; endpoints = newEndpoints;
} }

6
src/main/java/org/gcube/common/authorization/client/proxy/Utils.java
View File

@ -11,8 +11,6 @@ public class Utils {
private static final String REAL_TOKEN_REGEXPR ="([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(-[0-9]+)?"; private static final String REAL_TOKEN_REGEXPR ="([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(-[0-9]+)?";
private static final String DEFAULT_INFRASTRUCTURE_FOR_OLD_TOKEN = "gcube";
protected static int getInfrastructureHashfromContext(String context) { protected static int getInfrastructureHashfromContext(String context) {
try{ try{
@ -23,13 +21,13 @@ public class Utils {
} }
} }
public static int getInfrastructureHashFromToken(String token) { public static int getInfrastructureHashFromToken(String token, String defaultInfrastructureToUse) {
if (token==null) throw new RuntimeException("token required for this method"); if (token==null) throw new RuntimeException("token required for this method");
else if (token.matches(NEW_TOKEN_REGEXPR)){ else if (token.matches(NEW_TOKEN_REGEXPR)){
String hashCodeAsString = token.substring(token.lastIndexOf("-")+1, token.length()); String hashCodeAsString = token.substring(token.lastIndexOf("-")+1, token.length());
return Integer.parseInt(hashCodeAsString); return Integer.parseInt(hashCodeAsString);
} else if (token.matches(OLD_TOKEN_REGEXPR)) } else if (token.matches(OLD_TOKEN_REGEXPR))
return DEFAULT_INFRASTRUCTURE_FOR_OLD_TOKEN.hashCode(); return defaultInfrastructureToUse.hashCode();
throw new RuntimeException("valid token required for this method"); throw new RuntimeException("valid token required for this method");
} }

6
src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java
View File

@ -20,7 +20,7 @@ public class CallTest {
@Test @Test
public void resolveNodeToken() throws Exception{ public void resolveNodeToken() throws Exception{
System.out.println(resolveToken("c3c52f5b-ea65-4364-8357-be930763fdad")); //81caac0f-8a0d-4923-9312-7ff0eb3f2d5e|98187548")); System.out.println(resolveToken("46311827-6000-480a-8f75-01b7943d490b")); //81caac0f-8a0d-4923-9312-7ff0eb3f2d5e|98187548"));
} }
@Test @Test
@ -40,8 +40,8 @@ public class CallTest {
@Test @Test
public void getPolicies() throws Exception{ public void getPolicies() throws Exception{
SecurityTokenProvider.instance.set(requestTestToken("/gcube/devsec/devVRE")); SecurityTokenProvider.instance.set(requestTestToken("/gcube/devNext"));
List<Policy> policies = authorizationService().getPolicies("/gcube/devsec/devVRE"); List<Policy> policies = authorizationService().getPolicies("/gcube/devNext");
System.out.println(policies); System.out.println(policies);
} }