diff --git a/saml/response_test.go b/saml/response_test.go
index 574b38b..840d886 100644
--- a/saml/response_test.go
+++ b/saml/response_test.go
@@ -9,13 +9,14 @@ import (
"testing"
"time"
- "github.com/hashicorp/cap/saml"
- "github.com/hashicorp/cap/saml/models/core"
- testprovider "github.com/hashicorp/cap/saml/test"
"github.com/jonboulle/clockwork"
saml2 "github.com/russellhaering/gosaml2"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
+ "github.com/hashicorp/cap/saml"
+ "github.com/hashicorp/cap/saml/models/core"
+ testprovider "github.com/hashicorp/cap/saml/test"
)
var testExpiredResp = `<?xml version="1.0" encoding="UTF-8"?>
<saml2p:Response Destination="http://localhost:8000/saml/acs" ID="_8849c2ee532fcdb781f2a1776eac3741" InResponseTo="bc5a5baa-94e0-58a8-872c-e51491d2b3ee" IssueInstant="2023-08-25T14:32:53.680Z" Version="2.0" xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><saml2:Issuer xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">https://samltest.id/saml/idp</saml2:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><ds:Reference URI="#_8849c2ee532fcdb781f2a1776eac3741"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces PrefixList="xsd" 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>RV485uKGJZmNA1o56gxxk+VZkvxMqtlHZA2iHH8ZU1Q=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>d3Lpc6hcSB7bwCzMrO3wfZrNiGk5gZ8rKRKOQENDP2q+p3+LkDmSBt6zzyxn33MCSJt+dPHpF14YMAK/N3PnWwSSUp0j5kzOc9Ka5NdianE0NgYnU0qjhFJbThAQz7hRowS4J49hS/6MuSQ0Z7nBBCeDgeD6PYRApKMvlOtkBGPJaLT2mRy/gnQ+CC6udUdJyvSgb9n43lvxdaaZWrDK3Wga98YlkcRHLrmPAAM8KxYWnkopio6YINU4D5mZjsEsnUkH41WgcwgmS2xzP3ICnNc3WH9NHrVKp9at2DBwrYDIses6FXgYq+iUWK2191jWpIC3qVAB0cOilmRXwtEH7g==</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDEjCCAfqgAwIBAgIVAMECQ1tjghafm5OxWDh9hwZfxthWMA0GCSqGSIb3DQEBCwUAMBYxFDAS
BgNVBAMMC3NhbWx0ZXN0LmlkMB4XDTE4MDgyNDIxMTQwOVoXDTM4MDgyNDIxMTQwOVowFjEUMBIG
A1UEAwwLc2FtbHRlc3QuaWQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0Z4QX1NFK
s71ufbQwoQoW7qkNAJRIANGA4iM0ThYghul3pC+FwrGv37aTxWXfA1UG9njKbbDreiDAZKngCgyj
xj0uJ4lArgkr4AOEjj5zXA81uGHARfUBctvQcsZpBIxDOvUUImAl+3NqLgMGF2fktxMG7kX3GEVN
c1klbN3dfYsaw5dUrw25DheL9np7G/+28GwHPvLb4aptOiONbCaVvh9UMHEA9F7c0zfF/cL5fOpd
Va54wTI0u12CsFKt78h6lEGG5jUs/qX9clZncJM7EFkN3imPPy+0HC8nspXiH/MZW8o2cqWRkrw3
MzBZW3Ojk5nQj40V6NUbjb7kfejzAgMBAAGjVzBVMB0GA1UdDgQWBBQT6Y9J3Tw/hOGc8PNV7JEE
4k2ZNTA0BgNVHREELTArggtzYW1sdGVzdC5pZIYcaHR0cHM6Ly9zYW1sdGVzdC5pZC9zYW1sL2lk
cDANBgkqhkiG9w0BAQsFAAOCAQEASk3guKfTkVhEaIVvxEPNR2w3vWt3fwmwJCccW98XXLWgNbu3
YaMb2RSn7Th4p3h+mfyk2don6au7Uyzc1Jd39RNv80TG5iQoxfCgphy1FYmmdaSfO8wvDtHTTNiL
ArAxOYtzfYbzb5QrNNH/gQEN8RJaEf/g/1GTw9x/103dSMK0RXtl+fRs2nblD1JJKSQ3AdhxK/we
P3aUPtLxVVJ9wMOQOfcy02l+hHMb6uAjsPOpOVKqi3M8XmcUZOpx4swtgGdeoSpeRyrtMvRwdcci
NBp9UZome44qZAYH1iqrpmmjsfI9pJItsgWu3kXPjhSfj1AJGR1l9JGvJrHki1iHTA==</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><saml2p:Status><saml2p:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/></saml2p:Status><saml2:Assertion ID="_35ea90b711d6f385345f0dbdd7d0ed5b" IssueInstant="2023-08-25T14:32:53.680Z" Version="2.0" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"><saml2:Issuer>https://samltest.id/saml/idp</saml2:Issuer><saml2:Subject><saml2:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress" NameQualifier="https://samltest.id/saml/idp" SPNameQualifier="http://saml.julz/example" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">msmith@samltest.id</saml2:NameID><saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><saml2:SubjectConfirmationData Address="104.28.39.34" InResponseTo="bc5a5baa-94e0-58a8-872c-e51491d2b3ee" NotOnOrAfter="2023-08-25T14:37:53.693Z" Recipient="http://localhost:8000/saml/acs"/></saml2:SubjectConfirmation></saml2:Subject><saml2:Conditions NotBefore="2023-08-25T14:32:53.680Z" NotOnOrAfter="2023-08-25T14:37:53.680Z"><saml2:AudienceRestriction><saml2:Audience>http://saml.julz/example</saml2:Audience></saml2:AudienceRestriction></saml2:Conditions><saml2:AuthnStatement AuthnInstant="2023-08-25T14:31:56.064Z" SessionIndex="_f72a63ee3782b47c89f60e81adde0ab0"><saml2:SubjectLocality Address="104.28.39.34"/><saml2:AuthnContext><saml2:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</saml2:AuthnContextClassRef></saml2:AuthnContext></saml2:AuthnStatement><saml2:AttributeStatement><saml2:Attribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue>Ambassador</saml2:AttributeValue><saml2:AttributeValue>None</saml2:AttributeValue></saml2:Attribute><saml2:Attribute Name="urn:oasis:names:tc:SAML:attribute:subject-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">msmith@samltest.id</saml2:AttributeValue></saml2:Attribute><saml2:Attribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue>morty</saml2:AttributeValue></saml2:Attribute><saml2:Attribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue>+1-555-555-5505</saml2:AttributeValue></saml2:Attribute><saml2:Attribute FriendlyName="role" Name="https://samltest.id/attributes/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">janitor@samltest.id</saml2:AttributeValue></saml2:Attribute><saml2:Attribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue>msmith@samltest.id</saml2:AttributeValue></saml2:Attribute><saml2:Attribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue>Smith</saml2:AttributeValue></saml2:Attribute><saml2:Attribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue>Morty Smith</saml2:AttributeValue></saml2:Attribute><saml2:Attribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><saml2:AttributeValue>Mortimer</saml2:AttributeValue></saml2:Attribute></saml2:AttributeStatement></saml2:Assertion></saml2p:Response>`
@@ -24,12 +25,16 @@ var testExpiredResp = `PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNhb
func TestServiceProvider_ParseResponse(t *testing.T) {
t.Parallel()
const (
- testRequestId = "bc5a5baa-94e0-58a8-872c-e51491d2b3ee"
- testEntityID = "http://saml.julz/example"
- testAcs = "http://localhost:8000/saml/acs"
- metadataURL = "https://samltest.id/saml/idp"
+ testRequestId = "test-request-id"
+ testEntityID = "http://hashicorp-cap.test"
+ testAcs = "http://hashicorp-cap.test/saml/acs"
)
+ tp := testprovider.StartTestProvider(t)
+ defer tp.Close()
+
+ metadataURL := fmt.Sprintf("%s/saml/metadata", tp.ServerURL())
+
testCfg, err := saml.NewConfig(testEntityID, testAcs, metadataURL)
require.NoError(t, err)
testSp, err := saml.NewServiceProvider(testCfg)
@@ -38,7 +43,7 @@ func TestServiceProvider_ParseResponse(t *testing.T) {
fakeTime, err := time.Parse("2006-01-02 15:04:05", "2023-08-25 14:33:53")
require.NoError(t, err)
- testCfgWithBadMetadata, err := saml.NewConfig(testEntityID, testAcs, "https://samltest.id/saml/idp-invalid")
+ testCfgWithBadMetadata, err := saml.NewConfig(testEntityID, testAcs, fmt.Sprintf("%s/saml/invalid", tp.ServerURL()))
require.NoError(t, err)
testSpWithInvalidMetadataURL, err := saml.NewServiceProvider(testCfgWithBadMetadata)
require.NoError(t, err)
@@ -55,12 +60,10 @@ func TestServiceProvider_ParseResponse(t *testing.T) {
wantErrAs error
}{
{
- name: "success",
- sp: testSp,
- samlResp: testExpiredResp,
- opts: []saml.Option{
- saml.WithClock(clockwork.NewFakeClockAt(fakeTime)),
- },
+ name: "success",
+ sp: testSp,
+ samlResp: base64.StdEncoding.EncodeToString([]byte(tp.SamlResponse(t, testprovider.WithResponseSigned()))),
+ opts: []saml.Option{},
requestID: testRequestId,
},
{
@@ -139,19 +142,19 @@ func TestServiceProvider_ParseResponse(t *testing.T) {
wantErrContains: "unable to validate encoded response: illegal base64 data",
},
{
- name: "err-in-response-to",
- sp: testSp,
- samlResp: testExpiredResp,
- opts: []saml.Option{
- saml.WithClock(clockwork.NewFakeClockAt(fakeTime)),
- },
+ name: "err-in-response-to",
+ sp: testSp,
+ samlResp: base64.StdEncoding.EncodeToString([]byte(tp.SamlResponse(t, testprovider.WithResponseSigned()))),
requestID: "invalid-request-id",
wantErrContains: "doesn't match the expected requestID (invalid-request-id)",
},
{
- name: "expired",
- sp: testSp,
- samlResp: testExpiredResp,
+ name: "expired",
+ sp: testSp,
+ samlResp: base64.StdEncoding.EncodeToString([]byte(tp.SamlResponse(t,
+ testprovider.WithResponseSigned(),
+ testprovider.WithResponseExpired(),
+ ))),
requestID: "request-id",
wantErrAs: &saml2.ErrInvalidValue{},
wantErrContains: "unable to validate encoded response: Expired NotOnOrAfter value",
@@ -191,13 +194,13 @@ func TestServiceProvider_ParseResponse(t *testing.T) {
}
return
}
- require.NoError(err)
+ require.NoError(err, tc.name)
assert.Equal(testRequestId, got.InResponseTo)
- assert.Equal("http://localhost:8000/saml/acs", got.Destination)
+ assert.Equal("http://hashicorp-cap.test/saml/acs", got.Destination)
assert.Equal("urn:oasis:names:tc:SAML:2.0:status:Success", got.Status.StatusCode.Value)
- assert.Equal(metadataURL, got.Issuer())
- assert.Equal("msmith@samltest.id", got.Assertions()[0].Subject.NameID.Value)
- assert.Equal("_35ea90b711d6f385345f0dbdd7d0ed5b", got.Assertions()[0].ID)
+ assert.Equal("http://test.idp", got.Issuer())
+ assert.Equal("name-id", got.Assertions()[0].Subject.NameID.Value)
+ assert.Equal("assertion-id", got.Assertions()[0].ID)
})
}
}
@@ -213,7 +216,7 @@ func TestServiceProvider_ParseResponseCustomACS(t *testing.T) {
defer tp.Close()
cfg, err := saml.NewConfig(
- "http://test.me/entity",
+ "http://hashicorp-cap.test",
"http://test.me/saml/acs",
fmt.Sprintf("%s/saml/metadata", tp.ServerURL()),
)
@@ -288,7 +291,7 @@ const responseUnsigned = `
- http://test.me/entity
+ http://hashicorp-cap.test
@@ -313,11 +316,11 @@ const responseUnsigned = `
const testRespNoAssertions = `
-
https://samltest.id/saml/idp
+ xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">http://test.idp
@@ -363,11 +366,11 @@ NBp9UZome44qZAYH1iqrpmmjsfI9pJItsgWu3kXPjhSfj1AJGR1l9JGvJrHki1iHTA==
-
https://samltest.id/saml/idp
+ xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">http://test.idp
@@ -410,13 +413,13 @@ NBp9UZome44qZAYH1iqrpmmjsfI9pJItsgWu3kXPjhSfj1AJGR1l9JGvJrHki1iHTA==
- https://samltest.id/saml/idp
+ http://test.idp
msmith@samltest.id
-
+
@@ -470,11 +473,11 @@ NBp9UZome44qZAYH1iqrpmmjsfI9pJItsgWu3kXPjhSfj1AJGR1l9JGvJrHki1iHTA==
-
https://samltest.id/saml/idp
+ xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">http://test.idp
@@ -517,19 +520,19 @@ NBp9UZome44qZAYH1iqrpmmjsfI9pJItsgWu3kXPjhSfj1AJGR1l9JGvJrHki1iHTA==
- https://samltest.id/saml/idp
+ http://test.idp
msmith@samltest.id
-
+
- http://saml.julz/example
+ http://hashicorp-cap.test
@@ -578,11 +581,11 @@ NBp9UZome44qZAYH1iqrpmmjsfI9pJItsgWu3kXPjhSfj1AJGR1l9JGvJrHki1iHTA==
-
https://samltest.id/saml/idp
+ xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">http://test.idp
@@ -625,11 +628,11 @@ NBp9UZome44qZAYH1iqrpmmjsfI9pJItsgWu3kXPjhSfj1AJGR1l9JGvJrHki1iHTA==
- https://samltest.id/saml/idp
+ http://test.idp
- http://saml.julz/example
+ http://hashicorp-cap.test
@@ -678,11 +681,11 @@ NBp9UZome44qZAYH1iqrpmmjsfI9pJItsgWu3kXPjhSfj1AJGR1l9JGvJrHki1iHTA==
-
https://samltest.id/saml/idp
+ xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion">http://test.idp
@@ -725,19 +728,18 @@ NBp9UZome44qZAYH1iqrpmmjsfI9pJItsgWu3kXPjhSfj1AJGR1l9JGvJrHki1iHTA==
- https://samltest.id/saml/idp
+ http://test.idp
- msmith@samltest.id
-
+
- .
- http://saml.julz/example
+ http://hashicorp-cap.test
diff --git a/saml/test/provider.go b/saml/test/provider.go
index b4b9d7f..025577d 100644
--- a/saml/test/provider.go
+++ b/saml/test/provider.go
@@ -19,6 +19,9 @@ import (
"testing"
"time"
+ "github.com/beevik/etree"
+ "github.com/russellhaering/gosaml2/types"
+ dsig "github.com/russellhaering/goxmldsig"
"github.com/stretchr/testify/require"
"github.com/hashicorp/cap/saml/models/core"
@@ -46,8 +49,8 @@ const meta = `
`
// From https://www.samltool.com/generic_sso_res.php
-const responseSigned = `
-
+const ResponseSigned = `
+
http://idp.example.com/metadata.php
@@ -118,8 +121,9 @@ func (s *SAMLResponsePostData) PostRequest(t *testing.T) *http.Request {
// TestProvider is an identity provider that can be used for testing
// SAML federeation and authentication flows.
type TestProvider struct {
- t *testing.T
- server *httptest.Server
+ t *testing.T
+ server *httptest.Server
+ keystore dsig.X509KeyStore
metadata *metadata.EntityDescriptorIDPSSO
recorder *httptest.ResponseRecorder
@@ -199,9 +203,18 @@ func StartTestProvider(t *testing.T) *TestProvider {
err := xml.Unmarshal([]byte(meta), &m)
r.NoError(err)
+ keystore := dsig.RandomKeyStoreForTest()
+ _, cert, err := keystore.GetKeyPair()
+ r.NoError(err)
+
+ b64Cert := base64.StdEncoding.EncodeToString(cert)
+
+ m.IDPSSODescriptor[0].RoleDescriptor.KeyDescriptor[0].KeyInfo.X509Data.X509Certificates[0].Data = b64Cert
+
provider := &TestProvider{
t: t,
metadata: &m,
+ keystore: keystore,
}
provider.defaults()
@@ -272,14 +285,13 @@ func (p *TestProvider) loginHandlerPost(w http.ResponseWriter, req *http.Request
relayState := req.FormValue("RelayState")
r.Equal(p.expectedRelayState, relayState, "relay state doesn't match")
- http.Error(w, "not implemented", http.StatusNotImplemented)
samlReq := p.parseRequestPost(rawReq)
p.validateRequest(samlReq)
samlResponseData := &SAMLResponsePostData{
- SAMLResponse: responseSigned,
+ SAMLResponse: ResponseSigned,
RelayState: relayState,
Destination: samlReq.AssertionConsumerServiceURL,
}
@@ -312,7 +324,7 @@ func (p *TestProvider) loginHandlerRedirect(w http.ResponseWriter, req *http.Req
p.validateRequest(samlReq)
samlResponseData := &SAMLResponsePostData{
- SAMLResponse: responseSigned,
+ SAMLResponse: ResponseSigned,
RelayState: relayState,
Destination: samlReq.AssertionConsumerServiceURL,
}
@@ -417,3 +429,132 @@ func (p *TestProvider) parseRequestPost(request string) *core.AuthnRequest {
return &req
}
+
+type responseOptions struct {
+ sign bool
+ expired bool
+}
+
+type ResponseOption func(*responseOptions)
+
+func getResponseOptions(opts ...ResponseOption) *responseOptions {
+ defaults := defaultResponseOptions()
+ for _, o := range opts {
+ o(defaults)
+ }
+
+ return defaults
+}
+
+func defaultResponseOptions() *responseOptions {
+ return &responseOptions{}
+}
+
+func WithResponseSigned() ResponseOption {
+ return func(o *responseOptions) {
+ o.sign = true
+ }
+}
+
+func WithResponseExpired() ResponseOption {
+ return func(o *responseOptions) {
+ o.expired = true
+ }
+}
+
+func (p *TestProvider) SamlResponse(t *testing.T, opts ...ResponseOption) string {
+ r := require.New(t)
+
+ opt := getResponseOptions(opts...)
+
+ notOnOrAfter := "2200-01-18T06:21:48Z"
+
+ if opt.expired {
+ notOnOrAfter = "2001-01-18T06:21:48Z"
+ }
+
+ response := &core.Response{
+ Response: types.Response{
+ Destination: "http://hashicorp-cap.test/saml/acs",
+ ID: "test-resp-id",
+ InResponseTo: "test-request-id",
+ IssueInstant: time.Now(),
+ Version: "2.0",
+ Issuer: &types.Issuer{
+ Value: "http://test.idp",
+ },
+ Status: &types.Status{
+ StatusCode: &types.StatusCode{
+ Value: string(core.StatusCodeSuccess),
+ },
+ },
+ Assertions: []types.Assertion{
+ {
+ ID: "assertion-id",
+ Issuer: &types.Issuer{
+ Value: "http://test.idp",
+ },
+ Subject: &types.Subject{
+ NameID: &types.NameID{
+ Value: "name-id",
+ },
+ SubjectConfirmation: &types.SubjectConfirmation{
+ Method: "urn:oasis:names:tc:SAML:2.0:cm:bearer",
+ SubjectConfirmationData: &types.SubjectConfirmationData{
+ InResponseTo: "test-request-id",
+ Recipient: "http://hashicorp-cap.test/saml/acs",
+ NotOnOrAfter: notOnOrAfter,
+ },
+ },
+ },
+ Conditions: &types.Conditions{
+ NotBefore: "2001-01-18T06:21:48Z",
+ NotOnOrAfter: notOnOrAfter,
+ AudienceRestrictions: []types.AudienceRestriction{
+ {
+ Audiences: []types.Audience{
+ {Value: "http://hashicorp-cap.test"},
+ },
+ },
+ },
+ },
+ AttributeStatement: &types.AttributeStatement{
+ Attributes: []types.Attribute{
+ {
+ Name: "mail",
+ NameFormat: "urn:oasis:names:tc:SAML:2.0:attrname-format:basic",
+ Values: []types.AttributeValue{
+ {
+ Type: "xs:string",
+ Value: "user@hashicorp-cap.test",
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ }
+
+ resp, err := xml.Marshal(response)
+ r.NoError(err)
+
+ doc := etree.NewDocument()
+ err = doc.ReadFromBytes(resp)
+ r.NoError(err)
+
+ if opt.sign {
+ signCtx := dsig.NewDefaultSigningContext(p.keystore)
+
+ signed, err := signCtx.SignEnveloped(doc.Root())
+ r.NoError(err)
+
+ doc.SetRoot(signed)
+ }
+
+ result, err := doc.WriteToString()
+ r.NoError(err)
+
+ return result
+}