From c049cb3fd26dbf537a065e9537db2338b9c7248b Mon Sep 17 00:00:00 2001
From: Alexander Marsalek <amarsalek@iaik.tugraz.at>
Date: Mon, 14 Jun 2021 11:17:55 +0200
Subject: v4.1.7-RC-0.0.8 changed post formular parameter handling to
 sbp:keyA=valueA&sbp:keyB=valueB

---
 .../pdfas/web/helper/PdfAsParameterExtractor.java   | 21 ++++++++++-----------
 pdf-as-web/src/main/webapp/index.jsp                |  8 +++++---
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'pdf-as-web/src')

diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsParameterExtractor.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsParameterExtractor.java
index 77d6d217..1ec94c86 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsParameterExtractor.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsParameterExtractor.java
@@ -74,7 +74,7 @@ public class PdfAsParameterExtractor {
 	public static final String PARAM_PREPROCESSOR_PREFIX = "pp:";
 	public static final String PARAM_OVERWRITE_PREFIX = "ov:";
 	public static final String PARAM_QRCODE_CONTENT = "qrcontent";
-	public static final String PARAM_DYNAMIC_SIGNATURE_BLOCK_PARAMETER = "sbp";
+	public static final String PARAM_DYNAMIC_SIGNATURE_BLOCK_PARAMETER = "sbp:";
 
 	public static String getConnector(HttpServletRequest request) {
 		String connector = (String)request.getAttribute(PARAM_CONNECTOR);
@@ -86,18 +86,17 @@ public class PdfAsParameterExtractor {
 
 	public static Map<String,String> getDynamicSignatureBlockParameters(HttpServletRequest request) throws Exception {
 		HashMap<String, String> signatureBlockParametersMap = new HashMap<String, String>();
-		String sbpString = (String) request.getAttribute(PARAM_DYNAMIC_SIGNATURE_BLOCK_PARAMETER);
-//		Map<String, String[]> map = request.getParameterMap();
-		if(sbpString == null || sbpString.length() == 0)
-			return signatureBlockParametersMap;
-		for(String s : sbpString.split(";")){
-			if(!s.contains("=")) {
-				throw new Exception("Invalid parameter: "+s);
+
+		Enumeration<String> parameterNames = request.getAttributeNames();
+		while(parameterNames.hasMoreElements()) {
+			String parameterName = parameterNames.nextElement();
+			if (parameterName.startsWith(PARAM_DYNAMIC_SIGNATURE_BLOCK_PARAMETER)) {
+				String key = parameterName.substring(PARAM_DYNAMIC_SIGNATURE_BLOCK_PARAMETER.length());
+				String value = (String) request.getAttribute(parameterName);
+				signatureBlockParametersMap.put(key, value);
 			}
-			String[] values = s.split("=", 2);
-			signatureBlockParametersMap.put(values[0], values[1]);
 		}
-		return signatureBlockParametersMap;
+			return signatureBlockParametersMap;
 	}
 	public static String getQRCodeContent(HttpServletRequest request) {
 		String qrcodeContent = (String)request.getAttribute(PARAM_QRCODE_CONTENT);
diff --git a/pdf-as-web/src/main/webapp/index.jsp b/pdf-as-web/src/main/webapp/index.jsp
index 5a904374..a52d1361 100644
--- a/pdf-as-web/src/main/webapp/index.jsp
+++ b/pdf-as-web/src/main/webapp/index.jsp
@@ -24,9 +24,11 @@
 		<img src="assets/img/localBKU.png" /> <button type="submit"
 			value="bku" name="connector" id="bku">Lokale BKU
 		</button>
-		<!--
-		<label for="sbp">SBP</label>
-		<input type="text" id="ab" name="sbp">-->
+
+		<label for="ab">SBP keyA</label>
+		<input type="text" id="ab" name="sbp:keyA">
+		<label for="abc">SBP keyB</label>
+		<input type="text" id="abc" name="sbp:keyB">
 		<%
 			}
 		%>
-- 
cgit v1.2.3