This commit is contained in:
@@ -43,7 +43,7 @@ func (p *ListCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
|
||||
return subcommands.ExitUsageError
|
||||
}
|
||||
|
||||
username, password, err := credentials.Read()
|
||||
username, password, err := credentials.Read(f.Arg(0))
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error: failed to read std output: %s", err)
|
||||
return subcommands.ExitFailure
|
||||
|
||||
60
cmd/cli/commands/login/login.go
Normal file
60
cmd/cli/commands/login/login.go
Normal file
@@ -0,0 +1,60 @@
|
||||
package login
|
||||
|
||||
import (
|
||||
"cloudsave/cmd/cli/tools/prompt/credentials"
|
||||
"cloudsave/pkg/remote/client"
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/google/subcommands"
|
||||
)
|
||||
|
||||
type (
|
||||
LoginCmd struct {
|
||||
}
|
||||
)
|
||||
|
||||
func (*LoginCmd) Name() string { return "login" }
|
||||
func (*LoginCmd) Synopsis() string { return "save IN PLAIN TEXT your credentials" }
|
||||
func (*LoginCmd) Usage() string {
|
||||
return `Usage: cloudsave login <SERVER_HOSTNAME>
|
||||
|
||||
Warning: this command saves the login into a plain text json file
|
||||
|
||||
Options:
|
||||
`
|
||||
}
|
||||
|
||||
func (p *LoginCmd) SetFlags(f *flag.FlagSet) {
|
||||
}
|
||||
|
||||
func (p *LoginCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
|
||||
if f.NArg() != 1 {
|
||||
fmt.Fprintf(os.Stderr, "error: this command take 1 argument")
|
||||
return subcommands.ExitUsageError
|
||||
}
|
||||
|
||||
server := f.Arg(0)
|
||||
|
||||
username, password, err := credentials.Read(server)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error: failed to read std output: %s", err)
|
||||
return subcommands.ExitFailure
|
||||
}
|
||||
|
||||
cli := client.New(server, username, password)
|
||||
if _, err := cli.Version(); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error: failed to login: %s", err)
|
||||
return subcommands.ExitFailure
|
||||
}
|
||||
|
||||
if err := credentials.Login(username, password, server); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error: failed to save login: %s", err)
|
||||
return subcommands.ExitFailure
|
||||
}
|
||||
|
||||
fmt.Println("login information saved!")
|
||||
return subcommands.ExitSuccess
|
||||
}
|
||||
43
cmd/cli/commands/logout/logout.go
Normal file
43
cmd/cli/commands/logout/logout.go
Normal file
@@ -0,0 +1,43 @@
|
||||
package logout
|
||||
|
||||
import (
|
||||
"cloudsave/cmd/cli/tools/prompt/credentials"
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/google/subcommands"
|
||||
)
|
||||
|
||||
type (
|
||||
LogoutCmd struct {
|
||||
}
|
||||
)
|
||||
|
||||
func (*LogoutCmd) Name() string { return "logout" }
|
||||
func (*LogoutCmd) Synopsis() string { return "logout from a server" }
|
||||
func (*LogoutCmd) Usage() string {
|
||||
return `Usage: cloudsave logout <SERVER_HOSTNAME>
|
||||
|
||||
Options:
|
||||
`
|
||||
}
|
||||
|
||||
func (p *LogoutCmd) SetFlags(f *flag.FlagSet) {
|
||||
}
|
||||
|
||||
func (p *LogoutCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
|
||||
if f.NArg() != 1 {
|
||||
fmt.Fprintf(os.Stderr, "error: this command take 1 argument")
|
||||
return subcommands.ExitUsageError
|
||||
}
|
||||
|
||||
if err := credentials.Logout(f.Arg(0)); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error: failed to logout: %s", err)
|
||||
return subcommands.ExitFailure
|
||||
}
|
||||
|
||||
fmt.Println("bye!")
|
||||
return subcommands.ExitSuccess
|
||||
}
|
||||
@@ -41,7 +41,7 @@ func (p *PullCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
|
||||
gameID := f.Arg(1)
|
||||
path := f.Arg(2)
|
||||
|
||||
username, password, err := credentials.Read()
|
||||
username, password, err := credentials.Read(url)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error: failed to read std output: %s", err)
|
||||
return subcommands.ExitFailure
|
||||
|
||||
@@ -284,7 +284,7 @@ func connect(remoteCred map[string]map[string]string, r remote.Remote) (*client.
|
||||
fmt.Println()
|
||||
fmt.Println("Connexion to", r.URL)
|
||||
fmt.Println("============")
|
||||
username, password, err := credentials.Read()
|
||||
username, password, err := credentials.Read(r.URL)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to read std output: %w", err)
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ func (p *VersionCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{
|
||||
return subcommands.ExitUsageError
|
||||
}
|
||||
|
||||
username, password, err := credentials.Read()
|
||||
username, password, err := credentials.Read(f.Arg(0))
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "failed to read std output: %s", err)
|
||||
return subcommands.ExitFailure
|
||||
|
||||
@@ -4,6 +4,8 @@ import (
|
||||
"cloudsave/cmd/cli/commands/add"
|
||||
"cloudsave/cmd/cli/commands/apply"
|
||||
"cloudsave/cmd/cli/commands/list"
|
||||
"cloudsave/cmd/cli/commands/login"
|
||||
"cloudsave/cmd/cli/commands/logout"
|
||||
"cloudsave/cmd/cli/commands/pull"
|
||||
"cloudsave/cmd/cli/commands/remote"
|
||||
"cloudsave/cmd/cli/commands/remove"
|
||||
@@ -56,6 +58,8 @@ func main() {
|
||||
subcommands.Register(&remote.RemoteCmd{Service: s}, "remote")
|
||||
subcommands.Register(&sync.SyncCmd{Service: s}, "remote")
|
||||
subcommands.Register(&pull.PullCmd{Service: s}, "remote")
|
||||
subcommands.Register(&login.LoginCmd{}, "remote")
|
||||
subcommands.Register(&logout.LogoutCmd{}, "remote")
|
||||
|
||||
flag.Parse()
|
||||
ctx := context.Background()
|
||||
|
||||
@@ -2,14 +2,48 @@ package credentials
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"golang.org/x/term"
|
||||
)
|
||||
|
||||
func Read() (string, string, error) {
|
||||
type (
|
||||
credential struct {
|
||||
Username string `json:"username"`
|
||||
Password string `json:"password"`
|
||||
}
|
||||
|
||||
credentialsStore struct {
|
||||
Store map[string]credential `json:"store"`
|
||||
}
|
||||
)
|
||||
|
||||
var (
|
||||
datastorePath string
|
||||
)
|
||||
|
||||
func init() {
|
||||
roaming, err := os.UserConfigDir()
|
||||
if err != nil {
|
||||
panic("failed to get user config path: " + err.Error())
|
||||
}
|
||||
datastorePath = filepath.Join(roaming, "cloudsave")
|
||||
}
|
||||
|
||||
func Read(server string) (string, string, error) {
|
||||
var err error
|
||||
store, err := load()
|
||||
if err == nil {
|
||||
if c, ok := store[server]; ok {
|
||||
return c.Username, c.Password, nil
|
||||
}
|
||||
}
|
||||
|
||||
fmt.Print("Enter username: ")
|
||||
reader := bufio.NewReader(os.Stdin)
|
||||
username, _ := reader.ReadString('\n')
|
||||
@@ -24,3 +58,66 @@ func Read() (string, string, error) {
|
||||
|
||||
return username, string(password), nil
|
||||
}
|
||||
|
||||
func Login(username, password, server string) error {
|
||||
store, err := load()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
store[server] = credential{
|
||||
Username: username,
|
||||
Password: password,
|
||||
}
|
||||
|
||||
return save(store)
|
||||
}
|
||||
|
||||
func Logout(server string) error {
|
||||
store, err := load()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
delete(store, server)
|
||||
|
||||
return save(store)
|
||||
}
|
||||
|
||||
func save(store map[string]credential) error {
|
||||
c := credentialsStore{
|
||||
Store: store,
|
||||
}
|
||||
|
||||
f, err := os.OpenFile(filepath.Join(datastorePath, "credential.json"), os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0740)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to open datastore: %w", err)
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
e := json.NewEncoder(f)
|
||||
if err := e.Encode(c); err != nil {
|
||||
return fmt.Errorf("failed to encode data: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func load() (map[string]credential, error) {
|
||||
f, err := os.OpenFile(filepath.Join(datastorePath, "credential.json"), os.O_RDONLY, 0)
|
||||
if err != nil {
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
return make(map[string]credential), nil
|
||||
}
|
||||
return nil, fmt.Errorf("failed to open datastore: %w", err)
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
var c credentialsStore
|
||||
d := json.NewDecoder(f)
|
||||
if err := d.Decode(&c); err != nil {
|
||||
return nil, fmt.Errorf("failed to decode data: %w", err)
|
||||
}
|
||||
|
||||
return c.Store, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user