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

pom.xml

@@ -17,6 +17,11 @@
 	</properties>
 
 	<dependencies>
+	    <dependency>
+			<groupId>org.reflections</groupId>
+			<artifactId>reflections</artifactId>
+			<version>0.9.9-RC1</version>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope</artifactId>

src/main/java/org/gcube/common/authorization/library/annotations/AuthorizationControl.java

@@ -6,10 +6,12 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.gcube.common.authorization.library.policies.Mode;
+
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface IsAllowedFor {
+public @interface AuthorizationControl {
 	
-	String[] roles();
+	Mode[] check() default {Mode.ALL}; 
 }

src/main/java/org/gcube/common/authorization/library/annotations/SubjectToQuota.java

@@ -1,14 +0,0 @@
-package org.gcube.common.authorization.library.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface SubjectToQuota {
-
-}

src/main/java/org/gcube/common/authorization/library/policies/Mode.java

@@ -0,0 +1,6 @@
+package org.gcube.common.authorization.library.policies;
+
+public enum Mode {
+
+	ALL, ACCESS, WRITE, EXECUTE;
+}

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

@@ -22,6 +22,8 @@ public abstract class Policy {
 	
 	public abstract String getContext();
 	
+	public abstract Mode getMode();
+	
 	public long getId() {
 		return id;
 	}

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

@@ -11,7 +11,8 @@ public class Service2ServicePolicy extends Policy{
 	private ServiceAccess client;
 	private String context;
 	private ServiceAccess serviceAccess;
-		
+	private Mode mode = Mode.ALL;
+	
 	protected Service2ServicePolicy(){}
 	
 	public Service2ServicePolicy(String context, ServiceAccess serviceAccess,
@@ -21,6 +22,12 @@ public class Service2ServicePolicy extends Policy{
 		this.client = client;
 	}
 	
+	public Service2ServicePolicy(String context, ServiceAccess serviceAccess,
+			ServiceAccess client, Mode mode) {
+		this(context, serviceAccess, client);
+		this.mode = mode;
+	}
+	
 	@Override
 	public PolicyType getPolicyType() {
 		return PolicyType.SERVICE;
@@ -28,7 +35,7 @@ public class Service2ServicePolicy extends Policy{
 
 	@Override
 	public String getPolicyAsString() {
-		return this.context+","+serviceAccess.getAsString()+","+serviceAccess.getAsString();
+		return this.context+","+serviceAccess.getAsString()+","+serviceAccess.getAsString()+"["+mode.toString()+"]";
 	}
 
 	public ServiceAccess getClient() {
@@ -48,8 +55,8 @@ public class Service2ServicePolicy extends Policy{
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + ((client == null) ? 0 : client.hashCode());
-		result = prime * result
+		result = prime * result + ((context == null) ? 0 : context.hashCode());
-				+ ((context == null) ? 0 : context.hashCode());
+		result = prime * result + ((mode == null) ? 0 : mode.hashCode());
 		result = prime * result
 				+ ((serviceAccess == null) ? 0 : serviceAccess.hashCode());
 		return result;
@@ -74,6 +81,8 @@ public class Service2ServicePolicy extends Policy{
 				return false;
 		} else if (!context.equals(other.context))
 			return false;
+		if (mode != other.mode)
+			return false;
 		if (serviceAccess == null) {
 			if (other.serviceAccess != null)
 				return false;
@@ -81,11 +90,17 @@ public class Service2ServicePolicy extends Policy{
 			return false;
 		return true;
 	}
-
+	
 	@Override
 	public String toString() {
-		return "Service2ServicePolicy [client=" + client + ", environment="
+		return "Service2ServicePolicy [id="+getId()+" client=" + client + ", context="
-				+ context + ", serviceAccess=" + serviceAccess + ", id = "+id+"]";
+				+ context + ", serviceAccess=" + serviceAccess + ", mode="
+				+ mode + "]";
+	}
+
+	@Override
+	public Mode getMode() {
+		return this.mode;
 	}
 
 	

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

@@ -18,6 +18,8 @@ public class User2ServicePolicy extends Policy {
 	private String context;
 	private ServiceAccess serviceAccess;
 	
+	private Mode mode = Mode.ALL;
+	
 	protected User2ServicePolicy(){}
 	
 	public User2ServicePolicy(String context, ServiceAccess serviceAccess, UserEntity entity) {
@@ -26,6 +28,12 @@ public class User2ServicePolicy extends Policy {
 		this.entity = entity;
 	}
 
+	public User2ServicePolicy(String context, ServiceAccess serviceAccess, UserEntity entity, Mode mode) {
+		this(context, serviceAccess, entity);
+		this.mode = mode;
+	}
+	
+	
 	public UserEntity getEntity() {
 		return entity;
 	}
@@ -41,20 +49,22 @@ public class User2ServicePolicy extends Policy {
 
 	@Override
 	public String getPolicyAsString() {
-		return this.context+","+serviceAccess.getAsString()+","+entity.getAsString();
+		return this.context+","+serviceAccess.getAsString()+","+entity.getAsString()+"["+mode.toString()+"]";
 	}
 
 	public String getContext() {
 		return context;
 	}
 
+	
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
+		result = prime * result + ((context == null) ? 0 : context.hashCode());
 		result = prime * result + ((entity == null) ? 0 : entity.hashCode());
-		result = prime * result
+		result = prime * result + ((mode == null) ? 0 : mode.hashCode());
-				+ ((context == null) ? 0 : context.hashCode());
 		result = prime * result
 				+ ((serviceAccess == null) ? 0 : serviceAccess.hashCode());
 		return result;
@@ -69,15 +79,17 @@ public class User2ServicePolicy extends Policy {
 		if (getClass() != obj.getClass())
 			return false;
 		User2ServicePolicy other = (User2ServicePolicy) obj;
+		if (context == null) {
+			if (other.context != null)
+				return false;
+		} else if (!context.equals(other.context))
+			return false;
 		if (entity == null) {
 			if (other.entity != null)
 				return false;
 		} else if (!entity.equals(other.entity))
 			return false;
-		if (context == null) {
+		if (mode != other.mode)
-			if (other.context != null)
-				return false;
-		} else if (!context.equals(other.context))
 			return false;
 		if (serviceAccess == null) {
 			if (other.serviceAccess != null)
@@ -86,11 +98,16 @@ public class User2ServicePolicy extends Policy {
 			return false;
 		return true;
 	}
-
+	
 	@Override
 	public String toString() {
-		return "User2ServicePolicy [entity=" + entity + ", environment="
+		return "User2ServicePolicy [id="+getId()+" entity=" + entity + ", context=" + context
-				+ context + ", serviceAccess=" + serviceAccess + ", id = "+id+"]";
+				+ ", serviceAccess=" + serviceAccess + ", mode=" + mode + "]";
+	}
+
+	@Override
+	public Mode getMode() {
+		return this.mode;
 	}
 	
 }