Merge branch 'develop' into dist/ubuntu/bionic/develop

internal/query/get_inbox.go

@@ -19,6 +19,7 @@ type InboxSearch struct {
 	From    string
 	Body    string
 	Subject string
+	Headers map[string]string
 	After   time.Time
 	Before  time.Time
 }
@@ -149,6 +150,38 @@ func HandleGetInbox(ctx context.Context, qry cqrs.Query) (interface{}, error) {
 			match = false
 		}
 
+		if req.Search.Headers != nil {
+			found := false
+
+			for searchKey, searchValue := range req.Search.Headers {
+				for headerKey, headerValues := range eml.Headers {
+					if searchKey != headerKey {
+						continue
+					}
+
+					for _, hv := range headerValues {
+						if strings.Contains(hv, searchValue) {
+							found = true
+
+							break
+						}
+					}
+
+					if found {
+						break
+					}
+				}
+
+				if found {
+					break
+				}
+			}
+
+			if !found {
+				match = false
+			}
+		}
+
 		if match {
 			filtered = append(filtered, eml)
 		}

internal/route/helper.go

@@ -1,6 +1,7 @@
 package route
 
 import (
+	"encoding/json"
 	"net/http"
 	"strconv"
 	"time"
@@ -75,6 +76,16 @@ func createInboxQueryFromRequest(r *http.Request) (*query.GetInboxRequest, error
 		}
 	}
 
+	var headers map[string]string
+
+	rawHeaders := r.URL.Query().Get("headers")
+	if rawHeaders != "" {
+		headers = make(map[string]string)
+		if err := json.Unmarshal([]byte(rawHeaders), &headers); err != nil {
+			return nil, errors.WithStack(err)
+		}
+	}
+
 	search := &query.InboxSearch{}
 	if to != "" {
 		search.To = to
@@ -96,6 +107,10 @@ func createInboxQueryFromRequest(r *http.Request) (*query.GetInboxRequest, error
 		search.Before = before
 	}
 
+	if rawHeaders != "" {
+		search.Headers = headers
+	}
+
 	inboxRequest := &query.GetInboxRequest{
 		OrderBy: orderBy,
 		Reverse: reverse == "y",

misc/api.http

@@ -0,0 +1,5 @@
+@baseURL = http://localhost:8080
+
+### Filter emails via headers
+
+GET {{ baseURL }}/api/v1/emails?headers={"Mime-Version":"1.0"}

misc/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.15 AS build
+FROM golang:1.17 AS build
 
 ARG HTTP_PROXY=
 ARG HTTPS_PROXY=
@@ -7,7 +7,7 @@ ARG https_proxy=
 
 RUN apt-get update && apt-get install -y build-essential git bash curl
 
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
     && apt-get install -y nodejs
 
 COPY . /src