Merge branch '36-email-header-svdx-hostname' into 'main'

Add email header with SVDX public hostname

Closes #36

See merge request !37

.gitlab-ci.yml

@@ -2,14 +2,15 @@ stages:
   - check
   - test
 
+before_script:
+  - ln -s /builds /go/src/code.vereign.com
+  - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
+
 generate:swagger:
   image: golang:1.21.3
   stage: check
   tags:
     - amd64-docker
-  before_script:
-    - ln -s /builds /go/src/code.vereign.com
-    - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
   script:
     - go version
     - ./generate_swagger.sh
@@ -36,9 +37,6 @@ linters:
   stage: test
   tags:
     - amd64-docker
-  before_script:
-    - ln -s /builds /go/src/code.vereign.com
-    - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
   script:
     - go version
     - golangci-lint --version
@@ -49,9 +47,6 @@ unit tests:
   stage: test
   tags:
     - amd64-docker
-  before_script:
-    - ln -s /builds /go/src/code.vereign.com
-    - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
   script:
     - go version
     - go test -race ./... -coverprofile=coverage.out
@@ -63,9 +58,6 @@ govulncheck:
   stage: test
   tags:
     - amd64-docker
-  before_script:
-    - ln -s /builds /go/src/code.vereign.com
-    - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
   script:
     - go version
     - go install golang.org/x/vuln/cmd/govulncheck@latest

internal/service/ocm_mail_delivery.go

@@ -69,10 +69,16 @@ func (s *Service) ocmSendEmail(ctx context.Context, origin net.Addr, connID stri
 		return "", fmt.Errorf("error parsing FROM header: %v", err)
 	}
 
+	hostname, err := s.didcomm.ServiceEndpointHostname()
+	if err != nil {
+		return "", err
+	}
+
 	// generate unique message identifier and add to email headers
 	msgID = uuid.NewString()
 	msg.AddHeaders(map[string]string{
-		headerMessageID: msgID,
+		headerMessageID:    msgID,
+		headerSvdxHostname: hostname,
 	})
 
 	// add custom Received header value

internal/service/service.go

@@ -26,6 +26,7 @@ const (
 	headerDIDConnectionID    = "x-did-connection-id"
 	headerRecipientEmail     = "x-recipient-email"
 	headerMessageID          = "x-message-id"
+	headerSvdxHostname       = "x-svdx-hostname"
 	headerFrom               = "from"
 )