Added login/logout commands

cmd/odm/main.go

@@ -20,9 +20,5 @@ import (
 )
 
 func main() {
-	// fmt.Print("Enter password: ")
-	// bytePassword, _ := terminal.ReadPassword(int(syscall.Stdin))
-	// password := string(bytePassword)
-	// fmt.Printf("Your password is '%s'", password)
 	cmd.Execute()
 }

internal/cmd/login.go

@@ -0,0 +1,40 @@
+// Copyright © 2018 CloudODM Contributors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package cmd
+
+import (
+	"github.com/OpenDroneMap/CloudODM/internal/config"
+	"github.com/OpenDroneMap/CloudODM/internal/logger"
+	"github.com/spf13/cobra"
+)
+
+var loginCmd = &cobra.Command{
+	Use:   "login [--node default]",
+	Short: "Login with a node",
+	Run: func(cmd *cobra.Command, args []string) {
+		config.Initialize()
+
+		if config.CheckLogin(nodeName) != nil {
+			logger.Info("Logged in")
+		}
+	},
+}
+
+func init() {
+	loginCmd.Flags().StringVarP(&nodeName, "node", "n", "default", "Processing node to use")
+
+	rootCmd.AddCommand(loginCmd)
+}

internal/cmd/logout.go

@@ -0,0 +1,46 @@
+// Copyright © 2018 CloudODM Contributors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package cmd
+
+import (
+	"github.com/OpenDroneMap/CloudODM/internal/config"
+	"github.com/OpenDroneMap/CloudODM/internal/logger"
+	"github.com/spf13/cobra"
+)
+
+var logoutCmd = &cobra.Command{
+	Use:   "logout [--node default]",
+	Short: "Logout of a node",
+	Run: func(cmd *cobra.Command, args []string) {
+		config.Initialize()
+
+		node, err := config.User.GetNode(nodeName)
+		if err != nil {
+			logger.Error(err)
+		}
+
+		node.Token = ""
+		config.User.UpdateNode(nodeName, *node)
+
+		logger.Info("Logged out")
+	},
+}
+
+func init() {
+	logoutCmd.Flags().StringVarP(&nodeName, "node", "n", "default", "Processing node to use")
+
+	rootCmd.AddCommand(logoutCmd)
+}

internal/cmd/root.go

@@ -26,7 +26,6 @@ import (
 	"github.com/OpenDroneMap/CloudODM/internal/config"
 	"github.com/OpenDroneMap/CloudODM/internal/fs"
 	"github.com/OpenDroneMap/CloudODM/internal/logger"
-	"github.com/OpenDroneMap/CloudODM/internal/odm"
 
 	"github.com/spf13/cobra"
 )
