Skip to content

issue #4097 add warning when manually importing public keys #4110

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
Nov 13, 2021
Merged

issue #4097 add warning when manually importing public keys #4110

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
13f5e2c
issue #4097 add warning when manually importing public keys
Nov 10, 2021
4afdb86
Improve wording, make import buttons orange
Nov 12, 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
5 changes: 4 additions & 1 deletion extension/chrome/elements/add_pubkey.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ <h1>Add a pubkey to email address</h1>
<div class="line">
<textarea class="pubkey" placeholder="ASCII Armored Public Key" spellcheck="false" data-test="input-pubkey"></textarea>
</div>
<div class="line orange">
Manually importing Public Keys can be dangerous
</div>
<div class="line">
<button class="button long green action_ok" data-test="action-add-pubkey">OK</button>
<button class="button long orange action_ok" data-test="action-add-pubkey">OK</button>
<button class="button long gray action_settings">SETTINGS</button>
<button class="button long gray action_close">CLOSE</button>
</div>
Expand Down
6 changes: 5 additions & 1 deletion extension/chrome/elements/pgp_pubkey.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@
<div class="line fingerprints hide_if_compact">Fingerprint: <span class="fingerprint good"></span></div>
<div class="line add_contact">
<input class="input_email" data-test="input-email" value="..." />
<button class="button green action_add_contact" data-test="action-add-contact"></button>
<button class="button orange action_add_contact" data-test="action-add-contact"></button>
</div>
<div class="mt-10 orange hide_if_compact">
Manually importing Public Keys received over email can be dangerous. <br>
Contact the sender to verify that the fingerprint matches.
</div>
<pre class="pubkey hide_if_compact"></pre>
</div>
Expand Down
5 changes: 4 additions & 1 deletion extension/chrome/settings/modules/contacts.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,14 @@ <h1></h1>
</div>

<div id="bulk_import" style="display: none;">
<div class="line orange">
Manually importing Public Keys can be dangerous
</div>
<div class="line" id="file_import">
<a id="fineuploader_button" href="#">Select a file</a> or paste public key(s) below:
<div id="fineuploader" class="display_none"></div>
</div>
<div id="processed"></div>
<div id="processed" class="mt-20"></div>
<div class="line">
<textarea class="input_pubkey"
data-test="input-bulk-public-keys"
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/settings/modules/contacts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ View.run(class ContactsView extends View {
}
}
container.css('display', 'block');
$('#bulk_import .input_pubkey, #bulk_import .action_process, #file_import #fineuploader_button').css('display', 'none');
$('#bulk_import .input_pubkey, #bulk_import .action_process, #file_import, #fineuploader_button').css('display', 'none');
Copy link
Author

@limonte limonte Nov 12, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the fix for the unrelated issue when the unwanted block was shown after doing bulk import:

CleanShot 2021-11-13 at 00 56 19@2x

}
} catch (e) {
ApiErr.reportIfSignificant(e);
Expand Down
23 changes: 17 additions & 6 deletions extension/css/cryptup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@ td.red,
b.red,
span.red { color: #d14836; }

.line.prange,
.line.orange,
td.orange,
b.orange,
div.orange,
span.orange { color: #c27e23; }

.line.green,
Expand Down Expand Up @@ -140,6 +141,11 @@ span.gray { color: #b7b7b7; }
color: white;
}

.button.orange {
background: #d18826;
color: white;
}

.swal2-container.ui-toast-container {
width: 77%;
}
Expand Down Expand Up @@ -1046,8 +1052,8 @@ body#settings > div#content.dialog.add_pubkey select.copy_from_email {

body#settings > div#content.dialog.add_pubkey textarea.pubkey {
width: 500px;
height: 340px;
font-size: 10px;
height: 300px;
font-size: 12px;
padding: 8px;
}

Expand Down Expand Up @@ -1334,7 +1340,12 @@ td {

#pgp_block.pgp_pubkey { padding-top: 7px; }
#pgp_block.pgp_pubkey .line { margin: 0; }
#pgp_block.pgp_pubkey pre.pubkey { display: none; }
#pgp_block.pgp_pubkey .add_contact:not(.line) { text-align: center; }

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

#pgp_block .three_dots {
text-align: center;
Expand Down Expand Up @@ -1900,8 +1911,7 @@ table#compose td.text div#input_text {
}

table#compose td.text div#input_text,
#pgp_block,
#backup_block,
#pgp_block:not(.pgp_pubkey),
div#reply_message_successful_container > table div.replied_body {
white-space: pre-wrap;
tab-size: 4;
Expand Down Expand Up @@ -2824,6 +2834,7 @@ body#select_account .action_add_account::before {
}

.m-0 { margin: 0 !important; }
.mt-10 { margin-top: 10px; }
.mt-20 { margin-top: 20px; }
.mt-40 { margin-top: 40px; }
.mb-20 { margin-bottom: 20px; }
Expand Down