Bugfix: Querformat, BKU 2.7.x, ...

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@35 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 202 insertions, 48 deletions

diff --git a/work/cfg/config.properties b/work/cfg/config.properties
index 7dd07cc..d9c29b5 100644
--- a/work/cfg/config.properties
+++ b/work/cfg/config.properties
@@ -16,45 +16,6 @@ cert.alg.ecdsa=http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1
 

 strict_mode=false

 

-#############################################

-# start LDAP-Mappings

-# note: ldap_mapping.xxx.serial_attr may be omitted if value is "eidCertificateSerialNumber"

-

-ldap_mapping.asign_prem_sig01.issuer_name=CN=a-sign-Premium-Sig-01,OU=a-sign-Premium-Sig-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT

-ldap_mapping.asign_prem_sig01.url=ldap://ldap.a-trust.at/ou=a-sign-Premium-Sig-01,o=A-Trust,c=at

-ldap_mapping.asign_prem_sig01.serial_attr=eidCertificateSerialNumber

-

-ldap_mapping.asign_prem_sig02.issuer_name=CN=a-sign-Premium-Sig-02,OU=a-sign-Premium-Sig-02,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT

-ldap_mapping.asign_prem_sig02.url=ldap://ldap.a-trust.at/ou=a-sign-Premium-Sig-02,o=A-Trust,c=at

-ldap_mapping.asign_prem_sig02.serial_attr=eidCertificateSerialNumber

-

-ldap_mapping.asign_prem_enc01.issuer_name=CN=a-sign-Premium-Enc-01,OU=a-sign-Premium-Enc-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT

-ldap_mapping.asign_prem_enc01.url=ldap://ldap.a-trust.at/ou=a-sign-Premium-Enc-01,o=A-Trust,c=at

-ldap_mapping.asign_prem_enc01.serial_attr=eidCertificateSerialNumber

-

-ldap_mapping.asign_prem_enc02.issuer_name=CN=a-sign-Premium-Enc-02,OU=a-sign-Premium-Enc-02,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT

-ldap_mapping.asign_prem_enc02.url=ldap://ldap.a-trust.at/ou=a-sign-Premium-Enc-02,o=A-Trust,c=at

-ldap_mapping.asign_prem_enc02.serial_attr=eidCertificateSerialNumber

-

-ldap_mapping.ecard_vs_ca02.issuer_name=C=AT,O=Hauptverband österr. Sozialvers.,CN=VSig CA 2

-ldap_mapping.ecard_vs_ca02.url=ldap://ldap.ecard.sozialversicherung.at/ou=VSig CA 2,o=Hauptverband österr. Sozialvers.,c=at

-ldap_mapping.ecard_vs_ca02.serial_attr=serialNumber

-

-ldap_mapping.asign_corp_light01.issuer_name=CN=a-sign-corporate-light-01,OU=a-sign-corporate-light-01,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT

-ldap_mapping.asign_corp_light01.url=ldap://ldap.a-trust.at/ou=a-sign-corporate-light-01,o=A-Trust,c=at

-ldap_mapping.asign_corp_light01.serial_attr=eidCertificateSerialNumber

-

-ldap_mapping.asign_corp_light02.issuer_name=CN=a-sign-corporate-light-02,OU=a-sign-corporate-light-02,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT

-ldap_mapping.asign_corp_light02.url=ldap://ldap.a-trust.at/ou=a-sign-corporate-light-02,o=A-Trust,c=at

-ldap_mapping.asign_corp_light02.serial_attr=eidCertificateSerialNumber

-

-ldap_mapping.asign_corp_light03.issuer_name=CN=a-sign-corporate-light-03,OU=a-sign-corporate-light-03,O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT

-ldap_mapping.asign_corp_light03.url=ldap://ldap.a-trust.at/ou=a-sign-corporate-light-03,o=A-Trust,c=at

-ldap_mapping.asign_corp_light03.serial_attr=eidCertificateSerialNumber

-

