Skip to content

Fix: API Key / JSON Fast Follow #1 #1388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lunamidori5 merged 2 commits into from
Dec 5, 2023
Merged

Fix: API Key / JSON Fast Follow #1 #1388

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
add7fb3
fast follow fix #1 - imports, final loop, one last chance to skip
dave-gray101 Dec 5, 2023
1b94691
Merge branch 'master' into fix-json-api-keys-ff1
lunamidori5 Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package api

import (
"encoding/json"
"errors"
"fmt"
"encoding/json"
"io/ioutil"
"os"
"strings"

config "github.com/go-skynet/LocalAI/api/config"
Expand Down Expand Up @@ -151,7 +151,7 @@ func App(opts ...options.AppOption) (*fiber.App, error) {
}

// Check for api_keys.json file
fileContent, err := ioutil.ReadFile("api_keys.json")
fileContent, err := os.ReadFile("api_keys.json")
if err == nil {
// Parse JSON content from the file
var fileKeys []string
Expand All @@ -164,6 +164,10 @@ func App(opts ...options.AppOption) (*fiber.App, error) {
options.ApiKeys = append(options.ApiKeys, fileKeys...)
}

if len(options.ApiKeys) == 0 {
return c.Next()
}

authHeader := c.Get("Authorization")
if authHeader == "" {
return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{"message": "Authorization header missing"})
Expand All @@ -174,19 +178,15 @@ func App(opts ...options.AppOption) (*fiber.App, error) {
}

apiKey := authHeaderParts[1]
validApiKey := false
for _, key := range options.ApiKeys {
if apiKey == key {
validApiKey = true
return c.Next()
}
}
if !validApiKey {
return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{"message": "Invalid API key"})
}

return c.Next()
}
return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{"message": "Invalid API key"})

}

if options.CORS {
var c func(ctx *fiber.Ctx) error
Expand Down