mirror of
https://github.com/goharbor/harbor.git
synced 2024-10-06 17:27:35 +02:00
bug fix
This commit is contained in:
parent
6373497e58
commit
f5bf0c1a3f
@ -21,7 +21,6 @@ import (
|
|||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"strconv"
|
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@ -176,7 +175,7 @@ func (s *standardTokenHandler) generateToken(realm, service string, scopes []str
|
|||||||
|
|
||||||
tk := struct {
|
tk := struct {
|
||||||
Token string `json:"token"`
|
Token string `json:"token"`
|
||||||
ExpiresIn string `json:"expires_in"`
|
ExpiresIn int `json:"expires_in"`
|
||||||
IssuedAt string `json:"issued_at"`
|
IssuedAt string `json:"issued_at"`
|
||||||
}{}
|
}{}
|
||||||
if err = json.Unmarshal(b, &tk); err != nil {
|
if err = json.Unmarshal(b, &tk); err != nil {
|
||||||
@ -185,19 +184,14 @@ func (s *standardTokenHandler) generateToken(realm, service string, scopes []str
|
|||||||
|
|
||||||
token = tk.Token
|
token = tk.Token
|
||||||
|
|
||||||
expiresIn, err = strconv.Atoi(tk.ExpiresIn)
|
expiresIn = tk.ExpiresIn
|
||||||
|
|
||||||
|
t, err := time.Parse(time.RFC3339, tk.IssuedAt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
expiresIn = 0
|
log.Errorf("error occurred while parsing issued_at: %v", err)
|
||||||
log.Errorf("error occurred while converting expires_in: %v", err)
|
|
||||||
err = nil
|
err = nil
|
||||||
} else {
|
} else {
|
||||||
t, err := time.Parse(time.RFC3339, tk.IssuedAt)
|
issuedAt = &t
|
||||||
if err != nil {
|
|
||||||
log.Errorf("error occurred while parsing issued_at: %v", err)
|
|
||||||
err = nil
|
|
||||||
} else {
|
|
||||||
issuedAt = &t
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Debug("get token from token server")
|
log.Debug("get token from token server")
|
||||||
|
@ -103,7 +103,7 @@ func NewRepositoryWithUsername(name, endpoint, username string) (*Repository, er
|
|||||||
client: client,
|
client: client,
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Debugf("initialized a repository client with username: %s %s", endpoint, name, username)
|
log.Debugf("initialized a repository client with username: %s %s %s", endpoint, name, username)
|
||||||
|
|
||||||
return repository, nil
|
return repository, nil
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user