-# end LDAP-Mappings

-#############################################

-

 

 #############################################

 # Signaturdienste

@@ -68,8 +29,11 @@ bku.sign.KeyboxIdentifier=SecureSignatureKeypair
 

 bku.verify.url=http://127.0.0.1:3495/http-security-layer-request

 bku.verify.request=./templates/BKUVerifyRequest.xml

+

 bku.verify.template=./templates/BKUVerifyTemplateB64.xml

 bku.verify.template.SP=./templates/BKUVerifyTemplateSP.xml

+bku.verify.template2=./templates/BKUVerifyTemplateB64_neueBKU.xml

+bku.verify.template2.SP=./templates/BKUVerifyTemplateSP_neueBKU.xml

 

 

 a1.available_for_web=false

@@ -143,6 +107,11 @@ sig_obj.types.CIO-BUND-neu=on
 sig_obj.types.a_sit_demo2=on

 sig_obj.types.profEGIZ=on

 sig_obj.types.ECDL=on

+sig_obj.types.DEMO-PROFIL=on

+sig_obj.types.CL-DEMO-PROFIL=on

+sig_obj.types.ASIT-DEFAULT=on

+sig_obj.types.CIO-BUND3=on

+sig_obj.types.TEST=on

 

 

 #############################################

@@ -154,12 +123,15 @@ defaults.phlength.SIG_ISSUER=150
 defaults.phlength.SIG_VALUE=200

 defaults.phlength.SIG_ID=90

 

+defaults.phlength.SIG_NAME=150

+

 

 #############################################

 # egov_graz_gv_at

 

 # Signatur Typ Spezifikation

 sig_obj.egov_graz_gv_at.description=EGOV Graz.gv.at

+

 sig_obj.egov_graz_gv_at.key.SIG_NAME=Inhaber

 sig_obj.egov_graz_gv_at.key.SIG_DATE=Datum

 sig_obj.egov_graz_gv_at.key.SIG_ISSUER=Aussteller

@@ -186,7 +158,6 @@ sig_obj.egov_graz_gv_at.moa.sign.KeyIdentifier=BjornKey
 #absolute positioning

 #sig_obj.egov_graz_gv_at.pos=1;40.0;800.0;400.0

 

-

 # Signatur Tabellen Spezifikation

 sig_obj.egov_graz_gv_at.table.main.1=SIG_LABEL-i|TABLE-info

 sig_obj.egov_graz_gv_at.table.main.2=SIG_VALUE-cv

@@ -220,6 +191,7 @@ sig_obj.egov_graz_gv_at.table.info.ColsWidth=1.5 4
 # a_sit_demo

 

 sig_obj.a_sit_demo.description=A-Sit Demo

+

 sig_obj.a_sit_demo.key.SIG_NAME=Unterzeichner

 sig_obj.a_sit_demo.key.SIG_DATE=Datum

 sig_obj.a_sit_demo.key.SIG_ISSUER=Aussteller

@@ -351,7 +323,6 @@ sig_obj.bmi_su_zmr.table.info.ColsWidth=1.5 4
 #####################################################

 # CIO-BUND2

 

-sig_obj.CIO-BUND2.start_text=Signaturwert

 sig_obj.CIO-BUND2.description=CIO des BUNDES 2

 

 sig_obj.CIO-BUND2.key.SIG_VALUE=Signaturwert

@@ -394,7 +365,6 @@ sig_obj.CIO-BUND2.table.info.4=SIG_NUMBER-cv
 #####################################################

 # CIO-BUND-neu

 

-sig_obj.CIO-BUND-neu.start_text=Signaturwert

 sig_obj.CIO-BUND-neu.description=CIO des BUNDES 2

 

 sig_obj.CIO-BUND-neu.key.SIG_VALUE=Signaturwert

@@ -407,7 +377,7 @@ sig_obj.CIO-BUND-neu.key.SIG_ID=Kennung
 sig_obj.CIO-BUND-neu.key.SIG_KZ=Methode

 

 sig_obj.CIO-BUND-neu.value.SIG_SUBJECT=CIO des Bundes: o.-Univ. Prof. Dr. Reinhard Posch

