Merge branch 'master' of https://github.com/difi/begrep-SikkerDigital…

…Post
difi · Jun 2, 2014 · 10c11a4 · 10c11a4
2 parents b128914 + a8ccb9f
commit 10c11a4
Show file tree

Hide file tree

Showing 9 changed files with 249 additions and 269 deletions.
diff --git a/eksempler/sbdh.xml b/eksempler/sbdh.xml
@@ -11,7 +11,7 @@
 		<Identifier Authority="iso6523-actorid-upis">9908:996460320</Identifier>
 	</Receiver>
 	<DocumentIdentification> 
-		<Standard>urn:no:difi.sdp:1.0</Standard>
+		<Standard>urn:no:difi:sdp:1.0</Standard>
 		<TypeVersion>1.0</TypeVersion>
 		<!-- Unik identifikator i "Sender" sitt scope -->
 		<InstanceIdentifier>12e57bde-ea5d-43ee-96b6-e2cf73f8311e</InstanceIdentifier>
@@ -20,12 +20,10 @@
 	</DocumentIdentification>
 	<BusinessScope>
 	    <Scope>
-	        <Type>SCHEMA_GUIDE</Type>
-	        <InstanceIdentifier>SikkerDigitalPost/1.0</InstanceIdentifier>
-	        <CorrelationInformation>
-	        	<!-- Dette er den reelle unike identifikatoren i SDBH - bør vera GUID! -->
-	            <RequestingDocumentInstanceIdentifier>12e57bde-ea5d-43ee-96b6-e2cf73f8311e</RequestingDocumentInstanceIdentifier>
-	        </CorrelationInformation>
+	        <Type>ConversationId</Type>
+        	<!-- Dette er den reelle unike identifikatoren i SDBH - bør vera GUID! -->
+            <InstanceIdentifier>12e57bde-ea5d-43ee-96b6-e2cf73f8311e</InstanceIdentifier>
+	        <Identifier>urn:no:difi:sdp:1.0</Identifier>
 	    </Scope>
 	</BusinessScope>
 </StandardBusinessDocumentHeader>
diff --git a/eksempler/soap/1_request_forretningsmelding_fra_postavsender_til_meldingsformidler.xml b/eksempler/soap/1_request_forretningsmelding_fra_postavsender_til_meldingsformidler.xml
diff --git a/...onse_kvittering_for_mottatt_forretningsmelding_fra_meldingsformidler_til_postavsender.xml b/...onse_kvittering_for_mottatt_forretningsmelding_fra_meldingsformidler_til_postavsender.xml
@@ -1,75 +1,75 @@
 <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope">
   <env:Header>
     <wsse:Security env:mustUnderstand="true" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
