23 files changed, 128 insertions, 2 deletions
diff --git a/work/cfg/config.properties b/work/cfg/config.properties
index 292886e..53e6799 100644
--- a/work/cfg/config.properties
+++ b/work/cfg/config.properties
@@ -27,11 +27,23 @@ bku.sign.url=http://127.0.0.1:3495/http-security-layer-request
 bku.sign.request=./templates/BKUSignRequestB64.xml
 bku.sign.KeyboxIdentifier=SecureSignatureKeypair
 
+bku.sign.request.detached=./templates/BKUSignRequestDetached.xml
+
+bku.sign.request.binaer=./templates/BKUSignRequestBinaryDetached.xml
+bku.sign.request.text=./templates/BKUSignRequestTextualDetached.xml
+
 bku.verify.url=http://127.0.0.1:3495/http-security-layer-request
 bku.verify.request=./templates/BKUVerifyRequest.xml
+bku.verify.request.detached=./templates/BKUVerifyRequestDetached.xml
 
-bku.verify.template=./templates/BKUVerifyTemplateB64.xml
+# TODO
+#bku.verify.template=./templates/BKUVerifyTemplateB64.xml
+#bku.verify.template.SP=./templates/BKUVerifyTemplateSP.xml
+bku.verify.template=./templates/BKUVerifyTemplateDetached.xml
 bku.verify.template.SP=./templates/BKUVerifyTemplateSP.xml
+
+bku.verify.template.detached=./templates/BKUVerifyTemplateDetached.xml
+
 bku.verify.template2=./templates/BKUVerifyTemplateB64_neueBKU.xml
 bku.verify.template2.SP=./templates/BKUVerifyTemplateSP_neueBKU.xml
 
diff --git a/work/cfg/log4j.properties b/work/cfg/log4j.properties
index f44c7d0..a3274a8 100644
--- a/work/cfg/log4j.properties
+++ b/work/cfg/log4j.properties
@@ -21,5 +21,7 @@ log4j.appender.FA.layout=org.apache.log4j.PatternLayout
 log4j.appender.FA.layout.ConversionPattern=%d{ISO8601} %-4r %-5p [%t] %c: %m%n
 
 
-log4j.logger.at.knowcenter.wag.egov.egiz      = INFO
+log4j.logger.at.knowcenter.wag.egov.egiz      = DEBUG
 log4j.logger.at.knowcenter.wag.egov.egiz.ldap = DEBUG
