Update version to v1.4.168 and commit

feat: add simple optional api key management for protect routes in --serve mode

cli/cli.go

@@ -57,7 +57,7 @@ func Cli(version string) (err error) {
 
 	if currentFlags.Serve {
 		registry.ConfigureVendors()
-		err = restapi.Serve(registry, currentFlags.ServeAddress)
+		err = restapi.Serve(registry, currentFlags.ServeAddress, currentFlags.ServeAPIKey)
 		return
 	}
 

cli/flags.go

@@ -64,6 +64,7 @@ type Flags struct {
 	Serve                           bool              `long:"serve" description:"Serve the Fabric Rest API"`
 	ServeOllama                     bool              `long:"serveOllama" description:"Serve the Fabric Rest API with ollama endpoints"`
 	ServeAddress                    string            `long:"address" description:"The address to bind the REST API" default:":8080"`
+	ServeAPIKey                     string            `long:"api-key" description:"API key used to secure server routes" default:""`
 	Config                          string            `long:"config" description:"Path to YAML config file"`
 	Version                         bool              `long:"version" description:"Print current version"`
 	ListExtensions                  bool              `long:"listextensions" description:"List all registered extensions"`

nix/pkgs/fabric/version.nix

@@ -1 +1 @@
-"1.4.166"
+"1.4.168"

restapi/auth.go

@@ -0,0 +1,27 @@
+package restapi
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+)
+
+const APIKeyHeader = "X-API-Key"
+
+func APIKeyMiddleware(apiKey string) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		headerApiKey := c.GetHeader(APIKeyHeader)
+
+		if headerApiKey == "" {
+			c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "Missing API Key"})
+			return
+		}
+
+		if headerApiKey != apiKey {
+			c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "Wrong API Key"})
+			return
+		}
+
+		c.Next()
+	}
+}

restapi/serve.go

@@ -1,17 +1,25 @@
 package restapi
 
 import (
+	"log/slog"
+
 	"github.com/danielmiessler/fabric/core"
 	"github.com/gin-gonic/gin"
 )
 
-func Serve(registry *core.PluginRegistry, address string) (err error) {
+func Serve(registry *core.PluginRegistry, address string, apiKey string) (err error) {
 	r := gin.New()
 
 	// Middleware
 	r.Use(gin.Logger())
 	r.Use(gin.Recovery())
 
+	if apiKey != "" {
+		r.Use(APIKeyMiddleware(apiKey))
+	} else {
+		slog.Warn("Starting REST API server without API key authentication. This may pose security risks.")
+	}
+
 	// Register routes
 	fabricDb := registry.Db
 	NewPatternsHandler(r, fabricDb.Patterns)

version.go

@@ -1,3 +1,3 @@
 package main
 
-var version = "v1.4.166"
+var version = "v1.4.168"

web/src/lib/components/chat/DropdownGroup.svelte

@@ -12,7 +12,8 @@
     { code: 'es', name: 'Spanish' },
     { code: 'de', name: 'German' },
     { code: 'zh', name: 'Chinese' },
-    { code: 'ja', name: 'Japanese' }
+    { code: 'ja', name: 'Japanese' },
+    { code: 'it', name: 'Italian' }
   ];
 </script>