diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/at/gv/egiz/pdfas/api/PdfAs.java | 4 | ||||
| -rw-r--r-- | src/main/java/at/gv/egiz/pdfas/web/helper/SessionHelper.java | 2 | ||||
| -rw-r--r-- | src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java | 2 | ||||
| -rw-r--r-- | src/main/java/at/knowcenter/wag/egov/egiz/pdf/AdobeSignatureHelper.java | 1 | ||||
| -rw-r--r-- | src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignServlet.java | 4 | ||||
| -rw-r--r-- | src/main/resources/DefaultConfiguration.zip | bin | 635448 -> 635825 bytes | |||
| -rw-r--r-- | src/main/resources/config/pdf-as.properties | 5 | ||||
| -rw-r--r-- | src/main/webapp/jsp/signupload.jsp | 10 |
8 files changed, 19 insertions, 9 deletions
diff --git a/src/main/java/at/gv/egiz/pdfas/api/PdfAs.java b/src/main/java/at/gv/egiz/pdfas/api/PdfAs.java index 4a8a0e0..6e63b85 100644 --- a/src/main/java/at/gv/egiz/pdfas/api/PdfAs.java +++ b/src/main/java/at/gv/egiz/pdfas/api/PdfAs.java @@ -99,7 +99,7 @@ public interface PdfAs public void reloadConfig() throws PdfAsException;
/**
- * Returns the list of information objects about the profiles available in the
+ * Returns the list of information objects about activated profiles available in the
* configuration.
*
* <p>
@@ -113,7 +113,7 @@ public interface PdfAs * </p>
*
* @return Returns the list of {@link SignatureProfile} objects with
- * information about the profiles available in the configuration.
+ * information about active profiles available in the configuration.
* @throws PdfAsException
* Thrown on error.
*
diff --git a/src/main/java/at/gv/egiz/pdfas/web/helper/SessionHelper.java b/src/main/java/at/gv/egiz/pdfas/web/helper/SessionHelper.java index 93c0aa2..ca09871 100644 --- a/src/main/java/at/gv/egiz/pdfas/web/helper/SessionHelper.java +++ b/src/main/java/at/gv/egiz/pdfas/web/helper/SessionHelper.java @@ -37,7 +37,7 @@ public class SessionHelper Object sessionObject = session.getAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION);
if (sessionObject == null)
{
- String msg = "The session is not found or no longer valid."; //$NON-NLS-1$
+ String msg = "Unable to find session data in session " + session.getId();
log.error(msg);
throw new SessionExpiredException(msg);
}
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java b/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java index 4b585fe..424aad1 100644 --- a/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java +++ b/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java @@ -100,7 +100,7 @@ public abstract class PdfAS * The current version of the pdf-as library. This version string is logged on every invocation
* of the api or the web application.
*/
- public static final String PDFAS_VERSION = "3.1.1-snapshot (20100316)";
+ public static final String PDFAS_VERSION = "3.1.1-snapshot (20100408)";
/**
* The key of the strict mode setting.
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/pdf/AdobeSignatureHelper.java b/src/main/java/at/knowcenter/wag/egov/egiz/pdf/AdobeSignatureHelper.java index 1db1de0..aca45f0 100644 --- a/src/main/java/at/knowcenter/wag/egov/egiz/pdf/AdobeSignatureHelper.java +++ b/src/main/java/at/knowcenter/wag/egov/egiz/pdf/AdobeSignatureHelper.java @@ -136,6 +136,7 @@ public class AdobeSignatureHelper { sig.setName(getAdobeSignText(profileId, si));
sap.setCryptoDictionary(sig);
+ sap.setCertificationLevel(PdfSignatureAppearance.NOT_CERTIFIED);
// content element is mandatory but empty
HashMap exc = new HashMap();
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignServlet.java index 69b237f..4c93b73 100644 --- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignServlet.java +++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignServlet.java @@ -280,7 +280,9 @@ public class SignServlet extends HttpServlet si.pos = pos;
// end add
- request.getSession().setAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION, si);
+ HttpSession session = request.getSession();
+ log.info("Putting signature data into session " + session.getId());
+ session.setAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION, si);
// String user_name = (String)
// request.getSession().getAttribute(SessionAttributes.ATTRIBUTE_USER_NAME);
diff --git a/src/main/resources/DefaultConfiguration.zip b/src/main/resources/DefaultConfiguration.zip Binary files differindex b9a0e77..3ee9b81 100644 --- a/src/main/resources/DefaultConfiguration.zip +++ b/src/main/resources/DefaultConfiguration.zip diff --git a/src/main/resources/config/pdf-as.properties b/src/main/resources/config/pdf-as.properties index 32bd3a5..c8d168b 100644 --- a/src/main/resources/config/pdf-as.properties +++ b/src/main/resources/config/pdf-as.properties @@ -31,8 +31,9 @@ signaturelayout.pattern.tdb=^citizen-card-environment/1\\.2 trustDeskbasic((-OSX signaturelayout.implementation.tdb=at.knowcenter.wag.egov.egiz.sig.signaturelayout.td.TrustDeskSignatureLayoutHandler
# signature layout for supported A-Trust CCS
-signaturelayout.pattern.atrust=^citizen-card-environment/1\\.2 atrustSecurityLayer/1\\.2\\.0$
-signaturelayout.implementation.atrust=at.knowcenter.wag.egov.egiz.sig.signaturelayout.atrust.ATrustSignatureLayoutHandler
+# currently disabled since A-Trust CCS has still some problems preventing the usage with PDF-AS
+#signaturelayout.pattern.atrust=^citizen-card-environment/1\\.2 atrustSecurityLayer/1\\.2\\.2$
+#signaturelayout.implementation.atrust=at.knowcenter.wag.egov.egiz.sig.signaturelayout.atrust.ATrustSignatureLayoutHandler
#############################################
diff --git a/src/main/webapp/jsp/signupload.jsp b/src/main/webapp/jsp/signupload.jsp index f6c02fe..4df2fe3 100644 --- a/src/main/webapp/jsp/signupload.jsp +++ b/src/main/webapp/jsp/signupload.jsp @@ -86,7 +86,7 @@ // signature device
String device = (String) session.getAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_DEVICE_KEY);
if (device == null) {
- device = Constants.SIGNATURE_DEVICE_BKU;
+ device = Constants.SIGNATURE_DEVICE_MOC;
session.setAttribute(UpdateFormServlet.UPLOADFORM_SIGNATURE_DEVICE_KEY, device);
}
// signature mode
@@ -254,9 +254,15 @@ </td>
</tr>
</table>
+ <% if ((!freeText && (FormFields.VALUE_MODE_TEXTUAL.equals(mode))) || pdfa) { %>
<div class="pdfasnote"><span class="pdfasemphasis">
- <fmt:message key="signupload.note.prefix"/>:</span> <% if (!freeText) { %><fmt:message key="signupload.note.file"/><% } %> <fmt:message key="signupload.note"/> <% if (pdfa) { %><fmt:message key="signupload.note.pdfa"/><% } %>
+ <fmt:message key="signupload.note.prefix"/>:</span>
+ <% if ((FormFields.VALUE_MODE_TEXTUAL.equals(mode))) { %>
+ <% if (!freeText) { %><fmt:message key="signupload.note.file"/><% } %> <fmt:message key="signupload.note"/>
+ <% } // end if %>
+ <% if (pdfa) { %> <fmt:message key="signupload.note.pdfa"/><% } %>
</div>
+ <% } // end if %>
<input type="hidden" name="<%= FormFields.FIELD_DOWNLOAD %>" value="<%= FormFields.VALUE_DOWNLOAD_ATTACHMENT %>"/>
<input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="false" />
|