gCubeSystem
/
common-authorization
14
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-library@122534 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Lucio Lelii 2016-01-26 17:45:22 +00:00
parent 97ec52938a
commit f3f777adb8
5 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java
View File

@ -9,7 +9,11 @@ import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlRootElement;
import org.gcube.common.authorization.library.policies.Policy;
import org.gcube.common.authorization.library.policies.Service2ServicePolicy;
import org.gcube.common.authorization.library.policies.User2ServicePolicy;
import org.gcube.common.authorization.library.provider.ClientInfo;
import org.gcube.common.authorization.library.provider.ServiceInfo;
import org.gcube.common.authorization.library.provider.UserInfo;
import org.gcube.common.scope.api.ServiceMap;
import org.gcube.common.scope.impl.DefaultServiceMap;
@ -17,10 +21,18 @@ import org.gcube.common.scope.impl.DefaultServiceMap;
@XmlAccessorType(XmlAccessType.FIELD)
public class AuthorizationEntry {
@XmlElementRefs({
@XmlElementRef(type = UserInfo.class),
@XmlElementRef(type = ServiceInfo.class),
})
ClientInfo clientInfo;
private String context;
@XmlElementRefs({@XmlElementRef(type=DefaultServiceMap.class)})
private ServiceMap map;
@XmlElementRefs({
@XmlElementRef(type = Service2ServicePolicy.class),
@XmlElementRef(type = User2ServicePolicy.class),
})
private List<Policy> policies;
protected AuthorizationEntry(){}

4
src/main/java/org/gcube/common/authorization/library/policies/Policy.java
View File

@ -3,12 +3,14 @@ package org.gcube.common.authorization.library.policies;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@XmlSeeAlso({User2ServicePolicy.class, Service2ServicePolicy.class})
public abstract class Policy {
private long id;
protected long id;
protected Policy() {}

2
src/main/java/org/gcube/common/authorization/library/policies/Service2ServicePolicy.java
View File

@ -85,7 +85,7 @@ public class Service2ServicePolicy extends Policy{
@Override
public String toString() {
return "Service2ServicePolicy [client=" + client + ", environment="
+ context + ", serviceAccess=" + serviceAccess + "]";
+ context + ", serviceAccess=" + serviceAccess + ", id = "+id+"]";
}

9
src/main/java/org/gcube/common/authorization/library/policies/User2ServicePolicy.java
View File

@ -2,13 +2,18 @@ package org.gcube.common.authorization.library.policies;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementRefs;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class User2ServicePolicy extends Policy {
@XmlElementRefs({
@XmlElementRef(type = User.class),
@XmlElementRef(type = Role.class),
})
private UserEntity entity;
private String context;
private ServiceAccess serviceAccess;
@ -85,7 +90,7 @@ public class User2ServicePolicy extends Policy {
@Override
public String toString() {
return "User2ServicePolicy [entity=" + entity + ", environment="
+ context + ", serviceAccess=" + serviceAccess + "]";
+ context + ", serviceAccess=" + serviceAccess + ", id = "+id+"]";
}
}

3
src/main/java/org/gcube/common/authorization/library/provider/UserInfo.java
View File

@ -1,6 +1,5 @@
package org.gcube.common.authorization.library.provider;
import java.util.Collections;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
@ -18,7 +17,7 @@ public class UserInfo extends ClientInfo {
private static final long serialVersionUID = 1L;
private String clientId;
private List<String> roles = Collections.emptyList();
private List<String> roles = null;
protected UserInfo(){}