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

test

Browse Source
This commit is contained in:
Josh Yan 2024-07-22 13:58:50 -07:00
parent 76b4dfcc9e
commit 5603441538
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/images.go
View File

@ -32,6 +32,7 @@ import (
"github.com/ollama/ollama/types/errtypes" "github.com/ollama/ollama/types/errtypes"
"github.com/ollama/ollama/types/model" "github.com/ollama/ollama/types/model"
"github.com/ollama/ollama/version" "github.com/ollama/ollama/version"
"golang.org/x/crypto/ssh"
) )
var ( var (
@ -1088,11 +1089,12 @@ func makeRequestWithRetry(ctx context.Context, method string, requestURL *url.UR
if anonymous { if anonymous {
// no user is associated with the public key, and the request requires non-anonymous access // no user is associated with the public key, and the request requires non-anonymous access
pubKey, nestedErr := auth.GetPublicKey() pubKey, nestedErr := auth.GetPublicKey()
localPubKey := strings.TrimSpace(string(ssh.MarshalAuthorizedKey(pubKey)))
if nestedErr != nil { if nestedErr != nil {
slog.Error(fmt.Sprintf("couldn't get public key: %v", nestedErr)) slog.Error(fmt.Sprintf("couldn't get public key: %v", nestedErr))
return nil, errUnauthorized return nil, errUnauthorized
} }
return nil, &errtypes.UnknownOllamaKey{Key: pubKey} return nil, &errtypes.UnknownOllamaKey{Key: localPubKey}
} }
// user is associated with the public key, but is not authorized to make the request // user is associated with the public key, but is not authorized to make the request
return nil, errUnauthorized return nil, errUnauthorized