diff options
| author | kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2012-02-07 16:15:24 +0000 |
|---|---|---|
| committer | kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2012-02-07 16:15:24 +0000 |
| commit | 453bd7f12223fe4e58049bb8f2f40d80d80bccd7 (patch) | |
| tree | e88db7a1a621a15447c881ddd00e7d274050ce1d /id/server/idserverlib/src/main | |
| parent | d89d097cf6ae5f044e592d747a25395a06f95168 (diff) | |
| download | moa-id-spss-453bd7f12223fe4e58049bb8f2f40d80d80bccd7.tar.gz moa-id-spss-453bd7f12223fe4e58049bb8f2f40d80d80bccd7.tar.bz2 moa-id-spss-453bd7f12223fe4e58049bb8f2f40d80d80bccd7.zip | |
* Alte MOCCA Signaturen wieder prüfbar (Parsererror fehlendes Target Attribut in QualifyingProperties wird ignoriert)
* Update MOA Template für Bürgerkartenauswahl (No-Script-Variante, Update Bilder und Text)
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1235 d688527b-c9ab-4aba-bd8d-4036d912da1d
Diffstat (limited to 'id/server/idserverlib/src/main')
3 files changed, 4 insertions, 4 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java index db70a6111..53c1168c5 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java @@ -199,9 +199,7 @@ public class AuthenticationBlockAssertionBuilder extends AuthenticationAssertion sectorName = targetFriendlyName; } - System.out.println("targetFriendlyName: " + targetFriendlyName); - System.out.println("sectorName: " + sectorName); - + //gebeORwbpk = MessageFormat.format(GESCHAEFTS_BEREICH_ATTRIBUTE, new Object[] { target }); gebeORwbpk = MessageFormat.format(GESCHAEFTS_BEREICH_ATTRIBUTE, new Object[] { target + " (" + sectorName + ")" }); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java index d49d038fa..49105b306 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java @@ -187,7 +187,7 @@ public class CreateXMLSignatureResponseValidator { } gbTarget = gbTarget + " (" + sectorName + ")"; //gbTarget = gbTarget + " (" + TargetToSectorNameMapper.getSectorNameViaTarget(gbTarget) + ")"; - System.out.println("Validate: " + gbTarget + " - " + samlAttribute.getValue()); + if (!gbTarget.equals((String)samlAttribute.getValue())) { throw new ValidateException("validator.13", null); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java index fa220d13d..644e59f72 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java @@ -43,6 +43,7 @@ import org.xml.sax.SAXException; import at.gv.egovernment.moa.id.config.ConfigurationException;
import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.DOMUtils; public class ParamValidatorUtils {
@@ -506,6 +507,7 @@ public class ParamValidatorUtils { // }
public static boolean isValidXMLDocument(String document) {
+ if (document == null)
return false;
|