Skip to content

Commit 7d0e518

Browse files
celuchmarekceluchmarek
authored
Merge pull request #647 from slovensko-digital/add-some-restrictions
Only allow transformations for XDC or to-be XDC; and check XSLT digest against existing XDC
2 parents 0c140c7 + 15b9f20 commit 7d0e518

8 files changed

Lines changed: 2431 additions & 57 deletions

File tree

‎src/main/java/digital/slovensko/autogram/core/SigningParameters.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ public static SigningParameters buildParameters(
7676
if (document.getMimeType() == null)
7777
throw new SigningParametersException(NO_MIME_TYPE);
7878

79+
if (digestAlgorithm == null)
80+
digestAlgorithm = DigestAlgorithm.SHA256;
81+
7982
var extractedDocument = document;
8083
if (AutogramMimeType.isAsice(document.getMimeType()))
8184
extractedDocument = AsicContainerUtils.getOriginalDocument(document);
@@ -89,21 +92,24 @@ public static SigningParameters buildParameters(
8992
var extractedDocumentMimeType = extractedDocument.getMimeType();
9093

9194
if (eFormAttributes.containerXmlns() != null && eFormAttributes.containerXmlns().contains("xmldatacontainer")) {
92-
if (digestAlgorithm == null) digestAlgorithm = DigestAlgorithm.SHA256;
93-
9495
if (container == null) container = ASiCContainerType.ASiC_E;
9596

9697
if (packaging == null) packaging = SignaturePackaging.ENVELOPING;
9798

98-
if (AutogramMimeType.isXML(extractedDocumentMimeType) || AutogramMimeType.isXDC(extractedDocumentMimeType))
99-
XDCValidator.validateXml(
100-
eFormAttributes.schema(), eFormAttributes.transformation(), extractedDocument,
101-
propertiesCanonicalization, digestAlgorithm, eFormAttributes.embedUsedSchemas());
102-
103-
else
99+
if (!AutogramMimeType.isXML(extractedDocumentMimeType) && !AutogramMimeType.isXDC(extractedDocumentMimeType))
104100
throw new SigningParametersException(WRONG_MIME_TYPE);
105101
}
106102

103+
if (AutogramMimeType.isXDC(extractedDocumentMimeType) || AutogramMimeType.isXML(extractedDocumentMimeType)) {
104+
XDCValidator.validateXml(
105+
eFormAttributes.schema(), eFormAttributes.transformation(), extractedDocument,
106+
propertiesCanonicalization, digestAlgorithm, eFormAttributes.embedUsedSchemas());
107+
} else {
108+
// if the document is not an XML resulting in XML Datacontainer, ignore all eForm attributes (mainly transformation)
109+
if (eFormAttributes.containerXmlns() == null || !eFormAttributes.containerXmlns().contains("xmldatacontainer"))
110+
eFormAttributes = new EFormAttributes(null, null, null, null, null, null, false);
111+
}
112+
107113
if (!plainXmlEnabled && (AutogramMimeType.isXML(extractedDocumentMimeType) || AutogramMimeType.isXDC(extractedDocumentMimeType)) && (eFormAttributes.transformation() == null))
108114
throw new UnknownEformException();
109115

‎src/main/resources/digital/slovensko/autogram/server/server.yml‎

Lines changed: 4 additions & 16 deletions
Large diffs are not rendered by default.

‎src/test/java/digital/slovensko/autogram/SignHttpSmokeTest.java‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -114,33 +114,42 @@ void testSigningHappyScenario() throws URISyntaxException, ClientProtocolExcepti
114114
// StandardCharsets.UTF_8));
115115
}
116116

117+
@ParameterizedTest
118+
@ValueSource(strings = {
119+
"XAdES-ASiC_E-Base64-HTML", "XAdES-ASiC_E-Base64-TXT", "XAdES-ASiC_E-TXT-HTML_md", "XAdES-ASiC_E-TXT-TXT",
120+
"XAdES-ASiC_E-Auto", "XAdES-ASiC_E-SKXDC-Base64-TXT", "XAdES-ASiC_E-SKXDC-TXT-TXT",
121+
"Signed-XAdES-ASiC_E-SKXDC-Base64-TXT", "Signed-XAdES-ASiC_E-SKXDC-Base64-HTML",
122+
"Signed-XAdES-ASiC_E-SKXDC-Auto", "FS-EForm-Auto", "PAdES-PDF_lg", "XAdES-PDF", "XAdES-ASiC_E-PDF", "CAdES-ASiC_E-PDF",
123+
"XAdES-ASiC_E-TXT", "XAdES-ASiC_E-DOCX", "CAdES-ASiC_E-DOCX", "CAdES-PNG_lg", "CAdES-ASiC_E-PNG_md",
124+
"Signed-XAdES-ASiC_E-PDF", "Double-Signed-XAdES-ASiC_E-PDF", "Signed-CAdES-ASiC_E-PDF",
125+
"Double-Signed-CAdES-ASiC_E-PDF",
126+
})
127+
public void testPositiveFromYaml(String exampleName)
128+
throws ClientProtocolException, IOException, IllegalAccessException,
129+
NoSuchFieldException, SecurityException {
130+
testFromYaml(exampleName, HttpStatus.SC_OK, SignResponse.class);
131+
}
132+
117133
@ParameterizedTest
118134
@ValueSource(strings = {
119-
"XAdES-XML-Base64-HTML_md", "XAdES-XML-Base64-TXT", "XAdES-XML-TXT-HTML", "XAdES-XML-TXT-TXT_md",
120-
"XAdES-ASiC_E-Base64-HTML", "XAdES-ASiC_E-Base64-TXT", "XAdES-ASiC_E-TXT-HTML_md", "XAdES-ASiC_E-TXT-TXT",
121-
"XAdES-ASiC_E-Auto", "XAdES-ASiC_E-SKXDC-Base64-TXT", "XAdES-ASiC_E-SKXDC-TXT-TXT",
122-
"Signed-XAdES-ASiC_E-SKXDC-Base64-TXT", "Signed-XAdES-ASiC_E-SKXDC-Base64-HTML",
123-
"Signed-XAdES-ASiC_E-SKXDC-Auto", "FS-EForm-Auto", "PAdES-PDF_lg", "XAdES-PDF", "XAdES-ASiC_E-PDF", "CAdES-ASiC_E-PDF",
124-
"XAdES-ASiC_E-TXT", "XAdES-ASiC_E-DOCX", "CAdES-ASiC_E-DOCX", "CAdES-PNG_lg", "CAdES-ASiC_E-PNG_md",
125-
"Signed-XAdES-ASiC_E-PDF", "Double-Signed-XAdES-ASiC_E-PDF", "Signed-CAdES-ASiC_E-PDF",
126-
"Double-Signed-CAdES-ASiC_E-PDF",
135+
"XAdES-ASiC_E-SKXDC-Auto-WrongXSLT",
127136
})
128-
public void testPositiveFromYaml(String exampleName)
137+
public void testNegative422FromYaml(String exampleName)
129138
throws ClientProtocolException, IOException, IllegalAccessException,
130139
NoSuchFieldException, SecurityException {
131-
testFromYaml(exampleName, HttpStatus.SC_OK, SignResponse.class);
140+
testFromYaml(exampleName, HttpStatus.SC_UNPROCESSABLE_ENTITY, ErrorResponseBody.class);
132141
}
133142

134143
@ParameterizedTest
135144
@ValueSource(strings = {
136-
"XAdES-ASiC_E-SKXDC-Auto-WrongXSLT",
145+
"negative-XAdES-XML-Base64-HTML_md", "negative-XAdES-XML-Base64-TXT", "negative-XAdES-XML-TXT-HTML",
146+
"negative-XAdES-XML-TXT-TXT_md",
137147
})
138-
public void testNegativeFromYaml(String exampleName)
148+
public void testNegative400FromYaml(String exampleName)
139149
throws ClientProtocolException, IOException, IllegalAccessException,
140150
NoSuchFieldException, SecurityException {
141-
testFromYaml(exampleName, HttpStatus.SC_UNPROCESSABLE_ENTITY, ErrorResponseBody.class);
151+
testFromYaml(exampleName, HttpStatus.SC_BAD_REQUEST, ErrorResponseBody.class);
142152
}
143-
144153
public void testFromYaml(String exampleName, int expectedStatus, Class responseClass)
145154
throws ClientProtocolException, IOException, IllegalAccessException,
146155
NoSuchFieldException, SecurityException {

‎src/test/java/digital/slovensko/autogram/SigningJobTests.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import digital.slovensko.autogram.server.dto.ServerSigningParameters;
1010
import digital.slovensko.autogram.server.dto.SignRequestBody;
1111
import digital.slovensko.autogram.server.errors.RequestValidationException;
12+
import eu.europa.esig.dss.enumerations.ASiCContainerType;
1213
import eu.europa.esig.dss.enumerations.SignatureLevel;
1314

1415
import org.junit.jupiter.api.Test;
@@ -21,25 +22,25 @@
2122
public class SigningJobTests {
2223

2324
private static final String transformation = "<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0"  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"  xmlns:egonp="http://schemas.gov.sk/form/App.GeneralAgenda/1.9" exclude-result-prefixes="egonp">
<xsl:output method="html" doctype-system="http://www.w3.org/TR/html4/strict.dtd" doctype-public="-//W3C//DTD HTML 4.01//EN" indent="no" omit-xml-declaration="yes"/>
<xsl:template match="/">
<html>
<head>
<meta http-equiv="X-UA-Compatible" content="IE=8" />
<title>Všeobecná agenda</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="language" content="sk-SK"/>
<style type="text/css">
body { 
	font-family: 'Open Sans', 'Segoe UI', 'Trebuchet MS', 'Geneva CE', lucida, sans-serif;
	background : #ffffff !important ;
}
.ui-tabs {
	padding: .2em;
	position: relative;
	zoom: 1;
}								
.clear { clear: both; height: 0;}
.layoutMain {
	margin: 0px auto;
	padding: 5px 5px 5px 5px;	
}				
.layoutRow { margin-bottom: 5px; }				
.caption { /*width: 100%; border-bottom: solid 1px black;*/ }
.nocaption &gt; .caption { border: 0px !important; }
.nocaption &gt; .caption span {
	background: none !important;
	display: none;
} 
.caption .title { padding-left: 5px; }
.headercorrection {	
	margin: 0px;
    font-size : 1em;
    font-weight: bold;
}				
.labelVis {
	float: left;
	font-weight: bold;
	font-family: 'Open Sans', 'Segoe UI', 'Trebuchet MS', 'Geneva CE', lucida, sans-serif;
	line-height: 25px;
	margin: 0px 18px 0px 0px;
	padding-left: 3px;
	width: 190px;
	word-wrap: break-word;
    font-size: 0.8em;
}
.contentVis {    	     
	float: left;	
	line-height: 25px;
	margin: 0px;
	padding: 0px;
	vertical-align: top;
    font-size: 0.75em;			
}
.wordwrap { 
    white-space: pre-wrap;      
    white-space: -moz-pre-wrap; 
    white-space: -pre-wrap;     
    white-space: -o-pre-wrap;   
    word-wrap: break-word;      
}	
.ui-widget-content {
	background : 50% 50% repeat-x #ffffff;
	border : #d4d4d4 solid 2px;
	color : #4f4e4e;
	border-radius : 3px;
}
.ui-widget-header {
	cursor : pointer;
	font-size : 0.8em;
	color : #494949;
	padding-left : 2px;
	border : #eae9e8 solid 1px;
	background-color : #eae9e8;
	margin-bottom: 3px;
	border-radius : 3px;
}			
</style>
</head>
<body>
<div id="main" class="layoutMain">
<xsl:apply-templates/>
</div>
</body>
</html>
</xsl:template>
<xsl:template match="/egonp:GeneralAgenda">
<div class="layoutRow ui-tabs ui-widget-content" >
<div class="caption ui-widget-header">
<div class="headercorrection">Všeobecná agenda</div>
</div>
<xsl:apply-templates select="./egonp:subject"/>
<xsl:apply-templates select="./egonp:text"/>
</div>
</xsl:template>
<xsl:template match="egonp:GeneralAgenda/egonp:subject">
<xsl:if test="./text()">
<div><label class="labelVis">Predmet: </label><span class="contentVis wordwrap"><xsl:call-template name="string-replace-all"><xsl:with-param name="text" select="." /><xsl:with-param name="replace" select="'%0A'" /><xsl:with-param name="by" select="'&#13;&#10;'" /></xsl:call-template></span></div><div class="clear">&#xa0;</div></xsl:if>
</xsl:template>
<xsl:template match="egonp:GeneralAgenda/egonp:text">
<xsl:if test="./text()">
<div><label class="labelVis">Text: </label><span class="contentVis wordwrap"><xsl:call-template name="string-replace-all"><xsl:with-param name="text" select="." /><xsl:with-param name="replace" select="'%0A'" /><xsl:with-param name="by" select="'&#13;&#10;'" /></xsl:call-template></span></div><div class="clear">&#xa0;</div></xsl:if>
</xsl:template>
<xsl:template name="formatToSkDate">
<xsl:param name="date" />
<xsl:variable name="dateString" select="string($date)" />
<xsl:choose>
<xsl:when test="$dateString != '' and string-length($dateString)=10 and string(number(substring($dateString, 1, 4))) != 'NaN' ">
<xsl:value-of select="concat(substring($dateString, 9, 2), '.', substring($dateString, 6, 2), '.', substring($dateString, 1, 4))" />
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$dateString"></xsl:value-of>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="booleanCheckboxToString">
<xsl:param name="boolValue" />
<xsl:variable name="boolValueString" select="string($boolValue)" />
<xsl:choose>
<xsl:when test="$boolValueString = 'true' ">
<xsl:text>Áno</xsl:text>
</xsl:when>
<xsl:when test="$boolValueString = 'false' ">
<xsl:text>Nie</xsl:text>
</xsl:when>
<xsl:when test="$boolValueString = '1' ">
<xsl:text>Áno</xsl:text>
</xsl:when>
<xsl:when test="$boolValueString = '0' ">
<xsl:text>Nie</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$boolValueString"></xsl:value-of>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="formatTimeTrimSeconds">
<xsl:param name="time" />
<xsl:variable name="timeString" select="string($time)" />
<xsl:if test="$timeString != ''">
<xsl:value-of select="substring($timeString, 1, 5)" />
</xsl:if>
</xsl:template>
<xsl:template name="formatTime">
<xsl:param name="time" />
<xsl:variable name="timeString" select="string($time)" />
<xsl:if test="$timeString != ''">
<xsl:value-of select="substring($timeString, 1, 8)" />
</xsl:if>
</xsl:template>
<xsl:template name="string-replace-all">
<xsl:param name="text"/>
<xsl:param name="replace"/>
<xsl:param name="by"/>
<xsl:choose>
<xsl:when test="contains($text, $replace)">
<xsl:value-of select="substring-before($text,$replace)"/>
<xsl:value-of select="$by"/>
<xsl:call-template name="string-replace-all">
<xsl:with-param name="text" select="substring-after($text,$replace)"/>
<xsl:with-param name="replace" select="$replace"/>
<xsl:with-param name="by" select="$by" />
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$text"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="formatToSkDateTime">
<xsl:param name="dateTime" />
<xsl:variable name="dateTimeString" select="string($dateTime)" />
<xsl:choose>
<xsl:when test="$dateTimeString!= '' and string-length($dateTimeString)>18 and string(number(substring($dateTimeString, 1, 4))) != 'NaN' ">
<xsl:value-of select="concat(substring($dateTimeString, 9, 2), '.', substring($dateTimeString, 6, 2), '.', substring($dateTimeString, 1, 4),' ', substring($dateTimeString, 12, 2),':', substring($dateTimeString, 15, 2))" />
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$dateTimeString"></xsl:value-of>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="formatToSkDateTimeSecond">
<xsl:param name="dateTime" />
<xsl:variable name="dateTimeString" select="string($dateTime)" />
<xsl:choose>
<xsl:when test="$dateTimeString!= '' and string-length($dateTimeString)>18 and string(number(substring($dateTimeString, 1, 4))) != 'NaN' ">
<xsl:value-of select="concat(substring($dateTimeString, 9, 2), '.', substring($dateTimeString, 6, 2), '.', substring($dateTimeString, 1, 4),' ', substring($dateTimeString, 12, 2),':', substring($dateTimeString, 15, 2),':', substring($dateTimeString, 18, 2))" />
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$dateTimeString"></xsl:value-of>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

";
24-
25+
private static final String schema = "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48eHM6c2NoZW1hIGVsZW1lbnRGb3JtRGVmYXVsdD0icXVhbGlmaWVkIiBhdHRyaWJ1dGVGb3JtRGVmYXVsdD0idW5xdWFsaWZpZWQiIHhtbG5zOnhzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSIgdGFyZ2V0TmFtZXNwYWNlPSJodHRwOi8vc2NoZW1hcy5nb3Yuc2svZm9ybS9BcHAuR2VuZXJhbEFnZW5kYS8xLjkiIHhtbG5zPSJodHRwOi8vc2NoZW1hcy5nb3Yuc2svZm9ybS9BcHAuR2VuZXJhbEFnZW5kYS8xLjkiPgo8eHM6c2ltcGxlVHlwZSBuYW1lPSJ0ZXh0QXJlYSI+Cjx4czpyZXN0cmljdGlvbiBiYXNlPSJ4czpzdHJpbmciPgo8L3hzOnJlc3RyaWN0aW9uPgo8L3hzOnNpbXBsZVR5cGU+Cjx4czpzaW1wbGVUeXBlIG5hbWU9Im1lbm8iPgo8eHM6cmVzdHJpY3Rpb24gYmFzZT0ieHM6c3RyaW5nIj4KPC94czpyZXN0cmljdGlvbj4KPC94czpzaW1wbGVUeXBlPgoKCjx4czplbGVtZW50IG5hbWU9IkdlbmVyYWxBZ2VuZGEiPgo8eHM6Y29tcGxleFR5cGU+Cjx4czpzZXF1ZW5jZT4KPHhzOmVsZW1lbnQgbmFtZT0ic3ViamVjdCIgdHlwZT0ibWVubyIgbWluT2NjdXJzPSIwIiBuaWxsYWJsZT0idHJ1ZSIgLz4KPHhzOmVsZW1lbnQgbmFtZT0idGV4dCIgdHlwZT0idGV4dEFyZWEiIG1pbk9jY3Vycz0iMCIgbmlsbGFibGU9InRydWUiIC8+CjwveHM6c2VxdWVuY2U+CjwveHM6Y29tcGxleFR5cGU+CjwveHM6ZWxlbWVudD4KPC94czpzY2hlbWE+";
2526
private static final String content = "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48R2VuZXJhbEFnZW5kYSB4bWxucz0iaHR0cDovL3NjaGVtYXMuZ292LnNrL2Zvcm0vQXBwLkdlbmVyYWxBZ2VuZGEvMS45Ij4KICA8c3ViamVjdD5Ob3bDqSBwb2RhbmllPC9zdWJqZWN0PgogIDx0ZXh0PlBvZMOhdmFtIHRvdG8gbm92w6kgcG9kYW5pZS48L3RleHQ+CjwvR2VuZXJhbEFnZW5kYT4=";
2627

2728
@Test
2829
void testEnd2EndHtmlTransformationEncoding() throws IOException, RequestValidationException {
2930
var ssParams = new ServerSigningParameters(
3031
ServerSigningParameters.LocalSignatureLevel.XAdES_BASELINE_B,
32+
ASiCContainerType.ASiC_E,
3133
null,
34+
"http://data.gov.sk/def/container/xmldatacontainer+xml/1.1",
3235
null,
3336
null,
3437
null,
3538
null,
3639
null,
3740
null,
38-
null,
39-
null,
40-
null,
41+
schema,
4142
transformation,
42-
null,
43+
"http://schemas.gov.sk/form/App.GeneralAgenda/1.9",
4344
false,
4445
null,
4546
false,

0 commit comments

Comments
 (0)