diff options
49 files changed, 132 insertions, 135 deletions
diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/Settings.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/Settings.java index 56631a7e..1cb85f7f 100644 --- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/Settings.java +++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/settings/Settings.java @@ -147,7 +147,7 @@ public class Settings implements ISettings, IProfileConstants { } } - logger.debug("Settings: {}", + logger.debug("Configured Settings: {}", properties.size()); // Resolve Parent Structures ... @@ -181,14 +181,6 @@ public class Settings implements ISettings, IProfileConstants { // key, childBase+keyToCopy); String sourceKey = parentBase+keyToCopy; String targetKey = childBase+keyToCopy; - - int idx = targetKey.indexOf("NOTE"); - if(idx > 0) { - if(targetKey.indexOf("NOTE", idx+1) > 0) { - logger.debug("Profile: {} => {}", - parentBase, childBase); - } - } if(!this.hasValue(targetKey)) { properties.setProperty(targetKey, @@ -227,7 +219,7 @@ public class Settings implements ISettings, IProfileConstants { } } - logger.debug("Settings: {}", + logger.debug("Derived Settings: {}", properties.size()); } diff --git a/pdf-as-lib/src/configuration/pdfastmp/024855edaaec4a9e70a10c8dada03c3c2872abd9/0c12b16dc63efa3bfc53fb580b20de5a56f6f86f.tmppdf b/pdf-as-lib/src/configuration/pdfastmp/024855edaaec4a9e70a10c8dada03c3c2872abd9/0c12b16dc63efa3bfc53fb580b20de5a56f6f86f.tmppdf Binary files differnew file mode 100644 index 00000000..867f68db --- /dev/null +++ b/pdf-as-lib/src/configuration/pdfastmp/024855edaaec4a9e70a10c8dada03c3c2872abd9/0c12b16dc63efa3bfc53fb580b20de5a56f6f86f.tmppdf diff --git a/pdf-as-lib/src/configuration/pdfastmp/1bc3511b26297bf767ab8bb767815ec65d48b71e/651beb1a92f9313e46752667ad2caad8e55cc785.tmppdf b/pdf-as-lib/src/configuration/pdfastmp/1bc3511b26297bf767ab8bb767815ec65d48b71e/651beb1a92f9313e46752667ad2caad8e55cc785.tmppdf Binary files differnew file mode 100644 index 00000000..867f68db --- /dev/null +++ b/pdf-as-lib/src/configuration/pdfastmp/1bc3511b26297bf767ab8bb767815ec65d48b71e/651beb1a92f9313e46752667ad2caad8e55cc785.tmppdf diff --git a/pdf-as-lib/src/configuration/pdfastmp/1e58de17f4bbdc2a3eb911d8d73b8e5f0b9b8d8f/5990344a0c25a1998c13b80fb54163df279ab0b3.tmppdf b/pdf-as-lib/src/configuration/pdfastmp/1e58de17f4bbdc2a3eb911d8d73b8e5f0b9b8d8f/5990344a0c25a1998c13b80fb54163df279ab0b3.tmppdf Binary files differnew file mode 100644 index 00000000..867f68db --- /dev/null +++ b/pdf-as-lib/src/configuration/pdfastmp/1e58de17f4bbdc2a3eb911d8d73b8e5f0b9b8d8f/5990344a0c25a1998c13b80fb54163df279ab0b3.tmppdf diff --git a/pdf-as-lib/src/configuration/pdfastmp/43cca4ac73be06a084ff233127b261dbf14ea783/3db03bf642b2dfefb9d5e9c4685b6bf4d2801347.tmppdf b/pdf-as-lib/src/configuration/pdfastmp/43cca4ac73be06a084ff233127b261dbf14ea783/3db03bf642b2dfefb9d5e9c4685b6bf4d2801347.tmppdf Binary files differnew file mode 100644 index 00000000..867f68db --- /dev/null +++ b/pdf-as-lib/src/configuration/pdfastmp/43cca4ac73be06a084ff233127b261dbf14ea783/3db03bf642b2dfefb9d5e9c4685b6bf4d2801347.tmppdf diff --git a/pdf-as-lib/src/configuration/pdfastmp/7c7e273e4cecbcf5e0bca3e3770535b767ccf65c/fdf2688a1a93fbf4759ddc444275ae38e03fa86e.tmppdf b/pdf-as-lib/src/configuration/pdfastmp/7c7e273e4cecbcf5e0bca3e3770535b767ccf65c/fdf2688a1a93fbf4759ddc444275ae38e03fa86e.tmppdf Binary files differnew file mode 100644 index 00000000..867f68db --- /dev/null +++ b/pdf-as-lib/src/configuration/pdfastmp/7c7e273e4cecbcf5e0bca3e3770535b767ccf65c/fdf2688a1a93fbf4759ddc444275ae38e03fa86e.tmppdf diff --git a/pdf-as-lib/src/configuration/pdfastmp/87cf3a0d9ca039d5260e102a672e485e3e7b711e/02591ca7b2fa3dabd5041f8a3f21e867d0cc0591.tmppdf b/pdf-as-lib/src/configuration/pdfastmp/87cf3a0d9ca039d5260e102a672e485e3e7b711e/02591ca7b2fa3dabd5041f8a3f21e867d0cc0591.tmppdf Binary files differnew file mode 100644 index 00000000..867f68db --- /dev/null +++ b/pdf-as-lib/src/configuration/pdfastmp/87cf3a0d9ca039d5260e102a672e485e3e7b711e/02591ca7b2fa3dabd5041f8a3f21e867d0cc0591.tmppdf diff --git a/pdf-as-lib/src/configuration/pdfastmp/cd1fe1d42172b0daeedd6d4dedbf7c67f16fa94c/e6b460a6ddc28c62c6a04f78bff877cb5eb970ff.tmppdf b/pdf-as-lib/src/configuration/pdfastmp/cd1fe1d42172b0daeedd6d4dedbf7c67f16fa94c/e6b460a6ddc28c62c6a04f78bff877cb5eb970ff.tmppdf Binary files differnew file mode 100644 index 00000000..867f68db --- /dev/null +++ b/pdf-as-lib/src/configuration/pdfastmp/cd1fe1d42172b0daeedd6d4dedbf7c67f16fa94c/e6b460a6ddc28c62c6a04f78bff877cb5eb970ff.tmppdf diff --git a/pdf-as-lib/src/configuration/pdfastmp/cf6014eb965316128c7d6b4e129da73f95ba46ee/4c67eec41791b71414dadeb0ff387a04448cbe9f.tmppdf b/pdf-as-lib/src/configuration/pdfastmp/cf6014eb965316128c7d6b4e129da73f95ba46ee/4c67eec41791b71414dadeb0ff387a04448cbe9f.tmppdf Binary files differnew file mode 100644 index 00000000..867f68db --- /dev/null +++ b/pdf-as-lib/src/configuration/pdfastmp/cf6014eb965316128c7d6b4e129da73f95ba46ee/4c67eec41791b71414dadeb0ff387a04448cbe9f.tmppdf diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java index 8e86364b..fe7f72ab 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java @@ -238,7 +238,7 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, return result; } catch (Throwable e) { - logger.error("Failed to create signature [" + e.getMessage() + "]", + logger.warn("Failed to create signature [" + e.getMessage() + "]", e); throw ErrorExtractor.searchPdfAsError(e, status); } finally { @@ -316,7 +316,7 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, return request; } catch (Throwable e) { - logger.error("startSign", e); + logger.warn("startSign", e); throw ErrorExtractor.searchPdfAsError(e, status); } } @@ -378,7 +378,7 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, request.setNeedSignature(true); } catch (Throwable e) { - logger.error("process", e); + logger.warn("process", e); throw ErrorExtractor.searchPdfAsError(e, status); } } else if (request.needSignature()) { @@ -548,10 +548,10 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants, return signer.generateVisibleSignaturePreview(parameter, iaikCert, resolution, status, requestedSignature); } catch (PdfAsException e) { - logger.error("PDF-AS Exception", e); + logger.warn("PDF-AS Exception", e); throw ErrorExtractor.searchPdfAsError(e, status); } catch (Throwable e) { - logger.error("Throwable Exception", e); + logger.warn("Throwable Exception", e); throw ErrorExtractor.searchPdfAsError(e, status); } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateResolver.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateResolver.java index 7012a93a..bff573a4 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateResolver.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateResolver.java @@ -57,14 +57,14 @@ public class CertificateResolver implements IResolver { Map<String, String> issuerDNMap = DNUtils.dnToMap(certificate.getIssuerDN().getName()); this.ctx.put("issuer", issuerDNMap); } catch (InvalidNameException e) { - logger.error("Failed to build issuer Map", e); + logger.warn("Failed to build issuer Map", e); } try { Map<String, String> subjectDNMap = DNUtils.dnToMap(certificate.getSubjectDN().getName()); this.ctx.put("subject", subjectDNMap); } catch (InvalidNameException e) { - logger.error("Failed to build subject Map", e); + logger.warn("Failed to build subject Map", e); } Map<String, String> iuiMap = new HashMap<String, String>(); diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IntegrityVerifier.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IntegrityVerifier.java index 9142bc68..3b49497b 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IntegrityVerifier.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IntegrityVerifier.java @@ -66,7 +66,7 @@ public class IntegrityVerifier implements IVerifier { signedCertificate = signerInfos[0] .getSignedAttribute(ObjectID.signingCertificateV2); if (signedCertificate == null) { - logger.error("Signature ERROR missing signed Signing Certificate: "); + logger.warn("Signature ERROR missing signed Signing Certificate: "); throw new SignatureException("Signature ERROR missing signed Signing Certificate"); } else { @@ -80,12 +80,12 @@ public class IntegrityVerifier implements IVerifier { // OK logger.debug("Found and verified SigningCertificateV2"); } else { - logger.error("Signature ERROR certificate missmatch: "); + logger.warn("Signature ERROR certificate missmatch, misbehaving Sign Backend?"); throw new SignatureException("Signature ERROR certificate missmatch"); } } catch (Throwable e) { - logger.error("Signature ERROR wrong encoding for ESSCertIDv2"); + logger.error("Signature ERROR wrong encoding for ESSCertIDv2, misbehaving Signature Backend?"); throw new SignatureException("Signature ERROR wrong encoding for ESSCertIDv2"); } @@ -99,12 +99,12 @@ public class IntegrityVerifier implements IVerifier { // OK logger.debug("Found and verified SigningCertificate"); } else { - logger.error("Signature ERROR certificate missmatch"); + logger.warn("Signature ERROR certificate missmatch"); throw new SignatureException("Signature ERROR certificate missmatch"); } } catch (Throwable e) { - logger.error("Signature ERROR wrong encoding for ESSCertIDv2"); + logger.error("Signature ERROR wrong encoding for ESSCertIDv2, misbehaving Signature Backend?"); throw new SignatureException("Signature ERROR wrong encoding for ESSCertIDv2", e); } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/SignatureUtils.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/SignatureUtils.java index ef5df8b1..6e584f32 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/SignatureUtils.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/SignatureUtils.java @@ -45,12 +45,12 @@ public class SignatureUtils implements ErrorConstants { // get the signer infos SignerInfo[] signerInfos = signedData.getSignerInfos(); if (signerInfos.length == 0) { - logger.error("Invalid signature (no signer information)"); + logger.warn("Invalid signature (no signer information)"); throw new PDFASError(ERROR_SIG_INVALID_BKU_SIG); } if (signerInfos.length != 1) { - logger.error("Invalid signature (multiple signer information)"); + logger.warn("Invalid signature (multiple signer information)"); throw new PDFASError(ERROR_SIG_INVALID_BKU_SIG); } // verify the signatures @@ -72,7 +72,7 @@ public class SignatureUtils implements ErrorConstants { signedCertificate = signerInfos[0] .getSignedAttribute(ObjectID.signingCertificateV2); if (signedCertificate == null) { - logger.error("Signature ERROR missing signed Signing Certificate: "); + logger.warn("Signature ERROR missing signed Signing Certificate: "); throw new PDFASError(ERROR_SIG_INVALID_BKU_SIG); } else { @@ -84,12 +84,12 @@ public class SignatureUtils implements ErrorConstants { // OK logger.debug("Found and verified SigningCertificateV2"); } else { - logger.error("Signature ERROR certificate missmatch: "); + logger.error("Signature ERROR certificate missmatch, misbehaving Signature Backend?"); throw new PDFASError(ERROR_SIG_INVALID_BKU_SIG); } } catch (Throwable e) { - logger.error("Signature ERROR wrong encoding for ESSCertIDv2:"); + logger.error("Signature ERROR wrong encoding for ESSCertIDv2, misbehaving Signature Backend?"); throw new PDFASError(ERROR_SIG_INVALID_BKU_SIG, e); } @@ -102,12 +102,12 @@ public class SignatureUtils implements ErrorConstants { // OK logger.debug("Found and verified SigningCertificate"); } else { - logger.error("Signature ERROR certificate missmatch"); + logger.warn("Signature ERROR certificate missmatch, misbehaving Signature Backend?"); throw new PDFASError(ERROR_SIG_INVALID_BKU_SIG); } } catch (Throwable e) { - logger.error("Signature ERROR wrong encoding for ESSCertIDv2"); + logger.error("Signature ERROR wrong encoding for ESSCertIDv2, misbehaving Signature Backend?"); throw new PDFASError(ERROR_SIG_INVALID_BKU_SIG, e); } @@ -121,7 +121,7 @@ public class SignatureUtils implements ErrorConstants { } catch (SignatureException ex) { // if the signature is not OK a SignatureException // is thrown - logger.error( + logger.warn( "Signature ERROR from signer: " + signedData.getCertificate( signerInfos[0].getSignerIdentifier()) diff --git a/pdf-as-lib/src/main/resources/config/config.zip b/pdf-as-lib/src/main/resources/config/config.zip Binary files differindex 19971a5b..e46d87d2 100644 --- a/pdf-as-lib/src/main/resources/config/config.zip +++ b/pdf-as-lib/src/main/resources/config/config.zip diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/AnyChildrenType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/AnyChildrenType.java index a7ce868d..5304f283 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/AnyChildrenType.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/AnyChildrenType.java @@ -64,9 +64,9 @@ public class AnyChildrenType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link String } * {@link Object } + * {@link String } + * {@link Element } * * */ diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/VerifyCMSSignatureResponseType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/VerifyCMSSignatureResponseType.java index 0a370d28..405805b7 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/VerifyCMSSignatureResponseType.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822/VerifyCMSSignatureResponseType.java @@ -40,9 +40,9 @@ import org.w3._2000._09.xmldsig.KeyInfoType; public class VerifyCMSSignatureResponseType { @XmlElementRefs({ + @XmlElementRef(name = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class), @XmlElementRef(name = "SignatureCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class), - @XmlElementRef(name = "CertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class), - @XmlElementRef(name = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class) + @XmlElementRef(name = "CertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class) }) protected List<JAXBElement<?>> signerInfoAndSignatureCheckAndCertificateCheck; @@ -64,9 +64,9 @@ public class VerifyCMSSignatureResponseType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >} * {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >} * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >} + * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >} * * */ diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/MOAFault.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/MOAFault.java index 69cef510..0add2565 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/MOAFault.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/MOAFault.java @@ -6,7 +6,7 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 3.0.1 - * 2014-10-21T07:59:06.684+02:00 + * 2014-11-28T08:32:27.729+01:00 * Generated source version: 3.0.1 */ diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationPortType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationPortType.java index 8cb5ad50..e682e0d6 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationPortType.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationPortType.java @@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; /** * This class was generated by Apache CXF 3.0.1 - * 2014-10-21T07:59:06.696+02:00 + * 2014-11-28T08:32:27.738+01:00 * Generated source version: 3.0.1 * */ diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationService.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationService.java index 09a0e99d..c88833e5 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationService.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureCreationService.java @@ -9,7 +9,7 @@ import javax.xml.ws.Service; /** * This class was generated by Apache CXF 3.0.1 - * 2014-10-21T07:59:06.741+02:00 + * 2014-11-28T08:32:27.775+01:00 * Generated source version: 3.0.1 * */ diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationPortType.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationPortType.java index 050caf76..446276c6 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationPortType.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationPortType.java @@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; /** * This class was generated by Apache CXF 3.0.1 - * 2014-10-21T07:59:06.733+02:00 + * 2014-11-28T08:32:27.767+01:00 * Generated source version: 3.0.1 * */ diff --git a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationService.java b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationService.java index 4d847f29..c242d913 100644 --- a/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationService.java +++ b/pdf-as-moa/src/generated/java/at/gv/e_government/reference/namespace/moa/_20020822_/SignatureVerificationService.java @@ -9,7 +9,7 @@ import javax.xml.ws.Service; /** * This class was generated by Apache CXF 3.0.1 - * 2014-10-21T07:59:06.766+02:00 + * 2014-11-28T08:32:27.797+01:00 * Generated source version: 3.0.1 * */ diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java index 6bdfca52..9ff1650b 100644 --- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java +++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java @@ -63,8 +63,8 @@ public class CanonicalizationMethodType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link String } * {@link Object } + * {@link String } * * */ diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/DigestMethodType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/DigestMethodType.java index 64ce9a83..7ecc4eeb 100644 --- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/DigestMethodType.java +++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/DigestMethodType.java @@ -64,9 +64,9 @@ public class DigestMethodType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link String } * {@link Object } + * {@link String } + * {@link Element } * * */ diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyInfoType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyInfoType.java index b45024fc..2ed8d404 100644 --- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyInfoType.java +++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyInfoType.java @@ -53,12 +53,12 @@ import org.w3c.dom.Element; public class KeyInfoType { @XmlElementRefs({ - @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), - @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), - @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) }) @XmlMixed @@ -88,14 +88,14 @@ public class KeyInfoType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} - * {@link Object } - * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} + * {@link String } * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link JAXBElement }{@code <}{@link X509DataType }{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link String } + * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link Object } + * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} * {@link Element } * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} * diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyValueType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyValueType.java index f995991b..94431007 100644 --- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyValueType.java +++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/KeyValueType.java @@ -42,8 +42,8 @@ import org.w3c.dom.Element; public class KeyValueType { @XmlElementRefs({ - @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), - @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) + @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) }) @XmlMixed @XmlAnyElement(lax = true) @@ -67,10 +67,10 @@ public class KeyValueType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link String } * {@link Object } - * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} + * {@link String } * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} + * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} * {@link Element } * * diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java index 29ed3692..f15b501f 100644 --- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java +++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectFactory.java @@ -49,15 +49,15 @@ public class ObjectFactory { private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue"); private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference"); private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue"); + private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID"); + private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket"); + private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp"); private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength"); private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial"); private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate"); private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI"); private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName"); private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL"); - private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp"); - private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID"); - private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket"); private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath"); /** @@ -460,6 +460,33 @@ public class ObjectFactory { } /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class) + public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) { + return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class) + public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) { + return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class) + public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) { + return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value)); + } + + /** * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} * */ @@ -514,33 +541,6 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class) - public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) { - return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class) - public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) { - return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class) - public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) { - return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); - } - - /** * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectType.java index 358ee9d5..3de8892c 100644 --- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectType.java +++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/ObjectType.java @@ -76,9 +76,9 @@ public class ObjectType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link String } * {@link Object } + * {@link String } + * {@link Element } * * */ diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/PGPDataType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/PGPDataType.java index 013db7d0..5a9025e4 100644 --- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/PGPDataType.java +++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/PGPDataType.java @@ -59,8 +59,8 @@ public class PGPDataType { * <p> * You are getting this "catch-all" property because of the following reason: * The field name "PGPKeyPacket" is used by two different parts of a schema. See: - * line 0 of http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd - * line 0 of http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd + * line 218 of file:/home/afitzek/devel/pdf-as-4/src/pdf-as-4/pdf-as-moa/src/main/resources/wsdl/xmldsig-core-schema.xsd + * line 213 of file:/home/afitzek/devel/pdf-as-4/src/pdf-as-4/pdf-as-moa/src/main/resources/wsdl/xmldsig-core-schema.xsd * <p> * To get rid of this property, apply a property customization to one * of both of the following declarations to change their names: @@ -81,9 +81,9 @@ public class PGPDataType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link Object } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link Element } * * diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignatureMethodType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignatureMethodType.java index 08944fd5..045718ac 100644 --- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignatureMethodType.java +++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignatureMethodType.java @@ -68,9 +68,9 @@ public class SignatureMethodType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link BigInteger }{@code >} - * {@link String } * {@link Object } + * {@link String } + * {@link JAXBElement }{@code <}{@link BigInteger }{@code >} * * */ diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java index 4e84715e..ecfbdb1f 100644 --- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java +++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java @@ -73,9 +73,9 @@ public class SignaturePropertyType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link String } * {@link Object } + * {@link String } + * {@link Element } * * */ diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/TransformType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/TransformType.java index 0f631ea6..6d55d9ef 100644 --- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/TransformType.java +++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/TransformType.java @@ -68,10 +68,10 @@ public class TransformType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link String } * {@link Object } * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link String } + * {@link Element } * * */ diff --git a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/X509DataType.java b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/X509DataType.java index cecbef03..b56b5bd1 100644 --- a/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/X509DataType.java +++ b/pdf-as-moa/src/generated/java/org/w3/_2000/_09/xmldsig/X509DataType.java @@ -47,10 +47,10 @@ public class X509DataType { @XmlElementRefs({ @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), - @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), - @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), - @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) + @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) }) @XmlAnyElement(lax = true) protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName; @@ -73,11 +73,11 @@ public class X509DataType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Object } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} + * {@link Object } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link Element } * diff --git a/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java b/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java index 212e4116..5f3d9cb8 100644 --- a/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java +++ b/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAConnector.java @@ -131,7 +131,7 @@ public class MOAConnector implements ISignatureConnector, this.certificate = new X509Certificate( certificateURL.openStream()); } catch (MalformedURLException e) { - logger.error(certificateValue + " is not a valid url but!"); + logger.error(certificateValue + " is not a valid url but starts with http!"); throw new PdfAsWrappedIOException(new PdfAsException( certificateValue + " is not a valid url but!")); } @@ -210,7 +210,7 @@ public class MOAConnector implements ISignatureConnector, try { response = creationPort.createCMSSignature(request); } catch (MOAFault e) { - logger.error("MOA signing failed!", e); + logger.warn("MOA signing failed!", e); if (e.getFaultInfo() != null) { throw new PdfAsMOAException(e.getFaultInfo().getErrorCode() .toString(), e.getFaultInfo().getInfo(), "", ""); diff --git a/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java b/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java index 45f9a223..1dc63e0b 100644 --- a/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java +++ b/pdf-as-moa/src/main/java/at/gv/egiz/pdfas/moa/MOAVerifier.java @@ -177,7 +177,7 @@ public class MOAVerifier implements IVerifier { } resultList.add(result); } catch (Throwable e) { - logger.error("Verification failed", e); + logger.warn("Verification failed", e); throw new PdfAsException("error.pdf.verify.02", e); } return resultList; diff --git a/pdf-as-pdfbox/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/pdfbox/PDFBOXVerifier.java b/pdf-as-pdfbox/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/pdfbox/PDFBOXVerifier.java index 85ff2d87..4d0c3cbb 100644 --- a/pdf-as-pdfbox/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/pdfbox/PDFBOXVerifier.java +++ b/pdf-as-pdfbox/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/pdfbox/PDFBOXVerifier.java @@ -153,10 +153,10 @@ public class PDFBOXVerifier implements VerifyBackend { } return result; } catch (IOException e) { - logger.error("Failed to verify document", e); + logger.warn("Failed to verify document", e); throw ErrorExtractor.searchPdfAsError(e, null); } catch (PdfAsException e) { - logger.error("Failed to verify document", e); + logger.warn("Failed to verify document", e); throw ErrorExtractor.searchPdfAsError(e, null); } finally { if (doc != null) { diff --git a/pdf-as-pdfbox/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFPage.java b/pdf-as-pdfbox/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFPage.java index 84574b41..5a3711a4 100644 --- a/pdf-as-pdfbox/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFPage.java +++ b/pdf-as-pdfbox/src/main/java/at/knowcenter/wag/egov/egiz/pdf/PDFPage.java @@ -234,7 +234,12 @@ public class PDFPage extends PDFTextStripper { // this depicts the current end of path-related page content float lowerBoundYPositionFromTop; - PDRectangle boundaryBox = this.getCurrentPage().findMediaBox(); + PDRectangle boundaryBox = this.getCurrentPage().findCropBox(); + + if(boundaryBox == null) { + boundaryBox = this.getCurrentPage().findMediaBox(); + } + float pageHeight; switch (this.getCurrentPage().findRotation()) { diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java index 0fbd9163..c16eec27 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java @@ -323,7 +323,7 @@ public class WebConfiguration implements IConfigurationConstants { return true; } } catch (Throwable e) { - logger.error("Error in matching regex: " + pattern, e); + logger.warn("Error in matching regex: " + pattern, e); } } diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java index 53085ca2..7f900b0f 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java @@ -293,7 +293,7 @@ public class PdfAsHelper { try { signIdx = Integer.parseInt(signidxString); } catch (Throwable e) { - logger.error("Failed to parse Signature Index: " + logger.warn("Failed to parse Signature Index: " + signidxString); } } @@ -1097,12 +1097,12 @@ public class PdfAsHelper { if (obj != null) { try { if (!(obj instanceof List<?>)) { - logger.error("Invalid object type"); + logger.warn("Invalid object type"); return null; } return (List<VerifyResult>) obj; } catch (Throwable e) { - logger.error("Invalid object type"); + logger.warn("Invalid object type"); } } return null; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java index f3c1c946..462c1bc8 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java @@ -44,7 +44,7 @@ public class RemotePDFFetcher { try { url = new URL(pdfURL); } catch (MalformedURLException e) { - logger.error("Not a valid URL!", e); + logger.warn("Not a valid URL!", e); throw new PdfAsWebException("Not a valid URL!", e); } if (WebConfiguration.isProvidePdfURLinWhitelist(url.toExternalForm())) { @@ -55,7 +55,7 @@ public class RemotePDFFetcher { InputStream is = url.openStream(); return StreamUtils.inputStreamToByteArray(is); } catch (Exception e) { - logger.error("Failed to fetch pdf document!", e); + logger.warn("Failed to fetch pdf document!", e); throw new PdfAsWebException( "Failed to fetch pdf document!", e); } diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/DataURLServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/DataURLServlet.java index 5b951b78..86bef9f3 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/DataURLServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/DataURLServlet.java @@ -94,7 +94,7 @@ public class DataURLServlet extends HttpServlet { PdfAsHelper.injectSignature(request, response, createCMSSignatureResponseType, getServletContext()); } else if(jaxbObject.getValue() instanceof ErrorResponseType) { ErrorResponseType errorResponseType = (ErrorResponseType)jaxbObject.getValue(); - logger.error("SecurityLayer: " + errorResponseType.getErrorCode() + " " + errorResponseType.getInfo()); + logger.warn("SecurityLayer: " + errorResponseType.getErrorCode() + " " + errorResponseType.getInfo()); throw new PdfAsSecurityLayerException(errorResponseType.getInfo(), errorResponseType.getErrorCode()); } else { @@ -102,7 +102,7 @@ public class DataURLServlet extends HttpServlet { 9999); } } catch (Exception e) { - logger.error("Error in DataURL Servlet. " , e); + logger.warn("Error in DataURL Servlet. " , e); PdfAsHelper.setSessionException(request, response, e.getMessage(), e); PdfAsHelper.gotoError(getServletContext(), request, response); diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ExternSignServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ExternSignServlet.java index 7900dfde..0982c98c 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ExternSignServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ExternSignServlet.java @@ -194,7 +194,7 @@ public class ExternSignServlet extends HttpServlet { } } catch(Throwable e) { - logger.error("In resolving filename", e); + logger.warn("In resolving filename", e); } if(filecontent.length < 10) { filecontent = null; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFData.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFData.java index b0c434af..483b9707 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFData.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFData.java @@ -85,9 +85,9 @@ public class PDFData extends HttpServlet { if(plainPDFDigest != null) { String signatureDataHash = PdfAsHelper.getSignatureDataHash(request); if(!plainPDFDigest.equalsIgnoreCase(signatureDataHash)) { - logger.error("Digest Hash mismatch!"); - logger.error("Requested digest: " + plainPDFDigest); - logger.error("Saved digest: " + signatureDataHash); + logger.warn("Digest Hash mismatch!"); + logger.warn("Requested digest: " + plainPDFDigest); + logger.warn("Saved digest: " + signatureDataHash); PdfAsHelper.setSessionException(request, response, "Signature Data digest do not match!", null); diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFSignatureCertificateData.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFSignatureCertificateData.java index 9b3e9f31..e4465e77 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFSignatureCertificateData.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFSignatureCertificateData.java @@ -99,17 +99,17 @@ public class PDFSignatureCertificateData extends HttpServlet { os.write(res.getSignerCertificate().getEncoded()); os.close(); } else { - logger.error("Verification CERT not found! for id " + request.getParameter(SIGN_ID) + " in session " + request.getSession().getId()); + logger.warn("Verification CERT not found! for id " + request.getParameter(SIGN_ID) + " in session " + request.getSession().getId()); response.sendError(HttpServletResponse.SC_NOT_FOUND); } } catch (NumberFormatException e) { - logger.error("Verification CERT not found! for id " + request.getParameter(SIGN_ID) + " in session " + request.getSession().getId()); + logger.warn("Verification CERT not found! for id " + request.getParameter(SIGN_ID) + " in session " + request.getSession().getId()); response.sendError(HttpServletResponse.SC_NOT_FOUND); } catch (PdfAsException e) { - logger.error("Verification CERT not found:", e); + logger.warn("Verification CERT not found:", e); response.sendError(HttpServletResponse.SC_NOT_FOUND); } catch (CertificateEncodingException e) { - logger.error("Verification CERT invalid:", e); + logger.warn("Verification CERT invalid:", e); response.sendError(HttpServletResponse.SC_NOT_FOUND); } } diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFSignatureData.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFSignatureData.java index 63a38c52..e493f4ae 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFSignatureData.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFSignatureData.java @@ -98,14 +98,14 @@ public class PDFSignatureData extends HttpServlet { os.write(res.getSignatureData()); os.close(); } else { - logger.error("Verification DATA not found! for id " + request.getParameter(SIGN_ID) + " in session " + request.getSession().getId()); + logger.warn("Verification DATA not found! for id " + request.getParameter(SIGN_ID) + " in session " + request.getSession().getId()); response.sendError(HttpServletResponse.SC_NOT_FOUND); } } catch (NumberFormatException e) { - logger.error("Verification DATA not found! for id " + request.getParameter(SIGN_ID) + " in session " + request.getSession().getId()); + logger.warn("Verification DATA not found! for id " + request.getParameter(SIGN_ID) + " in session " + request.getSession().getId()); response.sendError(HttpServletResponse.SC_NOT_FOUND); } catch (PdfAsException e) { - logger.error("Verification DATA not found:", e); + logger.warn("Verification DATA not found:", e); response.sendError(HttpServletResponse.SC_NOT_FOUND); } } diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UIEntryPointServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UIEntryPointServlet.java index e602a8e0..53be36da 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UIEntryPointServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UIEntryPointServlet.java @@ -166,7 +166,7 @@ public class UIEntryPointServlet extends HttpServlet { } } catch (Throwable e) { - logger.error("Failed to process Request: ", e); + logger.warn("Failed to process Request: ", e); PdfAsHelper.setSessionException(req, resp, e.getMessage(), e); PdfAsHelper.gotoError(getServletContext(), req, resp); } diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java index aaa6afbb..32bb41ac 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java @@ -99,7 +99,7 @@ public class VerifyServlet extends HttpServlet { byte[] pdfData = RemotePDFFetcher.fetchPdfFile(pdfUrl); doVerify(request, response, pdfData); } catch (Throwable e) { - logger.error("Generic Error: ", e); + logger.warn("Generic Error: ", e); PdfAsHelper.setSessionException(request, response, e.getMessage(), e); PdfAsHelper.gotoError(getServletContext(), request, response); @@ -187,7 +187,7 @@ public class VerifyServlet extends HttpServlet { name); } } catch (Throwable e) { - logger.error("In resolving filename", e); + logger.warn("In resolving filename", e); } if (filecontent.length < 10) { filecontent = null; @@ -233,7 +233,7 @@ public class VerifyServlet extends HttpServlet { doVerify(request, response, filecontent); } catch (Throwable e) { - logger.error("Generic Error: ", e); + logger.warn("Generic Error: ", e); PdfAsHelper.setSessionException(request, response, e.getMessage(), e); PdfAsHelper.gotoError(getServletContext(), request, response); diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VisBlockServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VisBlockServlet.java index 1ee6f0f8..b49264f7 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VisBlockServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VisBlockServlet.java @@ -83,10 +83,10 @@ public class VisBlockServlet extends HttpServlet { throw new ServletException(PARAM_RESOLUTION + " invalid value! Not a Number"); } catch (CertificateException e) { - logger.error("CERT Error", e); + logger.warn("CERT Error", e); throw new ServletException("Failed to find certificate"); } catch (PDFASError e) { - logger.error("PDF_AS Error", e); + logger.warn("PDF_AS Error", e); throw new ServletException("Generic Error"); } } diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/ws/PDFASSigningImpl.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/ws/PDFASSigningImpl.java index d15492b4..91aec279 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/ws/PDFASSigningImpl.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/ws/PDFASSigningImpl.java @@ -149,7 +149,7 @@ public class PDFASSigningImpl implements PDFASSigning { response.setRedirectUrl(userEntryURL); } } catch (Throwable e) { - logger.error("Error in Soap Service", e); + logger.warn("Error in Soap Service", e); if (e.getCause() != null) { response.setError(e.getCause().getMessage()); } else { @@ -179,7 +179,7 @@ public class PDFASSigningImpl implements PDFASSigning { logger.debug("Done SOAP Sign Request"); return response; } - logger.error("Server Signature failed. [PDFASBulkSignRequest is NULL]"); + logger.warn("Server Signature failed. [PDFASBulkSignRequest is NULL]"); if (WebConfiguration.isShowErrorDetails()) { throw new WebServiceException("PDFASBulkSignRequest is NULL"); diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/ws/PDFASVerificationImpl.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/ws/PDFASVerificationImpl.java index 0257f835..e46da89e 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/ws/PDFASVerificationImpl.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/ws/PDFASVerificationImpl.java @@ -112,7 +112,7 @@ public class PDFASVerificationImpl implements PDFASVerification { response.getVerifyResults().add(webResult); } } catch (Exception e) { - logger.error("Failed to verify PDF", e); + logger.warn("Failed to verify PDF", e); if (WebConfiguration.isShowErrorDetails()) { throw new WebServiceException("Generic Error", e); } else { |