added auth function

oaipmh-core/pom.xml

@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>oaipmh</artifactId>
 		<groupId>info.textgrid.middleware</groupId>
-		<version>1.3.3-SNAPSHOT</version>
+		<version>1.3.4-SNAPSHOT</version>
 	</parent>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh-core</artifactId>
-	<version>1.3.3-SNAPSHOT</version>
+	<version>1.3.4-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>TextGrid :: TG-OAI-PMH :: Core</name>
 	<url>http://maven.apache.org</url>

oaipmh-core/src/main/java/info/textgrid/middleware/oaipmh/auth/AuthClient.java

+package info.textgrid.middleware.oaipmh.auth;
+
+import java.util.List;
+
+public interface AuthClient {
+	
+	List<String> filterUris(String sessionId, List<String> uris);
+
+	List<String> getUrisForProject(String sid, String id);
+
+	List<String> getProjectsForSID(String sid);
+	
+	boolean isProjectAuth();
+}

oaipmh-core/src/main/java/info/textgrid/middleware/oaipmh/auth/TGAuthClient.java

+package info.textgrid.middleware.oaipmh.auth;
+
+import info.textgrid.namespaces.middleware.tgauth.AuthenticationFault;
+import info.textgrid.namespaces.middleware.tgauth.FilterBySidRequest;
+import info.textgrid.namespaces.middleware.tgauth.FilterResponse;
+import info.textgrid.namespaces.middleware.tgauth.GetObjectsRequest;
+import info.textgrid.namespaces.middleware.tgauth.PortTgextra;
+import info.textgrid.namespaces.middleware.tgauth.ResourcesetResponse;
+import info.textgrid.namespaces.middleware.tgauth.RolesetResponse;
+import info.textgrid.namespaces.middleware.tgauth.TgAssignedProjectsRequest;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class TGAuthClient implements AuthClient {
+	
+	static final boolean PROJECT_AUTH = true; 
+
+	private PortTgextra tgp;
+	private Log log = LogFactory.getLog(TGAuthClient.class);
+
+
+	public TGAuthClient(PortTgextra tgExtraClient){
+		tgp = tgExtraClient;
+	}
+
+	/**
+	 * 
+	 */
+	@Override
+	public List<String> filterUris(String sessionId, List<String> uris) {
+		
+		// do not modify incoming list, copy for retainAll operation
+		List<String> response = new ArrayList<String>(uris);
+		
+		FilterBySidRequest filterBySidInput = new FilterBySidRequest();
+		filterBySidInput.setAuth(sessionId);
+		filterBySidInput.setOperation("read");
+		//TODO: set logstring
+		filterBySidInput.setLog("");
+		filterBySidInput.getResource().addAll(response);
+
+		List<String> allowed = null;
+		try {
+			log.debug("start filterUris: "+ new Date());
+			FilterResponse res = tgp.filterBySid(filterBySidInput);
+			allowed = res.getResource();
+			log.debug("end filterUris: "+ new Date());
+		} catch (AuthenticationFault e) {
+			//log.error(e);
+			log.error("filterUris: Failure regarding to sid ", e);
+		}
+		
+		// we need to keep the order of the list, tgauth doesn't guarantee this, so intersect
+		response.retainAll(allowed);	
+		return response;
+		
+	}
+	
+	@Override
+	public List<String> getUrisForProject(String sessionId, String projectId) {
+		
+		GetObjectsRequest getObjectsInput = new GetObjectsRequest();
+		getObjectsInput.setAuth(sessionId);
+		//getObjectsInput.setLog(tglog.getLoginfo());
+		getObjectsInput.setProject(projectId);
+		
+		log.debug("start getObjects: "+ new Date());
+		ResourcesetResponse res = tgp.getObjects(getObjectsInput);
+		log.debug("end getObjects: "+ new Date());
+		List<String> uris = new ArrayList<String>(res.getResource());
+		
+		return uris;
+	}
+	
+	@Override
+	public List<String> getProjectsForSID(String sid) {
+		
+		TgAssignedProjectsRequest tgAssignedProjectsInput = new TgAssignedProjectsRequest();
+		tgAssignedProjectsInput.setAuth(sid);
+		RolesetResponse res = tgp.tgAssignedProjects(tgAssignedProjectsInput);
+		
+		return res.getRole();
+		
+	}
+	
+	@Override
+	public boolean isProjectAuth() {
+		// TODO Auto-generated method stub
+		return TGAuthClient.PROJECT_AUTH;
+	}
+
+}

oaipmh-webapp/pom.xml

@@ -4,12 +4,12 @@
 	<parent>
 		<artifactId>oaipmh</artifactId>
 		<groupId>info.textgrid.middleware</groupId>
-		<version>1.3.3-SNAPSHOT</version>
+		<version>1.3.4-SNAPSHOT</version>
 	</parent>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh-webapp</artifactId>
 	<packaging>war</packaging>
-	<version>1.3.3-SNAPSHOT</version>
+	<version>1.3.4-SNAPSHOT</version>
 	<name>TextGrid :: OAI-PMH :: Webapp</name>
 	<url>http://maven.apache.org</url>
 	<profiles>

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>info.textgrid.middleware</groupId>
   <artifactId>oaipmh</artifactId>
-  <version>1.3.3-SNAPSHOT</version>
+  <version>1.3.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>TextGrid :: TG-OAI-PMH :: Parent</name>
   <properties>