TUSK_URLS are considered (#87)

* TUSK_URLS are considered

* Update rEADME

README.md

@@ -10,6 +10,10 @@
 
 **Chrome:** https://chrome.google.com/webstore/detail/fmhmiaejopepamlcjkncpgpdjichnecm
 
+## Tusk Custom Fields
+
+* `TUSK_URLS`: a comma separated list of URLs or hostnames to which the entry should always match.  For example, active directory login credentials that must match several sites.  e.g. `my.login.domain.com,https://github.com,foobar.net`
+
 ## Build Setup
 
 Tusk requires:

lib/utils.js

@@ -3,6 +3,26 @@ const urlencode = function(str) {
 	return encodeURIComponent(str).replace(/[!'()*]/g, escape);
 }
 
+const getValidTokens = tokenString => {
+	if (!tokenString)
+		return []
+	else
+		return tokenString.toLowerCase().split(/\.|\s|\//).filter(t => {
+			return (t && t !== "com" && t !== "www" && t.length > 1)
+		})
+} // end getValidTokens
+
+const parseUrl = url => {
+	if (url && !url.indexOf('http') == 0)
+		url = 'http://' + url
+	//from https://gist.github.com/jlong/2428561
+	var parser = document.createElement('a')
+	parser.href = url
+	return parser
+} // end parseUrl
+
 export {
+	getValidTokens,
+	parseUrl,
 	urlencode
 }

services/googleDrivePasswordFileManager.js

@@ -172,10 +172,16 @@ function GoogleDrivePasswordFileManager(settings) {
 	}
 
 	// If this browser has the getAuthToken function.  Hack for #64
-	if (chrome.identity.getAuthToken !== undefined){
-		oauth['auth'] = chrome_auth;
+	try {
+		if (chrome.identity.getAuthToken !== undefined){
+			oauth['auth'] = chrome_auth;
+		}
+	} 
+	catch (e) {
+		console.info("Firefox mobile detected.")
 	}
 
+
 	return OauthManager(settings, oauth)
 }
 

services/keepassService.js

@@ -7,9 +7,8 @@ let Case = require('case'),
 	pako = require('pako'),
 	kdbxweb = require('kdbxweb')
 
-import {
-	argon2
-} from '$lib/argon2.js'
+import { argon2 } from '$lib/argon2.js'
+import { parseUrl, getValidTokens } from '$lib/utils.js'
 
 function KeepassService(keepassHeader, settings, passwordFileStoreRegistry, keepassReference) {
 	var my = {};
@@ -68,6 +67,45 @@ function KeepassService(keepassHeader, settings, passwordFileStoreRegistry, keep
 		});
 	}
 
+	my.rankEntries = (entries, siteUrl, title, siteTokens) => {
+		entries.forEach(function(entry) {
+			//apply a ranking algorithm to find the best matches
+			var entryHostnames = [ parseUrl(entry.url).hostname || "" ]
+
+			if (entry.keys.indexOf('tuskUrls') >= 0){
+				let others = entry.tuskUrls
+					.split(',')
+					.map(val => {
+						return parseUrl(val).hostname
+					})
+				entryHostnames = entryHostnames.concat(others)
+			}
+
+			if (entryHostnames.length && entryHostnames.some((host => host == siteUrl.hostname)))
+				entry.matchRank = 100 //exact url match
+			else
+				entry.matchRank = 0
+
+			entry.matchRank += (entry.title && title && entry.title.toLowerCase() == title.toLowerCase()) ? 1 : 0
+			entry.matchRank += (entry.title && entry.title.toLowerCase() === siteUrl.hostname.toLowerCase()) ? 1 : 0
+			entry.matchRank += (entry.url && siteUrl.hostname.indexOf(entry.url.toLowerCase()) > -1) ? 0.9 : 0
+			entry.matchRank += (entry.title && siteUrl.hostname.indexOf(entry.title.toLowerCase()) > -1) ? 0.9 : 0
+
+			var entryTokens = getValidTokens(entryHostnames.join('.') + "." + entry.title);
+			for (var i = 0; i < entryTokens.length; i++) {
+				var token1 = entryTokens[i]
+				for (var j = 0; j < siteTokens.length; j++) {
+					var token2 = siteTokens[j]
+					if (token1 == token2) {
+						console.log(token2)
+						entry.matchRank += 0.2;
+					}
+
+				}
+			}
+		})
+	} // end rankEntries
+
 	function getKey(isKdbx, masterPassword, fileKey) {
 		var creds = new kdbxweb.Credentials(kdbxweb.ProtectedValue.fromString(masterPassword), fileKey);
 		return creds.ready.then(() => {

src/components/Unlock.vue

@@ -78,6 +78,8 @@
 </template>
 
 <script>
+	import { parseUrl, getValidTokens } from '$lib/utils.js'
+
 	import InfoCluster from '@/components/InfoCluster'
 	import EntryList from '@/components/EntryList'
 	import Spinner from 'vue-simple-spinner'
@@ -223,55 +225,10 @@
 			},
 			showResults(entries) {
 
-				let getValidTokens = tokenString => {
-					if (!tokenString)
-						return []
-					else
-						return tokenString.toLowerCase().split(/\.|\s|\//).filter(t => {
-							return (t && t !== "com" && t !== "www" && t.length > 1)
-						})
-				} // end getValidTokens
-
-				let parseUrl = url => {
-					if (url && !url.indexOf('http') == 0)
-						url = 'http://' + url
-					//from https://gist.github.com/jlong/2428561
-					var parser = document.createElement('a')
-					parser.href = url
-					return parser
-				} // end parseUrl
-
-				let rankEntries = (entries, siteUrl, title, siteTokens) => {
-					entries.forEach(function(entry) {
-						//apply a ranking algorithm to find the best matches
-						var entryHostName = parseUrl(entry.url).hostname || ""
-
-						if (entryHostName && entryHostName == siteUrl.hostname)
-							entry.matchRank = 100 //exact url match
-						else
-							entry.matchRank = 0
-
-						entry.matchRank += (entry.title && title && entry.title.toLowerCase() == title.toLowerCase()) ? 1 : 0
-						entry.matchRank += (entry.title && entry.title.toLowerCase() === siteUrl.hostname.toLowerCase()) ? 1 : 0
-						entry.matchRank += (entry.url && siteUrl.hostname.indexOf(entry.url.toLowerCase()) > -1) ? 0.9 : 0
-						entry.matchRank += (entry.title && siteUrl.hostname.indexOf(entry.title.toLowerCase()) > -1) ? 0.9 : 0
-
-						var entryTokens = getValidTokens(entryHostName + "." + entry.title);
-						for (var i = 0; i < entryTokens.length; i++) {
-							var token1 = entryTokens[i]
-							for (var j = 0; j < siteTokens.length; j++) {
-								var token2 = siteTokens[j]
-
-								entry.matchRank += (token1 === token2) ? 0.2 : 0;
-							}
-						}
-					})
-				} // end rankEntries
-
 				let siteUrl = parseUrl(this.unlockedState.url)
 				let title = this.unlockedState.title
 				let siteTokens = getValidTokens(siteUrl.hostname + '.' + this.unlockedState.title)
-				rankEntries(entries, siteUrl, title, siteTokens) // in-place
+				this.keepassService.rankEntries(entries, siteUrl, title, siteTokens) // in-place
 
 				let allEntries = entries
 				let priorityEntries = entries
@@ -365,7 +322,6 @@
 			}
 		},
 		mounted() {
-
 			if (!this.isUnlocked()) {
 
 				let try_autounlock = () => {