From 3e1aba668f76677ecd3923b039e52b5bb5348d96 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 19 Feb 2019 11:30:59 +0100
Subject: update eID4u attribute collection and add a jUnit test for TUG->eID4u
 attribute mapping

---
 .../tasks/CollectAddtionalAttributesTask.java      | 30 +++++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

(limited to 'id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/tasks/CollectAddtionalAttributesTask.java')

diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/tasks/CollectAddtionalAttributesTask.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/tasks/CollectAddtionalAttributesTask.java
index 9d9d44b34..a58bc4f8d 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/tasks/CollectAddtionalAttributesTask.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/tasks/CollectAddtionalAttributesTask.java
@@ -5,9 +5,12 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import com.google.common.collect.UnmodifiableIterator;
+
 import at.gv.egiz.eaaf.core.api.idp.IAuthData;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
 import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
@@ -19,7 +22,8 @@ import at.gv.egiz.eid4u.api.attributes.Definitions;
 import at.gv.egovernment.moa.id.auth.builder.AuthenticationDataBuilder;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSessionWrapper;
 import at.gv.egovernment.moa.id.auth.modules.eidas.eID4UConstants;
-import at.gv.egovernment.moa.id.auth.modules.eidas.utils.SimpleEidasAttributeGenerator;
+import at.gv.egovernment.moa.id.auth.modules.eidas.eid4u.utils.AttributeScopeMapper;
+import at.gv.egovernment.moa.id.protocols.builder.attributes.SimpleStringAttributeGenerator;
 import at.gv.egovernment.moa.id.protocols.eidas.EIDASData;
 import at.gv.egovernment.moa.id.protocols.oauth20.OAuth20Constants;
 import at.gv.egovernment.moa.id.protocols.oauth20.OAuth20SessionObject;
@@ -31,6 +35,7 @@ import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
 import eu.eidas.auth.commons.attribute.ImmutableAttributeMap;
 import eu.eidas.auth.commons.attribute.ImmutableAttributeMap.Builder;
+import eu.eidas.auth.commons.attribute.ImmutableAttributeMap.ImmutableAttributeEntry;
 
 @Component("CollectAddtionalAttributesTask")
 public class CollectAddtionalAttributesTask extends AbstractAuthServletTask {
@@ -75,8 +80,7 @@ public class CollectAddtionalAttributesTask extends AbstractAuthServletTask {
 					
 					if (MiscUtil.isEmpty(scopes)) {
 						//generate scope from attributes
-						//TODO extract 'scopes' from requested attributes
-						Logger.warn("Dynamic 'scope' generation is currently NOT supported");
+						scopes = mapReqAttributesIntoScopes(reqEid4uAttrList);
 						
 					}					
 					
@@ -139,7 +143,7 @@ public class CollectAddtionalAttributesTask extends AbstractAuthServletTask {
 							new BPKAttributeBuilder().build(
 									fakeOpenIDReq.getServiceProviderConfiguration(), 
 									authData, 
-									new SimpleEidasAttributeGenerator()));
+									new SimpleStringAttributeGenerator()));
 					requestStoreage.storePendingRequest(pendingReq);
 					
 				} else
@@ -156,4 +160,22 @@ public class CollectAddtionalAttributesTask extends AbstractAuthServletTask {
 		
 	}
 
+	private String mapReqAttributesIntoScopes(ImmutableAttributeMap reqEid4uAttrList) {
+		String result = StringUtils.EMPTY;
+		UnmodifiableIterator<ImmutableAttributeEntry<?>> it = reqEid4uAttrList.entrySet().iterator();
+		while (it.hasNext()) {
+			ImmutableAttributeEntry<?> el = it.next();
+			String scope = AttributeScopeMapper.getInstance().getTUGScopesForAttribute(
+								el.getKey().getNameUri().toString());
+			
+			if (result.isEmpty())
+				result = scope;
+			else
+				result += " " + scope;
+							
+		}
+		
+		return result;
+	}
+
 }
-- 
cgit v1.2.3