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

JaxbContext updated

Browse Source
master
lucio 4 years ago
parent 9ed284e2d1
commit fa7ac84ba0
4 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File

4
.project
Unescape Escape View File

@ -16,12 +16,12 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>

3
src/main/java/org/gcube/common/authorization/client/Binder.java
Unescape Escape View File

@ -14,6 +14,7 @@ import org.gcube.common.authorization.library.provider.ServiceInfo;
import org.gcube.common.authorization.library.provider.UserInfo;
import org.gcube.common.authorization.library.utils.AuthorizationEntryList;
import org.gcube.common.authorization.library.utils.ListMapper;
import org.gcube.common.authorization.library.utils.MultiServiceTokenRequest;
public class Binder {
@ -22,7 +23,7 @@ public class Binder {
public static JAXBContext getContext() throws JAXBException{
if (context==null)
context = JAXBContext.newInstance(ExternalServiceList.class, QualifiersList.class, AuthorizationEntry.class, ClientInfo.class, UserInfo.class,
ServiceInfo.class, Policies.class, Policy.class, ListMapper.class, AuthorizationEntryList.class);
ServiceInfo.class, Policies.class, Policy.class, ListMapper.class, AuthorizationEntryList.class, MultiServiceTokenRequest.class);
return context;
}

21
src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java
Unescape Escape View File

@ -18,6 +18,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
import javax.net.ssl.HttpsURLConnection;
@ -113,6 +114,10 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
StringBuilder callUrl = new StringBuilder(getInternalEnpoint(infrastructureHash)).append(methodPath);
List<String> realTokens = containerTokens.stream().map(t -> Utils.getRealToken(t)).collect(Collectors.toList());
URL url = new URL(callUrl.toString());
HttpURLConnection connection = makeRequest(url, "PUT", true);
connection.setDoOutput(true);
@ -120,7 +125,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
connection.setRequestProperty("Content-type", "application/xml");
try(OutputStream os = new BufferedOutputStream(connection.getOutputStream())){
Binder.getContext().createMarshaller().marshal(new MultiServiceTokenRequest(containerTokens, client), os);
Binder.getContext().createMarshaller().marshal(new MultiServiceTokenRequest(realTokens, client), os);
}
log.debug("response code for "+callUrl.toString()+" is "+connection.getResponseCode()+" "+connection.getResponseMessage());
@ -264,6 +269,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
public void removeAllReleatedToken(String clientId, String context) throws Exception{
String methodPath = "/token/user";
int infrastructureHash = Utils.getInfrastructureHashfromContext(context);
StringBuilder callUrl = new StringBuilder(getInternalEnpoint(infrastructureHash)).append(methodPath).append("?")
.append(CONTEXT_PARAM).append("=").append(context).append("&").append(CLIENT_ID_PARAM).append("=").append(clientId);
@ -277,6 +283,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
if (connection.getResponseCode()!=200 && connection.getResponseCode()!=204) throw new Exception("error contacting authorization service");
}
@Override
public String generateApiKey(String apiQualifier) throws Exception {
@ -507,13 +514,19 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy {
}
}
final String methodPath = "/resolve/?";
final String methodPath = "/token/resolve/?";
StringBuilder callUrl = new StringBuilder(getInternalEnpoint(endpoint))
.append(methodPath);
for (String toAppend : realTokens)
callUrl= callUrl.append("token=").append(toAppend);
boolean first = true;
for (String toAppend : realTokens) {
if (first) {
callUrl= callUrl.append("token=").append(toAppend);
first = false;
} else callUrl= callUrl.append("&token=").append(toAppend);
}
URL url = new URL(callUrl.toString());
HttpURLConnection connection = makeRequest(url, "GET", false);

14
src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java
Unescape Escape View File

@ -24,6 +24,8 @@ import org.gcube.common.authorization.library.policies.User2ServicePolicy;
import org.gcube.common.authorization.library.policies.Users;
import org.gcube.common.authorization.library.provider.ContainerInfo;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.authorization.library.provider.ServiceIdentifier;
import org.gcube.common.authorization.library.provider.ServiceInfo;
import org.gcube.common.authorization.library.provider.UserInfo;
import org.junit.Ignore;
import org.junit.Test;
@ -36,19 +38,7 @@ public class CallTest {
}
@Test
public void requestActivation() throws Exception {
SecurityTokenProvider.instance.set("b653566c-2983-4a0e-a0a9-b913636469a8-98187548");
//ic-test.dev.int.d4science.net b653566c-2983-4a0e-a0a9-b913636469a8-98187548 80 /home/gcube/.containerxml/2-container.xml /gcube /gcube/devNext
String token = authorizationService().requestActivation(new ContainerInfo("ic-test.dev.int.d4science.net", 80), "/gcube/devNext") ;
System.out.println(token);
}
@Test
public void requestUserTokenViaUserNameAndScope() throws Exception {
AuthorizationEntry token = authorizationService().get("d9431600-9fef-41a7-946d-a5b402de30d6-98187548");
System.out.println(token);
}
@Test
public void removeUserinContext() throws Exception {

Write Preview
Loading…
Cancel
Save