feat: sign protected pdfs #498
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,4 +67,4 @@ jobs: | |
| with: | ||
| name: code-coverage-report-markdown | ||
| path: ./*/coverage-results.md | ||
| retention-days: 1 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,10 +4,12 @@ | |
| import digital.slovensko.autogram.core.visualization.DocumentVisualizationBuilder; | ||
| import digital.slovensko.autogram.core.visualization.UnsupportedVisualization; | ||
| import digital.slovensko.autogram.drivers.TokenDriver; | ||
| import digital.slovensko.autogram.model.AutogramDocument; | ||
| import digital.slovensko.autogram.ui.BatchUiResult; | ||
| import digital.slovensko.autogram.ui.UI; | ||
| import digital.slovensko.autogram.util.Logging; | ||
| import digital.slovensko.autogram.util.PDFUtils; | ||
| import eu.europa.esig.dss.enumerations.SignatureLevel; | ||
| import eu.europa.esig.dss.model.DSSException; | ||
| import eu.europa.esig.dss.pdfa.PDFAStructureValidator; | ||
| import eu.europa.esig.dss.spi.x509.tsp.TSPSource; | ||
|
|
@@ -56,22 +58,45 @@ public void checkPDFACompliance(SigningJob job) { | |
| return; | ||
|
|
||
| ui.onWorkThreadDo(() -> { | ||
| // PDF/A doesn't support encryption | ||
| if (job.getDocument().hasOpenDocumentPassword()) { | ||
| ui.onUIThreadDo(() -> ui.onPDFAComplianceCheckFailed(job)); | ||
| return; | ||
| } | ||
|
|
||
| var result = new PDFAStructureValidator().validate(job.getDocument()); | ||
| if (!result.isCompliant()) { | ||
| ui.onUIThreadDo(() -> ui.onPDFAComplianceCheckFailed(job)); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| public void handleProtectedPdfDocument(AutogramDocument document) { | ||
| var protection = PDFUtils.determinePDFProtection(document); | ||
| if (protection == PDFUtils.PDFProtection.NONE) | ||
| return; | ||
|
|
||
| var password = ui.getDocumentPassword(document); | ||
| switch (protection) { | ||
| case OPEN_DOCUMENT_PASSWORD -> document.setOpenDocumentPassword(password); | ||
| case MASTER_PASSWORD -> document.setMasterPassword(password); | ||
| } | ||
| } | ||
|
|
||
| public SigningJob buildSigningJobFromFile(File file, Responder responder, boolean checkPDFACompliance, SignatureLevel signatureType, boolean isEn319132, TSPSource tspSource, boolean plainXmlEnabled) { | ||
| var document = SigningJob.createDSSFileDocumentFromFile(file); | ||
| handleProtectedPdfDocument(document); | ||
|
|
||
| var parameters = SigningJob.getParametersForFile(document, checkPDFACompliance, signatureType, isEn319132, tspSource, plainXmlEnabled); | ||
| return SigningJob.build(document, parameters, responder); | ||
| } | ||
|
|
||
| public void wrapInWorkThread(Runnable callback) { | ||
| ui.onWorkThreadDo(callback); | ||
|
There was a problem hiding this comment. Toto sa pouziva presne na 1 mieste, cize dajme inline, nijako to nezvysuje prehladnost, skor naopak. There was a problem hiding this comment.
There was a problem hiding this comment. Ešte k tomu komentáru vyššie o PDF/A enkrypcií, tak nikdy mi to nešlo a podľa https://en.wikipedia.org/wiki/PDF/A#:~:text=PDF/A%20differs%20from%20PDF%20by%20prohibiting%20features%20unsuitable%20for%20long%2Dterm%20archiving%2C%20such%20as%20font%20linking%20(as%20opposed%20to%20font%20embedding)%20and%20encryption to nie je povolené. Mám to aj tak nechať prejsť kontrolou než to takto okamžite nechať failnúť? |
||
| } | ||
|
|
||
| public void startVisualization(SigningJob job) { | ||
| ui.onWorkThreadDo(() -> { | ||
| try { | ||
| var visualization = DocumentVisualizationBuilder.fromJob(job, settings); | ||
| ui.onUIThreadDo(() -> ui.showVisualization(visualization, this)); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package digital.slovensko.autogram.core.errors; | ||
|
|
||
| public class InvalidPasswordException extends AutogramException { | ||
| public InvalidPasswordException(String message) { | ||
| super("Nesprávne heslo", "Heslo je nesprávne", message); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| package digital.slovensko.autogram.model; | ||
|
|
||
| import eu.europa.esig.dss.enumerations.DigestAlgorithm; | ||
| import eu.europa.esig.dss.enumerations.MimeType; | ||
| import eu.europa.esig.dss.model.DSSDocument; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.io.OutputStream; | ||
|
|
||
| public class AutogramDocument implements DSSDocument { | ||
| private final DSSDocument document; | ||
|
|
||
| private char[] openDocumentPassword = new char[0]; | ||
| private char[] masterPassword = new char[0]; | ||
|
|
||
| public AutogramDocument(DSSDocument document) { | ||
| this.document = document; | ||
| } | ||
|
|
||
| public boolean hasOpenDocumentPassword() { | ||
| return openDocumentPassword.length > 0; | ||
| } | ||
|
|
||
| public char[] getOpenDocumentPassword() { | ||
| return openDocumentPassword; | ||
| } | ||
|
|
||
| public void setOpenDocumentPassword(char[] openDocumentPassword) { | ||
| this.openDocumentPassword = openDocumentPassword; | ||
| } | ||
|
|
||
| public char[] getMasterPassword() { | ||
| return masterPassword; | ||
| } | ||
|
|
||
| public void setMasterPassword(char[] masterPassword) { | ||
| this.masterPassword = masterPassword; | ||
| } | ||
|
|
||
| public char[] getSigningPassword() { | ||
| return hasOpenDocumentPassword() ? openDocumentPassword : masterPassword; | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return document.getName(); | ||
| } | ||
|
|
||
| @Override | ||
| public void setName(String s) { | ||
| document.setName(s); | ||
| } | ||
|
|
||
| @Override | ||
| public MimeType getMimeType() { | ||
| return document.getMimeType(); | ||
| } | ||
|
|
||
| @Override | ||
| public void setMimeType(MimeType mimeType) { | ||
| document.setMimeType(mimeType); | ||
| } | ||
|
|
||
| @Override | ||
| public void save(String s) throws IOException { | ||
| document.save(s); | ||
| } | ||
|
|
||
| @Override | ||
| public String getDigest(DigestAlgorithm digestAlgorithm) { | ||
| return document.getDigest(digestAlgorithm); | ||
| } | ||
|
|
||
| @Override | ||
| public InputStream openStream() { | ||
| return document.openStream(); | ||
| } | ||
|
|
||
| @Override | ||
| public void writeTo(OutputStream outputStream) throws IOException { | ||
| document.writeTo(outputStream); | ||
| } | ||
|
|
||
| public DSSDocument getDSSDocument() { | ||
| return document; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ešte uvažujem, či sa neplatí vyrobiť pre tento prípad inú hlášku. Prípadne vedieť do toho
onPDFAComplianceCheckFailedposlať ešte AutogramException, na základe ktorej sa zobrazí taký alebo onaký text. Totiž, pri tomto hesle má zmysel povedať userovi konkrétne, že nie len že dokument nie je v súlade s PDF/A, ale je to práva preto, že je zaheslovaný.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Urcite ano. Poslime tam
ui.onPDFPasswordProtectedCheck(job)