diff options
14 files changed, 32 insertions, 20 deletions
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-common/src/main/java/at/gv/egiz/pdfas/common/utils/StringUtils.java b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StringUtils.java index 70344f78..c5880b68 100644 --- a/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StringUtils.java +++ b/pdf-as-common/src/main/java/at/gv/egiz/pdfas/common/utils/StringUtils.java @@ -25,6 +25,7 @@ package at.gv.egiz.pdfas.common.utils; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.Formatter; import org.slf4j.Logger; @@ -74,7 +75,7 @@ public class StringUtils { String restored_value = unapplyWinAnsiEncoding(replace_bytes); if (!value.equals(restored_value)) { // Cannot encode String with CP1252 have to use URL encoding ... - return URLEncoder.encode(value, "UTF-8"); + return URLEncoder.encode(value, StandardCharsets.UTF_8); } return replaceSpecialCharacters(value); diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java index f71b639a..cac4698c 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/ValueResolver.java @@ -34,6 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.HashMap; @@ -57,8 +58,8 @@ public class ValueResolver implements IProfileConstants, IResolver { public static final String EXP_START = "${"; public static final String EXP_END = "}"; - private static final Charset ISO = Charset.forName("ISO-8859-1"); - private static final Charset UTF_8 = Charset.forName("UTF-8"); + private static final Charset ISO = StandardCharsets.ISO_8859_1; + private static final Charset UTF_8 = StandardCharsets.UTF_8; private IResolver internalResolver; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/StreamUtils.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/StreamUtils.java index 1590bef7..7378b777 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/StreamUtils.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/util/StreamUtils.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.PrintStream; +import java.nio.charset.Charset; public class StreamUtils { @@ -108,7 +109,7 @@ public class StreamUtils { * a <code>String</code>. * @throws IOException on any exception thrown */ - public static String readStream(InputStream in, String encoding) throws IOException { + public static String readStream(InputStream in, Charset encoding) throws IOException { ByteArrayOutputStream out = new ByteArrayOutputStream(); copyStream(in, out, null); diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java index 72aa1204..15b01c29 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/BKUSLConnector.java @@ -27,6 +27,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -133,9 +134,9 @@ public class BKUSLConnector extends BaseSLConnector { MultipartEntityBuilder entityBuilder = MultipartEntityBuilder .create(); - entityBuilder.setCharset(Charset.forName("UTF-8")); + entityBuilder.setCharset(StandardCharsets.UTF_8); entityBuilder.addTextBody(XMLREQUEST, xmlRequest, - ContentType.TEXT_XML.withCharset(Charset.forName("UTF-8"))); + ContentType.TEXT_XML.withCharset(StandardCharsets.UTF_8)); if (parameter != null) { String transactionId = parameter.getTransactionId(); diff --git a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFAsVisualSignatureBuilder.java b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFAsVisualSignatureBuilder.java index 50268a1c..f1b735be 100644 --- a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFAsVisualSignatureBuilder.java +++ b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox2/PDFAsVisualSignatureBuilder.java @@ -334,7 +334,7 @@ public class PDFAsVisualSignatureBuilder extends PDVisibleSigBuilder implements // " Do Q\n"; //String innerFormComment = new String(getStructure().getInnerFormStream().toByteArray(), "ISO-8859-1"); - String innerFormComment = new String(getStructure().getInnerFormStream().toByteArray(), "UTF-8"); + String innerFormComment = new String(getStructure().getInnerFormStream().toByteArray(), StandardCharsets.UTF_8); // .getInputStreamAsString();//TODO: pdfbox2 - get the string from the stream diff --git a/pdf-as-web-status/src/main/java/at/gv/egiz/status/content/HtmlGenerator.java b/pdf-as-web-status/src/main/java/at/gv/egiz/status/content/HtmlGenerator.java index 8f80a91e..b4f981f6 100644 --- a/pdf-as-web-status/src/main/java/at/gv/egiz/status/content/HtmlGenerator.java +++ b/pdf-as-web-status/src/main/java/at/gv/egiz/status/content/HtmlGenerator.java @@ -1,6 +1,7 @@ package at.gv.egiz.status.content; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; @@ -77,7 +78,7 @@ public class HtmlGenerator implements ContentGenerator { sb.append("</body></html>"); - response.getOutputStream().write(sb.toString().getBytes("UTF-8")); + response.getOutputStream().write(sb.toString().getBytes(StandardCharsets.UTF_8)); response.getOutputStream().close(); } diff --git a/pdf-as-web-status/src/main/java/at/gv/egiz/status/content/XMLGenerator.java b/pdf-as-web-status/src/main/java/at/gv/egiz/status/content/XMLGenerator.java index 0cc4f6b9..2f2bdb1d 100644 --- a/pdf-as-web-status/src/main/java/at/gv/egiz/status/content/XMLGenerator.java +++ b/pdf-as-web-status/src/main/java/at/gv/egiz/status/content/XMLGenerator.java @@ -35,7 +35,7 @@ public class XMLGenerator implements ContentGenerator { } else { response.setStatus(HttpServletResponse.SC_OK); } - response.setCharacterEncoding("UTF-8"); + response.setCharacterEncoding(StandardCharsets.UTF_8); response.setContentType("application/xml"); StringBuilder sb = new StringBuilder(); diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java index d904030f..33811617 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/RemotePDFFetcher.java @@ -28,6 +28,7 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; +import java.nio.charset.StandardCharsets; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; @@ -108,7 +109,7 @@ public class RemotePDFFetcher { if(fetchInfos.length == 3) { String userpass = fetchInfos[1] + ":" + fetchInfos[2]; - String basicAuth = "Basic " + jakarta.xml.bind.DatatypeConverter.printBase64Binary(userpass.getBytes("UTF-8")); + String basicAuth = "Basic " + jakarta.xml.bind.DatatypeConverter.printBase64Binary(userpass.getBytes(StandardCharsets.UTF_8)); uc.setRequestProperty("Authorization", basicAuth); } 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 index 64043cac..cfb78008 100644 --- 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 @@ -4,6 +4,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URL; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; @@ -20,8 +21,8 @@ public class UrlParameterExtractor { 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")); + URLDecoder.decode(pair.substring(0, idx), StandardCharsets.UTF_8), + URLDecoder.decode(pair.substring(idx + 1), StandardCharsets.UTF_8)); } } return query_pairs; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/JSONAPIServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/JSONAPIServlet.java index f2c39a75..343e18f2 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/JSONAPIServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/JSONAPIServlet.java @@ -1,6 +1,7 @@ package at.gv.egiz.pdfas.web.servlets; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -65,7 +66,7 @@ public class JSONAPIServlet extends HttpServlet { return; } - String jsonString = IOUtils.toString(req.getInputStream(), "UTF-8"); + String jsonString = IOUtils.toString(req.getInputStream(), StandardCharsets.UTF_8); logger.debug("Reading json String {}", jsonString); @@ -279,7 +280,7 @@ public class JSONAPIServlet extends HttpServlet { } response.setContentType("application/json"); - IOUtils.write(jsonResponse.toString(), response.getOutputStream(), "UTF-8"); + IOUtils.write(jsonResponse.toString(), response.getOutputStream(), StandardCharsets.UTF_8); } catch (Throwable e) { 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 f6c3e646..f6b42024 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 @@ -26,6 +26,7 @@ package at.gv.egiz.pdfas.web.servlets; import java.io.IOException; import java.net.URL; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.List; import jakarta.servlet.RequestDispatcher; @@ -214,8 +215,8 @@ public class ProvidePDFServlet extends HttpServlet { template = template.replace("##TARGET##", StringEscapeUtils.escapeHtml4(target)); template = template.replace("##PDFURL##", - URLEncoder.encode(PdfAsHelper.generatePdfURL(request, response), - "UTF-8")); + URLEncoder.encode(PdfAsHelper.generatePdfURL(request, response), + StandardCharsets.UTF_8)); response.setContentType("text/html"); response.getWriter().write(template); response.getWriter().close(); diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SLDataURLServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SLDataURLServlet.java index 7df32340..9f144f84 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SLDataURLServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SLDataURLServlet.java @@ -1,6 +1,7 @@ package at.gv.egiz.pdfas.web.servlets; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Base64; @@ -81,7 +82,7 @@ public class SLDataURLServlet extends HttpServlet { String sl20Result = request.getParameter(SL20Constants.PARAM_SL20_REQ_COMMAND_PARAM); if (StringUtils.isEmpty(sl20Result)) { //Workaround for SIC Handy-Signature, because it sends result in InputStream - String isReqInput = StreamUtils.readStream(request.getInputStream(), "UTF-8"); + String isReqInput = StreamUtils.readStream(request.getInputStream(), StandardCharsets.UTF_8); if (StringUtils.isNotEmpty(isReqInput)) { logger.info("Use SIC Handy-Signature work-around!"); sl20Result = isReqInput.substring("slcommand=".length()); diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/sl20/SL20HttpBindingUtils.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/sl20/SL20HttpBindingUtils.java index 8d049030..d59f649a 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/sl20/SL20HttpBindingUtils.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/sl20/SL20HttpBindingUtils.java @@ -3,6 +3,7 @@ package at.gv.egiz.pdfas.web.sl20; import java.io.IOException; import java.io.StringWriter; import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -27,7 +28,7 @@ public class SL20HttpBindingUtils { log.debug("Client request containts 'native client' header ... "); StringWriter writer = new StringWriter(); writer.write(sl20Forward.toString()); - final byte[] content = writer.toString().getBytes("UTF-8"); + final byte[] content = writer.toString().getBytes(StandardCharsets.UTF_8); response.setStatus(HttpServletResponse.SC_OK); response.setContentLength(content.length); response.setContentType(ContentType.APPLICATION_JSON.toString()); |