1 files changed, 33 insertions, 3 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDIssuingNationAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDIssuingNationAttributeBuilder.java
index 251d263d9..2452e35c9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDIssuingNationAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDIssuingNationAttributeBuilder.java
@@ -1,8 +1,14 @@
 package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
 
+import iaik.x509.X509Certificate;
+
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
+
 import org.opensaml.saml2.core.Attribute;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.logging.Logger;
 
 public class EIDIssuingNationAttributeBuilder extends BaseAttributeBuilder {
 
@@ -12,13 +18,37 @@ public class EIDIssuingNationAttributeBuilder extends BaseAttributeBuilder {
 
 	public Attribute build(AuthenticationSession authSession) {
 		String countryCode = "AT";
-		if(authSession.getStorkAuthnRequest() != null) {
-			countryCode = authSession.getStorkAuthnRequest().getCitizenCountryCode();
+
+		
+		if (authSession.getStorkAuthnRequest() != null) {
+			countryCode = authSession.getStorkAuthnRequest()
+					.getCitizenCountryCode();
+		} else {
+			
+			//TODO: replace with TSL lookup when TSL is ready!
+			X509Certificate certificate = authSession.getSignerCertificate();
+
+			if (certificate != null) {
+				try {
+					LdapName ln = new LdapName(certificate.getIssuerDN()
+							.getName());
+					for (Rdn rdn : ln.getRdns()) {
+						if (rdn.getType().equalsIgnoreCase("C")) {
+							Logger.info("C is: " + rdn.getValue());
+							countryCode = rdn.getValue().toString();
+							break;
+						}
+					}
+				} catch (Exception e) {
+					Logger.error("Failed to extract country code from certificate", e);
+				}
+			}
 		}
+
 		return buildStringAttribute(EID_ISSUING_NATION_FRIENDLY_NAME,
 				EID_ISSUING_NATION_NAME, countryCode);
 	}
-	
+
 	public Attribute buildEmpty() {
 		return buildemptyAttribute(EID_ISSUING_NATION_FRIENDLY_NAME,
 				EID_ISSUING_NATION_NAME);