Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-09 06:28:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

https://github.com/the-djmaze/snappymail/issues/1450#issuecomment-1972147950

Browse source
This commit is contained in:
the-djmaze 2024-03-01 02:08:29 +01:00
parent d84f39be86
commit 2efe90fe48
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dev/Model/Identity.js
View file

@ -32,9 +32,9 @@ export class IdentityModel extends AbstractModel {
});
addComputablesTo(this, {
smimeKeyEncrypted: () => this.smimeKey().includes('-----BEGIN ENCRYPTED PRIVATE KEY-----')
// smimeKeyValid: () => this.smimeKeyEncrypted() | this.smimeKey().includes('-----BEGIN PRIVATE KEY-----')
// smimeCertificateValid: () => this.smimeKey().includes('-----BEGIN CERTIFICATE-----')
smimeKeyEncrypted: () => this.smimeKey().includes('-----BEGIN ENCRYPTED PRIVATE KEY-----'),
smimeKeyValid: () => /^-----BEGIN (ENCRYPTED )?PRIVATE KEY-----/.test(this.smimeKey()),
smimeCertificateValid: () => /^-----BEGIN CERTIFICATE-----/.test(this.smimeCertificate())
});
}

2
dev/View/Popup/Compose.js
View file

@ -1377,7 +1377,7 @@ export class ComposePopupView extends AbstractViewPopup {
key && options.push(['OpenPGP', key]);
key = GnuPGUserStore.getPrivateKeyFor(email, 1);
key && options.push(['GnuPG', key]);
identity.smimeKey() && identity.smimeCertificate() && identity.email() === email
identity.smimeKeyValid() && identity.smimeCertificateValid() && identity.email() === email
&& options.push(['S/MIME']);
console.dir({signOptions: options});
this.signOptions(options);

4
snappymail/v/0.0.0/app/templates/Views/User/PopupsIdentity.html
View file

@ -88,11 +88,11 @@
-->
<details>
<summary><strong>S/MIME</strong></summary>
<div class="control-group">
<div class="control-group" data-bind="css: {'error': smimeKey() && !smimeKeyValid()}">
<label data-i18n="CRYPTO/PRIVATE_KEY"></label>
<textarea name="smimeKey" class="input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: smimeKey"></textarea>
</div>
<div class="control-group">
<div class="control-group" data-bind="css: {'error': smimeCertificate() && !smimeCertificateValid()}">
<label data-i18n="SMIME/CERTIFICATE"></label>
<textarea name="smimeCertificate" class="input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: smimeCertificate"></textarea>
</div>