From 1219abaf9f0029e39f5fbdf342fd4ebf07144b5b Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Fri, 11 Jul 2014 13:38:49 +0200 Subject: added Signature Verification Level --- .../at/gv/egiz/pdfas/api/ws/PDFASSignRequest.java | 10 +++++++ .../at/gv/egiz/pdfas/api/ws/PDFASSignResponse.java | 18 ++++++++++++ .../pdfas/api/ws/PDFASVerificationResponse.java | 34 ++++++++++++++++++++++ .../at/gv/egiz/pdfas/api/ws/VerificationLevel.java | 23 +++++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASVerificationResponse.java create mode 100644 pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/VerificationLevel.java (limited to 'pdf-as-common') diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignRequest.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignRequest.java index 71328d36..3e714ea9 100644 --- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignRequest.java +++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignRequest.java @@ -39,6 +39,7 @@ public class PDFASSignRequest implements Serializable { String requestID; byte[] inputData; PDFASSignParameters parameters; + VerificationLevel verificationLevel; @XmlElement(required = true, nillable = false, name="requestID") public String getRequestID() { @@ -49,6 +50,15 @@ public class PDFASSignRequest implements Serializable { this.requestID = requestID; } + @XmlElement(required = false, nillable = true, name="verificationLevel") + public VerificationLevel getVerificationLevel() { + return verificationLevel; + } + + public void setVerificationLevel(VerificationLevel verificationLevel) { + this.verificationLevel = verificationLevel; + } + @XmlElement(required = true, nillable = false, name="inputData") public byte[] getInputData() { return inputData; diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignResponse.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignResponse.java index 20b0cebb..19517a13 100644 --- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignResponse.java +++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASSignResponse.java @@ -39,6 +39,8 @@ public class PDFASSignResponse implements Serializable { String requestID; String error; byte[] signedPDF; + byte[] signerCertificate; + PDFASVerificationResponse verificationResponse; String redirectUrl; @XmlElement(required = true, nillable = false, name="requestID") @@ -57,6 +59,22 @@ public class PDFASSignResponse implements Serializable { this.signedPDF = signedPDF; } + @XmlElement(required = false, nillable = false, name="signerCertificate") + public byte[] getSignerCertificate() { + return signerCertificate; + } + public void setSignerCertificate(byte[] signerCertificate) { + this.signerCertificate = signerCertificate; + } + + @XmlElement(required = false, nillable = false, name="verificationResponse") + public PDFASVerificationResponse getVerificationResponse() { + return verificationResponse; + } + public void setVerificationResponse(PDFASVerificationResponse verificationResponse) { + this.verificationResponse = verificationResponse; + } + @XmlElement(required = false, name="error") public String getError() { return error; diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASVerificationResponse.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASVerificationResponse.java new file mode 100644 index 00000000..c4fb438d --- /dev/null +++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/PDFASVerificationResponse.java @@ -0,0 +1,34 @@ +package at.gv.egiz.pdfas.api.ws; + +import java.io.Serializable; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +@XmlType(name="VerificationResponse") +public class PDFASVerificationResponse implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -2581929633991566751L; + + int valueCode; + int certificateCode; + + @XmlElement(required = true, nillable = false, name="valueCode") + public int getValueCode() { + return valueCode; + } + public void setValueCode(int valueCode) { + this.valueCode = valueCode; + } + + @XmlElement(required = true, nillable = false, name="certificateCode") + public int getCertificateCode() { + return certificateCode; + } + public void setCertificateCode(int certificateCode) { + this.certificateCode = certificateCode; + } +} diff --git a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/VerificationLevel.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/VerificationLevel.java new file mode 100644 index 00000000..ca4d893e --- /dev/null +++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/api/ws/VerificationLevel.java @@ -0,0 +1,23 @@ +package at.gv.egiz.pdfas.api.ws; + +import javax.xml.bind.annotation.XmlType; + +@XmlType(name = "VerificationLevel") +public enum VerificationLevel { + + INTEGRITY_ONLY("intOnly"), FULL_CERT_PATH("full"); + + private final String name; + + private VerificationLevel(String s) { + name = s; + } + + public boolean equalsName(String otherName) { + return (otherName == null) ? false : name.equals(otherName); + } + + public String toString() { + return name; + } +} -- cgit v1.2.3