aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorharald.bratko <harald.bratko@d688527b-c9ab-4aba-bd8d-4036d912da1d>2005-10-21 16:20:46 +0000
committerharald.bratko <harald.bratko@d688527b-c9ab-4aba-bd8d-4036d912da1d>2005-10-21 16:20:46 +0000
commitd964bdfe182c23d8bafbd4f3b73a1527a8377ded (patch)
treeaf06fa85f9d052b2e196bdfac9fdd59095798fa2
parentd72f8684b8464d6acb65e376b2a0450fddbcfc31 (diff)
downloadmoa-id-spss-d964bdfe182c23d8bafbd4f3b73a1527a8377ded.tar.gz
moa-id-spss-d964bdfe182c23d8bafbd4f3b73a1527a8377ded.tar.bz2
moa-id-spss-d964bdfe182c23d8bafbd4f3b73a1527a8377ded.zip
*** empty log message ***
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@526 d688527b-c9ab-4aba-bd8d-4036d912da1d
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java6
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java4
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java2
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java2
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java1
5 files changed, 9 insertions, 6 deletions
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java
index e5bbaa585..29e0badc7 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java
@@ -1,6 +1,7 @@
package at.gv.egovernment.moa.id.auth.builder;
import at.gv.egovernment.moa.id.BuildException;
+import at.gv.egovernment.moa.util.StringUtils;
/**
* Base class for HTML/XML builders providing commonly useful functions.
@@ -11,7 +12,7 @@ import at.gv.egovernment.moa.id.BuildException;
public class Builder {
/**
- * Replaces a special tag in an XML or HTML template by a value.
+ * Replaces oll occurrences of a special tag in an XML or HTML template by a value.
* @param htmlTemplate template
* @param tag special tag
* @param value value replacing the tag
@@ -24,7 +25,8 @@ public class Builder {
throw new BuildException(
"builder.01",
new Object[] {"&lt;" + tag.substring(1, tag.length() - 1) + "&gt;"});
- return template.substring(0, index) + value + template.substring(index + tag.length());
+ return StringUtils.replaceAll(template, tag, value);
+// return template.substring(0, index) + value + template.substring(index + tag.length());
}
}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
index 4fb5b0837..69dfd1d3f 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
@@ -29,9 +29,9 @@ public class GetIdentityLinkFormBuilder extends Builder {
/** default HTML template */
private static final String DEFAULT_HTML_TEMPLATE =
- "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">" + nl +
"<html>" + nl +
"<head>" + nl +
+ "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">" + nl +
"<title>Anmeldung mit B&uuml;rgerkarte</title>" + nl +
"</head>" + nl +
"<body>" + nl +
@@ -86,7 +86,7 @@ public class GetIdentityLinkFormBuilder extends Builder {
htmlForm = replaceTag(htmlForm, BKU_TAG, bkuURL);
htmlForm = replaceTag(htmlForm, XMLREQUEST_TAG, encodeParameter(xmlRequest));
htmlForm = replaceTag(htmlForm, DATAURL_TAG, dataURL);
- htmlForm = replaceTag(htmlForm, BKU_TAG, bkuURL);
+// htmlForm = replaceTag(htmlForm, BKU_TAG, bkuURL);
htmlForm = replaceTag(htmlForm, CERTINFO_XMLREQUEST_TAG, encodeParameter(certInfoXMLRequest));
htmlForm = replaceTag(htmlForm, CERTINFO_DATAURL_TAG, certInfoDataURL);
return htmlForm;
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java
index 363cd65a3..b1553efc9 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java
@@ -22,9 +22,9 @@ public class SelectBKUFormBuilder extends Builder {
* Template for the default html-code to be returned as security-layer-selection to be built
*/
private static final String DEFAULT_HTML_TEMPLATE =
- "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">" + nl +
"<html>" + nl +
"<head>" + nl +
+ "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">" + nl +
"<title>Auswahl der B&uuml;rgerkartenumgebung</title>" + nl +
"</head>" + nl +
"<body>" + nl +
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java b/id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java
index 4264ca2cb..eb7d76fda 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/parser/CreateXMLSignatureResponseParser.java
@@ -155,7 +155,7 @@ public class CreateXMLSignatureResponseParser {
return cResp;
}
-// public CreateXMLSignatureResponse parseResponse1() throws ParseException {
+// public CreateXMLSignatureResponse parseResponse() throws ParseException {
// CreateXMLSignatureResponse cResp;
// try {
// cResp = new CreateXMLSignatureResponse();
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java b/id.server/src/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
index 877df31d5..6131a1790 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
@@ -79,6 +79,7 @@ public class VerifyXMLSignatureResponseValidator {
else
throw new ValidateException("validator.19", new Object[] { checkFailedReason } );
}
+
if (ignoreManifestValidationResult) {
Logger.debug("OA type is business service, thus ignoring DSIG manifest validation result");
} else {