#18 | Popup Issues - association/connection status issues

Author: alan-null

chromeipass/background/keepass.js

@@ -385,6 +385,47 @@ keepass.isAssociated = function () {
 	return !!(keepass.associated.value && keepass.associated.hash && keepass.associated.hash === keepass.databaseHash);
 };
 
+keepass.isPreAssociated = function () {
+	return (
+		keepass.databaseHash !== "no-hash" &&
+		(keepass.databaseHash in keepass.keyRing) &&
+		keepass.getCryptoKey() &&
+		!keepass.isEncryptionKeyUnrecognized &&
+		!keepass.isDatabaseClosed &&
+		keepass.isKeePassHttpAvailable
+	);
+};
+
+keepass.loadKeyRingAsync = function () {
+	return new Promise(completePromise => {
+		keepass._loadKeyRing(() => completePromise());
+	});
+};
+
+keepass.bootstrapAssociation = async function () {
+	try {
+		if (keepass.isAssociated()) {
+			return;
+		}
+		await keepass.loadKeyRingAsync();
+		await keepass._getDatabaseHashAsync(null, false);
+		if (keepass.isPreAssociated() && !keepass.isAssociated()) {
+			await keepass._testAssociationAsync(null, false);
+		}
+	} catch (e) {
+		console.log("bootstrapAssociation error", e);
+	}
+};
+
+if (chrome && chrome.runtime) {
+	try {
+		chrome.runtime.onStartup.addListener(() => keepass.bootstrapAssociation());
+		chrome.runtime.onInstalled.addListener(() => keepass.bootstrapAssociation());
+	} catch (e) {
+		console.log('bootstrapAssociation listener error', e);
+	}
+}
+
 keepass.send = function (request) {
 	// ORIGINAL synchronous keepass.send replaced (do not use directly)
 	throw new Error("keepass.send (synchronous) removed. Use keepass._sendAsync via higher level functions.");

chromeipass/background/service_worker.js

@@ -142,7 +142,13 @@ chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
                 return withTab(t => {
                     if (typeof browserAction !== 'undefined') {
                         if (!page.tabs[t.id]) page.tabs[t.id] = { stack: [], loginList: [], credentials: {}, errorMessage: null };
-                        page.tabs[t.id].loginList = (msg.args && msg.args[0]) ? (msg.args[0].map(u => ({ Login: u }))) : [];
+                        var stackData = {
+                            level: 1,
+                            iconType: "questionmark",
+                            popup: "popup_login.html"
+                        }
+                        browserAction.stackUnshift(stackData, t.id);
+                        page.tabs[t.id].loginList = (msg.args && msg.args[0]) ? (msg.args[0].map(u => ({ Login: u }))) : [];;
                         browserAction.show(null, t);
                     }
                     sendResponse({ ok: true });
@@ -169,20 +175,20 @@ chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
                 }, { ok: false });
             }
             case 'get_status': {
-                return withTab(t => {
-                    const status = {
-                        configured: keepass.isConfigured(),
-                        associated: keepass.isAssociated(),
-                        identifier: (keepass.databaseHash in keepass.keyRing)
-                            ? keepass.keyRing[keepass.databaseHash].id
-                            : null,
-                        keePassHttpAvailable: keepass.isKeePassHttpAvailable,
-                        databaseClosed: keepass.isDatabaseClosed,
-                        encryptionKeyUnrecognized: keepass.isEncryptionKeyUnrecognized,
-                        error: (t && page.tabs[t.id] && page.tabs[t.id].errorMessage) || undefined
-                    };
-                    sendResponse(status);
-                }, { configured: false, associated: false });
+                const tId = tab && tab.id;
+                const error = (tId && page.tabs[tId] && page.tabs[tId].errorMessage) || undefined;
+                sendResponse({
+                    configured: keepass.isConfigured(),
+                    associated: keepass.isAssociated(),
+                    identifier: (keepass.databaseHash in keepass.keyRing)
+                        ? keepass.keyRing[keepass.databaseHash].id
+                        : null,
+                    keePassHttpAvailable: keepass.isKeePassHttpAvailable,
+                    databaseClosed: keepass.isDatabaseClosed,
+                    encryptionKeyUnrecognized: keepass.isEncryptionKeyUnrecognized,
+                    error
+                });
+                return;
             }
             case 'check_update_keepasshttp': {
                 keepass.checkForNewKeePassHttpVersion()

chromeipass/popups/popup.js

@@ -29,25 +29,50 @@ function status_response(r) {
 	hide('configured-and-associated');
 	hide('configured-not-associated');
 
+	// Plugin unreachable
+	if (!r.keePassHttpAvailable) {
+		setHTML('error-message', r.error || 'Cannot reach KeePassHttp. Is KeePass running?');
+		show('error-encountered');
+		return;
+	}
 
-	if (!r.keePassHttpAvailable || r.databaseClosed) {
-		setHTML('error-message', r.error);
+	// Database closed
+	if (r.databaseClosed) {
+		setHTML('error-message', r.error || 'KeePass database is closed. Open it and reload status.');
 		show('error-encountered');
-	} else if (!r.configured) {
+		return;
+	}
+
+	// Not configured (no key stored for current hash)
+	if (!r.configured) {
 		show('not-configured');
-	} else if (r.encryptionKeyUnrecognized) {
-		show('need-reconfigure');
-		setHTML('need-reconfigure-message', r.error);
-	} else if (!r.associated) {
+		return;
+	}
+
+	// Key mismatch / encryption key lost
+	if (r.encryptionKeyUnrecognized) {
 		show('need-reconfigure');
-		setHTML('need-reconfigure-message', r.error);
-	} else if (typeof r.error !== 'undefined') {
+		setHTML('need-reconfigure-message', r.error || 'Encryption key not recognized. Please re-associate.');
+		return;
+	}
+
+	// Configured but not yet associated this session
+	if (!r.associated) {
+		show('configured-not-associated');
+		setHTML('unassociated-identifier', r.identifier);
+		return;
+	}
+
+	// Any explicit error after association
+	if (typeof r.error !== 'undefined' && r.error) {
 		show('error-encountered');
 		setHTML('error-message', r.error);
-	} else {
-		show('configured-and-associated');
-		setHTML('associated-identifier', r.identifier);
+		return;
 	}
+
+	// Success
+	show('configured-and-associated');
+	setHTML('associated-identifier', r.identifier || '(unknown)');
 }
 
 document.addEventListener('DOMContentLoaded', () => {