From 80686cc60dc0bccb7a42fddefefcf13dcabdd80a Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Tue, 19 Aug 2014 11:45:45 +0200 Subject: Fixed #18, Get Parameters in external urls are not discarded --- .../gv/egiz/pdfas/web/config/WebConfiguration.java | 2 +- .../at/gv/egiz/pdfas/web/helper/PdfAsHelper.java | 7 ++++ .../pdfas/web/helper/UrlParameterExtractor.java | 46 ++++++++++++++++++++++ .../at/gv/egiz/pdfas/web/servlets/ErrorPage.java | 6 +++ .../egiz/pdfas/web/servlets/ProvidePDFServlet.java | 8 +++- .../main/resources/template_error_redirect.html | 1 + .../src/main/resources/template_generic_param.html | 1 + .../main/resources/template_invoke_redirect.html | 1 + 8 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/UrlParameterExtractor.java create mode 100644 pdf-as-web/src/main/resources/template_generic_param.html diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java index 6306852e..0fbd9163 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java @@ -143,7 +143,7 @@ public class WebConfiguration implements IConfigurationConstants { } File f = new File(pdfASDir); - + if (!f.exists() || !f.isDirectory()) { logger.error("Pdf As working directory does not exists or is not a directory!: " + pdfASDir); diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java index 83dd2610..9e3fb3fe 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java @@ -746,6 +746,13 @@ public class PdfAsHelper { return xml; } + public static String getGenericTemplate() throws IOException { + String xml = FileUtils.readFileToString(FileUtils + .toFile(PdfAsHelper.class + .getResource("/template_generic_param.html"))); + return xml; + } + public static String getInvokeRedirectTemplateSL() throws IOException { String xml = FileUtils.readFileToString(FileUtils .toFile(PdfAsHelper.class diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/UrlParameterExtractor.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/UrlParameterExtractor.java new file mode 100644 index 00000000..4c793524 --- /dev/null +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/UrlParameterExtractor.java @@ -0,0 +1,46 @@ +package at.gv.egiz.pdfas.web.helper; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URL; +import java.net.URLDecoder; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Map.Entry; + +public class UrlParameterExtractor { + + + public static Map splitQuery(URL url) throws UnsupportedEncodingException { + Map query_pairs = new LinkedHashMap(); + String query = url.getQuery(); + String[] pairs = query.split("&"); + for (String pair : pairs) { + int idx = pair.indexOf("="); + query_pairs.put(URLDecoder.decode(pair.substring(0, idx), "UTF-8"), URLDecoder.decode(pair.substring(idx + 1), "UTF-8")); + } + return query_pairs; + } + + public static String buildParameterFormString(URL url) throws IOException { + Map query_pairs = splitQuery(url); + Iterator> entryIt = query_pairs.entrySet().iterator(); + + if(query_pairs.isEmpty()) { + return ""; + } + String genericTemplate = PdfAsHelper.getGenericTemplate(); + StringBuilder sb = new StringBuilder(); + while(entryIt.hasNext()) { + Entry entry = entryIt.next(); + + String current = genericTemplate.replace("##NAME##", entry.getKey()); + current = current.replace("##VALUE##", entry.getValue()); + sb.append(current); + } + + return sb.toString(); + } + +} diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ErrorPage.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ErrorPage.java index 12693797..8e59ff1c 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ErrorPage.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ErrorPage.java @@ -24,6 +24,7 @@ package at.gv.egiz.pdfas.web.servlets; import java.io.IOException; +import java.net.URL; import java.net.URLEncoder; import javax.servlet.ServletException; @@ -37,6 +38,7 @@ import org.slf4j.LoggerFactory; import at.gv.egiz.pdfas.web.config.WebConfiguration; import at.gv.egiz.pdfas.web.helper.HTMLFormater; import at.gv.egiz.pdfas.web.helper.PdfAsHelper; +import at.gv.egiz.pdfas.web.helper.UrlParameterExtractor; /** * Servlet implementation class ErrorPage @@ -93,6 +95,10 @@ public class ErrorPage extends HttpServlet { template = template.replace("##ERROR_URL##", errorURL); + URL url = new URL(errorURL); + String extraParams = UrlParameterExtractor.buildParameterFormString(url); + template = template.replace("##ADD_PARAMS##", extraParams); + String target = PdfAsHelper.getInvokeTarget(request, response); if(target == null) { diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java index 1ee96602..7909e926 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java @@ -24,6 +24,7 @@ package at.gv.egiz.pdfas.web.servlets; import java.io.IOException; +import java.net.URL; import java.net.URLEncoder; import javax.servlet.ServletException; @@ -37,6 +38,7 @@ import org.slf4j.LoggerFactory; import at.gv.egiz.pdfas.common.exceptions.PdfAsException; import at.gv.egiz.pdfas.web.config.WebConfiguration; import at.gv.egiz.pdfas.web.helper.PdfAsHelper; +import at.gv.egiz.pdfas.web.helper.UrlParameterExtractor; /** * Servlet implementation class ProvidePDF @@ -95,7 +97,11 @@ public class ProvidePDFServlet extends HttpServlet { // Redirect Browser String template = PdfAsHelper.getInvokeRedirectTemplateSL(); template = template.replace("##INVOKE_URL##", invokeURL); - + + URL url = new URL(invokeURL); + String extraParams = UrlParameterExtractor.buildParameterFormString(url); + template = template.replace("##ADD_PARAMS##", extraParams); + byte[] signedData = PdfAsHelper.getSignedPdf(request, response); if (signedData != null) { template = template.replace("##PDFLENGTH##", diff --git a/pdf-as-web/src/main/resources/template_error_redirect.html b/pdf-as-web/src/main/resources/template_error_redirect.html index b5ca858d..4d0ffb6a 100644 --- a/pdf-as-web/src/main/resources/template_error_redirect.html +++ b/pdf-as-web/src/main/resources/template_error_redirect.html @@ -47,6 +47,7 @@ div.content { name="Senden"> + ##ADD_PARAMS## diff --git a/pdf-as-web/src/main/resources/template_generic_param.html b/pdf-as-web/src/main/resources/template_generic_param.html new file mode 100644 index 00000000..1b67f201 --- /dev/null +++ b/pdf-as-web/src/main/resources/template_generic_param.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pdf-as-web/src/main/resources/template_invoke_redirect.html b/pdf-as-web/src/main/resources/template_invoke_redirect.html index fcd75008..15934157 100644 --- a/pdf-as-web/src/main/resources/template_invoke_redirect.html +++ b/pdf-as-web/src/main/resources/template_invoke_redirect.html @@ -45,6 +45,7 @@ div.content {
+ ##ADD_PARAMS##
-- cgit v1.2.3