Infra-Mirrors/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2024-10-01 01:26:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'change' into 162

Browse Source
This commit is contained in:
Tobias Gurtzick 2024-01-08 11:10:11 +01:00
commit e1e8618015
No known key found for this signature in database
GPG Key ID: 6C56E4E3D2EAC901
1 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
js/privatebin.js
View File

@ -228,7 +228,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
'<': '&lt;', '<': '&lt;',
'>': '&gt;', '>': '&gt;',
'"': '&quot;', '"': '&quot;',
"'": '&#39;', '\'': '&#39;',
'/': '&#x2F;', '/': '&#x2F;',
'`': '&#x60;', '`': '&#x60;',
'=': '&#x3D;' '=': '&#x3D;'
@ -2215,7 +2215,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
* @function * @function
* @param {Event} event * @param {Event} event
*/ */
function submitPasswordModal(event) async function submitPasswordModal(event)
{ {
event.preventDefault(); event.preventDefault();
@ -2225,6 +2225,19 @@ jQuery.PrivateBin = (function($, RawDeflate) {
// hide modal // hide modal
$passwordModal.modal('hide'); $passwordModal.modal('hide');
// check if protected pathname
const url = new URL(window.location);
// if protected request password
if(url.pathname === '/protected') {
const enc = CryptTool.base58decode(newKey).padStart(32, '\u0000');
const cipherdata = [enc.ct, enc.adata];
const plaindata = await CryptTool.decipher(enc.k, password, cipherdata);
window.location.replace(Helper.baseUri() + plaindata);
return;
}
PasteDecrypter.run(); PasteDecrypter.run();
} }
@ -4796,16 +4809,32 @@ jQuery.PrivateBin = (function($, RawDeflate) {
* @param {int} status * @param {int} status
* @param {object} data * @param {object} data
*/ */
function showCreatedPaste(status, data) { async function showCreatedPaste(status, data) {
Alert.hideLoading(); Alert.hideLoading();
Alert.hideMessages(); Alert.hideMessages();
// show notification // show notification
const baseUri = Helper.baseUri() + '?', const baseUri = Helper.baseUri() + '?',
url = baseUri + data.id + '#' + CryptTool.base58encode(data.encryptionKey), deleteUrl = baseUri + 'pasteid=' + data.id + '&deletetoken=' + data.deletetoken;
deleteUrl = baseUri + 'pasteid=' + data.id + '&deletetoken=' + data.deletetoken;
PasteStatus.createPasteNotification(url, deleteUrl); PasteStatus.createPasteNotification(url, deleteUrl);
const pw = TopNav.getPassword()
const sm = CryptTool.getSymmetricKey();
let openUri = + '?' + data.id + '#' + CryptTool.base58encode(data.encryptionKey);
let cipherResult = await CryptTool.cipher(sm, pw, openUri, []);
let dt = {}
dt['v'] = 2;
dt['ct'] = cipherResult[0];
dt['adata'] = cipherResult[1];
dt['k'] = sm;
const encUrl = CryptTool.base58encode(JSON.stringify(dt))
const url = baseUri + 'protected/#' + encUrl;
// show new URL in browser bar // show new URL in browser bar
history.pushState({type: 'newpaste'}, document.title, url); history.pushState({type: 'newpaste'}, document.title, url);
@ -5536,6 +5565,17 @@ jQuery.PrivateBin = (function($, RawDeflate) {
try { try {
Model.getPasteId(); Model.getPasteId();
} catch (e) { } catch (e) {
// check if protected pathname
const url = new URL(window.location);
// if protected request password
if(url.pathname === '/protected') {
const enc = CryptTool.base58decode(newKey).padStart(32, '\u0000');
return Prompt.requestPassword();
}
// otherwise create a new paste // otherwise create a new paste
return me.newPaste(); return me.newPaste();
} }