-sig_obj.CIO-BUND-neu.value.SIG_META=Prüfservice: https://demo.egiz.gv.at/pdf-as/Verify.

+sig_obj.CIO-BUND-neu.value.SIG_META=Prüfservice: http://demo.a-sit.at/el_signatur/verification

 sig_obj.CIO-BUND-neu.value.SIG_LABEL=./images/BMI-AS.jpg

 

 sig_obj.CIO-BUND-neu.table.main.1=SIG_VALUE-cv

@@ -434,7 +404,6 @@ sig_obj.CIO-BUND-neu.table.info.6=SIG_ID-cv
 #####################################################

 # profEGIZ

 

-sig_obj.profEGIZ.start_text=Signaturwert

 sig_obj.profEGIZ.description=EGIZ Profil mit Rechtschreibfehler

 

 sig_obj.profEGIZ.key.SIG_VALUE=Signaturwert

@@ -448,7 +417,7 @@ sig_obj.profEGIZ.key.SIG_ID=Kennung
 sig_obj.profEGIZ.key.SIG_KZ=Methode

 

 sig_obj.profEGIZ.value.SIG_SUBJECT=Jemand von Egiz

-sig_obj.profEGIZ.value.SIG_META=Prüfservice: https://demo.egiz.gv.at/pdf-as/Verify.

+sig_obj.profEGIZ.value.SIG_META=Prüfservice: http://demo.a-sit.at/el_signatur/verification

 sig_obj.profEGIZ.value.SIG_LABEL=./images/BMI-AS.jpg

 

 sig_obj.profEGIZ.table.main.1=SIG_VALUE-cv

@@ -530,7 +499,6 @@ sig_obj.ECDL.phlength.SIG_TYPE=-1
 sig_obj.ECDL.phlength.SIG_NORM=-1

 sig_obj.ECDL.phlength.SIG_META=-1

 

-sig_obj.ECDL.start_text=Signaturwert

 sig_obj.ECDL.description=ECDL

 

 sig_obj.ECDL.key.SIG_VALUE=Signaturwert

@@ -543,10 +511,9 @@ sig_obj.ECDL.key.SIG_ID=Kennung
 sig_obj.ECDL.key.SIG_KZ=Methode

 

 sig_obj.ECDL.value.SIG_TYPE=Österreichische Computer Gesellschaft OCG

-sig_obj.ECDL.value.SIG_META=Die Prüfung aus dem Text und von Papier ist möglich. Online-Prüfservice: https://demo.egiz.gv.at/pdf-as/Verify  

+sig_obj.ECDL.value.SIG_META=Die Prüfung aus dem Text und von Papier ist möglich. Online-Prüfservice: http://demo.a-sit.at/el_signatur/verification

 sig_obj.ECDL.value.SIG_LABEL=./images/amtssignatur_graz.gif

 

-

 sig_obj.ECDL.table.main.1=SIG_VALUE-cv

 sig_obj.ECDL.table.main.2=SIG_LABEL-i|TABLE-info

 

@@ -568,3 +535,190 @@ sig_obj.ECDL.table.info.5=SIG_KZ-cv
 sig_obj.ECDL.table.info.6=SIG_ID-cv

 sig_obj.ECDL.table.info.7=SIG_META-cv

 

+

+

+#############################################

+# Demo-Profil

+

+sig_obj.DEMO-PROFIL.description=Demo-Profil

+

+sig_obj.DEMO-PROFIL.key.SIG_VALUE=Signaturwert

+sig_obj.DEMO-PROFIL.key.SIG_SUBJECT=Signator

+sig_obj.DEMO-PROFIL.key.SIG_DATE=Datum

+sig_obj.DEMO-PROFIL.key.SIG_ISSUER=Aussteller

+sig_obj.DEMO-PROFIL.key.SIG_NUMBER=Seriennummer