-      <wsse:BinarySecurityToken EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary" ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3" wsu:Id="X509-18cb578f-8e1a-4c77-a072-7c8ae43fa7bf">MIIC+zCCAeOgAwIBAgIEJzFOFjANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDDBxEaWdpcG9zdCBUZXN0IENlcnQgQXV0aG9yaXR5MB4XDTE0MDQyNjExMDc1NVoXDTI0MDUyMzExMDc1NVowFDESMBAGA1UEAwwJMTIzNDU2Nzg5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk5TJdUuV/RFEsKJciRTYx1fd7Y0d2MsmCoQ7fdOEqs3NrDJYb+qPYM4kgt6SqrkIB1/A762X+md1iOsO+lXsTja2naNdbe5ckU8vs8G/BKfKCfHP+BGI2Cn9m+MY9bXRAMEEMaMTHwcQIliKSCf5A5Mc8EebZk8oSsrIt9u/ObvSeBgI80JFgDkKA6C0cdXJKDjvC+983zO2NdQCaV7RuMA/Rs1HbwX2wsQD5NfUn6lf48QS9g+WYO1OKtVu8/r8Nr9sgUrzAtaCg+PLlntO/0fzmDY3DruD6dP0AM4w6zVzcdgo2As5rPmqp5rOn+6tM5EgjG9ga5EyUMxErouMBQIDAQABo0IwQDAdBgNVHQ4EFgQUR1bRKz2J205LjWPB9iSWqGTk/z8wHwYDVR0jBBgwFoAUABDYeA0iP6t06+wAew7wk9T9tf8wDQYJKoZIhvcNAQELBQADggEBAJHVLFsYDdHDtXuFx2mzUJHMfMv4wCQkgJCJ25mZvad6rI7Tc3mBc3fn5rBOwPCpmpN6LZW5fOh69EGgvWnpgWCbdzIKFLsQ2YuM+KJh43xH1zzvYr/atgsUIoj19ngnEZifJd0xd0ZxxvWWoZRKzMuae/gJfzfI47O9wGS0x7MiFVoNjwStFz2wAOUC9dSVZh9Ja4cIQmFdcHjMxyP5ACsDog7yQNwvaX3lAASB1h5jF0cwWtB81vBLOWUTye0E5W9+yEs/r8Lub/LUNKZz/FJKSVcEU5HMRaboh0XpfuT8zZ5AbxJs8uh1MNPxGznqXV7cEc4IwkGGDe9f5qAaCxQ=</wsse:BinarySecurityToken>
-      <wsu:Timestamp wsu:Id="TS-1403e96f-2e2f-44bd-8650-ef4e4a562a39">
-        <wsu:Created>2014-05-26T11:08:01.339Z</wsu:Created>
-        <wsu:Expires>2014-05-26T11:13:01.339Z</wsu:Expires>
+      <wsse:BinarySecurityToken EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary" ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3" wsu:Id="X509-08ace21e-7f0d-4172-a4f1-19c11359a1b6">MIIC+zCCAeOgAwIBAgIEnrMwhDANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDDBxEaWdpcG9zdCBUZXN0IENlcnQgQXV0aG9yaXR5MB4XDTE0MDUwMzEwMzcxNVoXDTI0MDUzMDEwMzcxNVowFDESMBAGA1UEAwwJMTIzNDU2Nzg5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm/7KnaEMDPE6VM6hZhwZ7S/9GU1OhRCnWB+rZiWmGdWSqkQKO4M1yAlhYnoebQ7BF3r3iEsMVOmTVwmBwZ0MqpBZiaM4HU9kOlXUL0QmNRHJ6OJngDdG/+CL18JqiGt8uLRHBjyZ7jWJK9NxQNSreHqeaWLVdN+W8P3hLgLerCJVYNBZXpeEr78UJ9RsgDGpd+HXzv7MTR3rR93Kl8NvbwOh+rg4+FrSYLRgkoH/1XBELXslXpVitNsX25+5wsAXoJt81HSQMmHKPIJPsGAXwjB9V8o3HmWZolhuc4dbfXjOVWnLgA6sG6NerviESJzDibGxncva6wVXRixn1JVPpwIDAQABo0IwQDAdBgNVHQ4EFgQUnl5H9kK/J0EVTpL5nX/S+O5YfXQwHwYDVR0jBBgwFoAUBhdwwHji7q5VUG6LFH0G6cMRV+8wDQYJKoZIhvcNAQELBQADggEBAHDaR+RwNY+tBLWAAR5oOZk4sGrc10pEsSSko80lrnsDOaqlTf46XIy3Q2wU2r1d3XAhspxQHzNXGYmi9zIwlPLs/0d59bt9U8HtvYQR2jiIEk9ID3cSFKtelhwNzC2f0oNXzjdXkjtIEqCCIMlERqJhviMFUXijQZGXaFLMVT4jky5s7s3BhdqymrP0VfsSavlNN7hpNJhk0rAVGyS2RWumj4FCR3tWMBwpFM52M99ogA7impYsb3rp/ZTtQMyK9+frDnnPvAJrGKstWcrODwU7jfQEQ83z8ZzNk4Mk6FcE3Z7YMvgkGn919OdmmbHpc8n0dcK8MC/p9ub2MHyrsdA=</wsse:BinarySecurityToken>
+      <wsu:Timestamp wsu:Id="TS-5e104942-fa24-4008-b9fe-4b0312bbb870">
+        <wsu:Created>2014-06-02T10:37:19.961Z</wsu:Created>
+        <wsu:Expires>2014-06-02T10:42:19.961Z</wsu:Expires>
       </wsu:Timestamp>
-      <ds:Signature Id="SIG-8442e1b6-77d7-4452-a2a6-1a91cbd3b0dc" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:Signature Id="SIG-f1f5caec-8c49-48b6-8f08-cd01e493e7ef" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:SignedInfo>
           <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
             <ec:InclusiveNamespaces PrefixList="env" xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#"/>
           </ds:CanonicalizationMethod>
           <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-          <ds:Reference URI="#id-5ea47f7b-fe89-4981-b005-26abf3601eb4">
