AuthData Generierung von VerifyAuthBlock nach GenerateSAMLArtifact verschoben.

Die daraus erforderlichen PVP2 Änderungen sind zu prüfen!!!!

1 files changed, 12 insertions, 0 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
index fa9789530..de86a4f05 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
@@ -27,6 +27,8 @@ package at.gv.egovernment.moa.id.auth.builder;
 import java.security.MessageDigest;
 
 import at.gv.egovernment.moa.id.BuildException;
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Base64Utils;
 import at.gv.egovernment.moa.util.Constants;
 
@@ -89,6 +91,16 @@ public class BPKBuilder {
           new Object[] {"wbPK", "Unvollständige Parameterangaben: identificationValue=" + 
                         identificationValue + ",Register+Registernummer=" + registerAndOrdNr});
     }
+    
+	if (registerAndOrdNr.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) {
+		// If domainIdentifier starts with prefix
+		// "urn:publicid:gv.at:wbpk+"; remove this prefix
+		registerAndOrdNr = registerAndOrdNr
+				.substring(AuthenticationSession.REGISTERANDORDNR_PREFIX_.length());
+		Logger.debug("Register and ordernumber prefix stripped off; resulting register string: "
+				+ registerAndOrdNr);
+	} 
+    
     String basisbegriff = identificationValue + "+" + Constants.URN_PREFIX_WBPK + "+" + registerAndOrdNr;
     try {
       MessageDigest md = MessageDigest.getInstance("SHA-1");