gered/ollama
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix get auth token

Browse source
This commit is contained in:
Michael Yang 2023-09-07 11:49:36 -07:00
parent 07b4074e7b
commit f0f4943577
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/auth.go
View file

@ -103,7 +103,7 @@ func getAuthToken(ctx context.Context, redirData AuthRedirect, regOpts *Registry
headers := make(http.Header) headers := make(http.Header)
headers.Set("Authorization", sig) headers.Set("Authorization", sig)
resp, err := makeRequest(ctx, "GET", redirectURL, headers, nil, regOpts) resp, err := makeRequest(ctx, "GET", redirectURL, headers, nil, nil)
if err != nil { if err != nil {
log.Printf("couldn't get token: %q", err) log.Printf("couldn't get token: %q", err)
} }

10
server/images.go
View file

@ -1313,10 +1313,12 @@ func makeRequest(ctx context.Context, method string, requestURL *url.URL, header
req.Header = headers req.Header = headers
} }
if regOpts.Token != "" { if regOpts != nil {
req.Header.Set("Authorization", "Bearer "+regOpts.Token) if regOpts.Token != "" {
} else if regOpts.Username != "" && regOpts.Password != "" { req.Header.Set("Authorization", "Bearer "+regOpts.Token)
req.SetBasicAuth(regOpts.Username, regOpts.Password) } else if regOpts.Username != "" && regOpts.Password != "" {
req.SetBasicAuth(regOpts.Username, regOpts.Password)
}
} }
req.Header.Set("User-Agent", fmt.Sprintf("ollama/%s (%s %s) Go/%s", version.Version, runtime.GOARCH, runtime.GOOS, runtime.Version())) req.Header.Set("User-Agent", fmt.Sprintf("ollama/%s (%s %s) Go/%s", version.Version, runtime.GOARCH, runtime.GOOS, runtime.Version()))