+          <ds:Reference URI="#id-795e88eb-d343-42fd-89ce-4f665c6e67b4">
             <ds:Transforms>
               <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
                 <ec:InclusiveNamespaces PrefixList="" xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#"/>
               </ds:Transform>
             </ds:Transforms>
             <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-            <ds:DigestValue>OMn2J9wO2v64iQvWGIE3Y5SOSIa/uY6vwjB83CbhYVE=</ds:DigestValue>
+            <ds:DigestValue>Cg/xlCQwZFy3dx/4ICw2Eniojo0iN43EgUnWHW1T6SE=</ds:DigestValue>
           </ds:Reference>
-          <ds:Reference URI="#TS-1403e96f-2e2f-44bd-8650-ef4e4a562a39">
+          <ds:Reference URI="#TS-5e104942-fa24-4008-b9fe-4b0312bbb870">
             <ds:Transforms>
               <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
                 <ec:InclusiveNamespaces PrefixList="wsse env" xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#"/>
               </ds:Transform>
             </ds:Transforms>
             <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-            <ds:DigestValue>6znw6Xgij79fObgmekkl4sHzuFHiRrrSutntvvMUoUo=</ds:DigestValue>
+            <ds:DigestValue>PpNjOroOcxJklCa+UepFtx5JOQESwZVHH1w4tFoM8sM=</ds:DigestValue>
           </ds:Reference>
-          <ds:Reference URI="#id-8a4408a9-7db0-40b3-9606-b0e20aa1c2ad">
+          <ds:Reference URI="#id-eebfa603-96ae-48a2-b128-15d1f4093c65">
             <ds:Transforms>
               <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
                 <ec:InclusiveNamespaces PrefixList="" xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#"/>
               </ds:Transform>
             </ds:Transforms>
             <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-            <ds:DigestValue>RN3T67ZGP6fHAoRh851HQT05OZPWStYGZlvpk5ZzNak=</ds:DigestValue>
+            <ds:DigestValue>h8LXvgOikk+sICMk7Bjm5nVABX5pW8RFiJVCW8HUoxM=</ds:DigestValue>
           </ds:Reference>
         </ds:SignedInfo>
-        <ds:SignatureValue>WXzaJITqeSm2VIZdBigIq/umNNM3SLT7OhiHSW5fVr4DeAL4bS0IQ/1JaPcStQPTEWLTYHqsXjFXbv7HhKncdlhCxILs2C8JlD3h3VT3ByrM45Bx0EW77m0v7qrxa+fUIuyN5ipGylQ3lTMBs/70dlYKElKGqbZONH5ySSSH0Cg1BIXwMLv0TOQbb22h0dRAFJpuQTw4emQFcuN9+oEt+BJgQJMCPcEPojTaUmKnZOJLtUszAxh6bkFBgOvVHCBGehyzHkM1fO/f8vt3Z0sgNWJlhe0PwKVJtS9UGu9qN8xIb+WhV9s8DiOardoJYWNEjgPmWVzEx45Ok5/84pYfmg==</ds:SignatureValue>
-        <ds:KeyInfo Id="KI-fa4212e2-307b-45ac-a239-755cbfdc1a7a">
-          <wsse:SecurityTokenReference wsu:Id="STR-a83d7df3-2320-4816-9790-0a585861c034">
-            <wsse:Reference URI="#X509-18cb578f-8e1a-4c77-a072-7c8ae43fa7bf" ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3"/>
+        <ds:SignatureValue>d4EOPHCS777dPNJnWG4ypAYA2Sc/WYOXx9m8bCh8IDr0BvPq09om+rjqmOo0wU1zC5fz9Gi79E0u3f/3JPWc5pznuZquvAEWxxzyHiRaYdIP3caYBg2kTQDUJMYX3DEiyXa7n++/2EK1CxWnv13QjVfBHPI9Mgg2uIq+bD2SyjUvcGKM3+5M43pxPdOvgLAv/8shD95IOwoqx6rUjJZsz9SJFpZSZwVIWriDcVNd+YGHLZLxNPEtS6LHoAD3a7mchiD9KsxwWam5W7R2jGyiK70xgzE8092LJy+Sg4cH3MylDYhQW7IIM0tN4RVrk/7tuzcjQmYvaYPHMJPp13N21w==</ds:SignatureValue>
+        <ds:KeyInfo Id="KI-cd276b81-677f-4267-a609-72127091aa47">
+          <wsse:SecurityTokenReference wsu:Id="STR-d7503a54-282b-443f-b7fe-7c75234e54b6">
+            <wsse:Reference URI="#X509-08ace21e-7f0d-4172-a4f1-19c11359a1b6" ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3"/>
           </wsse:SecurityTokenReference>
         </ds:KeyInfo>
       </ds:Signature>
     </wsse:Security>
