map protocol specific requested attributes to PVP 2.1 attributes

6 files changed, 76 insertions, 48 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
index 94851ee8f..4a54a516b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
@@ -23,10 +23,13 @@
 package at.gv.egovernment.moa.id.moduls;
 
 import java.io.Serializable;
+import java.util.List;
+
+import org.opensaml.saml2.core.Attribute;
 
 import at.gv.egovernment.moa.id.protocols.pvp2x.messages.MOAResponse;
 
-public class RequestImpl implements IRequest, Serializable{
+public abstract class RequestImpl implements IRequest, Serializable{
 
 	private static final long serialVersionUID = 1L;
 	
@@ -43,6 +46,12 @@ public class RequestImpl implements IRequest, Serializable{
 	private String requestedIDP = null;
 	private MOAResponse response = null;
 	
+	/**
+	 * This method map the protocol specific requested attributes to PVP 2.1 attributes.
+	 * 
+	 * @return List of PVP 2.1 attributes with maps all protocol specific attributes
+	 */
+	public abstract List<Attribute> getRequestedAttributes();
 	
 	public void setOAURL(String value) {
 		oaURL = value;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java
index dc3335631..6a9e98792 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java
@@ -22,8 +22,12 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.protocols.oauth20.protocol;
 
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 
+import org.opensaml.saml2.core.Attribute;
+
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAOAUTH20;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
@@ -153,4 +157,13 @@ class OAuth20AuthRequest extends OAuth20BaseRequest {
 		}
 		
 	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.moduls.RequestImpl#getRequestedAttributes()
+	 */
+	@Override
+	public List<Attribute> getRequestedAttributes() {
+		//TODO: implement attribut mapping
+		return null;
+	}
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java
index 0f1ba23b3..3c90a5773 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java
@@ -22,8 +22,12 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.protocols.oauth20.protocol;
 
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 
+import org.opensaml.saml2.core.Attribute;
+
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAOAUTH20;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
@@ -137,4 +141,12 @@ class OAuth20TokenRequest extends OAuth20BaseRequest {
 		this.allowedParameters.add(OAuth20Constants.PARAM_SCOPE);
 		this.allowedParameters.add(OAuth20Constants.PARAM_REDIRECT_URI);
 	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.moduls.RequestImpl#getRequestedAttributes()
+	 */
+	@Override
+	public List<Attribute> getRequestedAttributes() {
+		return null;
+	}
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPTargetConfiguration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPTargetConfiguration.java
index 6e749aaf0..9cddb9a17 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPTargetConfiguration.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPTargetConfiguration.java
@@ -22,6 +22,10 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.protocols.pvp2x;
 
+import java.util.List;
+
+import org.opensaml.saml2.core.Attribute;
+
 import at.gv.egovernment.moa.id.moduls.RequestImpl;
 import at.gv.egovernment.moa.id.protocols.pvp2x.messages.MOARequest;
 import at.gv.egovernment.moa.id.protocols.pvp2x.messages.MOAResponse;
@@ -56,5 +60,15 @@ public class PVPTargetConfiguration extends RequestImpl {
 
 	public void setConsumerURL(String consumerURL) {
 		this.consumerURL = consumerURL;
+		
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.moduls.RequestImpl#getRequestedAttributes()
+	 */
+	@Override
+	public List<Attribute> getRequestedAttributes() {
+		// TODO Auto-generated method stub
+		return null;
 	}	
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1RequestImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1RequestImpl.java
index 72adfe0e7..dc5e715c9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1RequestImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1RequestImpl.java
@@ -22,6 +22,10 @@
  */
 package at.gv.egovernment.moa.id.protocols.saml1;
 
+import java.util.List;
+
+import org.opensaml.saml2.core.Attribute;
+
 import at.gv.egovernment.moa.id.moduls.RequestImpl;
 
 /**
@@ -48,4 +52,13 @@ public class SAML1RequestImpl extends RequestImpl {
 		this.sourceID = sourceID;
 	}
 
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.moduls.RequestImpl#getRequestedAttributes()
+	 */
+	@Override
+	public List<Attribute> getRequestedAttributes() {
+		//TODO: implement attribut mapping
+		return null;
+	}
+
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKRequest.java
index 0eb1b83ca..9508919b0 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKRequest.java
@@ -1,8 +1,10 @@
 package at.gv.egovernment.moa.id.protocols.stork2;
 
-import java.io.Serializable;
+import java.util.List;
 
-import at.gv.egovernment.moa.id.moduls.IRequest;
+import org.opensaml.saml2.core.Attribute;
+
+import at.gv.egovernment.moa.id.moduls.RequestImpl;
 import at.gv.egovernment.moa.id.protocols.pvp2x.messages.MOAResponse;
 import at.gv.egovernment.moa.logging.Logger;
 import eu.stork.peps.auth.commons.IPersonalAttributeList;
@@ -14,7 +16,7 @@ import eu.stork.peps.auth.commons.STORKAuthnRequest;
  *
  * @author bsuzic
  */
-public class MOASTORKRequest implements IRequest, Serializable {
+public class MOASTORKRequest extends RequestImpl {
 	
 	/** The Constant serialVersionUID. */
 	private static final long serialVersionUID = 4581953368724501376L;
@@ -22,15 +24,6 @@ public class MOASTORKRequest implements IRequest, Serializable {
 	/** The request id. */
 	private String requestID;
     
-    /** The target. */
-    private String target = null;
-    
-    /** The module. */
-    String module = null;
-    
-    /** The action. */
-    String action = null;
-    
     /** The stork authn request. */
     private STORKAuthnRequest storkAuthnRequest;
     
@@ -128,41 +121,6 @@ public class MOASTORKRequest implements IRequest, Serializable {
     }
 
     /* (non-Javadoc)
-     * @see at.gv.egovernment.moa.id.moduls.IRequest#requestedModule()
-     */
-    public String requestedModule() {
-        return this.module;
-    }
-
-    /* (non-Javadoc)
-     * @see at.gv.egovernment.moa.id.moduls.IRequest#requestedAction()
-     */
-    public String requestedAction() {
-        return action;
-    }
-
-    /* (non-Javadoc)
-     * @see at.gv.egovernment.moa.id.moduls.IRequest#setModule(java.lang.String)
-     */
-    public void setModule(String module) {
-        this.module = module;
-    }
-
-    /* (non-Javadoc)
-     * @see at.gv.egovernment.moa.id.moduls.IRequest#setAction(java.lang.String)
-     */
-    public void setAction(String action) {
-        this.action = action;
-    }
-
-    /* (non-Javadoc)
-     * @see at.gv.egovernment.moa.id.moduls.IRequest#getTarget()
-     */
-    public String getTarget() {
-        return this.target;
-    }
-
-    /* (non-Javadoc)
      * @see at.gv.egovernment.moa.id.moduls.IRequest#setRequestID(java.lang.String)
      */
     public void setRequestID(String id) {
@@ -229,4 +187,13 @@ public class MOASTORKRequest implements IRequest, Serializable {
 		// TODO Auto-generated method stub
 		return null;
 	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.moduls.RequestImpl#getRequestedAttributes()
+	 */
+	@Override
+	public List<Attribute> getRequestedAttributes() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }