george/PrivateBin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correcting old browser detection logic, fixes #446

Browse Source
This commit is contained in:
El RIDO
2019-06-27 20:11:22 +02:00
parent fdc532b3c1
commit 67b9b5f0d8
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/privatebin.js
View File

@@ -4580,11 +4580,11 @@ jQuery.PrivateBin = (function($, RawDeflate) {
function isOldBrowser() {
// webcrypto support
if (typeof window.crypto !== 'object') {
return false;
return true;
}
if (typeof WebAssembly !== 'object' && typeof WebAssembly.instantiate !== 'function') {
return false;
return true;
}
try {
// [\0, 'a', 's', 'm', (uint_32) 1] - smallest valid wasm module
@@ -4595,17 +4595,17 @@ jQuery.PrivateBin = (function($, RawDeflate) {
new WebAssembly.Instance(module) instanceof WebAssembly.Instance
)
) {
return false;
return true;
}
} catch (e) {
return false;
return true;
}
// not checking for async/await, ES6, Promise or Uint8Array support,
// as most browsers introduced these earlier then webassembly and webcrypto:
// https://github.com/PrivateBin/PrivateBin/pull/431#issuecomment-493129359
return true;
return false;
}
/**

5
js/test/InitialCheck.js
View File

@@ -22,6 +22,7 @@ describe('InitialCheck', function () {
'</body></html>'
);
$.PrivateBin.Alert.init();
window.crypto = null;
const result1 = !$.PrivateBin.InitialCheck.init(),
result2 = !$('#errormessage').hasClass('hidden');
clean();
@@ -48,13 +49,10 @@ describe('InitialCheck', function () {
'<html><body><div id="errormessage" class="hidden"></div>'+
'<div id="oldnotice" class="hidden"></div></body></html>'
);
const crypto = window.crypto;
window.crypto = null;
$.PrivateBin.Alert.init();
const result1 = !$.PrivateBin.InitialCheck.init(),
result2 = isSecureContext === $('#errormessage').hasClass('hidden'),
result3 = !$('#oldnotice').hasClass('hidden');
window.crypto = crypto;
clean();
return result1 && result2 && result3;
}
@@ -78,6 +76,7 @@ describe('InitialCheck', function () {
'</body></html>'
);
$.PrivateBin.Alert.init();
window.crypto = null;
const result1 = $.PrivateBin.InitialCheck.init(),
result2 = isSecureContext === $('#httpnotice').hasClass('hidden');
clean();