@@ -55,19 +54,7 @@ var rootCmd = &cobra.Command{
 
 		logger.Debug("Options: " + strings.Join(options, " "))
 
-		node, err := config.User.GetNode(nodeName)
-		if err != nil {
-			logger.Error(err)
-		}
-
-		info, err := node.Info()
-		err = node.CheckAuthorization(err)
-		if err != nil {
-			if err == odm.ErrAuthRequired {
-				logger.Debug("AUTH")
-			}
-			logger.Error(err)
-		}
+		info := config.CheckLogin(nodeName)
 
 		// Check max images
 		if len(inputFiles) > info.MaxImages {
@@ -93,6 +80,8 @@ func Execute() {
 func init() {
 	rootCmd.PersistentFlags().BoolVarP(&logger.VerboseFlag, "verbose", "v", false, "show verbose output")
 	rootCmd.PersistentFlags().BoolVarP(&logger.DebugFlag, "debug", "d", false, "show debug output")
+	rootCmd.PersistentFlags().BoolVarP(&logger.QuietFlag, "quiet", "q", false, "suppress output")
+
 	rootCmd.Flags().StringVarP(&outputPath, "output", "o", "./output", "directory where to store processing results")
 	rootCmd.Flags().StringVarP(&nodeName, "node", "n", "default", "Processing node to use")
 	rootCmd.Flags().SetInterspersed(false)

internal/config/auth.go

@@ -0,0 +1,42 @@
+package config
+
+import (
+	"github.com/OpenDroneMap/CloudODM/internal/logger"
+	"github.com/OpenDroneMap/CloudODM/internal/odm"
+)
+
+// CheckLogin checks if the node needs login
+// if it does, it attempts to login
+// it it doesn't, returns node.Info()
+// on error, it prints a message and exits
+func CheckLogin(nodeName string) *odm.InfoResponse {
+	node, err := User.GetNode(nodeName)
+	if err != nil {
+		logger.Error(err)
+	}
+
+	info, err := node.Info()
+	err = node.CheckAuthentication(err)
+	if err != nil {
+		if err == odm.ErrAuthRequired {
+			token, err := node.TryLogin()
+			if err != nil {
+				logger.Error(err)
+			}
+
+			// Validate token
+			node.Token = token
+			info, err = node.Info()
+			err = node.CheckAuthentication(err)
+			if err != nil {
+				logger.Error(err)
+			}
+
+			User.UpdateNode(nodeName, *node)
+		} else {
+			logger.Error(err)
+		}
+	}
+
+	return info
+}

internal/config/configuration.go

@@ -89,7 +89,7 @@ func saveToFile(conf Configuration, filePath string) {
 
 	jsonFile.Write(jsonData)
 
-	logger.Debug("Wrote default configuration in " + filePath)
+	logger.Debug("Wrote configuration to " + filePath)
 }
 
 func loadFromFile(filePath string) Configuration {
@@ -155,3 +155,8 @@ func (c Configuration) GetNode(name string) (*odm.Node, error) {
 
 	return &node, nil
 }
+
+func (c Configuration) UpdateNode(name string, node odm.Node) {
+	c.Nodes[name] = node
+	c.Save()
+}

internal/logger/logger.go

@@ -11,6 +11,9 @@ var VerboseFlag bool
 // DebugFlag sets debug output
 var DebugFlag bool
 
+// QuietFlag supresses all output
+var QuietFlag bool
+
 // Debug message (if DebugFlag is enabled)
 func Debug(a ...interface{}) {
 	if DebugFlag {
@@ -27,11 +30,15 @@ func Verbose(a ...interface{}) {
 
 // Info message
 func Info(a ...interface{}) {
-	fmt.Println(a...)
+	if !QuietFlag {
+		fmt.Println(a...)
+	}
 }
 
 //Error message and exit
 func Error(a ...interface{}) {
-	fmt.Println(a...)
+	if !QuietFlag {
+		fmt.Println(a...)
+	}
 	os.Exit(1)
 }

internal/odm/node.go

@@ -1,14 +1,21 @@
 package odm
 
 import (
+	"bufio"
+	"bytes"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"math"
 	"net/http"
 	"net/url"
+	"os"
 	"strconv"
 	"strings"
+	"syscall"
+
+	"golang.org/x/crypto/ssh/terminal"
 
 	"github.com/OpenDroneMap/CloudODM/internal/logger"
 )
@@ -26,6 +33,12 @@ type InfoResponse struct {
 	Error string `json:"error"`
 }
 
+type AuthInfoResponse struct {
+	Message     string `json:"message"`
+	LoginUrl    string `json:"loginUrl"`
+	RegisterUrl string `json:"registerUrl"`
+}
+
 // Node is a NodeODM processing node
 type Node struct {
 	URL   string `json:"url"`
@@ -74,7 +87,29 @@ func (n Node) apiGET(path string) ([]byte, error) {
 
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		logger.Info(err)
+		return nil, err
+	}
+
+	return body, nil
+}
+
+func (n Node) apiPOST(path string, values map[string]string) ([]byte, error) {
+	url := n.URLFor(path)
+	logger.Debug("POST: " + url)
+
+	formData, _ := json.Marshal(values)
+	resp, err := http.Post(url, "application/json", bytes.NewBuffer(formData))
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != 200 {
+		return nil, errors.New("Server returned status code: " + strconv.Itoa(resp.StatusCode))
+	}
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
 		return nil, err
 	}
 
@@ -106,7 +141,7 @@ func (n Node) Info() (*InfoResponse, error) {
 	return &res, nil
 }
 
-func (n Node) CheckAuthorization(err error) error {
+func (n Node) CheckAuthentication(err error) error {
 	if err != nil {
 		if err == ErrUnauthorized {
 			// Is there a token?
@@ -122,3 +157,75 @@ func (n Node) CheckAuthorization(err error) error {
 
 	return nil
 }
+
+type LoginResponse struct {
+	Token string `json:"token"`
+}
+
+func (n Node) TryLogin() (token string, err error) {
+	res := AuthInfoResponse{}
+	body, err := n.apiGET("/auth/info")
+	if err != nil {
+		return "", err
+	}
+	if err := json.Unmarshal(body, &res); err != nil {
+		return "", err
+	}
+
+	if res.Message != "" {
+		logger.Info("")
+		logger.Info(res.Message)
+		logger.Info("")
+	}
+
+	if res.LoginUrl != "" {
+		reader := bufio.NewReader(os.Stdin)
+		username := ""
+		for len(username) == 0 {
+			fmt.Print("Enter username: ")
+			username, _ = reader.ReadString('\n')
+			username = strings.TrimSpace(username)
+		}
+
+		password := ""
+		for len(password) == 0 {
+			fmt.Print("Enter password: ")
+			bytePassword, _ := terminal.ReadPassword(int(syscall.Stdin))
+			password = string(bytePassword)
+		}
+
+		logger.Debug("")
+		logger.Debug("POST: " + res.LoginUrl)
+
+		formData, _ := json.Marshal(map[string]string{"username": username, "password": password})
+		resp, err := http.Post(res.LoginUrl, "application/json", bytes.NewBuffer(formData))
+		if err != nil {
+			return "", err
+		}
+		defer resp.Body.Close()
+
+		if resp.StatusCode != 200 {
+			return "", errors.New("Login URL returned status code: " + strconv.Itoa(resp.StatusCode))
+		}
+
+		body, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			return "", err
+		}
+
+		res := LoginResponse{}
+		if err := json.Unmarshal(body, &res); err != nil {
+			return "", err
+		}
+
+		if res.Token == "" {
+			return "", errors.New("Login failed")
+		}
+
+		return res.Token, nil
+	}
+
+	// TODO: support for res.RegisterUrl
+
+	return "", errors.New("Cannot login")
+}