Support per-site configuration for autoSubmit in pass entries (#252) (fixes #251)

Author: erayd

browserpass.go

@@ -19,11 +19,12 @@ import (
 
 // Login represents a single pass login.
 type Login struct {
-	Username string `json:"u"`
-	Password string `json:"p"`
-	OTP      string `json:"digits"`
-	OTPLabel string `json:"label"`
-	URL      string `json:"url"`
+	Username   string `json:"u"`
+	Password   string `json:"p"`
+	OTP        string `json:"digits"`
+	OTPLabel   string `json:"label"`
+	URL        string `json:"url"`
+	AutoSubmit *bool  `json:"autoSubmit,omitempty"`
 }
 
 var endianness = binary.LittleEndian
@@ -37,7 +38,7 @@ var endianness = binary.LittleEndian
 // Config defines the root config structure sent from the browser extension
 type Config struct {
 	// Manual searches use FuzzySearch if true, GlobSearch otherwise
-	UseFuzzy    bool                    `json:"use_fuzzy_search"`
+	UseFuzzy     bool                   `json:"use_fuzzy_search"`
 	CustomStores []pass.StoreDefinition `json:"customStores"`
 }
 
@@ -231,19 +232,31 @@ func parseLogin(r io.Reader) (*Login, error) {
 	// Keep reading file for string in "login:", "username:" or "user:" format (case insensitive).
 	userPattern := regexp.MustCompile("(?i)^(login|username|user):")
 	urlPattern := regexp.MustCompile("(?i)^(url|link|website|web|site):")
+	autoSubmitPattern := regexp.MustCompile("(?i)^autosubmit:")
 	for scanner.Scan() {
 		line := scanner.Text()
-		parseTotp(line, login)
-		replaced := userPattern.ReplaceAllString(line, "")
-		if len(replaced) != len(line) {
-			login.Username = strings.TrimSpace(replaced)
+		if login.OTP == "" {
+			parseTotp(line, login)
+		}
+		if login.Username == "" {
+			replaced := userPattern.ReplaceAllString(line, "")
+			if len(replaced) != len(line) {
+				login.Username = strings.TrimSpace(replaced)
+			}
 		}
 		if login.URL == "" {
-			replaced = urlPattern.ReplaceAllString(line, "")
+			replaced := urlPattern.ReplaceAllString(line, "")
 			if len(replaced) != len(line) {
 				login.URL = strings.TrimSpace(replaced)
 			}
 		}
+		if login.AutoSubmit == nil {
+			replaced := autoSubmitPattern.ReplaceAllString(line, "")
+			if len(replaced) != len(line) {
+				value := strings.ToLower(strings.TrimSpace(replaced)) == "true"
+				login.AutoSubmit = &value
+			}
+		}
 	}
 
 	// if an unlabelled OTP is present, label it with the username

chrome/background.browserify.js

@@ -12,7 +12,7 @@ chrome.tabs.onUpdated.addListener(onTabUpdated);
 chrome.runtime.onInstalled.addListener(onExtensionInstalled);
 
 // fill login form & submit
-function fillLoginForm(login, tab) {
+function fillLoginForm(login, tab, autoSubmit) {
   const loginParam = JSON.stringify(login);
   chrome.tabs.executeScript(
     tab.id,
@@ -23,7 +23,7 @@ function fillLoginForm(login, tab) {
     function() {
       chrome.tabs.executeScript({
         allFrames: true,
-        code: `browserpassFillForm(${loginParam}, ${getSettings().autoSubmit});`
+        code: `browserpassFillForm(${loginParam}, ${autoSubmit});`
       });
     }
   );
@@ -76,7 +76,8 @@ function onMessage(request, sender, sendResponse) {
           ) {
             // do not send login data to page if URL changed during search.
             if (tabs[0].url == request.urlDuringSearch) {
-              fillLoginForm(response, tabs[0]);
+              var autoSubmit = response.hasOwnProperty('autoSubmit') ? response.autoSubmit : getSettings().autoSubmit;
+              fillLoginForm(response, tabs[0], autoSubmit);
             }
           });