From 38c6ea7e6014f800a87c72f7bf830a7b4397cbf3 Mon Sep 17 00:00:00 2001 From: bschnalzer Date: Mon, 6 Nov 2017 15:11:50 +0100 Subject: Updated PDFA Preflight Parser and Validation, placeholder issues, PDF-AS-WEB issues --- .../configuration/cfg/advancedconfig.properties | 2 +- .../pdfas/lib/api/IConfigurationConstants.java | 5 +++++ .../impl/configuration/GlobalConfiguration.java | 7 +++++++ pdf-as-lib/src/main/resources/config/config.zip | Bin 1276512 -> 1276508 bytes .../resources/icm/sRGB Color Space Profile.icm | Bin 3144 -> 0 bytes 5 files changed, 13 insertions(+), 1 deletion(-) delete mode 100644 pdf-as-lib/src/main/resources/icm/sRGB Color Space Profile.icm (limited to 'pdf-as-lib') diff --git a/pdf-as-lib/src/configuration/cfg/advancedconfig.properties b/pdf-as-lib/src/configuration/cfg/advancedconfig.properties index b128d978..5fd8b5cb 100644 --- a/pdf-as-lib/src/configuration/cfg/advancedconfig.properties +++ b/pdf-as-lib/src/configuration/cfg/advancedconfig.properties @@ -105,6 +105,6 @@ 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/cmaierhofer/temp/debugImg.png +#sigblock.placement.debug.file=/home/user/temp/debugImg.png #runtime.backend=PDFBOX_2_BACKEND diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java index 364acb44..f8f71f2f 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java @@ -52,6 +52,9 @@ public interface IConfigurationConstants { public static final String DEFAULT_SIGNATURE_PROFILE = SIG_OBJECT + SEPERATOR + TYPE + SEPERATOR + DEFAULT; public static final String CONFIG_BKU_URL = "bku.sign.url"; + + /*Protect PDF content*/ + public static final String DEFAULT_CONFIG_PROTECT_PDF=DEFAULT+SEPERATOR+"protectPDF"; /** * MOA SS Signing Key Identifier @@ -106,6 +109,8 @@ public interface IConfigurationConstants { public static final String SIG_PLACEMENT_DEBUG_OUTPUT = "sigblock.placement.debug.file"; + + /** * PADES Constants */ diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/GlobalConfiguration.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/GlobalConfiguration.java index f2864a07..d04f6878 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/GlobalConfiguration.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/configuration/GlobalConfiguration.java @@ -39,5 +39,12 @@ public class GlobalConfiguration extends SpecificBaseConfiguration } return null; } + + public String getDefaultProtection() { + if(this.configuration.hasValue(DEFAULT_CONFIG_PROTECT_PDF)) { + return this.configuration.getValue(DEFAULT_CONFIG_PROTECT_PDF); + } + return null; + } } diff --git a/pdf-as-lib/src/main/resources/config/config.zip b/pdf-as-lib/src/main/resources/config/config.zip index fc0a409d..57e7df54 100644 Binary files a/pdf-as-lib/src/main/resources/config/config.zip and b/pdf-as-lib/src/main/resources/config/config.zip differ diff --git a/pdf-as-lib/src/main/resources/icm/sRGB Color Space Profile.icm b/pdf-as-lib/src/main/resources/icm/sRGB Color Space Profile.icm deleted file mode 100644 index 7f9d18d0..00000000 Binary files a/pdf-as-lib/src/main/resources/icm/sRGB Color Space Profile.icm and /dev/null differ -- cgit v1.2.3