aboutsummaryrefslogtreecommitdiff
path: root/pdf-as-web/src/main/java/at/gv
diff options
context:
space:
mode:
authoremusic <emina.music@egiz.gv.at>2018-07-27 12:31:04 +0200
committeremusic <emina.music@egiz.gv.at>2018-07-27 12:31:04 +0200
commit3e224770ad6db67f1ca818fd6de52b7e3c3b8863 (patch)
treecf0f2d344d1a33afa0aa1505e729eea16dc1ebac /pdf-as-web/src/main/java/at/gv
parent236cd00a49b04523a325e06fdc8839be9049f892 (diff)
parent1e2919e08a871581654ab88004c11921a56469b3 (diff)
downloadpdf-as-4-3e224770ad6db67f1ca818fd6de52b7e3c3b8863.tar.gz
pdf-as-4-3e224770ad6db67f1ca818fd6de52b7e3c3b8863.tar.bz2
pdf-as-4-3e224770ad6db67f1ca818fd6de52b7e3c3b8863.zip
Merge branch 'SL20_development' of gitlab.iaik.tugraz.at:egiz/pdf-as-4 into SL20_development
# Conflicts: # pdf-as-lib/src/main/java/at/gv/egiz/sl20/utils/SL20JSONBuilderUtils.java # pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java
Diffstat (limited to 'pdf-as-web/src/main/java/at/gv')
-rw-r--r--pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java33
-rw-r--r--pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/SLDataURLServlet.java6
-rw-r--r--pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/sl20/SL20HttpBindingUtils.java1
3 files changed, 33 insertions, 7 deletions
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 bd904aae..4b69e5a8 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
@@ -60,6 +60,8 @@ import org.apache.http.entity.ContentType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import at.gv.egiz.pdfas.api.ws.PDFASSignParameters;
@@ -67,6 +69,7 @@ import at.gv.egiz.pdfas.api.ws.PDFASSignParameters.Connector;
import at.gv.egiz.pdfas.api.ws.PDFASSignResponse;
import at.gv.egiz.pdfas.api.ws.PDFASVerificationResponse;
import at.gv.egiz.pdfas.common.exceptions.PDFASError;
+import at.gv.egiz.pdfas.common.utils.PDFUtils;
import at.gv.egiz.pdfas.lib.api.ByteArrayDataSource;
import at.gv.egiz.pdfas.lib.api.Configuration;
import at.gv.egiz.pdfas.lib.api.IConfigurationConstants;
@@ -1143,7 +1146,6 @@ public class PdfAsHelper {
command, signedCommand);
//store requestId
-
request.getSession(false).setAttribute(PDF_SESSION_PREFIX + SL20Constants.SL20_REQID, reqId);
//forward SL2.0 command
@@ -1192,9 +1194,24 @@ public class PdfAsHelper {
} else if (slConnector instanceof SL20Connector) {
//convert byte range
- List<String> byteRanges = new ArrayList<String>();
- for (int el : statusRequest.getSignatureDataByteRange())
- byteRanges.add(String.valueOf(el));
+
+ int[] exclude_range = PDFUtils.buildExcludeRange(statusRequest.getSignatureDataByteRange());
+ logger.info("Exclude Byte Range: " + exclude_range[0] + " " + exclude_range[1]);
+
+ List<JsonElement> byteRanges = new ArrayList<JsonElement>();
+ if (statusRequest.getSignatureDataByteRange().length % 2 != 0) {
+ logger.warn("ByteRange is not a set of pairs. Something is maybe suspect");
+
+ }
+
+ for (int i=0; i<exclude_range.length/2; i++) {
+ JsonArray el = new JsonArray();
+ el.add(exclude_range[2*i]);
+ el.add(exclude_range[2*i + 1]);
+ byteRanges.add(el);
+
+ }
+
java.security.cert.X509Certificate x5cEnc = null;
if (WebConfiguration.isSL20EncryptionEnabled() && joseTools != null)
@@ -1205,11 +1222,15 @@ public class PdfAsHelper {
if (pack.getRequestType().getPAdESFlag() != null)
padesCompatibel = pack.getRequestType().getPAdESFlag();
+ byte[] data = PDFUtils.blackOutSignature(statusRequest.getSignatureData(),
+ statusRequest.getSignatureDataByteRange());
+
JsonObject createCAdESSigParams =
SL20JSONBuilderUtils.createCreateCAdESCommandParameters(
pack.getRequestType().getKeyboxIdentifier(),
//statusRequest.getSignatureData(),
generateNSPdfURL(request,response),
+ SL20Constants.SL20_COMMAND_PARAM_CREATE_SIG_CADES_CONTENTMODE_DETACHED,
pack.getRequestType().getDataObject().getMetaInfo().getMimeType(),
padesCompatibel ,
byteRanges,
@@ -1226,7 +1247,7 @@ public class PdfAsHelper {
} else {
JsonObject getCertCommand = SL20JSONBuilderUtils.createCommand(SL20Constants.SL20_COMMAND_IDENTIFIER_CREATE_SIG_CADES, createCAdESSigParams);
- sl20CreateCAdES = SL20JSONBuilderUtils.createGenericRequest(UUID.randomUUID().toString(), null, getCertCommand, null);
+ sl20CreateCAdES = SL20JSONBuilderUtils.createGenericRequest(reqId, null, getCertCommand, null);
}
@@ -1791,6 +1812,8 @@ public class PdfAsHelper {
redirectTwoCommand,
null);
+ logger.trace("SL2.0 command: " + respContainer.toString());
+
//workaround for A-Trust
if (request.getHeader(SL20Constants.HTTP_HEADER_SL20_CLIENT_TYPE) != null &&
request.getHeader(SL20Constants.HTTP_HEADER_SL20_CLIENT_TYPE).equals(SL20Constants.HTTP_HEADER_VALUE_NATIVE)
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 7ddf0a55..31f5a2ef 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
@@ -93,7 +93,7 @@ public class SLDataURLServlet extends HttpServlet {
}
- logger.trace("Received SL2.0 result: " + sl20Result);
+ logger.trace("Received SL2.0 command: " + sl20Result);
//parse SL2.0 command/result into JSON
try {
@@ -144,6 +144,8 @@ public class SLDataURLServlet extends HttpServlet {
//extract payloaf
JsonObject payLoad = payLoadContainer.getPayload();
+ logger.trace("SL2.0 payLoad on DataURL: " + payLoad.toString());
+
//check response type
if (SL20JSONExtractorUtils.getStringValue(
payLoad, SL20Constants.SL20_COMMAND_CONTAINER_NAME, true)
@@ -175,7 +177,7 @@ public class SLDataURLServlet extends HttpServlet {
List<X509Certificate> sortedCerts = X509Utils.sortCertificates(certs);
logger.debug("Sorting of certificate completed. Select end-user certificate ... ");
- PdfAsHelper.injectCertificate(request, response, Base64.getDecoder().decode(sortedCerts.get(0).getEncoded()), getServletContext());
+ PdfAsHelper.injectCertificate(request, response, sortedCerts.get(0).getEncoded(), getServletContext());
}
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 f5d6ff55..e43ebfcf 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
@@ -21,6 +21,7 @@ public class SL20HttpBindingUtils {
public static void writeIntoResponse(HttpServletRequest request, HttpServletResponse response, JsonObject sl20Forward, String redirectURL) throws IOException, URISyntaxException {
//forward SL2.0 command
+ log.trace("SL20 command: " + sl20Forward.toString());
if (request.getHeader(SL20Constants.HTTP_HEADER_SL20_CLIENT_TYPE) != null &&
request.getHeader(SL20Constants.HTTP_HEADER_SL20_CLIENT_TYPE).equals(SL20Constants.HTTP_HEADER_VALUE_NATIVE)) {
log.debug("Client request containts 'native client' header ... ");