+sig_obj.DEMO-PROFIL.key.SIG_META=Hinweis

+sig_obj.DEMO-PROFIL.key.SIG_ID=Kennzeichnung

+sig_obj.DEMO-PROFIL.key.SIG_KZ=Algorithmus

+

+sig_obj.DEMO-PROFIL.value.SIG_SUBJECT=Das ist eine Testsignatur

+sig_obj.DEMO-PROFIL.value.SIG_META=Der Textinhalt dieses Dokumentes wurde ohne Formatsteuerungen elektronisch signiert

+sig_obj.DEMO-PROFIL.value.SIG_LABEL=./images/demo-signatur.gif

+

+sig_obj.DEMO-PROFIL.table.main.1=SIG_VALUE-cv

+sig_obj.DEMO-PROFIL.table.main.2=SIG_LABEL-i|TABLE-info

+sig_obj.DEMO-PROFIL.table.main.3=SIG_META-cv

+sig_obj.DEMO-PROFIL.table.main.4=SIG_ID-cv

+sig_obj.DEMO-PROFIL.table.main.5=SIG_KZ-cv

+sig_obj.DEMO-PROFIL.table.main.ColsWidth=1 5

+sig_obj.DEMO-PROFIL.table.main.Style.bgcolor=245 245 240

+sig_obj.DEMO-PROFIL.table.main.Style.padding=3

+sig_obj.DEMO-PROFIL.table.main.Style.border=0.1

+sig_obj.DEMO-PROFIL.table.main.Style.halign=center

+sig_obj.DEMO-PROFIL.table.main.Style.valign=middle

+sig_obj.DEMO-PROFIL.table.main.Style.font=HELVETICA,9,NORMAL

+

+sig_obj.DEMO-PROFIL.table.info.ColsWidth=1.2 4

+sig_obj.DEMO-PROFIL.table.info.1=SIG_SUBJECT-cv

+sig_obj.DEMO-PROFIL.table.info.2=SIG_DATE-cv

+sig_obj.DEMO-PROFIL.table.info.3=SIG_ISSUER-cv

+sig_obj.DEMO-PROFIL.table.info.4=SIG_NUMBER-cv

+

+

+

+#####################################################

+# CL-DEMO-PROFIL

+

+sig_obj.CL-DEMO-PROFIL.description=CL-DEMO-PROFIL

+

+sig_obj.CL-DEMO-PROFIL.key.SIG_VALUE=Signaturwert

+

+sig_obj.CL-DEMO-PROFIL.key.SIG_DATE=Datum

+sig_obj.CL-DEMO-PROFIL.key.SIG_ISSUER=Aussteller

+sig_obj.CL-DEMO-PROFIL.key.SIG_NUMBER=Seriennummer

+sig_obj.CL-DEMO-PROFIL.key.SIG_META=Hinweis

+sig_obj.CL-DEMO-PROFIL.key.SIG_ID=Kennzeichnung

+sig_obj.CL-DEMO-PROFIL.key.SIG_KZ=Algorithmus

+

+sig_obj.CL-DEMO-PROFIL.value.SIG_META=Der Textinhalt dieses Dokumentes wurde ohne Formatsteuerungen elektronisch signiert

+sig_obj.CL-DEMO-PROFIL.value.SIG_LABEL=./images/buergersignatur_graz.gif

+

+sig_obj.CL-DEMO-PROFIL.table.main.1=SIG_VALUE-cv

+sig_obj.CL-DEMO-PROFIL.table.main.2=SIG_LABEL-i|TABLE-info

+sig_obj.CL-DEMO-PROFIL.table.main.3=SIG_META-cv

+sig_obj.CL-DEMO-PROFIL.table.main.4=SIG_ID-cv

+sig_obj.CL-DEMO-PROFIL.table.main.5=SIG_KZ-cv

+sig_obj.CL-DEMO-PROFIL.table.main.ColsWidth=1 5

