aboutsummaryrefslogtreecommitdiff
path: root/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UIEntryPointServlet.java
diff options
context:
space:
mode:
authoremusic <emina.music@egiz.gv.at>2018-11-22 13:14:28 +0100
committeremusic <emina.music@egiz.gv.at>2018-11-22 13:14:28 +0100
commitf76f559c8c1437a152a4f51b441e4cebe25430f1 (patch)
tree8930f89863cdc7e564f6a97ac777c133384a8730 /pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UIEntryPointServlet.java
parentcd6ff625d48a63e024b05ed1a253be3551e41599 (diff)
parentc87c82009fb07e285d6c9acfd4686efc2cbf21c9 (diff)
downloadpdf-as-4-f76f559c8c1437a152a4f51b441e4cebe25430f1.tar.gz
pdf-as-4-f76f559c8c1437a152a4f51b441e4cebe25430f1.tar.bz2
pdf-as-4-f76f559c8c1437a152a4f51b441e4cebe25430f1.zip
Merge branch 'SL20_development'
# Conflicts: # build.gradle # pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/Main.java # pdf-as-lib/src/configuration/cfg/advancedconfig.properties # pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java # pdf-as-lib/src/main/resources/config/config.zip # pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java # pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFData.java
Diffstat (limited to 'pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UIEntryPointServlet.java')
-rw-r--r--pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UIEntryPointServlet.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UIEntryPointServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UIEntryPointServlet.java
index e8ac3658..73f8299c 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UIEntryPointServlet.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UIEntryPointServlet.java
@@ -131,7 +131,8 @@ public class UIEntryPointServlet extends HttpServlet {
// IPlainSigner signer;
if (connector.equals(Connector.BKU)
|| connector.equals(Connector.ONLINEBKU)
- || connector.equals(Connector.MOBILEBKU)) {
+ || connector.equals(Connector.MOBILEBKU)
+ || connector.equals(Connector.SECLAYER20)) {
// start asynchronous signature creation
if (connector.equals(Connector.BKU)) {
@@ -154,6 +155,14 @@ public class UIEntryPointServlet extends HttpServlet {
"Invalid connector mobilebku is not supported");
}
}
+
+ if (connector.equals(Connector.SECLAYER20)) {
+ if (WebConfiguration.getSecurityLayer20URL() == null) {
+ throw new PdfAsWebException(
+ "Invalid connector mobilebku is not supported");
+ }
+ }
+
Map<String, String> map = null;
if (pdfAsRequest.getParameters().getPreprocessor() != null) {
map = pdfAsRequest.getParameters().getPreprocessor()