Navigation Menu

Skip to content

Commit

Permalink
Oppdatert slik at eksempel er gyldig i forhold til spec
Browse files Browse the repository at this point in the history
  • Loading branch information
@landro
landro committed Apr 9, 2014
1 parent 84033cd commit 17b98dd
Show file tree
Hide file tree
Showing 2 changed files with 200 additions and 178 deletions.
2 changes: 1 addition & 1 deletion Meldingsutveksling/FormidleDigitalPostForsendelse.textile
View file
Expand Up @@ -33,7 +33,7 @@ h5. Protokoll
h5.

{background:#ddd}.|_. P-Mode |_. Verdi |
| PMode<notextile>[1]</notextile>.BusinessInfo.Service | "SDP" |
| PMode<notextile>[1]</notextile>.BusinessInfo.Service | "urn:sdp:service:sdp" |
{background:#ddd}.| PMode<notextile>[1]</notextile>.BusinessInfo.Action | "FormidleDigitalPost" |
| PMode<notextile>[1]</notextile>.BusinessInfo.Properties[]: | - ikke relevant - |

Expand Down
376 changes: 199 additions & 177 deletions eksempler/soap/1_request_forretningsmelding_fra_postavsender_til_meldingsformidler.xml
View file
@@ -1,179 +1,201 @@
<?xml version="1.0" ?>
<S12:Envelope xmlns:S12="http://www.w3.org/2003/05/soap-envelope" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/2003/05/soap-envelope http://www.w3.org/2003/05/soap-envelope">
<S12:Header>
<wsse:Security S12: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">
<ds:Signature Id="SIG-DE969A773C0E48851A139204210262312" 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 xsi" xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</ds:CanonicalizationMethod>
<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<ds:Reference URI="#id-DE969A773C0E48851A139204210260210">
<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>oQ8OT9OV+9Md/+FddyaNFEfzR85gXsd9KAugtk6/9EA=</ds:DigestValue>
</ds:Reference>
<ds:Reference URI="#id-DE969A773C0E48851A139204210261411">
<ds:Transforms>
<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
<ec:InclusiveNamespaces PrefixList="xsi" 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>Qt66RSmhjZqUkFRrMm33W209OPfht0Q2LrAcX/95uis=</ds:DigestValue>
</ds:Reference>
</ds:SignedInfo>
<ds:SignatureValue>VFw2UKvJYvXUnCpMno3kPldLQi7poMMwg/yed2/AaRmFvY6swqNvQbw9GqKDC4I/H
Z42INt3liTGskE2wHNJQJhE11DEUSC8pMZC38yrz/dgnPJd13p43mWRzUmlotCIWscJOf9+vn2zKMKxPCMb8
fWU8JPDkOU/boLFpUbVD5SqRJV50GoV8Q39MKBj5Pmg+sHR8Pw9KkNXJbIt3x1kqGTh9+x8m4Wp1j0pqQE1r
P/eSbxmlpCIWGeKOtvQlwHWypRc09CjY29rzAjG9Ux4cAfGlYJVgmnaCpfJjvWSVsdH31/iCt5xAEYe7DiGD
2tXHAM/5/Uz+3qfJvcxXHeo7g==</ds:SignatureValue>
<ds:KeyInfo Id="KI-DE969A773C0E48851A13920421025878">
<wsse:SecurityTokenReference wsu:Id="STR-DE969A773C0E48851A13920421025879">
<ds:X509Data>
<ds:X509IssuerSerial>
<ds:X509IssuerName>CN=Jentrata,OU=Jentrata,O=jentrata.org,L=Melbourne,ST=VIC,C=AU</ds:X509IssuerName>
<ds:X509SerialNumber>513240931</ds:X509SerialNumber>
</ds:X509IssuerSerial>
</ds:X509Data>
</wsse:SecurityTokenReference>
</ds:KeyInfo>
</ds:Signature>
</wsse:Security>
<eb:Messaging S12:mustUnderstand="true" id="ebmsHeader" wsu:Id="id-DE969A773C0E48851A139204210260210" 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" xsi:schemaLocation="http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/ns/core/200704/ http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/core/ebms-header-3_0-200704.xsd">
<!--TODO definerer kanal for pull requester -->

Avsender til MF:

SBD.Type: Digitalpost/ Varslingfeil / Åpning / Levering / Feil :

<eb:UserMessage mpc="urn:sdp:normal:identifier:123456789 (:avsenderidentifikator:1234) ">

SBD.Type: PrioritertDigitalpost :

<eb:UserMessage mpc="urn:sdp:prioritet:identifier:123456789 (:avsenderidentifikator:1234) ">

MF til PK:
<eb:UserMessage mpc="urn:sdp:normal:identifier:%%orgnr_MF%%">
<eb:UserMessage mpc="urn:sdp:prioritet:identifier:%%orgnr_MF%%">


PK til MF:
<eb:UserMessage mpc="urn:sdp:normal:identifier:%%orgnr_PK%%">
<eb:UserMessage mpc="urn:sdp:prioritet:identifier:%%orgnr_PK%%">


<eb:MessageInfo>
<eb:Timestamp>2014-02-10T14:21:42.520Z</eb:Timestamp>
<eb:MessageId>60a3ade5-84d1-46d7-b2cc-5f4fa15f41e5</eb:MessageId>
</eb:MessageInfo>

Avsender til MF:

<eb:PartyInfo>
<eb:From>
<!-- orgnr til avsender -->
<eb:PartyId type="urn:oasis:names:tc:ebcore:partyid-type:iso6523:9908">%%ORG_NR_DATABEHANDLER%%</eb:PartyId>
<!-- TODO spesifisere denne-->
<eb:Role>uri:som:identifiserar:rollen:avsender</eb:Role>
</eb:From>
<eb:To>
<!-- orgnr til meldingsformidler -->
<eb:PartyId type="urn:oasis:names:tc:ebcore:partyid-type:iso6523:9908">%%ORG_NR_MF%%</eb:PartyId>
<!-- TODO spesifisere denne -->
<eb:Role>uri:som:identifiserar:rollen:meldingsformidler</eb:Role>
</eb:To>
</eb:PartyInfo>

Fra MF til PK

<eb:PartyInfo>
<eb:From>
<!-- orgnr til avsender -->
<eb:PartyId type="urn:oasis:names:tc:ebcore:partyid-type:iso6523:9908">%%ORG_NR_MF%%</eb:PartyId>
<!-- TODO spesifisere denne-->
<eb:Role>uri:som:identifiserar:rollen:meldingsformidler</eb:Role>
</eb:From>
<eb:To>
<!-- orgnr til meldingsformidler -->
<eb:PartyId type="urn:oasis:names:tc:ebcore:partyid-type:iso6523:9908">%%ORG_NR_PK%%</eb:PartyId>
<!-- TODO spesifisere denne -->
<eb:Role>uri:som:identifiserar:rollen:postkasse</eb:Role>
</eb:To>
</eb:PartyInfo>


Fra PK til MF

<eb:PartyInfo>
<eb:From>
<!-- orgnr til avsender -->
<eb:PartyId type="urn:oasis:names:tc:ebcore:partyid-type:iso6523:9908">%%ORG_NR_PK%%</eb:PartyId>
<!-- TODO spesifisere denne-->
<eb:Role>uri:som:identifiserar:rollen:postkasse</eb:Role>
</eb:From>
<eb:To>
<!-- orgnr til meldingsformidler -->
<eb:PartyId type="urn:oasis:names:tc:ebcore:partyid-type:iso6523:9908">%%ORG_NR_MF%%</eb:PartyId>
<!-- TODO spesifisere denne -->
<eb:Role>uri:som:identifiserar:rollen:meldingsformidler</eb:Role>
</eb:To>
</eb:PartyInfo>


<eb:CollaborationInfo>
<!-- TODO lik for alle - kan utelates ref spec-->
<eb:AgreementRef>"PMode.Agreement :" = http://begrep.difi.local/SikkerDigitalPost/Meldingsutveksling/FormidleDigitalPostForsendelse</eb:AgreementRef>
<!-- TODO default AS4 service -->
<eb:Service>PMode[1].BusinessInfo.Service = "SDP"</eb:Service>
<!-- TODO default AS4 action -->
<eb:Action>"PMode[1].BusinessInfo.Action " = FormidleDigitalPost</eb:Action>
<!-- TODO detaljere innholdet av denne -->
<eb:ConversationId>%%SBD.InstanceIdentifier%%</eb:ConversationId>
</eb:CollaborationInfo>


<eb:PayloadInfo>
<eb:PartInfo href="#soapBody"/>
<!-- TODO standardisere cid ? -->
<!-- Avsender setter cid selv, men contenttype MÅ alltid settes contenttype i.h.h.t ASiC standarden. -->
<eb:PartInfo href="cid:sdp:asic" >
<contenttype></contenttype>
</eb:PartInfo>
</eb:PayloadInfo>


</eb:UserMessage>
</eb:Messaging>
</S12:Header>
<S12:Body xml:id="soapBody" wsu:Id="id-DE969A773C0E48851A139204210261411" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
<StandardBusinessDocument xmlns="http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader">
<StandardBusinessDocumentHeader>
<HeaderVersion>1.0</HeaderVersion>
<Sender>
<!-- orgnr avsender -->
<Identifier Authority="iso6523-actorid-upis">9908:123456789</Identifier>
</Sender>
<Receiver>
<!-- orgnr mottaker, postboks eller print -->
<Identifier Authority="iso6523-actorid-upis">9908:345678901</Identifier>
</Receiver>
<DocumentIdentification>
<Standard>urn:no:difi:sdp:1.0</Standard>
<TypeVersion>1.0</TypeVersion>
<!-- Dette er den reelle unike identifikatoren i SDBH - bør vera GUID! -->
<InstanceIdentifier>GUID-Conversation-ID</InstanceIdentifier>
<Type> Digitalpost/ Varslingfeil / Åpning / Levering / Feil </Type>
<CreationDateAndTime>2013-02-19T05:10:10Z</CreationDateAndTime>
</DocumentIdentification>
</StandardBusinessDocumentHeader>
<sdp:melding xmlns:sdp="http://begrep.difi.no/sdp/schema_v10">
<!-- .... -->
</sdp:melding>
</StandardBusinessDocument>
</S12:Body>
<S12:Envelope xmlns:S12="http://www.w3.org/2003/05/soap-envelope" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.w3.org/2003/05/soap-envelope http://www.w3.org/2003/05/soap-envelope">
<S12:Header>
<wsse:Security S12: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">
<ds:Signature Id="SIG-DE969A773C0E48851A139204210262312" 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 xsi" xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#"/>
</ds:CanonicalizationMethod>
<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
<ds:Reference URI="#id-DE969A773C0E48851A139204210260210">
<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>oQ8OT9OV+9Md/+FddyaNFEfzR85gXsd9KAugtk6/9EA=</ds:DigestValue>
</ds:Reference>
<ds:Reference URI="#id-DE969A773C0E48851A139204210261411">
<ds:Transforms>
<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
<ec:InclusiveNamespaces PrefixList="xsi" 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>Qt66RSmhjZqUkFRrMm33W209OPfht0Q2LrAcX/95uis=</ds:DigestValue>
</ds:Reference>
</ds:SignedInfo>
<ds:SignatureValue>VFw2UKvJYvXUnCpMno3kPldLQi7poMMwg/yed2/AaRmFvY6swqNvQbw9GqKDC4I/H
Z42INt3liTGskE2wHNJQJhE11DEUSC8pMZC38yrz/dgnPJd13p43mWRzUmlotCIWscJOf9+vn2zKMKxPCMb8
fWU8JPDkOU/boLFpUbVD5SqRJV50GoV8Q39MKBj5Pmg+sHR8Pw9KkNXJbIt3x1kqGTh9+x8m4Wp1j0pqQE1r
P/eSbxmlpCIWGeKOtvQlwHWypRc09CjY29rzAjG9Ux4cAfGlYJVgmnaCpfJjvWSVsdH31/iCt5xAEYe7DiGD
2tXHAM/5/Uz+3qfJvcxXHeo7g==
</ds:SignatureValue>
<ds:KeyInfo Id="KI-DE969A773C0E48851A13920421025878">
<wsse:SecurityTokenReference wsu:Id="STR-DE969A773C0E48851A13920421025879">
<ds:X509Data>
<ds:X509IssuerSerial>
<ds:X509IssuerName>CN=Jentrata,OU=Jentrata,O=jentrata.org,L=Melbourne,ST=VIC,C=AU</ds:X509IssuerName>
<ds:X509SerialNumber>513240931</ds:X509SerialNumber>
</ds:X509IssuerSerial>
</ds:X509Data>
</wsse:SecurityTokenReference>
</ds:KeyInfo>
</ds:Signature>
</wsse:Security>
<eb:Messaging S12:mustUnderstand="true" id="ebmsHeader" wsu:Id="id-DE969A773C0E48851A139204210260210"
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"
xsi:schemaLocation="http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/ns/core/200704/ http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/core/ebms-header-3_0-200704.xsd">
<!--
@mpc bærer informasjon om prioritet og hvem avsender er:
PRIORITET - normal | prioritert
ORG_NR_DATABEHANDLER - databehandlers organisasjonsnummer
Eksempel:
urn:sdp:normal:identifier:123456789
Leddet
:avsenderidentifikator:%%AVSENDERID%%
er ikke påkrevd, men kan brukes i tilfeller hvor samme databehandler sender på vegne av flere databehandlingsansvarlige
Eksempel:
urn:sdp:normal:identifier:123456789:avsenderidentifikator:123456
-->
<eb:UserMessage
mpc="urn:sdp:%%PRIORITET%%:identifier:%%ORG_NR_DATABEHANDLER%%:avsenderidentifikator:%%AVSENDERID%%">

<eb:MessageInfo>
<eb:Timestamp>2014-02-10T14:21:42.520Z</eb:Timestamp>
<eb:MessageId>60a3ade5-84d1-46d7-b2cc-5f4fa15f41e5</eb:MessageId>
</eb:MessageInfo>

<!--
PartyId brukes til å angi organisasjonsnummer til involverte parter :
ORG_NR_DATABEHANDLER - organisasjonsnummer databehandler, 9 siffer
ORG_NR_MF - organisasjonsnummer meldingsformidler, 9 siffer
Roller som finnes i SDP er:
Avsender - rollen som avsender av sikker digital post
Meldingsformidler - rollen som formidler av sikker digital post
Postkasse - rollen som tilbyder av postkasse for sikker digital post
-->
<eb:PartyInfo>
<eb:From>
<eb:PartyId type="urn:oasis:names:tc:ebcore:partyid-type:iso6523:9908">%%ORG_NR_DATABEHANDLER%%</eb:PartyId>
<eb:Role>Avsender</eb:Role>
</eb:From>
<eb:To>
<eb:PartyId type="urn:oasis:names:tc:ebcore:partyid-type:iso6523:9908">%%ORG_NR_MF%%</eb:PartyId>
<eb:Role>Meldingsformidler</eb:Role>
</eb:To>
</eb:PartyInfo>

<eb:CollaborationInfo>
<!--
AgreementRef brukes til å angi avtalen som regulerer forholdet
-->
<eb:AgreementRef>http://begrep.difi.no/SikkerDigitalPost/Meldingsutveksling/FormidleDigitalPostForsendelse
</eb:AgreementRef>
<!--
Service brukes til å angi hvilken tjeneste som skal benyttes
Eneste Service som finnes i SDP er:
urn:sdp:service:sdp
-->
<eb:Service>urn:sdp:service:sdp</eb:Service>
<!--
Action brukes til å angi hvilken action som skal benyttes
Actions som finnes i SDP er:
FormidleDigitalPost - formidle digital post videre til postkasse
PostkasseDigitalPost - motta digital post i en sluttbrukers postkasse
-->
<eb:Action>FormidleDigitalPost</eb:Action>
<!--
ConversationId brukes til å korrelere flere meldinger i en større samtale
I sdp brukes her samme verdi her som i StandardBusinessDocument.InstanceIdentifier
-->
<eb:ConversationId>%%SBD.InstanceIdentifier%%</eb:ConversationId>
</eb:CollaborationInfo>


<eb:PayloadInfo>
<!-- Avsender setter href selv, men MÅ alltid peke på SOAP body -->
<eb:PartInfo href="#soapBody">
<eb:PartProperties>
<!-- MimeType MÅ alltid settes til application/xml -->
<eb:Property name="MimeType">application/xml</eb:Property>
</eb:PartProperties>
</eb:PartInfo>
<!-- Avsender setter cid selv, men MÅ alltid peke på attachment med ASIC-E filen (datapakken) -->
<eb:PartInfo href="cid:sdp:asic">
<eb:PartProperties>
<!-- MimeType MÅ alltid settes til application/vnd.etsi.asic-e+zip -->
<eb:Property name="MimeType">application/vnd.etsi.asic-e+zip</eb:Property>
</eb:PartProperties>
</eb:PartInfo>
</eb:PayloadInfo>


</eb:UserMessage>
</eb:Messaging>
</S12:Header>
<S12:Body xml:id="soapBody" wsu:Id="id-DE969A773C0E48851A139204210261411"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
<StandardBusinessDocument xmlns="http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader">
<StandardBusinessDocumentHeader>
<HeaderVersion>1.0</HeaderVersion>

<Sender>
<!-- Orgnr databehandler -->
<Identifier Authority="iso6523-actorid-upis">9908:123456789</Identifier>
</Sender>
<Receiver>
<!-- Orgnr mottaker: postboks eller print -->
<Identifier Authority="iso6523-actorid-upis">9908:345678901</Identifier>
</Receiver>
<DocumentIdentification>
<Standard>urn:no:difi:sdp:1.0</Standard>
<TypeVersion>1.0</TypeVersion>
<!--
Unik innenfor databehandlers scope
Skal inneholde samme verdi som ConversationId
-->
<InstanceIdentifier>GUID-ConversationID</InstanceIdentifier>
<Type>Digitalpost/ Varslingfeil / Åpning / Levering / Feil</Type>
<CreationDateAndTime>2013-02-19T05:10:10Z</CreationDateAndTime>
</DocumentIdentification>
</StandardBusinessDocumentHeader>
<sdp:melding xmlns:sdp="http://begrep.difi.no/sdp/schema_v10">
<!-- .... -->
</sdp:melding>
</StandardBusinessDocument>
</S12:Body>
</S12:Envelope>

0 comments on commit 17b98dd

Please sign in to comment.