+sig_obj.CL-DEMO-PROFIL.table.main.Style.bgcolor=245 245 240

+sig_obj.CL-DEMO-PROFIL.table.main.Style.padding=3

+sig_obj.CL-DEMO-PROFIL.table.main.Style.border=0.1

+sig_obj.CL-DEMO-PROFIL.table.main.Style.halign=center

+sig_obj.CL-DEMO-PROFIL.table.main.Style.valign=middle

+sig_obj.CL-DEMO-PROFIL.table.main.Style.font=HELVETICA,9,NORMAL

+

+sig_obj.CL-DEMO-PROFIL.table.info.ColsWidth=1.2 4

+sig_obj.CL-DEMO-PROFIL.table.info.1=SIG_DATE-cv

+sig_obj.CL-DEMO-PROFIL.table.info.2=SIG_ISSUER-cv

+sig_obj.CL-DEMO-PROFIL.table.info.3=SIG_NUMBER-cv

+

+

+

+#####################################################

+# ASIT-DEFAULT

+

+sig_obj.ASIT-DEFAULT.description=Asit-Default

+

+sig_obj.ASIT-DEFAULT.key.SIG_VALUE=Signaturwert

+sig_obj.ASIT-DEFAULT.key.SIG_NAME=Signator

+sig_obj.ASIT-DEFAULT.key.SIG_DATE=Datum

+sig_obj.ASIT-DEFAULT.key.SIG_ISSUER=Aussteller

+sig_obj.ASIT-DEFAULT.key.SIG_NUMBER=Serienr.

+sig_obj.ASIT-DEFAULT.key.SIG_KZ=Methode

+sig_obj.ASIT-DEFAULT.key.SIG_ID=Kennung

+sig_obj.ASIT-DEFAULT.key.SIG_META=Hinweis

+

+sig_obj.ASIT-DEFAULT.value.SIG_META=Prüfservice: http://demo.a-sit.at/el_signatur/verification

+sig_obj.ASIT-DEFAULT.value.SIG_LABEL=./images/demo-signatur.gif

+

+sig_obj.ASIT-DEFAULT.phlength.SIG_NAME=120

+

+sig_obj.ASIT-DEFAULT.table.main.ColsWidth=1 3

+sig_obj.ASIT-DEFAULT.table.main.1=SIG_VALUE-cv

+sig_obj.ASIT-DEFAULT.table.main.2=SIG_LABEL-i|TABLE-info

+sig_obj.ASIT-DEFAULT.table.main.3=SIG_META-cv

+

+sig_obj.ASIT-DEFAULT.table.main.Style.bgcolor=245 245 240

+sig_obj.ASIT-DEFAULT.table.main.Style.padding=2

+sig_obj.ASIT-DEFAULT.table.main.Style.border=0.1

+sig_obj.ASIT-DEFAULT.table.main.Style.halign=center

+sig_obj.ASIT-DEFAULT.table.main.Style.valign=middle

+sig_obj.ASIT-DEFAULT.table.main.Style.font=HELVETICA,9,NORMAL

+

+sig_obj.ASIT-DEFAULT.table.info.ColsWidth=1.2 6

+sig_obj.ASIT-DEFAULT.table.info.1=SIG_NAME-cv

+sig_obj.ASIT-DEFAULT.table.info.2=SIG_DATE-cv

+sig_obj.ASIT-DEFAULT.table.info.3=SIG_ISSUER-cv

+sig_obj.ASIT-DEFAULT.table.info.4=SIG_NUMBER-cv

+sig_obj.ASIT-DEFAULT.table.info.5=SIG_KZ-cv

+sig_obj.ASIT-DEFAULT.table.info.6=SIG_ID-cv

+

+

+

+#####################################################

+# CIO-BUND3

+

+sig_obj.CIO-BUND3.description=CIO des BUNDES 3

+

+sig_obj.CIO-BUND3.key.SIG_VALUE=Signaturwert

+sig_obj.CIO-BUND3.key.SIG_SUBJECT=Signator

