Merge pull request #633 from marle3003/develop

Develop

Author: marle3003

acceptance/mail_test.go

@@ -94,7 +94,7 @@ func (suite *MailSuite) TestSendMail() {
 		smtptest.WithSubject("Test Mail"),
 		smtptest.WithRootCa(ca),
 	)
-	require.EqualError(suite.T(), err, "550 [5 1 0] rule allowSender: sender [email protected] does not match allow rule: .*@foo.bar")
+	require.EqualError(suite.T(), err, "550 [5 1 0] Rule allowSender: Sender [email protected] does not match allow rule: .*@foo.bar")
 
 	//from := "[email protected]"
 	//password := "super_secret_password"

acceptance/petstore_test.go

@@ -327,7 +327,7 @@ func (suite *PetStoreSuite) TestKafka3_Consume() {
 func (suite *PetStoreSuite) TestSearch_Paging() {
 	time.Sleep(3 * time.Second)
 
-	try.GetRequest(suite.T(), fmt.Sprintf("http://127.0.0.1:%v/api/search/query?q=api:%%22Swagger%%20Petstore%%22", suite.cfg.Api.Port),
+	try.GetRequest(suite.T(), fmt.Sprintf("http://127.0.0.1:%v/api/search/query?q=api:%%22Swagger%%20Petstore%%22%%20type:http", suite.cfg.Api.Port),
 		nil,
 		try.HasStatusCode(http.StatusOK),
 		try.AssertBody(func(t *testing.T, body string) {
@@ -347,7 +347,7 @@ func (suite *PetStoreSuite) TestSearch_Paging() {
 		}),
 	)
 
-	try.GetRequest(suite.T(), fmt.Sprintf("http://127.0.0.1:%v/api/search/query?q=api:%%22Swagger%%20Petstore%%22&index=1", suite.cfg.Api.Port),
+	try.GetRequest(suite.T(), fmt.Sprintf("http://127.0.0.1:%v/api/search/query?q=api:%%22Swagger%%20Petstore%%22%%20type:http&index=1", suite.cfg.Api.Port),
 		nil,
 		try.HasStatusCode(http.StatusOK),
 		try.AssertBody(func(t *testing.T, body string) {

api/handler_mail.go

@@ -213,6 +213,8 @@ func (h *handler) handleMailService(w http.ResponseWriter, r *http.Request) {
 	if s.Store.Settings != nil {
 		result.Settings.MaxRecipients = s.Store.Settings.MaxRecipients
 		result.Settings.AutoCreateMailbox = s.Store.Settings.AutoCreateMailbox
+	} else {
+		result.Settings.AutoCreateMailbox = true
 	}
 
 	for mName, m := range s.Store.Mailboxes {

api/handler_mail_test.go

@@ -46,7 +46,7 @@ func TestHandler_Smtp(t *testing.T) {
 			responseBody: `[{"name":"foo","description":"bar","version":"2.1","type":"mail"}]`,
 		},
 		{
-			name: "/api/services/mail",
+			name: "get /api/services/mail",
 			app: func() *runtime.App {
 				app := runtime.New(&static.Config{})
 				app.Mail.Set("foo", &runtime.MailInfo{
@@ -57,7 +57,7 @@ func TestHandler_Smtp(t *testing.T) {
 			},
 			requestUrl:   "http://foo.api/api/services/mail/foo",
 			contentType:  "application/json",
-			responseBody: `{"name":"foo","settings":{"maxRecipients":0,"autoCreateMailbox":false}}`,
+			responseBody: `{"name":"foo","settings":{"maxRecipients":0,"autoCreateMailbox":true}}`,
 		},
 		{
 			name: "get smtp service",
@@ -77,7 +77,7 @@ func TestHandler_Smtp(t *testing.T) {
 			},
 			requestUrl:   "http://foo.api/api/services/mail/foo",
 			contentType:  "application/json",
-			responseBody: `{"name":"foo","mailboxes":[{"name":"[email protected]","username":"alice","password":"foo","numMessages":0}],"configs":[{"id":"64613435-3062-6462-3033-316532633233","url":"file://foo.yml","provider":"test","time":"2023-12-27T13:01:30Z"}],"settings":{"maxRecipients":0,"autoCreateMailbox":false}}`,
+			responseBody: `{"name":"foo","mailboxes":[{"name":"[email protected]","username":"alice","password":"foo","numMessages":0}],"configs":[{"id":"64613435-3062-6462-3033-316532633233","url":"file://foo.yml","provider":"test","time":"2023-12-27T13:01:30Z"}],"settings":{"maxRecipients":0,"autoCreateMailbox":true}}`,
 		},
 		{
 			name: "get smtp service with mailbox",
@@ -101,7 +101,7 @@ func TestHandler_Smtp(t *testing.T) {
 			},
 			requestUrl:   "http://foo.api/api/services/mail/foo",
 			contentType:  "application/json",
-			responseBody: `{"name":"foo","mailboxes":[{"name":"[email protected]","username":"alice","password":"foo","numMessages":0}],"settings":{"maxRecipients":0,"autoCreateMailbox":false}}`,
+			responseBody: `{"name":"foo","mailboxes":[{"name":"[email protected]","username":"alice","password":"foo","numMessages":0}],"settings":{"maxRecipients":0,"autoCreateMailbox":true}}`,
 		},
 		{
 			name: "get smtp service with rules",
@@ -125,7 +125,7 @@ func TestHandler_Smtp(t *testing.T) {
 			},
 			requestUrl:   "http://foo.api/api/services/mail/foo",
 			contentType:  "application/json",
-			responseBody: `{"name":"foo","rules":[{"name":"foo","sender":"[email protected]","recipient":"[email protected]","subject":"foo","body":"bar","action":"deny"}],"settings":{"maxRecipients":0,"autoCreateMailbox":false}}`,
+			responseBody: `{"name":"foo","rules":[{"name":"foo","sender":"[email protected]","recipient":"[email protected]","subject":"foo","body":"bar","action":"deny"}],"settings":{"maxRecipients":0,"autoCreateMailbox":true}}`,
 		},
 		{
 			name: "get smtp mailboxes",

api/handler_search.go

@@ -1,7 +1,6 @@
 package api
 
 import (
-	"github.com/pkg/errors"
 	"mokapi/runtime/search"
 	"net/http"
 	"net/url"
@@ -12,6 +11,12 @@ const queryText = "q"
 const searchLimit = "limit"
 const searchIndex = "index"
 
+var searchFacetExcludeQueryParams = map[string]bool{
+	queryText:   true,
+	searchLimit: true,
+	searchIndex: true,
+}
+
 func (h *handler) getSearchResults(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
 
@@ -26,13 +31,11 @@ func (h *handler) getSearchResults(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	sr.Facets = getFacets(r.URL.Query())
+
 	results, err := h.app.Search(sr)
 	if err != nil {
-		if errors.Is(err, &search.ErrNotEnabled{}) {
-			writeError(w, err, http.StatusBadRequest)
-		} else {
-			writeError(w, err, http.StatusInternalServerError)
-		}
+		writeError(w, err, http.StatusBadRequest)
 	} else {
 		writeJsonBody(w, results)
 	}
@@ -47,3 +50,13 @@ func getQueryParamInsensitive(values url.Values, key string) string {
 	}
 	return ""
 }
+
+func getFacets(query url.Values) map[string]string {
+	facets := make(map[string]string)
+	for key, values := range query {
+		if !searchFacetExcludeQueryParams[key] {
+			facets[key] = values[0]
+		}
+	}
+	return facets
+}

api/handler_search_test.go

@@ -1,19 +1,23 @@
 package api
 
 import (
+	"encoding/json"
+	"github.com/stretchr/testify/require"
 	"mokapi/config/dynamic"
+	"mokapi/config/dynamic/asyncApi/asyncapitest"
 	"mokapi/config/dynamic/dynamictest"
 	"mokapi/config/static"
-	"mokapi/providers/openapi"
+	"mokapi/engine/enginetest"
 	"mokapi/providers/openapi/openapitest"
 	"mokapi/runtime"
+	"mokapi/runtime/search"
 	"mokapi/try"
 	"net/http"
 	"testing"
 )
 
 func TestHandler_SearchQuery(t *testing.T) {
-	toConfig := func(c *openapi.Config) *dynamic.Config {
+	toConfig := func(c any) *dynamic.Config {
 		cfg := &dynamic.Config{
 			Info: dynamictest.NewConfigInfo(),
 			Data: c,
@@ -34,7 +38,7 @@ func TestHandler_SearchQuery(t *testing.T) {
 			response: []try.ResponseCondition{
 				try.HasStatusCode(200),
 				try.HasHeader("Content-Type", "application/json"),
-				try.HasBody(`{"results":[{"type":"HTTP","title":"foo","params":{"service":"foo","type":"http"}}],"total":1}`),
+				try.HasBody(`{"results":[{"type":"HTTP","title":"foo","params":{"service":"foo","type":"http"}}],"facets":{"type":[{"value":"HTTP","count":1}]},"total":1}`),
 			},
 			app: func() *runtime.App {
 				app := runtime.New(&static.Config{Api: static.Api{Search: static.Search{
@@ -53,7 +57,7 @@ func TestHandler_SearchQuery(t *testing.T) {
 			response: []try.ResponseCondition{
 				try.HasStatusCode(200),
 				try.HasHeader("Content-Type", "application/json"),
-				try.HasBody(`{"results":[{"type":"HTTP","title":"foo","fragments":["\u003cmark\u003efoo\u003c/mark\u003e"],"params":{"service":"foo","type":"http"}}],"total":1}`),
+				try.HasBody(`{"results":[{"type":"HTTP","title":"foo","fragments":["\u003cmark\u003efoo\u003c/mark\u003e"],"params":{"service":"foo","type":"http"}}],"facets":{"type":[{"value":"HTTP","count":1}]},"total":1}`),
 			},
 			app: func() *runtime.App {
 				app := runtime.New(&static.Config{Api: static.Api{Search: static.Search{
@@ -72,7 +76,7 @@ func TestHandler_SearchQuery(t *testing.T) {
 			response: []try.ResponseCondition{
 				try.HasStatusCode(200),
 				try.HasHeader("Content-Type", "application/json"),
-				try.HasBody(`{"results":[{"type":"HTTP","title":"foo","fragments":["\u003cmark\u003efoo\u003c/mark\u003e"],"params":{"service":"foo","type":"http"}}],"total":1}`),
+				try.HasBody(`{"results":[{"type":"HTTP","title":"foo","fragments":["\u003cmark\u003efoo\u003c/mark\u003e"],"params":{"service":"foo","type":"http"}}],"facets":{"type":[{"value":"HTTP","count":1}]},"total":1}`),
 			},
 			app: func() *runtime.App {
 				app := runtime.New(&static.Config{Api: static.Api{Search: static.Search{
@@ -105,6 +109,36 @@ func TestHandler_SearchQuery(t *testing.T) {
 				cfg = openapitest.NewConfig("3.0", openapitest.WithInfo("bar", "", ""))
 				app.AddHttp(toConfig(cfg))
 
+				return app
+			},
+		},
+		{
+			name:       "using facet type=Kafka should filter out HTTP (case insensitive)",
+			requestUrl: "/api/search/query?q=foo&type=Kafka",
+			response: []try.ResponseCondition{
+				try.HasStatusCode(200),
+				try.HasHeader("Content-Type", "application/json"),
+				try.AssertBody(func(t *testing.T, body string) {
+					var result search.Result
+					err := json.Unmarshal([]byte(body), &result)
+					require.NoError(t, err)
+					require.Len(t, result.Facets, 1)
+					require.Equal(t, []search.FacetValue{{Value: "HTTP", Count: 1}, {Value: "Kafka", Count: 1}}, result.Facets["type"])
+					require.Len(t, result.Results, 1)
+					require.Equal(t, result.Results[0].Type, "Kafka")
+				}),
+			},
+			app: func() *runtime.App {
+				app := runtime.New(&static.Config{Api: static.Api{Search: static.Search{
+					Enabled: true,
+				}}})
+
+				h := openapitest.NewConfig("3.0", openapitest.WithInfo("foo", "", ""))
+				app.AddHttp(toConfig(h))
+				k := asyncapitest.NewConfig(asyncapitest.WithInfo("foo", "", ""))
+				_, err := app.Kafka.Add(toConfig(k), enginetest.NewEngine())
+				require.NoError(t, err)
+
 				return app
 			},
 		},

config/dynamic/mail/convert.go

@@ -37,6 +37,11 @@ func (c *Config) Convert() *mail.Config {
 		}
 	}
 
+	result.Settings = &mail.Settings{
+		AutoCreateMailbox: c.AutoCreateMailbox,
+		MaxRecipients:     c.MaxRecipients,
+	}
+
 	for _, mb := range c.Mailboxes {
 		m := &mail.MailboxConfig{
 			Username: mb.Username,

config/dynamic/mail/convert_test.go

@@ -138,6 +138,30 @@ func TestConvert(t *testing.T) {
 				require.Len(t, mb.Folders["folder"].Folders, 0)
 			},
 		},
+		{
+			name: "default settings",
+			cfg:  &Config{},
+			test: func(t *testing.T, c *mail.Config) {
+				require.NotNil(t, c)
+				require.Equal(t, &mail.Settings{
+					MaxRecipients:     0,
+					AutoCreateMailbox: false,
+					MaxInboxMails:     0,
+				}, c.Settings)
+			},
+		},
+		{
+			name: "set settings",
+			cfg: &Config{
+				AutoCreateMailbox: false,
+				MaxRecipients:     10,
+			},
+			test: func(t *testing.T, c *mail.Config) {
+				require.NotNil(t, c)
+				require.Equal(t, false, c.Settings.AutoCreateMailbox)
+				require.Equal(t, 10, c.Settings.MaxRecipients)
+			},
+		},
 		{
 			name: "rules",
 			cfg: &Config{

examples/ldap/users.ldif

@@ -4,6 +4,7 @@ dn: uid=awilliams,dc=mokapi,dc=io
 cn: Alice Williams
 uid: awilliams
 userPassword: foo123
+objectSid:: AQUAAAAAAAUVAAAAF8sUcR3r8QcekDXQw9wAAA==
 
 dn: uid=bmiller,dc=mokapi,dc=io
 cn: Bob Miller

examples/mail/smtp.yaml

@@ -1,6 +1,6 @@
 smtp: '1.0'
 info:
-  title: Mokapi's Mail Server
+  title: Mokapi's Mail Server Legacy
 servers:
   - url: smtps://127.0.0.1:2525
 mailboxes: