Backport: 6x > 2x: Optional show key selector in details view (#525)

dodmi · web-flow · commit a4f5bd4938b5 · 2025-05-26T21:31:41.000Z
diff --git a/chrome/content/options_display.js b/chrome/content/options_display.js
@@ -17,6 +17,7 @@ let gDKIMOptionsDisplayPane = {
 		if (gDKIMOptionsDisplayPane.initDone) { return; }
 		gDKIMOptionsDisplayPane.checkBox.showAdvancedInfo = document.getElementById("display.advancedInfo.show");
 		gDKIMOptionsDisplayPane.checkBox.allSignatures = document.getElementById("display.advancedInfo.allSignatures");
+		gDKIMOptionsDisplayPane.checkBox.includeSelector = document.getElementById("display.advancedInfo.includeSelector");
 		gDKIMOptionsDisplayPane.checkBox.includeHeaders = document.getElementById("display.advancedInfo.includeHeaders");
 		gDKIMOptionsDisplayPane.toggleDetailsOptionsEnabled();
 		gDKIMOptionsDisplayPane.initDone = true;
@@ -26,6 +27,7 @@ let gDKIMOptionsDisplayPane = {
 		"use strict";
 		let disabled = !gDKIMOptionsDisplayPane.checkBox.showAdvancedInfo.checked;
 		gDKIMOptionsDisplayPane.checkBox.allSignatures.disabled = disabled;
+		gDKIMOptionsDisplayPane.checkBox.includeSelector.disabled = disabled;
 		gDKIMOptionsDisplayPane.checkBox.includeHeaders.disabled = disabled;
 	}
 
diff --git a/chrome/content/options_display.xul b/chrome/content/options_display.xul
@@ -69,6 +69,9 @@
 		<preference id="pref_display.advancedInfo.allSignatures"
 		            name="extensions.dkim_verifier.advancedInfo.allSignatures"
 		            type="bool"/>
+		<preference id="pref_display.advancedInfo.includeSelector"
+		            name="extensions.dkim_verifier.advancedInfo.includeSelector"
+		            type="bool"/>
 		<preference id="pref_display.advancedInfo.includeHeaders"
 		            name="extensions.dkim_verifier.advancedInfo.includeHeaders"
 		            type="bool"/>
@@ -202,6 +205,9 @@
 			<checkbox preference="pref_display.advancedInfo.allSignatures"
 					  label="&display.advancedInfo.allSignatures.label;"
 					  id="display.advancedInfo.allSignatures" />
+			<checkbox preference="pref_display.advancedInfo.includeSelector"
+					  label="&display.advancedInfo.includeSelector.label;"
+					  id="display.advancedInfo.includeSelector" />
 			<checkbox preference="pref_display.advancedInfo.includeHeaders"
 					  label="&display.advancedInfo.includeHeaders.label;"
 					  id="display.advancedInfo.includeHeaders" />
diff --git a/chrome/locale/de/dkim.properties b/chrome/locale/de/dkim.properties
@@ -118,5 +118,6 @@ DKIM_RESULT_DETAILS_TIME_EXPIRY = Sigiert um %S, läuft ab um %S
 DKIM_RESULT_DETAILS_TIME_NO_EXPIRY = Signiert um %S, läuft nie ab
 DKIM_RESULT_DETAILS_ALGORITHM = Algorithmus: %S / %S
 DKIM_RESULT_DETAILS_ALGORITHM_WITH_LENGTH = Algorithmus: %S (%S Bit) / %S
+DKIM_RESULT_DETAILS_SELECTOR = Schlüssel-Selektor: %S
 DKIM_RESULT_DETAILS_HEADERS = Signierte Kopfzeilen: %S
 DKIM_RESULT_DETAILS_WARNINGS = Warnungen:\n- %S
diff --git a/chrome/locale/de/options.dtd b/chrome/locale/de/options.dtd
@@ -108,4 +108,5 @@
 
 <!ENTITY display.advancedInfo.show.label "Erweiterte Signatur-Informationen in Tooltips anzeigen">
 <!ENTITY display.advancedInfo.allSignatures.label "Alle Signaturen anzeigen">
+<!ENTITY display.advancedInfo.includeSelector.label "Schlüssel-Selektor anzeigen">
 <!ENTITY display.advancedInfo.includeHeaders.label "Information über signierte Kopfzeilen anzeigen">
diff --git a/chrome/locale/en-US/dkim.properties b/chrome/locale/en-US/dkim.properties
@@ -118,5 +118,6 @@ DKIM_RESULT_DETAILS_TIME_EXPIRY = Signed at %S, expires at %S
 DKIM_RESULT_DETAILS_TIME_NO_EXPIRY = Signed at %S, expires never
 DKIM_RESULT_DETAILS_ALGORITHM = Algorithm: %S / %S
 DKIM_RESULT_DETAILS_ALGORITHM_WITH_LENGTH = Algorithm: %S (%S bit) / %S
+DKIM_RESULT_DETAILS_SELECTOR = Key selector: %S
 DKIM_RESULT_DETAILS_HEADERS = Signed headers: %S
 DKIM_RESULT_DETAILS_WARNINGS = Warnings:\n- %S
diff --git a/chrome/locale/en-US/options.dtd b/chrome/locale/en-US/options.dtd
@@ -108,4 +108,5 @@
 
 <!ENTITY display.advancedInfo.show.label "Show extended signature information in tooltips">
 <!ENTITY display.advancedInfo.allSignatures.label "Show all signatures">
+<!ENTITY display.advancedInfo.includeSelector.label "Show key selector">
 <!ENTITY display.advancedInfo.includeHeaders.label "Show signed headers">
diff --git a/chrome/locale/fr/dkim.properties b/chrome/locale/fr/dkim.properties
@@ -118,5 +118,6 @@ DKIM_RESULT_DETAILS_TIME_EXPIRY = Signed at %S, expires at %S
 DKIM_RESULT_DETAILS_TIME_NO_EXPIRY = Signed at %S, expires never
 DKIM_RESULT_DETAILS_ALGORITHM = Algorithm: %S / %S
 DKIM_RESULT_DETAILS_ALGORITHM_WITH_LENGTH = Algorithm: %S (%S bit) / %S
+DKIM_RESULT_DETAILS_SELECTOR = Key selector: %S
 DKIM_RESULT_DETAILS_HEADERS = Signed headers: %S
 DKIM_RESULT_DETAILS_WARNINGS = Warnings:\n- %S
diff --git a/chrome/locale/fr/options.dtd b/chrome/locale/fr/options.dtd
@@ -108,4 +108,5 @@
 
 <!ENTITY display.advancedInfo.show.label "Show extended signature information in tooltips">
 <!ENTITY display.advancedInfo.allSignatures.label "Show all signatures">
+<!ENTITY display.advancedInfo.includeSelector.label "Show key selector">
 <!ENTITY display.advancedInfo.includeHeaders.label "Show signed headers">
diff --git a/chrome/locale/hu/dkim.properties b/chrome/locale/hu/dkim.properties
@@ -118,5 +118,6 @@ DKIM_RESULT_DETAILS_TIME_EXPIRY = Signed at %S, expires at %S
 DKIM_RESULT_DETAILS_TIME_NO_EXPIRY = Signed at %S, expires never
 DKIM_RESULT_DETAILS_ALGORITHM = Algorithm: %S / %S
 DKIM_RESULT_DETAILS_ALGORITHM_WITH_LENGTH = Algorithm: %S (%S bit) / %S
+DKIM_RESULT_DETAILS_SELECTOR = Key selector: %S
 DKIM_RESULT_DETAILS_HEADERS = Signed headers: %S
 DKIM_RESULT_DETAILS_WARNINGS = Warnings:\n- %S
diff --git a/chrome/locale/hu/options.dtd b/chrome/locale/hu/options.dtd
@@ -108,4 +108,5 @@
 
 <!ENTITY display.advancedInfo.show.label "Show extended signature information in tooltips">
 <!ENTITY display.advancedInfo.allSignatures.label "Show all signatures">
+<!ENTITY display.advancedInfo.includeSelector.label "Show key selector">
 <!ENTITY display.advancedInfo.includeHeaders.label "Show signed headers">
diff --git a/chrome/locale/it/dkim.properties b/chrome/locale/it/dkim.properties
@@ -118,5 +118,6 @@ DKIM_RESULT_DETAILS_TIME_EXPIRY = Signed at %S, expires at %S
 DKIM_RESULT_DETAILS_TIME_NO_EXPIRY = Signed at %S, expires never
 DKIM_RESULT_DETAILS_ALGORITHM = Algorithm: %S / %S
 DKIM_RESULT_DETAILS_ALGORITHM_WITH_LENGTH = Algorithm: %S (%S bit) / %S
+DKIM_RESULT_DETAILS_SELECTOR = Key selector: %S
 DKIM_RESULT_DETAILS_HEADERS = Signed headers: %S
 DKIM_RESULT_DETAILS_WARNINGS = Warnings:\n- %S
diff --git a/chrome/locale/it/options.dtd b/chrome/locale/it/options.dtd
@@ -108,4 +108,5 @@
 
 <!ENTITY display.advancedInfo.show.label "Show extended signature information in tooltips">
 <!ENTITY display.advancedInfo.allSignatures.label "Show all signatures">
+<!ENTITY display.advancedInfo.includeSelector.label "Show key selector">
 <!ENTITY display.advancedInfo.includeHeaders.label "Show signed headers">
diff --git a/chrome/locale/ja-JP/dkim.properties b/chrome/locale/ja-JP/dkim.properties
@@ -118,5 +118,6 @@ DKIM_RESULT_DETAILS_TIME_EXPIRY = Signed at %S, expires at %S
 DKIM_RESULT_DETAILS_TIME_NO_EXPIRY = Signed at %S, expires never
 DKIM_RESULT_DETAILS_ALGORITHM = Algorithm: %S / %S
 DKIM_RESULT_DETAILS_ALGORITHM_WITH_LENGTH = Algorithm: %S (%S bit) / %S
+DKIM_RESULT_DETAILS_SELECTOR = Key selector: %S
 DKIM_RESULT_DETAILS_HEADERS = Signed headers: %S
 DKIM_RESULT_DETAILS_WARNINGS = Warnings:\n- %S
diff --git a/chrome/locale/ja-JP/options.dtd b/chrome/locale/ja-JP/options.dtd
@@ -108,4 +108,5 @@
 
 <!ENTITY display.advancedInfo.show.label "Show extended signature information in tooltips">
 <!ENTITY display.advancedInfo.allSignatures.label "Show all signatures">
+<!ENTITY display.advancedInfo.includeSelector.label "Show key selector">
 <!ENTITY display.advancedInfo.includeHeaders.label "Show signed headers">
diff --git a/chrome/locale/zh-CN/dkim.properties b/chrome/locale/zh-CN/dkim.properties
@@ -114,5 +114,6 @@ DKIM_RESULT_DETAILS_TIME_EXPIRY = Signed at %S, expires at %S
 DKIM_RESULT_DETAILS_TIME_NO_EXPIRY = Signed at %S, expires never
 DKIM_RESULT_DETAILS_ALGORITHM = Algorithm: %S / %S
 DKIM_RESULT_DETAILS_ALGORITHM_WITH_LENGTH = Algorithm: %S (%S bit) / %S
+DKIM_RESULT_DETAILS_SELECTOR = Key selector: %S
 DKIM_RESULT_DETAILS_HEADERS = Signed headers: %S
 DKIM_RESULT_DETAILS_WARNINGS = Warnings:\n- %S
diff --git a/chrome/locale/zh-CN/options.dtd b/chrome/locale/zh-CN/options.dtd
@@ -87,4 +87,5 @@
 
 <!ENTITY display.advancedInfo.show.label "Show extended signature information in tooltips">
 <!ENTITY display.advancedInfo.allSignatures.label "Show all signatures">
+<!ENTITY display.advancedInfo.includeSelector.label "Show key selector">
 <!ENTITY display.advancedInfo.includeHeaders.label "Show signed headers">
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
@@ -124,6 +124,7 @@ pref("extensions.dkim_verifier.color.nosig.background", "unset");
 
 pref("extensions.dkim_verifier.advancedInfo.show", false);
 pref("extensions.dkim_verifier.advancedInfo.allSignatures", false);
+pref("extensions.dkim_verifier.advancedInfo.includeSelector", false);
 pref("extensions.dkim_verifier.advancedInfo.includeHeaders", false);
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/modules/authVerifier.jsm.js b/modules/authVerifier.jsm.js
@@ -392,6 +392,7 @@ function dkimSigResultV2_to_AuthResultDKIM(dkimSigResult) { // eslint-disable-li
 		let result = authResultDKIM.result_str;
 		let sigAlgo = dkimSigResult.algorithmSignature ? dkimSigResult.algorithmSignature.toUpperCase() : undefined;
 		let keyLength = dkimSigResult.keyLength ? dkimSigResult.keyLength.toString() : undefined;
+		let keySelector = dkimSigResult.selector;
 		let hashAlgo = dkimSigResult.algorithmHash ? dkimSigResult.algorithmHash.toUpperCase() : undefined;
 		let signingTime = dkimSigResult.timestamp ? new Date(dkimSigResult.timestamp*1000).toLocaleString() : undefined;
 		let expirationTime = dkimSigResult.expiration ? new Date(dkimSigResult.expiration*1000).toLocaleString() : undefined;
@@ -417,13 +418,16 @@ function dkimSigResultV2_to_AuthResultDKIM(dkimSigResult) { // eslint-disable-li
 			// Show this line only, if we're not using ARH (which contains a verifier)
 			authResultDKIM.details_str += "\n" + dkimStrings.getString("DKIM_RESULT_DETAILS_NO_TIME");
 		}
-		if ( sigAlgo && hashAlgo) {
+		if (sigAlgo && hashAlgo) {
 			if (keyLength) {
 				authResultDKIM.details_str += "\n" + dkimStrings.getFormattedString("DKIM_RESULT_DETAILS_ALGORITHM_WITH_LENGTH", [sigAlgo, keyLength, hashAlgo]);
 			} else {
 				authResultDKIM.details_str += "\n" + dkimStrings.getFormattedString("DKIM_RESULT_DETAILS_ALGORITHM", [sigAlgo, hashAlgo]);
 			}
 		}
+		if (prefs.getBoolPref("advancedInfo.includeSelector") && keySelector) {
+			authResultDKIM.details_str += "\n" + dkimStrings.getFormattedString("DKIM_RESULT_DETAILS_SELECTOR", [keySelector]);
+		}
 		if (prefs.getBoolPref("advancedInfo.includeHeaders") && signedHeaders) {
 			// exists only in Addon verified signatures
 			authResultDKIM.details_str += "\n" + dkimStrings.getFormattedString("DKIM_RESULT_DETAILS_HEADERS", [signedHeaders]);