+sig_obj.CIO-BUND3.key.SIG_DATE=Datum UTC Zeit

+sig_obj.CIO-BUND3.key.SIG_ISSUER=Aussteller

+sig_obj.CIO-BUND3.key.SIG_NUMBER=Seriennummer

+sig_obj.CIO-BUND3.key.SIG_META=Hinweis

+sig_obj.CIO-BUND3.key.SIG_ID=Kennzeichnung

+sig_obj.CIO-BUND3.key.SIG_KZ=Algorithmus

+

+sig_obj.CIO-BUND3.value.SIG_SUBJECT=CIO des Bundes: o.-Univ. Prof. Dr. Reinhard Posch

+sig_obj.CIO-BUND3.value.SIG_META=Der Textinhalt dieses Dokumentes wurde ohne Formatsteuerungen elektronisch signiert

+sig_obj.CIO-BUND3.value.SIG_LABEL=./images/BMI-AS.jpg

+

+sig_obj.CIO-BUND3.table.main.1=SIG_VALUE-cv

+sig_obj.CIO-BUND3.table.main.2=SIG_LABEL-i|TABLE-info

+sig_obj.CIO-BUND3.table.main.3=SIG_META-cv

+sig_obj.CIO-BUND3.table.main.4=SIG_ID-cv

+sig_obj.CIO-BUND3.table.main.5=SIG_KZ-cv

+sig_obj.CIO-BUND3.table.main.ColsWidth=1 5

+sig_obj.CIO-BUND3.table.main.Style.bgcolor=245 245 240

+sig_obj.CIO-BUND3.table.main.Style.padding=3

+sig_obj.CIO-BUND3.table.main.Style.border=0.1

+sig_obj.CIO-BUND3.table.main.Style.halign=center

+sig_obj.CIO-BUND3.table.main.Style.valign=middle

+sig_obj.CIO-BUND3.table.main.Style.font=HELVETICA,9,NORMAL

+

+sig_obj.CIO-BUND3.table.info.ColsWidth=1.2 4

+sig_obj.CIO-BUND3.table.info.1=SIG_SUBJECT-cv

+sig_obj.CIO-BUND3.table.info.2=SIG_DATE-cv

+sig_obj.CIO-BUND3.table.info.3=SIG_ISSUER-cv

+sig_obj.CIO-BUND3.table.info.4=SIG_NUMBER-cv

+

+

+

+

+#####################################################

+# TEST

+# Profil ohne Bildmarke und ohne optionale

+# Elemente zum Testen.

+

+sig_obj.TEST.description=Testprofil

+

+sig_obj.TEST.key.SIG_VALUE=Signaturwert

+sig_obj.TEST.key.SIG_DATE=Datum UTC Zeit

+sig_obj.TEST.key.SIG_ISSUER=Aussteller

+sig_obj.TEST.key.SIG_NUMBER=Seriennummer

+sig_obj.TEST.key.SIG_ID=Kennzeichnung

+sig_obj.TEST.key.SIG_KZ=Algorithmus

+

+sig_obj.TEST.table.main.1=SIG_DATE-cv

+sig_obj.TEST.table.main.2=SIG_VALUE-cv

+sig_obj.TEST.table.main.3=SIG_ISSUER-cv

+sig_obj.TEST.table.main.4=SIG_NUMBER-cv

+sig_obj.TEST.table.main.5=SIG_ID-cv

+sig_obj.TEST.table.main.6=SIG_KZ-cv

+sig_obj.TEST.table.main.ColsWidth=1 5

+sig_obj.TEST.table.main.Style.bgcolor=245 245 240

+sig_obj.TEST.table.main.Style.padding=3

+sig_obj.TEST.table.main.Style.border=0.1

+sig_obj.TEST.table.main.Style.halign=center

+sig_obj.TEST.table.main.Style.valign=middle

+sig_obj.TEST.table.main.Style.font=HELVETICA,9,NORMAL

+