Merge branch 'main' into dependabot/npm_and_yarn/examples/mail/nodemailer-8.0.4

Author: marle3003

.gitignore

@@ -25,3 +25,5 @@ node_modules
 server/api/dashboard.go
 coverage.txt
 versioninfo.json
+.DS_Store
+Icon

.idea/workspace.xml

@@ -22,6 +22,7 @@ import (
 type Handler interface {
 	http.Handler
 	RegisterHealthHandler(path string, h http.Handler)
+	RegisterMcpHandler(path string, h http.Handler)
 }
 
 type handler struct {
@@ -33,6 +34,8 @@ type handler struct {
 	index         string
 	healthPath    string
 	healthHandler http.Handler
+	mcpPath       string
+	mcpHandler    http.Handler
 }
 
 type info struct {
@@ -111,6 +114,11 @@ func (h *handler) RegisterHealthHandler(path string, handler http.Handler) {
 	h.healthHandler = handler
 }
 
+func (h *handler) RegisterMcpHandler(path string, handler http.Handler) {
+	h.mcpPath = path
+	h.mcpHandler = handler
+}
+
 func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if r.Method != "GET" && r.Method != "POST" {
 		http.Error(w, fmt.Sprintf("method %v is not allowed", r.Method), http.StatusMethodNotAllowed)
@@ -154,6 +162,8 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		h.getSearchResults(w, r)
 	case strings.HasPrefix(p, h.healthPath) && h.healthHandler != nil:
 		h.healthHandler.ServeHTTP(w, r)
+	case strings.HasPrefix(p, h.mcpPath) && h.mcpHandler != nil:
+		h.mcpHandler.ServeHTTP(w, r)
 	case h.fileServer != nil:
 		if r.Method != "GET" {
 			http.Error(w, fmt.Sprintf("method %v is not allowed", r.Method), http.StatusMethodNotAllowed)

api/handler.go

@@ -79,7 +79,17 @@ func (h *handler) getConfigData(w http.ResponseWriter, r *http.Request, key stri
 	ext := filepath.Ext(path)
 	mt := mime.TypeByExtension(filepath.Ext(ext))
 	if mt == "" {
-		mt = "text/plain"
+		if ext == "" {
+			values, err := mime.ExtensionsByType(c.Info.Kernel().ContentType)
+			if err == nil && len(values) > 0 {
+				ext = values[0]
+				path += ext
+				mt = mime.TypeByExtension(filepath.Ext(ext))
+			}
+		}
+		if mt == "" {
+			mt = "text/plain"
+		}
 	}
 	w.Header().Set("Last-Modified", c.Info.Time.UTC().Format(http.TimeFormat))
 	w.Header().Set("Content-Type", mt)

api/handler_config.go

@@ -149,6 +149,7 @@ func TestHandler_Config(t *testing.T) {
 			requestUrl: "http://foo.api/api/configs/foo/data",
 			test: []try.ResponseCondition{
 				try.HasStatusCode(http.StatusOK),
+				try.HasHeader("Content-Disposition", "inline; filename=\"foo.yaml\""),
 				try.HasHeader("Last-Modified", "Wed, 27 Dec 2023 13:01:30 GMT"),
 				try.HasHeaderXor("Content-Type", "text/plain", "application/yaml"),
 				try.HasHeader("Cache-Control", "no-cache"),
@@ -173,6 +174,34 @@ func TestHandler_Config(t *testing.T) {
 			requestUrl: "http://foo.api/api/configs/foo/data",
 			test: []try.ResponseCondition{
 				try.HasStatusCode(http.StatusOK),
+				try.HasHeader("Content-Disposition", "inline; filename=\"foo.json\""),
+				try.HasHeader("Last-Modified", "Fri, 22 Dec 2023 13:01:30 GMT"),
+				try.HasHeader("Content-Type", "application/json"),
+				try.HasHeader("Etag", etag),
+				try.HasHeader("Cache-Control", "no-cache"),
+				try.HasBody(`{"foo": "bar"}`),
+			},
+		},
+		{
+			name: "config data: no extension but ContentType in Info is set",
+			app: func() *runtime.App {
+
+				return &runtime.App{Configs: map[string]*dynamic.Config{
+					"foo": {
+						Info: dynamic.ConfigInfo{
+							Url:         mustUrl("https://foo.bar/foo"),
+							Time:        mustTime("2023-12-22T13:01:30+00:00"),
+							Checksum:    checksum,
+							ContentType: "application/json",
+						},
+						Raw: data,
+					},
+				}}
+			},
+			requestUrl: "http://foo.api/api/configs/foo/data",
+			test: []try.ResponseCondition{
+				try.HasStatusCode(http.StatusOK),
+				try.HasHeader("Content-Disposition", "inline; filename=\"foo.json\""),
 				try.HasHeader("Last-Modified", "Fri, 22 Dec 2023 13:01:30 GMT"),
 				try.HasHeader("Content-Type", "application/json"),
 				try.HasHeader("Etag", etag),

api/handler_config_test.go

@@ -89,6 +89,11 @@ health:
     path: /health
     port: 8080
     log: false
+mcp:
+    server:
+        enabled: false
+        path: /mcp
+        port: 8080
 rootCaCert: ""
 rootCaKey: ""
 configs: []

cmd/mokapi/main_test.go

@@ -12,12 +12,13 @@ import (
 )
 
 type ConfigInfo struct {
-	Provider string
-	Url      *url.URL
-	Checksum []byte
-	Time     time.Time
-	inner    *ConfigInfo
-	Tags     []string
+	Provider    string
+	Url         *url.URL
+	Checksum    []byte
+	Time        time.Time
+	inner       *ConfigInfo
+	Tags        []string
+	ContentType string
 }
 
 func (ci *ConfigInfo) Path() string {

config/dynamic/config_info.go

@@ -76,10 +76,12 @@ func parse(c *Config) (interface{}, error) {
 		var v interface{}
 		v, err = parseJson(b, result)
 		if err == nil {
+			c.Info.ContentType = "application/json"
 			return v, nil
 		}
 		v, err = parseYaml(b, result)
 		if v != nil && err == nil {
+			c.Info.ContentType = "application/yaml"
 			return v, nil
 		}
 		err = nil

config/dynamic/parse.go

@@ -107,6 +107,7 @@ func TestParse(t *testing.T) {
 				err := dynamic.Parse(c, &dynamictest.Reader{})
 				require.NoError(t, err)
 				require.Equal(t, "foo", c.Data.(*data).User)
+				require.Equal(t, "application/json", c.Info.ContentType)
 			},
 		},
 		{
@@ -161,6 +162,7 @@ func TestParse(t *testing.T) {
 				err := dynamic.Parse(c, &dynamictest.Reader{})
 				require.NoError(t, err)
 				require.Equal(t, "foo", c.Data.(*data).User)
+				require.Equal(t, "application/yaml", c.Info.ContentType)
 			},
 		},
 		{

config/dynamic/parse_test.go

@@ -198,6 +198,10 @@ func (p *Provider) readUrl(u *url.URL) (c *dynamic.Config, changed bool, err err
 		Raw: b,
 	}
 
+	if ct := res.Header.Get("Content-Type"); ct != "" {
+		c.Info.ContentType = ct
+	}
+
 	return
 }