Skip to content

issue #4168 Do not show import warning for unusable keys #4191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rrrooommmaaa merged 2 commits into from
Dec 14, 2021
Merged

issue #4168 Do not show import warning for unusable keys #4191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c285855
Do not show import warning for unusable keys
Dec 14, 2021
48f16e8
add test
Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions extension/chrome/elements/pgp_pubkey.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<input class="input_email" data-test="input-email" value="..." />
<button class="button orange action_add_contact" data-test="action-add-contact"></button>
</div>
<div class="mt-10 orange hide_if_compact">
<div class="mt-10 orange hide_if_compact" id="manual_import_warning" data-test="manual-import-warning">
Manually importing Public Keys received over email can be dangerous. <br>
Contact the sender to verify that the fingerprint matches.
</div>
Expand All @@ -38,4 +38,4 @@

</body>

</html>
</html>
2 changes: 1 addition & 1 deletion extension/chrome/elements/pgp_pubkey.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ View.run(class PgpPubkeyView extends View {
};

private showKeyNotUsableError = () => {
$('.fingerprints, .add_contact').remove();
$('.fingerprints, .add_contact, #manual_import_warning').remove();
$('#pgp_block.pgp_pubkey .result')
.prepend('<span class="bad">This OpenPGP key is not usable.</span>'); // xss-direct
$('.pubkey').addClass('bad');
Expand Down
1 change: 0 additions & 1 deletion extension/css/cryptup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,7 +1344,6 @@ td {
#pgp_block.pgp_pubkey .add_contact:not(.line) { text-align: center; }

#pgp_block.pgp_pubkey pre.pubkey {
margin-top: 0;
display: none;
}

Expand Down
1 change: 1 addition & 0 deletions test/source/tests/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ export const defineSettingsTests = (testVariant: TestVariant, testWithBrowser: T
await contactsFrame.waitAll('iframe');
const pubkeyFrame = await contactsFrame.getFrame(['pgp_pubkey.htm']);
await pubkeyFrame.notPresent('@action-add-contact');
await pubkeyFrame.notPresent('@manual-import-warning');
expect((await pubkeyFrame.read('#pgp_block.pgp_pubkey')).toLowerCase()).to.include('not usable');
const revocationAfter = await dbPage.page.evaluate(async () => {
const db = await (window as any).ContactStore.dbOpen();
Expand Down