second beta release

* adds new feature: fill-in password confirmation
* adds new feature: fill-in password only
* adds new feature: setting for url and submit-utl format
* updates version Info.plist and Update.plist

Author: mmichaa

Icon-Toolbar-128.png

@@ -13,9 +13,9 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.beta1</string>
+	<string>1.0.beta2</string>
 	<key>CFBundleVersion</key>
-	<string>0.9.1</string>
+	<string>0.9.2</string>
 	<key>Chrome</key>
 	<dict>
 		<key>Global Page</key>

Info.plist

@@ -12,6 +12,10 @@ TODO write some useful stuff.
 
 TODO write some useful stuff.
 
+## Settings
+
+TODO write some useful stuff.
+
 ## Features
 
 - [X] Associate with KeePassHTTP
@@ -30,9 +34,15 @@ TODO write some useful stuff.
 - [X] Setting for language
   - [X] I18n support
   - [X] Translate into german
-- [ ] Fill-in password only
-  - [ ] Forms with one one password field only
-  - [ ] Forms with multiple password fields only
+- [X] Fill-in password
+  - [X] Forms with one password field only
+  - [X] Forms with two password fields only
+- [X] Setting for host-only URL on add/update
+- [X] Setting for protocol-host-path-only Submit-URL on add/update
+- [ ] Setting for auto-submit after fill-in
+  - [ ] Auto submit form after fill-in
+- [ ] Setting for auto fill-in
+  - [ ] Auto fill-in credentialson page visit
 
 ## Credits
 

README.md

@@ -22,6 +22,54 @@
 		<key>Type</key>
 		<string>TextField</string>
 	</dict>
+	<dict>
+		<key>DefaultValue</key>
+		<string>host</string>
+		<key>Key</key>
+		<string>url_format</string>
+		<key>Title</key>
+		<string>URL-Format</string>
+		<key>Titles</key>
+		<array>
+			<string>Full</string>
+			<string>Protocol, Host &amp; Path</string>
+			<string>Protocol &amp; Host</string>
+			<string>Host</string>
+		</array>
+		<key>Type</key>
+		<string>PopUpButton</string>
+		<key>Values</key>
+		<array>
+			<string>full</string>
+			<string>protocol_host_path</string>
+			<string>protocol_host</string>
+			<string>host</string>
+		</array>
+	</dict>
+	<dict>
+		<key>DefaultValue</key>
+		<string>protocol_host</string>
+		<key>Key</key>
+		<string>submit_url_format</string>
+		<key>Title</key>
+		<string>Submit-URL-Format</string>
+		<key>Titles</key>
+		<array>
+			<string>Full</string>
+			<string>Protocol, Host &amp; Path</string>
+			<string>Protocol &amp; Host</string>
+			<string>Host</string>
+		</array>
+		<key>Type</key>
+		<string>PopUpButton</string>
+		<key>Values</key>
+		<array>
+			<string>full</string>
+			<string>protocol_host_path</string>
+			<string>protocol_host</string>
+			<string>host</string>
+		</array>
+	</dict>
 	<dict>
 		<key>DefaultValue</key>
 		<string>en</string>

Settings.plist

@@ -10,11 +10,11 @@
        <key>Developer Identifier</key>
        <string>897X8SYVFR</string>
        <key>CFBundleVersion</key>
-       <string>1.0.beta1</string>
+       <string>1.0.beta2</string>
        <key>CFBundleShortVersionString</key>
-       <string>0.9.1</string>
+       <string>0.9.2</string>
        <key>URL</key>
-       <string>https://github.com/mmichaa/passafari.safariextension/releases/download/v1.0.beta1/passafari-v1.0.beta1.safariextz</string>
+       <string>https://github.com/mmichaa/passafari.safariextension/releases/download/v1.0.beta2/passafari-v1.0.beta2.safariextz</string>
      </dict>
    </array>
 </dict>

Update.plist

