diff options
author | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2013-10-01 15:27:32 +0200 |
---|---|---|
committer | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2013-10-01 15:27:32 +0200 |
commit | add4460d9619f3586a02ae0d8c028f01903494bc (patch) | |
tree | 244ef6d0f0af028da98f9cecd3ee9a3424223889 /pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status | |
parent | 25f5495b60fb0fb089c7af216986d2f3abf92375 (diff) | |
download | pdf-as-4-add4460d9619f3586a02ae0d8c028f01903494bc.tar.gz pdf-as-4-add4460d9619f3586a02ae0d8c028f01903494bc.tar.bz2 pdf-as-4-add4460d9619f3586a02ae0d8c028f01903494bc.zip |
+ Extracting information from Certificate (Ognl)
+ CMS KeyStore Signer (still wrong format)
Diffstat (limited to 'pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status')
3 files changed, 38 insertions, 10 deletions
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java index d7b956a7..a9fd1443 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; import at.gv.egiz.pdfas.common.settings.ISettings; +import at.gv.egiz.pdfas.common.utils.TempFileHelper; import at.gv.egiz.pdfas.lib.api.sign.SignParameter; import at.gv.egiz.pdfas.lib.impl.configuration.GlobalConfiguration; import at.gv.egiz.pdfas.lib.impl.configuration.PlaceholderConfiguration; @@ -12,18 +13,24 @@ import at.gv.egiz.pdfas.lib.impl.configuration.SignatureProfileConfiguration; public class OperationStatus { private SignParameter signParamter; - private PDFObject pdfObject = new PDFObject(); - + private PDFObject pdfObject = new PDFObject(this); private ISettings configuration; private PlaceholderConfiguration placeholderConfiguration = null; private GlobalConfiguration gloablConfiguration = null; private Map<String, SignatureProfileConfiguration> signatureProfiles = new HashMap<String, SignatureProfileConfiguration>(); + private TempFileHelper helper; public OperationStatus(ISettings configuration, SignParameter signParameter) { this.configuration = configuration; this.signParamter = signParameter; + helper = new TempFileHelper(configuration); + } + + @Override + protected void finalize() throws Throwable { + super.finalize(); } // ======================================================================== @@ -73,4 +80,11 @@ public class OperationStatus { this.signParamter = signParamter; } + public TempFileHelper getTempFileHelper() { + return this.helper; + } + + public ISettings getSettings() { + return this.configuration; + } } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/PDFObject.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/PDFObject.java index 1fe64bee..df496f3f 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/PDFObject.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/PDFObject.java @@ -1,10 +1,17 @@ package at.gv.egiz.pdfas.lib.impl.status; public class PDFObject { + + private OperationStatus status; + private byte[] originalDocument; private byte[] stampedDocument; private byte[] signedDocument; + public PDFObject(OperationStatus operationStatus) { + this.status = operationStatus; + } + public byte[] getOriginalDocument() { return originalDocument; } @@ -28,4 +35,12 @@ public class PDFObject { public void setSignedDocument(byte[] signedDocument) { this.signedDocument = signedDocument; } + + public OperationStatus getStatus() { + return status; + } + + public void setStatus(OperationStatus status) { + this.status = status; + } } diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/RequestedSignature.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/RequestedSignature.java index a9065644..a2a6acd8 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/RequestedSignature.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/RequestedSignature.java @@ -1,5 +1,6 @@ package at.gv.egiz.pdfas.lib.impl.status; +import iaik.x509.X509Certificate; import at.gv.egiz.pdfas.common.exceptions.PdfAsException; import at.gv.egiz.pdfas.common.exceptions.PdfAsSettingsException; import at.knowcenter.wag.egov.egiz.pdf.TablePos; @@ -9,6 +10,7 @@ public class RequestedSignature { private String signatureProfile; private TablePos signaturePosition; private OperationStatus status; + private X509Certificate certificate; //private IPlainSigner signer = null; public RequestedSignature(OperationStatus status) throws PdfAsException { @@ -24,7 +26,8 @@ public class RequestedSignature { throw new PdfAsSettingsException("Failed to determine Signature Profile!"); } } - + certificate = status.getSignParamter().getPlainSigner().getCertificate(); + this.signatureProfile = profileID; if(status.getSignParamter().getSignaturePosition() == null) { @@ -45,13 +48,9 @@ public class RequestedSignature { public String getSignatureProfileID() { return this.signatureProfile; } - -/* - public IPlainSigner getSigner() { - return signer; + + public X509Certificate getCertificate() { + return this.certificate; } - public void setSigner(IPlainSigner signer) { - this.signer = signer; - }*/ } |