Mirrored_Repos/psu
1
0
Fork 0
mirror of https://gitlab.com/psuapp/psu.git synced 2024-08-30 18:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delay new auth token retrieval until it is really necessary

Browse Source
This commit is contained in:
Juan Carlos Mejías Rodríguez 2019-08-02 14:21:50 -04:00
parent 04a05fad86
commit 00439cc1c1
2 changed files with 59 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/login.go
View File

@ -14,10 +14,15 @@ var loginCmd = &cobra.Command{
Short: "Log in to a Portainer instance",
Run: func(cmd *cobra.Command, args []string) {
// Get auth token
client, err := common.GetClient()
client, err := common.NewClient(common.ClientConfig{
Url: viper.GetString("url"),
User: viper.GetString("user"),
Password: viper.GetString("password"),
DoNotUseToken: true,
})
common.CheckError(err)
authToken, err := client.Authenticate(viper.GetString("url"), viper.GetString("password"))
authToken, err := client.Authenticate()
common.CheckError(err)
if viper.GetBool("login.print") {

60
common/client.go
View File

@ -17,11 +17,12 @@ import (
var client *PortainerClient
type clientConfig struct {
type ClientConfig struct {
Url string
User string
Password string
Token string
DoNotUseToken bool
Insecure bool
Timeout time.Duration
}
@ -29,7 +30,10 @@ type clientConfig struct {
type PortainerClient struct {
http.Client
url *url.URL
user string
password string
token string
doNotUseToken bool
}
// Check if an http.Response object has errors
@ -73,7 +77,19 @@ func (n *PortainerClient) do(uri, method string, request io.Reader, requestType
req.Header.Set("Content-Type", requestType)
}
if n.token != "" {
if !n.doNotUseToken {
if n.token == "" {
clientClone, cloneErr := n.Clone()
if cloneErr != nil {
return resp, cloneErr
}
clientClone.doNotUseToken = true
n.token, err = clientClone.Authenticate()
if err != nil {
return
}
PrintDebug(fmt.Sprintf("Auth token: %s", n.token))
}
req.Header.Set("Authorization", "Bearer "+n.token)
}
@ -123,12 +139,12 @@ func (n *PortainerClient) doJSON(uri, method string, request interface{}, respon
}
// Authenticate a user to get an auth token
func (n *PortainerClient) Authenticate(user, password string) (token string, err error) {
func (n *PortainerClient) Authenticate() (token string, err error) {
PrintVerbose("Getting auth token...")
reqBody := AuthenticateUserRequest{
Username: user,
Password: password,
Username: n.user,
Password: n.password,
}
respBody := AuthenticateUserResponse{}
@ -247,8 +263,25 @@ func (n *PortainerClient) GetStatus() (status Status, err error) {
return
}
// Get a clone of the client
func (n *PortainerClient) Clone() (c *PortainerClient, err error) {
c = &PortainerClient{
url: n.url,
user: n.user,
password: n.password,
token: n.token,
doNotUseToken: n.doNotUseToken,
}
c.Timeout = n.Timeout
c.Transport = n.Transport
return
}
// Create a new client
func newClient(config clientConfig) (c *PortainerClient, err error) {
func NewClient(config ClientConfig) (c *PortainerClient, err error) {
apiUrl, err := url.Parse(config.Url + "/api/")
if err != nil {
return
@ -256,6 +289,9 @@ func newClient(config clientConfig) (c *PortainerClient, err error) {
c = &PortainerClient{
url: apiUrl,
user: config.User,
password: config.Password,
token: config.Token,
}
c.Timeout = config.Timeout
@ -266,23 +302,13 @@ func newClient(config clientConfig) (c *PortainerClient, err error) {
},
}
if config.Token != "" {
c.token = config.Token
} else {
c.token, err = c.Authenticate(config.User, config.Password)
if err != nil {
return nil, err
}
PrintDebug(fmt.Sprintf("Auth token: %s", c.token))
}
return
}
// Get the cached client or a new one
func GetClient() (c *PortainerClient, err error) {
if client == nil {
client, err = newClient(clientConfig{
client, err = NewClient(ClientConfig{
Url: viper.GetString("url"),
User: viper.GetString("user"),
Password: viper.GetString("password"),