Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auth: add ErrNoAuth, use it pkg/client log warning. 

Change-Id: If657da28bc9888941400c263be61809ead5cef12
This commit is contained in:
Brad Fitzpatrick 2013-01-26 11:23:39 -08:00
parent 26f8b015d8
commit 7c4380eebe
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/auth/auth.go
View File

@ -18,6 +18,7 @@ package auth
import ( import (
"encoding/base64" "encoding/base64"
"errors"
"fmt" "fmt"
"net" "net"
"net/http" "net/http"
@ -123,12 +124,20 @@ func newUserPassAuth(arg string) (AuthMode, error) {
return mode, nil return mode, nil
} }
// ErrNoAuth is returned when there is no configured authentication.
var ErrNoAuth = errors.New("auth: no configured authentication")
// FromConfig parses authConfig and accordingly sets up the AuthMode // FromConfig parses authConfig and accordingly sets up the AuthMode
// that will be used for all upcoming authentication exchanges. The // that will be used for all upcoming authentication exchanges. The
// supported modes are UserPass and DevAuth. UserPass requires an authConfig // supported modes are UserPass and DevAuth. UserPass requires an authConfig
// of the kind "userpass:joe:ponies". If the CAMLI_ADVERTISED_PASSWORD // of the kind "userpass:joe:ponies". If the CAMLI_ADVERTISED_PASSWORD
// environment variable is defined, the mode will default to DevAuth. // environment variable is defined, the mode will default to DevAuth.
//
// If the input string is empty, the error will be ErrNoAuth.
func FromConfig(authConfig string) (AuthMode, error) { func FromConfig(authConfig string) (AuthMode, error) {
if authConfig == "" {
return nil, ErrNoAuth
}
pieces := strings.SplitN(authConfig, ":", 2) pieces := strings.SplitN(authConfig, ":", 2)
if len(pieces) < 1 { if len(pieces) < 1 {
return nil, fmt.Errorf("Invalid auth string: %q", authConfig) return nil, fmt.Errorf("Invalid auth string: %q", authConfig)

4
pkg/client/config.go
View File

@ -103,9 +103,11 @@ func (c *Client) SetupAuth() error {
// If using an explicit blobserver, don't use auth // If using an explicit blobserver, don't use auth
// configured from the config file, so we don't send // configured from the config file, so we don't send
// our password to a friend's blobserver. // our password to a friend's blobserver.
log.Printf("Using explicit --server parameter; using auth from environment only.")
var err error var err error
c.authMode, err = auth.FromEnv() c.authMode, err = auth.FromEnv()
if err == auth.ErrNoAuth {
log.Printf("Using explicit --server parameter; not using config file auth, and no auth mode set in environment")
}
return err return err
} }
return c.SetupAuthFromConfig(config) return c.SetupAuthFromConfig(config)