Overview
Comment: | Fix decryption in edit form |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | stable |
Files: | files | file ages | folders |
SHA1: |
6abc5e4b43ed176869bc968106b7b518 |
User & Date: | bohwaz on 2020-12-07 16:49:04 |
Other Links: | manifest | tags |
Context
2020-12-07
| ||
19:07 | Make sure we don't change a transaction from another year check-in: 22085f3be3 user: bohwaz tags: trunk, stable | |
16:49 | Fix decryption in edit form check-in: 6abc5e4b43 user: bohwaz tags: trunk, stable | |
16:37 | Add header for projects, and add title to other reports check-in: 230bc8e3c1 user: bohwaz tags: stable | |
Changes
Modified src/www/admin/static/scripts/wiki-encryption.js from [2ac75e40c2] to [2f0eae2745].
︙ | ︙ | |||
60 61 62 63 64 65 66 | // nl2br content = content.replace(/\r/g, '').replace(/\n/g, '<br />'); return content; } | | | | | | | > | > > > > > > | | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | // nl2br content = content.replace(/\r/g, '').replace(/\n/g, '<br />'); return content; } window.wikiDecrypt = function () { loadAESlib(); encryptPassword = window.prompt('Mot de passe ?'); if (!encryptPassword) { encryptPassword = null; if (document.getElementById('f_contenu')) { if (window.confirm("Aucun mot de passe entré.\nDésactiver le chiffrement et effacer le contenu ?")) { document.getElementById('f_contenu').value = ''; document.getElementById('f_chiffrement').checked = false; checkEncryption(document.getElementById('f_chiffrement')); } else { wikiDecrypt(); } } return; } iteration = 0; decrypt(); }; var decrypt = function () { if (typeof GibberishAES == 'undefined') { if (iteration >= 10) { iteration = 0; encryptPassword = null; window.alert("Impossible de charger la bibliothèque AES, empêchant le déchiffrement de la page.\nAttendez quelques instants avant de recommencer ou rechargez la page."); return; } iteration++; window.setTimeout(decrypt, 500); return; } var content = document.getElementById('f_contenu'); var edit = true; if (!content) { content = document.getElementById('wikiEncryptedContent'); edit = false; } var wikiContent = content.value || content.innerText; wikiContent = wikiContent.replace(/\s+/g, ''); try { wikiContent = GibberishAES.dec(wikiContent, encryptPassword); } catch (e) { encryptPassword = null; window.alert('Impossible de déchiffrer. Mauvais mot de passe ?'); if (edit) { // Redemander le mot de passe wikiDecrypt(); } return false; } if (!edit) { content.style.display = 'block'; |
︙ | ︙ |