-    <eb:Messaging env:mustUnderstand="true" wsu:Id="id-8a4408a9-7db0-40b3-9606-b0e20aa1c2ad" xmlns:eb="http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/ns/core/200704/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
-      <ns6:SignalMessage xmlns:ns10="http://begrep.difi.no" xmlns:ns2="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns3="http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader" xmlns:ns4="http://www.w3.org/2003/05/soap-envelope" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:ns6="http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/ns/core/200704/" xmlns:ns7="http://docs.oasis-open.org/ebxml-bp/ebbp-signals-2.0" xmlns:ns8="http://www.w3.org/1999/xlink" xmlns:ns9="http://begrep.difi.no/sdp/schema_v10">
+    <eb:Messaging env:mustUnderstand="true" wsu:Id="id-eebfa603-96ae-48a2-b128-15d1f4093c65" xmlns:eb="http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/ns/core/200704/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+      <ns6:SignalMessage xmlns:ns2="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns3="http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader" xmlns:ns4="http://www.w3.org/2003/05/soap-envelope" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:ns6="http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/ns/core/200704/" xmlns:ns7="http://docs.oasis-open.org/ebxml-bp/ebbp-signals-2.0" xmlns:ns8="http://www.w3.org/1999/xlink" xmlns:ns9="http://begrep.difi.no/sdp/schema_v10">
         <ns6:MessageInfo>
-          <ns6:Timestamp>2014-05-26T13:08:01.318+02:00</ns6:Timestamp>
-          <ns6:MessageId>96b99f7a-0bda-478e-98e6-acf93423cdc1</ns6:MessageId>
-          <ns6:RefToMessageId>26d13d81-b0ad-49e4-a90b-81560ca547ff</ns6:RefToMessageId>
+          <ns6:Timestamp>2014-06-02T12:37:19.941+02:00</ns6:Timestamp>
+          <ns6:MessageId>a53f7cc8-6f87-40f8-8cc9-5d2e8af34dfc</ns6:MessageId>
+          <ns6:RefToMessageId>e7f0f749-15a3-490a-bafe-6094a944cb5e</ns6:RefToMessageId>
         </ns6:MessageInfo>
         <ns6:Receipt>
           <ns7:NonRepudiationInformation>
             <ns7:MessagePartNRInformation>
-              <ns5:Reference URI="#id-05b891e1-d94e-4186-bcb9-396622489155">
+              <ns5:Reference URI="#id-2abee854-713a-4728-9e64-6f55707298aa">
                 <ns5:Transforms>
                   <ns5:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
                     <ec:InclusiveNamespaces PrefixList="" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
                   </ns5:Transform>
                 </ns5:Transforms>
                 <ns5:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-                <ns5:DigestValue>as2nBMFOXLcvpqdS/EpoNYggsFJn/MYeWdG4pOBCywk=</ns5:DigestValue>
+                <ns5:DigestValue>OIYZewLKIny6uX1I5HJ3p9oShNolEaBEjJOZ1gqrJnQ=</ns5:DigestValue>
               </ns5:Reference>
             </ns7:MessagePartNRInformation>
             <ns7:MessagePartNRInformation>
-              <ns5:Reference URI="cid:sdp:asic">
+              <ns5:Reference URI="cid:938da45b-e547-48c9-8ae8-4a3f849d26e2@meldingsformidler.sdp.difi.no">
                 <ns5:Transforms>
                   <ns5:Transform Algorithm="http://docs.oasis-open.org/wss/oasis-wss-SwAProfile-1.1#Attachment-Content-Signature-Transform"/>
                 </ns5:Transforms>
@@ -82,5 +82,5 @@
       </ns6:SignalMessage>
     </eb:Messaging>
   </env:Header>
-  <env:Body wsu:Id="id-5ea47f7b-fe89-4981-b005-26abf3601eb4" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
+  <env:Body wsu:Id="id-795e88eb-d343-42fd-89ce-4f665c6e67b4" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
 </env:Envelope>