@@ -28,13 +28,14 @@ if(window.parent === window) {
 function passafari_injected_message_fillin(event_name, event_data) {
 	if(event_data.length === 1) {
 		var credentials = event_data[0];
-		var input_candidates = passafari_input_candidates();
+		var input_candidates = passafari_input_candidates(true);
 
 		if(input_candidates.length === 1) {
 			var inputs = input_candidates[0];
 
-			inputs.username.value = credentials.Login;
-			inputs.password.value = credentials.Password;
+			if(inputs.username) { inputs.username.value = credentials.Login; }
+			if(inputs.password) { inputs.password.value = credentials.Password; }
+			if(inputs.password_confirmation) { inputs.password_confirmation.value = credentials.Password; }
 		} else {
 			console.log("passafari_injected_message_fillin: more than one inputs found.")
 			console.log(inputs);
@@ -49,15 +50,16 @@ function passafari_injected_message_fillin(event_name, event_data) {
 
 // CALLED by passafari_injected_message_handler
 function passafari_injected_message_readout(event_name, event_data) {
-	var input_candidates = passafari_input_candidates();
+	var input_candidates = passafari_input_candidates(false);
 
 	if(input_candidates.length === 1) {
 		var inputs = input_candidates[0];
 
 		var username = inputs.username.value;
 		var password = inputs.password.value;
+		var submit_url = inputs.username.form.action;
 
-		passafari_notify_global_page("passafari_message_readout", {"Login": username, "Password": password, "Uuid": undefined});
+		passafari_notify_global_page("passafari_message_readout", {"Login": username, "Password": password, "SubmitUrl": submit_url, "Uuid": undefined});
 	} else {
 		console.log("passafari_injected_message_readout: more than one inputs found.")
 		console.log(inputs);
@@ -75,7 +77,7 @@ function passafari_notify_global_page(msg_name, msg_data) {
 }
 
 // UTILS end.js related
-function passafari_input_candidates() {
+function passafari_input_candidates(allow_password_only) {
 	var candidates = [];
 
 	for(var form_idx=0; form_idx < document.forms.length; form_idx++) {
@@ -85,7 +87,7 @@ function passafari_input_candidates() {
 			continue;
 		}
 
-		var inputs = { "username": undefined, "password": undefined };
+		var inputs = { "username": undefined, "password": undefined, "password_confirmation": undefined };
 
 		for(var elem_idx=0; elem_idx < form.elements.length; elem_idx++) {
 			var elem = form.elements[elem_idx];
@@ -97,23 +99,32 @@ function passafari_input_candidates() {
 			var elem_type = elem.type.toLowerCase();
 
 			if(elem_type === "password") {
-				inputs["password"] = elem;
+				if(inputs.password === undefined) { inputs.password = elem; }
+				else if(inputs.password_confirmation === undefined) { inputs.password_confirmation = elem; }
 			}
-			else if(elem_type === 'email' || elem_type === 'text') {
-				inputs["username"] = elem;
+			else if(elem_type === "email" || elem_type === "text") {
+				inputs.username = elem;
 			}
 
-			if(inputs["username"] && inputs["password"]) {
-				candidates.push(inputs);
+			if(inputs.username && inputs.password && inputs.password_confirmation) {
 				break;
 			}
 		}
+
+		if(inputs.username && inputs.password) {
+			candidates.push(inputs);
+			continue;
+		}
+		else if(allow_password_only && inputs.password) {
+			candidates.push(inputs);
+			continue;
+		}
 	}
 
 	for(var candidate_idx=0; candidate_idx < candidates.length; candidate_idx++) {
 		var inputs = candidates[candidate_idx];
 
-		if(inputs.username === document.activeElement || inputs.password === document.activeElement) {
+		if(inputs.password === document.activeElement || inputs.username === document.activeElement) {
 			console.log("passafari_input_candidates: using focused fields.")
 			candidates = [ inputs ];
 			break;

end.js

@@ -82,10 +82,11 @@ function passafari_command_update(event) {
 	if(credential) {
 		var updateCallback = function(code) { console.log("passafari_command_update: response code '" + code + "'.") };
 		var tab = undefined;
-		var entryId = credential.Uuid;
+		var entry_id = credential.Uuid;
 		var username = credential.Login;
 		var password = credential.Password;
-		var url = safari.application.activeBrowserWindow.activeTab.url;
+		var url = passafari_format_url(passafari_active_tab_url());
+		var submit_url = passafari_format_submit_url(credential.SubmitUrl);
 
 		if(password === undefined || password === "") {
 			var passwords = passafari_generate_password();
@@ -95,7 +96,7 @@ function passafari_command_update(event) {
 				passafari_notify_injected("passafari_message_fillin", [ credential ]);
 			}
 		}
-		keepass.updateCredentials(updateCallback, tab, entryId, username, password, url);
+		keepass.updateCredentials(updateCallback, tab, entry_id, username, password, url, submit_url);
 	} else {
 		console.log("passafari_command_update: no credential found in cache for index '" + idx + "'.");
 	}
@@ -124,6 +125,7 @@ function passafari_message_readout(event) {
 					var credential_upd = clone(credential);
 					credential_upd.passafari_command = "passafari_command_update"
 					credential_upd.Password = readout.Password;
+					credential_upd.SubmitUrl = readout.SubmitUrl;
 					credentials.push(credential_upd);
 					continue;
 				} else {
@@ -163,27 +165,30 @@ function passafari_display_credentials(credentials) {
 		var menu_item_image = undefined;
 
 		if(credential.passafari_command === "passafari_command_select") {
-			//menu_item_label = "credentials.fillin".toLocaleString() + ": " + credential.Login + " (" + credential.Name + ")";
 			menu_item_label = credential.Login + " (" + credential.Name + ")";
 			menu_item_image = safari.extension.baseURI + "images/font-awesome-pencil-square-o.png";
 		} else if(credential.passafari_command === "passafari_command_update" && credential.Uuid !== undefined) {
-			//menu_item_label = "credentials.update".toLocaleString() + ": " + credential.Login + " (" + credential.Name + ")";
-			menu_item_label = credential.Login + " (" + credential.Name + ")";
+			menu_item_label = credential.Login + " (" + credential.Name;
 			menu_item_image = safari.extension.baseURI + "images/font-awesome-floppy-o.png";
 
+			if (credential.Password === undefined || credential.Password === "") {
+				menu_item_label = menu_item_label + "; " + "credentials.password_generated".toLocaleString() + ")";
+			} else {
+				menu_item_label = menu_item_label + "; " + "credentials.password_entered".toLocaleString() + ")";
+			}
+
 			if (!menu_update_item_added) {
 				menu.appendSeparator("passafari_credentials_update_section");
 				menu_update_item_added = true;
 			}
 		} else if(credential.passafari_command === "passafari_command_update" && credential.Uuid === undefined) {
-			//menu_item_label = "credentials.add".toLocaleString() + ": " + credential.Login;
 			menu_item_label = credential.Login;
 			menu_item_image = safari.extension.baseURI + "images/font-awesome-plus-square-o.png";
 
 			if (credential.Password === undefined || credential.Password === "") {
 				menu_item_label = menu_item_label + " (" + "credentials.password_generated".toLocaleString() + ")";
 			} else {
-				menu_item_label = menu_item_label + " (" + "credentials.password_readout".toLocaleString() + ")";
+				menu_item_label = menu_item_label + " (" + "credentials.password_entered".toLocaleString() + ")";
 			}
 
 			if (!menu_add_item_added) {
@@ -215,6 +220,10 @@ function passafari_toolbar_item() {
 	return safari.extension.toolbarItems[0];
 }
 
+function passafari_active_tab_url() {
+	return safari.application.activeBrowserWindow.activeTab.url;
+}
+
 // UTILS global.js related
 function passafari_credentials_cache(credentials) {
 	if(credentials === undefined) {
@@ -229,6 +238,60 @@ function passafari_credentials_cache(credentials) {
 	return credentials;
 }
 
+// UTILS global.js related
+function passafari_format_url(url) {
+	var format = safari.extension.settings.url_format;
+
+	if(format === "protocol_host_path") {
+		return passafari_url_protocol_host_path_only(url);
+	} else if(format === "protocol_host") {
+		return passafari_url_protocol_host_only(url);
+	} else if(format === "host") {
+		return passafari_url_host_only(url);
+	} else {
+		return url;
+	}
+}
+
+// UTILS global.js related
+function passafari_format_submit_url(url) {
+	var format = safari.extension.settings.submit_url_format;
+
+	if(format === "protocol_host_path") {
+		return passafari_url_protocol_host_path_only(url);
+	} else if(format === "protocol_host") {
+		return passafari_url_protocol_host_only(url);
+	} else if(format === "host") {
+		return passafari_url_host_only(url);
+	} else {
+		return url;
+	}
+}
+
+// UTILS global.js related (passafari_format_url & passafari_format_submit_url)
+function passafari_url_host_only(url) {
+	var link = document.createElement("a");
+	link.href = url;
+
+	return link.host;
+}
+
+// UTILS global.js related (passafari_format_url & passafari_format_submit_url)
+function passafari_url_protocol_host_only(url) {
+	var link = document.createElement("a");
+	link.href = url;
+
+	return link.protocol + "//" + link.host;
+}
+
+// UTILS global.js related (passafari_format_url & passafari_format_submit_url)
+function passafari_url_protocol_host_path_only(url) {
+	var link = document.createElement("a");
+	link.href = url;
+
+	return link.protocol + "//" + link.host + link.pathname;
+}
+
 // UTILS global.js / keepass.js related
 function passafari_associate(event) {
 	if(keepass.isConfigured()) {
@@ -251,21 +314,21 @@ function passafari_associate(event) {
 function passafari_retrieve_credentials(callback) {
 	callback = (callback === undefined) ? function(credentials) {} : callback;
 	var tab = undefined;
-	var url = safari.application.activeBrowserWindow.activeTab.url;
-	var submiturl = undefined;
-	var forceCallback = false;
-	var triggerUnlock = true;
+	var url = passafari_format_url(passafari_active_tab_url());
+	var submit_url = passafari_format_submit_url(passafari_active_tab_url());
+	var force_callback = false;
+	var trigger_unlock = true;
 
 	if(url) {
-		return keepass.retrieveCredentials(callback, tab, url, submiturl, forceCallback, triggerUnlock);
+		return keepass.retrieveCredentials(callback, tab, url, submit_url, force_callback, trigger_unlock);
 	} else {
 		return undefined;
 	}
 }
 
 // UTILS global.js / keepass.js related
-function passafari_generate_password(callback, forceCallback) {
+function passafari_generate_password(callback, force_callback) {
 	callback = (callback === undefined) ? function(passwords) {} : callback;
 
-	return keepass.generatePassword(callback, undefined, forceCallback);
+	return keepass.generatePassword(callback, undefined, force_callback);
 }