From c7cd9327bbc4d7e180bab9b6bff2a17028c166dc Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 19 Feb 2019 11:28:24 +0100
Subject: add some more attribute functionality for 'Austrian eID' demo-mode

---
 .../moa/id/data/MOAAuthenticationData.java         | 44 +++++++++++++++++++---
 1 file changed, 39 insertions(+), 5 deletions(-)

(limited to 'id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/MOAAuthenticationData.java')

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/MOAAuthenticationData.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/MOAAuthenticationData.java
index c1545f354..897a06e62 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/MOAAuthenticationData.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/MOAAuthenticationData.java
@@ -29,6 +29,7 @@ import java.util.List;
 import org.w3c.dom.Element;
 
 import at.gv.egiz.eaaf.core.api.data.ILoALevelMapper;
+import at.gv.egiz.eaaf.core.impl.data.Pair;
 import at.gv.egiz.eaaf.core.impl.idp.AuthenticationData;
 import at.gv.egiz.eaaf.core.impl.utils.DOMUtils;
 import at.gv.egiz.eaaf.modules.pvp2.sp.exception.AssertionAttributeExtractorExeption;
@@ -54,8 +55,10 @@ public class MOAAuthenticationData extends AuthenticationData implements IMOAAut
 	private byte[] signerCertificate = null;
 	private String authBlock = null;	
 	private String QAALevel = null;
-	private List<String> encbPKList;
-
+	
+	private List<Pair<String, String>> encbPKList;
+	private List<Pair<String, String>> encMandateNaturalPersonbPKList;
+	
 	//ISA 1.18 attributes
 	private List<AuthenticationRole> roles = null;
 	private String pvpAttribute_OU = null;
@@ -106,9 +109,9 @@ public class MOAAuthenticationData extends AuthenticationData implements IMOAAut
 	}
 
 	@Override
-	public List<String> getEncbPKList() {
+	public List<Pair<String, String>> getEncbPKList() {
 		if (this.encbPKList == null)
-			this.encbPKList = new ArrayList<String>();
+			this.encbPKList = new ArrayList<Pair<String, String>>();
 		
 		return this.encbPKList;
 	}
@@ -293,10 +296,27 @@ public class MOAAuthenticationData extends AuthenticationData implements IMOAAut
 	}
 	
 	/**
+	 * Set a List of encrypted bPKs where each List element is formated according 
+	 * to Section 3.2.7 ENC-BPK-LIST in PVP Attribte-Profile 2.1.3 
+	 * 
 	 * @param encbPKList the encbPKList to set
 	 */
 	public void setEncbPKList(List<String> encbPKList) {
-		this.encbPKList = encbPKList;
+		if (encbPKList != null) {
+			for (String el : encbPKList) {
+				Logger.trace("Processing foreign bPK string: " + el );
+				int index = el.indexOf("|");								 
+				if (index >= 0) {
+					String encbPK = el.substring(index+1);
+					String second = el.substring(0, index);										
+					getEncbPKList().add(Pair.newInstance(encbPK, second));
+										
+				} else
+					Logger.info("Foreign bPK: " + el + " is misformatted. Ignore it");
+				
+			}
+						
+		}				
 	}
 	
 	
@@ -336,5 +356,19 @@ public class MOAAuthenticationData extends AuthenticationData implements IMOAAut
 	  public void setIseIDNewDemoMode(boolean iseIDNewDemoMode) {
 		  this.iseIDNewDemoMode = iseIDNewDemoMode;
 	  }
+
+	public List<Pair<String, String>> getEncMandateNaturalPersonbPKList() {
+		if (this.encMandateNaturalPersonbPKList == null)
+			this.encMandateNaturalPersonbPKList = new ArrayList<Pair<String, String>>();
+		
+		return this.encMandateNaturalPersonbPKList;
+		
+	}
+
+	public void setEncMandateNaturalPersonbPKList(List<Pair<String, String>> encMandateNaturalPersonbPKList) {
+		this.encMandateNaturalPersonbPKList = encMandateNaturalPersonbPKList;
+	}
+	  
+	  
 	
 }
-- 
cgit v1.2.3