From 3b7776e9020ea8affdf9fcd10b12d2da28adcd08 Mon Sep 17 00:00:00 2001 From: Klaus Stranacher Date: Wed, 4 Sep 2013 23:51:25 +0200 Subject: Validation signing time (auth block) against server time Update MOA-ID sample configs (new ES Test-PEPS Url) WAI compliant template --- common/src/main/java/at/gv/egovernment/moa/util/Constants.java | 7 ++++++- common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'common/src/main/java/at/gv/egovernment/moa/util') diff --git a/common/src/main/java/at/gv/egovernment/moa/util/Constants.java b/common/src/main/java/at/gv/egovernment/moa/util/Constants.java index 3b6e8c57d..75ea1534f 100644 --- a/common/src/main/java/at/gv/egovernment/moa/util/Constants.java +++ b/common/src/main/java/at/gv/egovernment/moa/util/Constants.java @@ -265,7 +265,7 @@ public interface Constants { /** URI of the XAdES v1.1.1 namespace */ public static final String XADES_1_1_1_NS_URI = "http://uri.etsi.org/01903/v1.1.1#"; - public static final String XADES_1_1_1_NS_PREFIX = "xades"; + public static final String XADES_1_1_1_NS_PREFIX = "xades111"; /** Local location of the XAdES v1.2.2 schema definition */ public static final String XADES_1_2_2_SCHEMA_LOCATION = @@ -273,6 +273,8 @@ public interface Constants { /** URI of the XAdES v1.2.2 namespace */ public static final String XADES_1_2_2_NS_URI = "http://uri.etsi.org/01903/v1.2.2#"; + + public static final String XADES_1_2_2_NS_PREFIX = "xades122"; /** Local location of the XAdES v1.1.1 schema definition */ public static final String XADES_1_3_2_SCHEMA_LOCATION = @@ -280,6 +282,8 @@ public interface Constants { /** URI of the XAdES v1.3.2 namespace */ public static final String XADES_1_3_2_NS_URI = "http://uri.etsi.org/01903/v1.3.2#"; + + public static final String XADES_1_3_2_NS_PREFIX = "xades132"; /** Local location of the XAdES v1.4.1 schema definition */ public static final String XADES_1_4_1_SCHEMA_LOCATION = @@ -288,6 +292,7 @@ public interface Constants { /** URI of the XAdES v1.4.1 namespace */ public static final String XADES_1_4_1_NS_URI = "http://uri.etsi.org/01903/v1.4.1#"; + public static final String XADES_1_4_1_NS_PREFIX = "xades141"; /** URI of the SAML 2.0 namespace. */ public static final String SAML2_NS_URI = "urn:oasis:names:tc:SAML:2.0:assertion"; diff --git a/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java index 21c41257a..0dfccb034 100644 --- a/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java +++ b/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java @@ -385,7 +385,7 @@ public class XPathUtils { * null, if no node matched. * @throws XPathException An error occurred evaluating the XPath expression. */ - private static Node selectSingleNode( + public static Node selectSingleNode( Node contextNode, NamespaceContext nsContext, String exp) -- cgit v1.2.3