Merge pull request #16 from rusq/ua-fix

User-Agent fix + optimisations

Author: rusq

browser.go

@@ -0,0 +1,120 @@
+package slackauth
+
+import (
+	"fmt"
+	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+
+	"github.com/go-rod/rod"
+	"github.com/go-rod/rod/lib/launcher"
+	"github.com/go-rod/rod/lib/proto"
+)
+
+func browserLauncher(headless bool) *launcher.Launcher {
+	var l *launcher.Launcher
+	if binpath, ok := lookPath(); ok {
+		l = launcher.New().
+			Bin(binpath).
+			Headless(headless).
+			Leakless(isLeaklessEnabled). // Causes false positive on Windows, see #260
+			Devtools(false)
+	} else {
+		l = launcher.New().
+			Leakless(isLeaklessEnabled). // Causes false positive on Windows, see #260
+			Headless(headless).
+			Devtools(false)
+	}
+	return l
+}
+
+// lookPath is extended launcher.LookPath that includes support for Brave
+// browser.
+//
+// (c) MIT license: Copyright 2019 Yad Smood
+func lookPath() (found string, has bool) {
+	list := map[string][]string{
+		"darwin": {
+			"/Applications/Brave Browser.app/Contents/MacOS/Brave Browser",
+			"/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+			"/Applications/Chromium.app/Contents/MacOS/Chromium",
+			"/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
+			"/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary",
+			"/usr/bin/google-chrome-stable",
+			"/usr/bin/google-chrome",
+			"/usr/bin/chromium",
+			"/usr/bin/chromium-browser",
+		},
+		"linux": {
+			"brave-browser",
+			"chrome",
+			"google-chrome",
+			"/usr/bin/brave-browser",
+			"/usr/bin/google-chrome",
+			"microsoft-edge",
+			"/usr/bin/microsoft-edge",
+			"chromium",
+			"chromium-browser",
+			"/usr/bin/google-chrome-stable",
+			"/usr/bin/chromium",
+			"/usr/bin/chromium-browser",
+			"/snap/bin/chromium",
+			"/data/data/com.termux/files/usr/bin/chromium-browser",
+		},
+		"openbsd": {
+			"chrome",
+			"chromium",
+		},
+		"windows": append([]string{"chrome", "edge"}, expandWindowsExePaths(
+			`BraveSoftware\Brave-Browser\Application\brave.exe`,
+			`Google\Chrome\Application\chrome.exe`,
+			`Chromium\Application\chrome.exe`,
+			`Microsoft\Edge\Application\msedge.exe`,
+		)...),
+	}[runtime.GOOS]
+
+	for _, path := range list {
+		var err error
+		found, err = exec.LookPath(path)
+		has = err == nil
+		if has {
+			break
+		}
+	}
+
+	return
+}
+
+// expandWindowsExePaths is a verbatim copy of the function from rod's
+// browser.go.
+//
+// (c) MIT license: Copyright 2019 Yad Smood
+func expandWindowsExePaths(list ...string) []string {
+	newList := []string{}
+	for _, p := range list {
+		newList = append(
+			newList,
+			filepath.Join(os.Getenv("ProgramFiles"), p),
+			filepath.Join(os.Getenv("ProgramFiles(x86)"), p),
+			filepath.Join(os.Getenv("LocalAppData"), p),
+		)
+	}
+
+	return newList
+}
+
+func setCookies(browser *rod.Browser, cookies []*http.Cookie) error {
+	if len(cookies) == 0 {
+		return nil
+	}
+	for _, c := range cookies {
+		if err := browser.SetCookies([]*proto.NetworkCookieParam{
+			{Name: c.Name, Value: c.Value, Domain: c.Domain, Path: c.Path, Expires: proto.TimeSinceEpoch(c.Expires.Unix())},
+		}); err != nil {
+			return fmt.Errorf("failed to set cookies: %w", err)
+		}
+	}
+	return nil
+}

cmd/playground/main.go

@@ -41,7 +41,7 @@ func browserLogin(ctx context.Context) {
 	ctx, cancel := context.WithTimeoutCause(ctx, 180*time.Second, errors.New("user too slow"))
 	defer cancel()
 
-	token, cookies, err := slackauth.Browser(ctx, workspace, slackauth.WithNoConsentPrompt(), slackauth.WithUserAgentAuto())
+	token, cookies, err := slackauth.Browser(ctx, workspace, slackauth.WithNoConsentPrompt())
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -57,12 +57,14 @@ func autoLogin(ctx context.Context) {
 	username := envOrScan("EMAIL", "Enter email: ")
 	password := envOrScan("PASSWORD", "Enter password: ")
 
-	token, cookies, err := slackauth.Headless(ctx, workspace, username, password, slackauth.WithDebug(enableTrace), slackauth.WithNoConsentPrompt(), slackauth.WithUserAgentAuto())
+	start := time.Now()
+	token, cookies, err := slackauth.Headless(ctx, workspace, username, password, slackauth.WithDebug(enableTrace), slackauth.WithNoConsentPrompt())
 	if err != nil {
 		log.Fatal(err)
 	}
 	fmt.Println(token)
 	fmt.Println(cookies)
+	fmt.Println("login took:", time.Since(start))
 }
 
 func envOrScan(env, prompt string) string {

hijacker.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/go-rod/rod"
-	"github.com/go-rod/rod/lib/proto"
 )
 
 // hijacker is a helper for hijacking requests.
@@ -70,20 +69,6 @@ func (h *hijacker) Token(ctx context.Context) (string, error) {
 	}
 }
 
-func setCookies(browser *rod.Browser, cookies []*http.Cookie) error {
-	if len(cookies) == 0 {
-		return nil
-	}
-	for _, c := range cookies {
-		if err := browser.SetCookies([]*proto.NetworkCookieParam{
-			{Name: c.Name, Value: c.Value, Domain: c.Domain, Path: c.Path, Expires: proto.TimeSinceEpoch(c.Expires.Unix())},
-		}); err != nil {
-			return fmt.Errorf("failed to set cookies: %w", err)
-		}
-	}
-	return nil
-}
-
 const (
 	maxMem     = 131072
 	paramToken = "token"