Handle captcha

Author: matteosuppo

auth/auth.go

@@ -48,6 +48,7 @@ import (
 	"math/rand"
 	"net/http"
 	"net/url"
+	"regexp"
 	"strings"
 	"time"
 
@@ -202,6 +203,8 @@ func (c *Config) requestAuth(client *http.Client) (string, cookies, error) {
 	return res.Request.URL.String(), cookies, err
 }
 
+var errorRE = regexp.MustCompile(`<div class="error">(?P<error>.*)</div>`)
+
 // authenticate uses the user and pass to pass the authentication challenge and returns the authorization_code
 func (c *Config) authenticate(client *http.Client, cookies cookies, uri, user, pass string) (string, error) {
 	// Find csrf
@@ -235,7 +238,11 @@ func (c *Config) authenticate(client *http.Client, cookies cookies, uri, user, p
 
 	if res.StatusCode != 302 {
 		body, _ := ioutil.ReadAll(res.Body)
-		return "", errors.New("status = " + res.Status + ", response = " + string(body))
+		errs := errorRE.FindStringSubmatch(string(body))
+		if len(errs) < 2 {
+			return "", errors.New("status = " + res.Status + ", response = " + string(body))
+		}
+		return "", errors.New(errs[1])
 	}
 
 	// Follow redirect to hydra

install.go

@@ -112,10 +112,21 @@ func askCredentials() (token string, err error) {
 	}
 	pass = string(bytePassword)
 
-	auth := auth.New()
-	auth.ClientID = "connector"
-	auth.Scopes = "iot:devices"
-	tok, err := auth.Token(user, pass)
+	authClient := auth.New()
+	authClient.ClientID = "connector"
+	authClient.Scopes = "iot:devices"
+
+	var tok *auth.Token
+	// Handle captcha
+	for {
+		tok, err = authClient.Token(user, pass)
+		if err == nil || !strings.HasPrefix(err.Error(), "authenticate: CAPTCHA") {
+			break
+		}
+		fmt.Println("The authentication requested a captcha! We can't let you solve it in a terminal, so please visit https://auth.arduino.cc/login. When you managed to log in from the browser come back here and press [Enter]")
+		var temp string
+		fmt.Scanln(&temp)
+	}
 	if err != nil {
 		return "", err
 	}