aboutsummaryrefslogtreecommitdiff
path: root/pdf-as-lib/src/main
diff options
context:
space:
mode:
authorAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2014-11-28 11:04:46 +0100
committerAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2014-11-28 11:04:46 +0100
commit2b70ab18a97dd248d478d985ae602bd7e3a9d320 (patch)
tree32ec7e5d1b327f4b356f404d55d071c444a06a2e /pdf-as-lib/src/main
parent48f8e5362fa6c7b2f0a708e2dd61cac1dd366397 (diff)
downloadpdf-as-4-2b70ab18a97dd248d478d985ae602bd7e3a9d320.tar.gz
pdf-as-4-2b70ab18a97dd248d478d985ae602bd7e3a9d320.tar.bz2
pdf-as-4-2b70ab18a97dd248d478d985ae602bd7e3a9d320.zip
Logging Error Levels adapted
Diffstat (limited to 'pdf-as-lib/src/main')
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java10
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/CertificateResolver.java4
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/verify/IntegrityVerifier.java10
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/SignatureUtils.java16
-rw-r--r--pdf-as-lib/src/main/resources/config/config.zipbin1248998 -> 1269360 bytes
5 files changed, 20 insertions, 20 deletions
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
index 19971a5b..e46d87d2 100644
--- a/pdf-as-lib/src/main/resources/config/config.zip
+++ b/pdf-as-lib/src/main/resources/config/config.zip
Binary files differ