aboutsummaryrefslogtreecommitdiff
path: root/pdf-as-cli/src
diff options
context:
space:
mode:
Diffstat (limited to 'pdf-as-cli/src')
-rw-r--r--pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/Main.java4
-rw-r--r--pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/CorruptPDF.java4
-rw-r--r--pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/EncoderTest.java5
-rw-r--r--pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/RotatedPDFTest.java2
-rw-r--r--pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/SignaturProfileTest.java2
-rw-r--r--pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/SignatureBlockParameterTest.java48
-rw-r--r--pdf-as-cli/src/test/resources/pdfas-config/cfg/advancedconfig.properties6
-rw-r--r--pdf-as-cli/src/test/resources/pdfas-config/cfg/config.properties2
-rw-r--r--pdf-as-cli/src/test/resources/pdfas-config/cfg/profiles/BASE_LOGO.properties4
-rw-r--r--pdf-as-cli/src/test/resources/pdfas-config/cfg/profiles/BASE_NORMAL.properties16
10 files changed, 37 insertions, 56 deletions
diff --git a/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/Main.java b/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/Main.java
index 86769c49..ac26cd18 100644
--- a/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/Main.java
+++ b/pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/Main.java
@@ -33,7 +33,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
@@ -600,7 +600,7 @@ public class Main {
File outputPdfFile = new File(outputFile);
FileOutputStream fos = new FileOutputStream(outputPdfFile,
false);
- fos.write(verifyResult.getSignatureData());
+ fos.write(verifyResult.getSignatureData().getBaseData());
fos.close();
System.out.println("\tSigned PDF: " + outputFile);
}
diff --git a/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/CorruptPDF.java b/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/CorruptPDF.java
index b107474f..fc051e38 100644
--- a/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/CorruptPDF.java
+++ b/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/CorruptPDF.java
@@ -4,8 +4,8 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import javax.activation.DataSource;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataSource;
+import jakarta.activation.FileDataSource;
import at.gv.egiz.pdfas.common.exceptions.PDFASError;
import at.gv.egiz.pdfas.common.settings.ISettings;
diff --git a/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/EncoderTest.java b/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/EncoderTest.java
index b53f6f92..99425582 100644
--- a/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/EncoderTest.java
+++ b/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/EncoderTest.java
@@ -2,14 +2,15 @@ package at.gv.egiz.pdfas.cli.test;
import java.net.URL;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
public class EncoderTest {
public static void main(String[] args) throws Exception {
System.out.println("URLEncoder");
- System.out.println(URLEncoder.encode("http://teasasd.host.asd/asdasd/asda/asd?asdqwqe=asdwqe812331&adijoij=123123", "UTF-8"));
- System.out.println(URLEncoder.encode("_topXXXX\"><script>alert()</script>", "UTF-8"));
+ System.out.println(URLEncoder.encode("http://teasasd.host.asd/asdasd/asda/asd?asdqwqe=asdwqe812331&adijoij=123123", StandardCharsets.UTF_8));
+ System.out.println(URLEncoder.encode("_topXXXX\"><script>alert()</script>", StandardCharsets.UTF_8));
URL url = new URL("_topXXXX\"><script>alert()</script>");
diff --git a/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/RotatedPDFTest.java b/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/RotatedPDFTest.java
index fcf766b1..17c5d62c 100644
--- a/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/RotatedPDFTest.java
+++ b/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/RotatedPDFTest.java
@@ -7,7 +7,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.security.KeyStore;
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
import junit.framework.Assert;
diff --git a/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/SignaturProfileTest.java b/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/SignaturProfileTest.java
index cb42fe3b..2d633925 100644
--- a/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/SignaturProfileTest.java
+++ b/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/SignaturProfileTest.java
@@ -30,7 +30,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
import org.apache.commons.io.IOUtils;
diff --git a/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/SignatureBlockParameterTest.java b/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/SignatureBlockParameterTest.java
index 186eb5a9..a53cecb3 100644
--- a/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/SignatureBlockParameterTest.java
+++ b/pdf-as-cli/src/test/java/at/gv/egiz/pdfas/cli/test/SignatureBlockParameterTest.java
@@ -34,6 +34,7 @@ import at.gv.egiz.pdfas.lib.api.sign.SignParameter;
import at.gv.egiz.pdfas.lib.api.sign.SignResult;
import at.gv.egiz.pdfas.sigs.pades.PAdESSignerKeystore;
import org.apache.commons.io.IOUtils;
+import org.apache.pdfbox.Loader;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature;
import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
@@ -42,7 +43,7 @@ import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
import org.junit.Assert;
import org.junit.Test;
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -129,7 +130,7 @@ public class SignatureBlockParameterTest {
SignResult result = pdfas.sign(signParameter);
fos.close();
- String name = getName(outFile, "PDF-AS Signatur1");
+ String name = getName(outFile, "PDF-AS Signatur 1");
Assert.assertEquals("TEST123 test bar 123 c TEST123 Andreas Fitzek ECC", name);
@@ -147,7 +148,7 @@ public class SignatureBlockParameterTest {
result = pdfas.sign(signParameter);
fos.close();
- name = getName(outFile, "PDF-AS Signatur1");
+ name = getName(outFile, "PDF-AS Signatur 1");
Assert.assertEquals("TEST123 test null 123 c TEST123 Andreas Fitzek ECC", name);
outFile = getPath("out") + "/" + profile + "-2.pdf";
@@ -161,7 +162,7 @@ public class SignatureBlockParameterTest {
signParameter.setSignatureProfileId(profile);
result = pdfas.sign(signParameter);
fos.close();
- name = getName(outFile, "PDF-AS Signatur1");
+ name = getName(outFile, "PDF-AS Signatur 1");
Assert.assertEquals("null test bar 123 c null Andreas Fitzek ECC", name);
outFile = getPath("out") + "/" + profile + "-3.pdf";
@@ -173,7 +174,7 @@ public class SignatureBlockParameterTest {
signParameter.setSignatureProfileId(profile);
result = pdfas.sign(signParameter);
fos.close();
- name = getName(outFile, "PDF-AS Signatur1");
+ name = getName(outFile, "PDF-AS Signatur 1");
Assert.assertEquals("null test null 123 c null Andreas Fitzek ECC", name);
// Assert.assertEquals("{sbp.subject} test {sbp.foo} 123 {subject.T != null ? (subject.T + \" a \"+sbp.subject) : " +
// "\"c \"+sbp.subject+\" \"}Andreas Fitzek ECC", name);
@@ -190,7 +191,7 @@ public class SignatureBlockParameterTest {
signParameter.setSignatureProfileId(profile);
result = pdfas.sign(signParameter);
fos.close();
- name = getName(outFile, "PDF-AS Signatur1");
+ name = getName(outFile, "PDF-AS Signatur 1");
Assert.assertEquals("null test null 123 c null Andreas Fitzek ECC", name);
@@ -226,7 +227,7 @@ public class SignatureBlockParameterTest {
SignResult result = pdfas.sign(signParameter);
fos.close();
- String name = getName(outFile, "PDF-AS Signatur1");
+ String name = getName(outFile, "PDF-AS Signatur 1");
Assert.assertEquals("TEST123 test baräöÜ 123 c TEST123 Andreas Fitzek ECC", name);
//expected:<TEST123 test bar[] 123 c TEST123 Andre...> but was:<TEST123 test bar[äöÜ] 123 c TEST123 Andre...>
}
@@ -262,31 +263,32 @@ public class SignatureBlockParameterTest {
SignResult result = pdfas.sign(signParameter);
fos.close();
- String name = getName(outFile, "PDF-AS Signatur1");
+ String name = getName(outFile, "PDF-AS Signatur 1");
Assert.assertEquals("Andreas Fitzek ECC text after variable", name);
//expected:<TEST123 test bar[] 123 c TEST123 Andre...> but was:<TEST123 test bar[äöÜ] 123 c TEST123 Andre...>
}
private String getName(String fileName, String sigFieldName) throws IOException {
- PDDocument pdDoc = PDDocument.load(new File(fileName));
- PDSignature signature = null;
- PDSignatureField signatureField;
- PDAcroForm acroForm = pdDoc.getDocumentCatalog().getAcroForm();
- if (acroForm != null) {
- List<PDField> aa = acroForm.getFields();
- signatureField = (PDSignatureField) acroForm.getField(sigFieldName);
- if (signatureField != null) {
- // retrieve signature dictionary
- signature = signatureField.getSignature();
- if (signature != null) {
- String name = signature.getName();
- return name;
+ try (PDDocument pdDoc = Loader.loadPDF(new File(fileName))) {
+ PDSignature signature = null;
+ PDSignatureField signatureField;
+ PDAcroForm acroForm = pdDoc.getDocumentCatalog().getAcroForm();
+ if (acroForm != null) {
+ List<PDField> aa = acroForm.getFields();
+ signatureField = (PDSignatureField) acroForm.getField(sigFieldName);
+ if (signatureField != null) {
+ // retrieve signature dictionary
+ signature = signatureField.getSignature();
+ if (signature != null) {
+ String name = signature.getName();
+ return name;
+
+ }
}
-
}
+ return null;
}
- return null;
}
}
diff --git a/pdf-as-cli/src/test/resources/pdfas-config/cfg/advancedconfig.properties b/pdf-as-cli/src/test/resources/pdfas-config/cfg/advancedconfig.properties
index d6b965cd..7520f4c7 100644
--- a/pdf-as-cli/src/test/resources/pdfas-config/cfg/advancedconfig.properties
+++ b/pdf-as-cli/src/test/resources/pdfas-config/cfg/advancedconfig.properties
@@ -91,10 +91,6 @@ sig_obj.CheckPAdESCompatibility=true
#default.verifyURL=http://www.signaturpruefung.gv.at
-# Standard Alternativer Text fuer den Signaturblock (WAI) (globale Einstellung)
-
-#default.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke.
-
#register Verificators
default.verifier.01=at.gv.egiz.pdfas.sigs.pades.PAdESVerifier
@@ -104,4 +100,4 @@ default.verifier.01=at.gv.egiz.pdfas.sigs.pades.PAdESVerifier
#Enable background color detection
#sigblock.placement.bgcolor.detection.enabled=true
#sigblock.placement.debug.file=/home/user/temp/debugImg.png
-#runtime.backend=PDFBOX_2_BACKEND
+#runtime.backend=PDFBOX_3_BACKEND
diff --git a/pdf-as-cli/src/test/resources/pdfas-config/cfg/config.properties b/pdf-as-cli/src/test/resources/pdfas-config/cfg/config.properties
index 74e328a9..0f4e0070 100644
--- a/pdf-as-cli/src/test/resources/pdfas-config/cfg/config.properties
+++ b/pdf-as-cli/src/test/resources/pdfas-config/cfg/config.properties
@@ -30,7 +30,7 @@ bku.verify.url=http://127.0.0.1:3495/http-security-layer-request
##
# Handy-Signatur
# Signaturservice URL
-mobile.sign.url=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx
+mobile.sign.url=https://service.a-trust.at/mobile/https-security-layer-request/default.aspx
##
# MOA Signatur
diff --git a/pdf-as-cli/src/test/resources/pdfas-config/cfg/profiles/BASE_LOGO.properties b/pdf-as-cli/src/test/resources/pdfas-config/cfg/profiles/BASE_LOGO.properties
index 8234d4d1..1446046c 100644
--- a/pdf-as-cli/src/test/resources/pdfas-config/cfg/profiles/BASE_LOGO.properties
+++ b/pdf-as-cli/src/test/resources/pdfas-config/cfg/profiles/BASE_LOGO.properties
@@ -7,16 +7,12 @@ sig_obj.BASE_LOGO.description= Signature block with logo
sig_obj.BASE_LOGO.key.SIG_META=Pr\u00fcfinformation
sig_obj.BASE_LOGO.pos=w:230.0;f:80
-sig_obj.BASE_LOGO.adobeSignFieldValue=PDF-AS Signatur
sig_obj.BASE_LOGO.adobeSignReasonValue=Signaturpruefung unter http://www.signaturpruefung.gv.at
sig_obj.BASE_LOGO.verifyURL=http://www.signaturpruefung.gv.at
sig_obj.BASE_LOGO.value.SIG_LABEL=./images/signatur-logo_de.png
sig_obj.BASE_LOGO.table.main.Style.imagescaletofit=65.0;65.0
-# WAI
-sig_obj.BASE_LOGO.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke.
-
#---------------------- MAIN TABLE -------------------------
sig_obj.BASE_LOGO.table.main.1=SIG_LABEL-i
diff --git a/pdf-as-cli/src/test/resources/pdfas-config/cfg/profiles/BASE_NORMAL.properties b/pdf-as-cli/src/test/resources/pdfas-config/cfg/profiles/BASE_NORMAL.properties
index b72af10a..a6a1e8d1 100644
--- a/pdf-as-cli/src/test/resources/pdfas-config/cfg/profiles/BASE_NORMAL.properties
+++ b/pdf-as-cli/src/test/resources/pdfas-config/cfg/profiles/BASE_NORMAL.properties
@@ -6,10 +6,6 @@
sig_obj.BASE_NORMAL.description=Basissignatur Deutsch
# Aktiviert ("on") bzw. deaktiviert ("off") dieses Profil.
-# "verify_only" beschraenkt das Profil auf Signaturpruefung, d.h. es kann nicht zum Erstellen von
-# Signaturen verwendet werden.
-# "sign_only" beschraenkt das Profil insofern, dass es nur noch zum Signieren, nicht aber
-# zum Pruefen verwendet werden kann.
sig_obj.types.BASE_NORMAL=on
# Festlegung der einzelner Bezeichnungen im Signaturblock.
@@ -52,16 +48,12 @@ sig_obj.BASE_NORMAL.value.SIG_NOTE=Dieses mit einer qualifizierten elektronische
# sig_obj.PROFILE.pos=p:1;x:40.0;y:800.0;w:400.0;f:80
sig_obj.BASE_NORMAL.pos=f:80
-sig_obj.BASE_NORMAL.adobeSignFieldValue=PDF-AS Signatur
# Text, der im Adobe Reader unter "Reason" angezeigt wird.
sig_obj.BASE_NORMAL.adobeSignReasonValue=Signaturpruefung unter http://www.signaturpruefung.gv.at
# URL fuer die Signaturpruefung durch das Adobe Acrobat Professional PDF-AS Plugin.
#sig_obj.SIGNATURBLOCK_DE.verifyURL=http://www.signaturpruefung.gv.at
-# WAI
-sig_obj.BASE_NORMAL.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke.
-
# Pruefhinweis im Signaturblock
#sig_obj.SIGNATURBLOCK_DE.value.SIG_META=Signaturpruefung unter: http://www.signaturpruefung.gv.at
@@ -107,7 +99,7 @@ sig_obj.BASE_NORMAL.table.main.Style.imagevalign=middle
#
# FACE: HELVETICA | TIMES_ROMAN | COURIER
# WEIGHT: float value
-# STYLE: NORMAL | BOLD | ITALIC | BOLDITALIC | UNDERLINE | STRIKETHRU
+# STYLE: NORMAL | BOLD | ITALIC | BOLDITALIC
#
# z.B. sig_obj.SIGNATURBLOCK_DE.table.main.Style.valuefont=COURIER,8,NORMAL
sig_obj.BASE_NORMAL.table.main.Style.font=TTF:DejaVuSansCondensed-Bold.ttf,8
@@ -132,14 +124,8 @@ sig_obj.BASE_NORMAL.table.info.3=SIG_META-cv
# Name fuer die Signaturkennzeichnung (binaer)
# sig_obj.PROFILE.adobeSignText.textual=PDF-AS
#
-# Name fuer die PDF-Signatur
-# sig_obj.PROFILE.adobeSignFieldValue=PDF-AS Signatur
-#
# "Reason"-Feld der jeweiligen Signatur
# sig_obj.PROFILE.adobeSignReasonValue=Informationen zur Pr\u00FCfung finden Sie unter http://www.signaturpruefung.gv.at
#
# Prueflink fuer die Adobe Signaturkennzeichnung (nur relevant falls Adobe Plugin fuer Pruefung verwendet wird)
# sig_obj.PROFILE.verifyURL=http://www.signaturpruefung.gv.at
-#
-# Alternativer Text fuer den Signaturblock (WAI) (globale Einstellung)
-# sig_obj.PROFILE.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke.
generated by cgit v1.2.3 (git 2.39.1) at 2026-07-03 09:26:32 +0000