jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmt

Browse Source
This commit is contained in:
Josh Yan 2024-07-17 14:03:57 -07:00
parent b85705162f
commit bd8596d32b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/routes.go
View File

@ -9,7 +9,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"log"
"log/slog" "log/slog"
"math" "math"
"net" "net"
@ -943,7 +942,7 @@ func (s *Server) CreateBlobHandler(c *gin.Context) {
c.Status(http.StatusOK) c.Status(http.StatusOK)
return return
} }
if c.GetHeader("X-Redirect-Create") == "1" && s.IsLocal(c) { if c.GetHeader("X-Redirect-Create") == "1" && s.IsServerKeyPublicKey(c) {
c.Header("LocalLocation", path) c.Header("LocalLocation", path)
c.Status(http.StatusTemporaryRedirect) c.Status(http.StatusTemporaryRedirect)
return return
@ -963,7 +962,7 @@ func (s *Server) CreateBlobHandler(c *gin.Context) {
c.Status(http.StatusCreated) c.Status(http.StatusCreated)
} }
func (s *Server) IsLocal(c *gin.Context) bool { func (s *Server) IsServerKeyPublicKey(c *gin.Context) bool {
if authz := c.GetHeader("Authorization"); authz != "" { if authz := c.GetHeader("Authorization"); authz != "" {
parts := strings.Split(authz, ":") parts := strings.Split(authz, ":")
if len(parts) != 3 { if len(parts) != 3 {
@ -997,14 +996,13 @@ func (s *Server) IsLocal(c *gin.Context) bool {
serverPublicKey, err := auth.GetPublicKey() serverPublicKey, err := auth.GetPublicKey()
if err != nil { if err != nil {
log.Fatal(err) slog.Error(fmt.Sprintf("failed to get server public key: %v", err))
} }
if bytes.Equal(serverPublicKey.Marshal(), clientPublicKey.Marshal()) { if bytes.Equal(serverPublicKey.Marshal(), clientPublicKey.Marshal()) {
return true return true
} }
c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "unauthorized"})
return false return false
} }