+
+log4j.logger.test.at.knowcenter = DEBUG
diff --git a/work/templates/BKUSignRequestDetached.xml b/work/templates/BKUSignRequestDetached.xml
new file mode 100644
index 0000000..f809927
--- /dev/null
+++ b/work/templates/BKUSignRequestDetached.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sl:CreateXMLSignatureRequest xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
+<sl:KeyboxIdentifier>KeyboxIdentifierReplace</sl:KeyboxIdentifier>
+<sl:DataObjectInfo Structure="detached">
+<sl:DataObject Reference="urn:Document"/>
+<sl:TransformsInfo>
+<sl:FinalDataMetaInfo>
+<sl:MimeType>MimeTypeReplace</sl:MimeType>
+</sl:FinalDataMetaInfo>
+</sl:TransformsInfo>
+<sl:Supplement>
+<sl:Content Reference="urn:Document">
+<sl:LocRefContent>formdata:fileupload</sl:LocRefContent>
+</sl:Content>
+</sl:Supplement>
+</sl:DataObjectInfo>
+</sl:CreateXMLSignatureRequest>
+\ No newline at end of file
diff --git a/work/templates/BKUVerifyRequestDetached.xml b/work/templates/BKUVerifyRequestDetached.xml
new file mode 100644
index 0000000..ef9aa14
--- /dev/null
+++ b/work/templates/BKUVerifyRequestDetached.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sl:VerifyXMLSignatureRequest xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+<sl:SignatureInfo>
+<sl:SignatureEnvironment>
+<sl:XMLContent>XMLContentReplace</sl:XMLContent>
+</sl:SignatureEnvironment>
+<sl:SignatureLocation>/dsig:Signature</sl:SignatureLocation>
+</sl:SignatureInfo>
+<sl:Supplement>
+<sl:Content Reference="urn:Document">
+<sl:LocRefContent>formdata:fileupload</sl:LocRefContent>
+</sl:Content>
+</sl:Supplement>
+</sl:VerifyXMLSignatureRequest>
+\ No newline at end of file
diff --git a/work/templates/BKUVerifyTemplateDetached.xml b/work/templates/BKUVerifyTemplateDetached.xml
new file mode 100644
index 0000000..19a2c1c
--- /dev/null
+++ b/work/templates/BKUVerifyTemplateDetached.xml
@@ -0,0 +1,13 @@
+<dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" Id="signature-SigIdReplace">
+<dsig:SignedInfo>
+<dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
+<dsig:SignatureMethod Algorithm="CertAlgReplace"/>
+<dsig:Reference Id="signed-data-reference-SigDataRefReplace" URI="urn:Document">
+<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+<dsig:DigestValue>DigestValueSignedDataReplace</dsig:DigestValue>
+</dsig:Reference>
+<dsig:Reference Id="etsi-data-reference-EtsiDataRefReplace" Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-data-object-EtsiDataObjURIReplace')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>DigestValueSignedPropertiesReplace</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>
+<dsig:SignatureValue>SignatureValueReplace</dsig:SignatureValue>
+<dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>X509CertificateReplace</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo>
+<dsig:Object Id="etsi-data-object-EtsiDataObjURIReplace"><etsi:QualifyingProperties xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#" Target="#signature-SigIdReplace"><etsi:SignedProperties xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>SigningTimeReplace</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></etsi:DigestMethod><etsi:DigestValue>DigestValueX509CertificateReplace</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>X509IssuerNameReplace</dsig:X509IssuerName><dsig:X509SerialNumber>X509SerialNumberReplace</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied></etsi:SignaturePolicyImplied></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#signed-data-reference-SigDataRefReplace"><etsi:MimeType>MimeTypeReplace</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object>
+</dsig:Signature>
+\ No newline at end of file
diff --git a/work/templates/BKUSignRequestB64.xml b/work/templates/old/BKUSignRequestB64.xml
index 4cebb0e..4cebb0e 100644
--- a/work/templates/BKUSignRequestB64.xml
+++ b/work/templates/old/BKUSignRequestB64.xml
diff --git a/work/templates/old/BKUSignRequestBinaryDetached.xml b/work/templates/old/BKUSignRequestBinaryDetached.xml
new file mode 100644
index 0000000..ab154ad
--- /dev/null
+++ b/work/templates/old/BKUSignRequestBinaryDetached.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sl:CreateXMLSignatureRequest xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
+<sl:KeyboxIdentifier>KeyboxIdentifierReplace</sl:KeyboxIdentifier>
+<sl:DataObjectInfo Structure="detached">
+<sl:DataObject Reference="urn:Document"/>
+<sl:TransformsInfo>
+<sl:FinalDataMetaInfo>
+<sl:MimeType>application/pdf</sl:MimeType>
+</sl:FinalDataMetaInfo>
+</sl:TransformsInfo>
+<sl:Supplement>
+<sl:Content Reference="urn:Document">
+<sl:LocRefContent>formdata:fileupload</sl:LocRefContent>
+</sl:Content>
+</sl:Supplement>
+</sl:DataObjectInfo>
+</sl:CreateXMLSignatureRequest>
+\ No newline at end of file
diff --git a/work/templates/old/BKUSignRequestTextualDetached.xml b/work/templates/old/BKUSignRequestTextualDetached.xml
new file mode 100644
index 0000000..e673422
--- /dev/null
+++ b/work/templates/old/BKUSignRequestTextualDetached.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sl:CreateXMLSignatureRequest xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
+<sl:KeyboxIdentifier>KeyboxIdentifierReplace</sl:KeyboxIdentifier>
+<sl:DataObjectInfo Structure="detached">
+<sl:DataObject Reference="urn:Document"/>
+<sl:TransformsInfo>
+<sl:FinalDataMetaInfo>
+<sl:MimeType>text/plain</sl:MimeType>
+</sl:FinalDataMetaInfo>
+</sl:TransformsInfo>
+<sl:Supplement>
+<sl:Content Reference="urn:Document">
+<sl:LocRefContent>formdata:fileupload</sl:LocRefContent>
+</sl:Content>
+</sl:Supplement>
+</sl:DataObjectInfo>
+</sl:CreateXMLSignatureRequest>
+\ No newline at end of file
diff --git a/work/templates/BKUVerifyRequest.xml b/work/templates/old/BKUVerifyRequest.xml
index e232e51..e232e51 100644
--- a/work/templates/BKUVerifyRequest.xml
+++ b/work/templates/old/BKUVerifyRequest.xml
diff --git a/work/templates/BKUVerifyTemplateB64.xml b/work/templates/old/BKUVerifyTemplateB64.xml
index 229cb4f..229cb4f 100644
--- a/work/templates/BKUVerifyTemplateB64.xml
+++ b/work/templates/old/BKUVerifyTemplateB64.xml
diff --git a/work/templates/BKUVerifyTemplateB64_neueBKU.xml b/work/templates/old/BKUVerifyTemplateB64_neueBKU.xml
index 36b543a..36b543a 100644
--- a/work/templates/BKUVerifyTemplateB64_neueBKU.xml
+++ b/work/templates/old/BKUVerifyTemplateB64_neueBKU.xml
diff --git a/work/templates/old/BKUVerifyTemplateDetached_mitQPextern.xml b/work/templates/old/BKUVerifyTemplateDetached_mitQPextern.xml
new file mode 100644
index 0000000..3c178b8
--- /dev/null
+++ b/work/templates/old/BKUVerifyTemplateDetached_mitQPextern.xml
@@ -0,0 +1,13 @@
+<dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" Id="signature-SigIdReplace">
+<dsig:SignedInfo>
+<dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
+<dsig:SignatureMethod Algorithm="CertAlgReplace"/>
+<dsig:Reference Id="signed-data-reference-SigDataRefReplace" URI="urn:Document">
+<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+<dsig:DigestValue>DigestValueSignedDataReplace</dsig:DigestValue>
+</dsig:Reference>
+<dsig:Reference Id="etsi-data-reference-EtsiDataRefReplace" Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-data-object-EtsiDataObjURIReplace')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>DigestValueSignedPropertiesReplace</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>
+<dsig:SignatureValue>SignatureValueReplace</dsig:SignatureValue>
+<dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>X509CertificateReplace</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo>
+<dsig:Object Id="etsi-data-object-EtsiDataObjURIReplace">TemplateQualifyingPropertiesReplace</dsig:Object>
+</dsig:Signature>
+\ No newline at end of file
diff --git a/work/templates/BKUVerifyTemplateSP.xml b/work/templates/old/BKUVerifyTemplateSP.xml
index 0360b58..0360b58 100644
--- a/work/templates/BKUVerifyTemplateSP.xml
+++ b/work/templates/old/BKUVerifyTemplateSP.xml
diff --git a/work/templates/BKUVerifyTemplateSP_neueBKU.xml b/work/templates/old/BKUVerifyTemplateSP_neueBKU.xml
index 2589e62..2589e62 100644
--- a/work/templates/BKUVerifyTemplateSP_neueBKU.xml
+++ b/work/templates/old/BKUVerifyTemplateSP_neueBKU.xml
diff --git a/work/templates/old/BKUVerifyTemplateSP_neueBKU_bin.xml b/work/templates/old/BKUVerifyTemplateSP_neueBKU_bin.xml
new file mode 100644
index 0000000..8570227
--- /dev/null
+++ b/work/templates/old/BKUVerifyTemplateSP_neueBKU_bin.xml
@@ -0,0 +1 @@
+<etsi:QualifyingProperties xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#" Target="#signature-SigIdReplace"><etsi:SignedProperties xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>SigningTimeReplace</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></etsi:DigestMethod><etsi:DigestValue>DigestValueX509CertificateReplace</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>X509IssuerNameReplace</dsig:X509IssuerName><dsig:X509SerialNumber>X509SerialNumberReplace</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied></etsi:SignaturePolicyImplied></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#signed-data-reference-SigDataRefReplace"><etsi:MimeType>application/pdf</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties>
+\ No newline at end of file
diff --git a/work/templates/old/BKUVerifyTemplateSP_neueBKU_text.xml b/work/templates/old/BKUVerifyTemplateSP_neueBKU_text.xml
new file mode 100644
index 0000000..2589e62
--- /dev/null
+++ b/work/templates/old/BKUVerifyTemplateSP_neueBKU_text.xml
@@ -0,0 +1 @@
+<etsi:QualifyingProperties xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#" Target="#signature-SigIdReplace"><etsi:SignedProperties xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedSignatureProperties><etsi:SigningTime>SigningTimeReplace</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></etsi:DigestMethod><etsi:DigestValue>DigestValueX509CertificateReplace</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>X509IssuerNameReplace</dsig:X509IssuerName><dsig:X509SerialNumber>X509SerialNumberReplace</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied></etsi:SignaturePolicyImplied></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#signed-data-reference-SigDataRefReplace"><etsi:MimeType>text/plain</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties>
+\ No newline at end of file
diff --git a/work/templates/MOASignRequest.xml b/work/templates/old/MOASignRequest.xml
index 4873f5e..4873f5e 100644
--- a/work/templates/MOASignRequest.xml
+++ b/work/templates/old/MOASignRequest.xml
diff --git a/work/templates/MOASignRequestB64.xml b/work/templates/old/MOASignRequestB64.xml
index 3c08c9e..3c08c9e 100644
--- a/work/templates/MOASignRequestB64.xml
+++ b/work/templates/old/MOASignRequestB64.xml
diff --git a/work/templates/old/MOASignRequestDetached.xml b/work/templates/old/MOASignRequestDetached.xml
new file mode 100644
index 0000000..5011443
--- /dev/null
+++ b/work/templates/old/MOASignRequestDetached.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+<KeyIdentifier>KeyIdentifierReplace</KeyIdentifier>
+<SingleSignatureInfo SecurityLayerConformity="true">
+<DataObjectInfo Structure="detached">
+<DataObject Reference="urn:Document">
+  <LocRefContent>formdata:fileupload</LocRefContent>
+</DataObject>
+<CreateTransformsInfoProfile>
+<CreateTransformsInfo>
+<FinalDataMetaInfo>
+<MimeType>text/plain</MimeType>
+</FinalDataMetaInfo>
+</CreateTransformsInfo>
+</CreateTransformsInfoProfile>
+</DataObjectInfo>
+</SingleSignatureInfo>
+</CreateXMLSignatureRequest>
+
diff --git a/work/templates/MOAVerifyRequest.xml b/work/templates/old/MOAVerifyRequest.xml
index 04c6863..04c6863 100644
--- a/work/templates/MOAVerifyRequest.xml
+++ b/work/templates/old/MOAVerifyRequest.xml
diff --git a/work/templates/MOAVerifyTemplate.xml b/work/templates/old/MOAVerifyTemplate.xml
index ce63949..ce63949 100644
--- a/work/templates/MOAVerifyTemplate.xml
+++ b/work/templates/old/MOAVerifyTemplate.xml
diff --git a/work/templates/MOAVerifyTemplateB64.xml b/work/templates/old/MOAVerifyTemplateB64.xml
index 547bc7c..547bc7c 100644
--- a/work/templates/MOAVerifyTemplateB64.xml
+++ b/work/templates/old/MOAVerifyTemplateB64.xml
diff --git a/work/templates/MOAVerifyTemplateSP.xml b/work/templates/old/MOAVerifyTemplateSP.xml
index 9e902a3..9e902a3 100644
--- a/work/templates/MOAVerifyTemplateSP.xml
+++ b/work/templates/old/MOAVerifyTemplateSP.xml