From e50a809855911af9d30f269f5e8c5b169d6edd66 Mon Sep 17 00:00:00 2001 From: El RIDO Date: Tue, 22 Jul 2025 10:32:08 +0200 Subject: [PATCH] upgrade base-x to 5.0.1 --- CHANGELOG.md | 2 +- js/{base-x-4.0.0.js => base-x-5.0.1.js} | 104 ++++++++++++------------ js/common.js | 2 +- js/privatebin.js | 4 +- lib/Configuration.php | 4 +- tpl/bootstrap.php | 2 +- tpl/bootstrap5.php | 2 +- 7 files changed, 62 insertions(+), 58 deletions(-) rename js/{base-x-4.0.0.js => base-x-5.0.1.js} (51%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9640e7ec..3198255d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ * CHANGED: Removed support for `privatebin_data`, `privatebin_db` & `zerobin_db` model class configurations, must be replaced with `Filesystem` or `Database` in `cfg/conf.php`, if still present * CHANGED: Removed unused columns in database schema of tables `paste` & `comment` * CHANGED: Jdenticons are now used as the default icons -* CHANGED: Upgrading libraries to: bootstrap 5.3.7, jdenticon 2.0.0 & kjua 0.10.0 +* CHANGED: Upgrading libraries to: base-x 5.0.1, bootstrap 5.3.7, jdenticon 2.0.0 & kjua 0.10.0 * CHANGED: Minimum required PHP version is 7.4, due to a change in the jdenticon library * CHANGED: Set bootstrap5 template as default for PrivateBin (#1572) * FIXED: Name mismatches in attached files (#1584) diff --git a/js/base-x-4.0.0.js b/js/base-x-5.0.1.js similarity index 51% rename from js/base-x-4.0.0.js rename to js/base-x-5.0.1.js index 0a839786..a600992c 100644 --- a/js/base-x-4.0.0.js +++ b/js/base-x-5.0.1.js @@ -7,47 +7,47 @@ (function(){ this.baseX = function base (ALPHABET) { if (ALPHABET.length >= 255) { throw new TypeError('Alphabet too long') } - var BASE_MAP = new Uint8Array(256) - for (var j = 0; j < BASE_MAP.length; j++) { + const BASE_MAP = new Uint8Array(256) + for (let j = 0; j < BASE_MAP.length; j++) { BASE_MAP[j] = 255 } - for (var i = 0; i < ALPHABET.length; i++) { - var x = ALPHABET.charAt(i) - var xc = x.charCodeAt(0) + for (let i = 0; i < ALPHABET.length; i++) { + const x = ALPHABET.charAt(i) + const xc = x.charCodeAt(0) if (BASE_MAP[xc] !== 255) { throw new TypeError(x + ' is ambiguous') } BASE_MAP[xc] = i } - var BASE = ALPHABET.length - var LEADER = ALPHABET.charAt(0) - var FACTOR = Math.log(BASE) / Math.log(256) // log(BASE) / log(256), rounded up - var iFACTOR = Math.log(256) / Math.log(BASE) // log(256) / log(BASE), rounded up + const BASE = ALPHABET.length + const LEADER = ALPHABET.charAt(0) + const FACTOR = Math.log(BASE) / Math.log(256) // log(BASE) / log(256), rounded up + const iFACTOR = Math.log(256) / Math.log(BASE) // log(256) / log(BASE), rounded up function encode (source) { - if (source instanceof Uint8Array) { - } else if (ArrayBuffer.isView(source)) { + // eslint-disable-next-line no-empty + if (source instanceof Uint8Array) { } else if (ArrayBuffer.isView(source)) { source = new Uint8Array(source.buffer, source.byteOffset, source.byteLength) } else if (Array.isArray(source)) { source = Uint8Array.from(source) } if (!(source instanceof Uint8Array)) { throw new TypeError('Expected Uint8Array') } if (source.length === 0) { return '' } - // Skip & count leading zeroes. - var zeroes = 0 - var length = 0 - var pbegin = 0 - var pend = source.length + // Skip & count leading zeroes. + let zeroes = 0 + let length = 0 + let pbegin = 0 + const pend = source.length while (pbegin !== pend && source[pbegin] === 0) { pbegin++ zeroes++ } - // Allocate enough space in big-endian base58 representation. - var size = ((pend - pbegin) * iFACTOR + 1) >>> 0 - var b58 = new Uint8Array(size) - // Process the bytes. + // Allocate enough space in big-endian base58 representation. + const size = ((pend - pbegin) * iFACTOR + 1) >>> 0 + const b58 = new Uint8Array(size) + // Process the bytes. while (pbegin !== pend) { - var carry = source[pbegin] - // Apply "b58 = b58 * 256 + ch". - var i = 0 - for (var it1 = size - 1; (carry !== 0 || i < length) && (it1 !== -1); it1--, i++) { + let carry = source[pbegin] + // Apply "b58 = b58 * 256 + ch". + let i = 0 + for (let it1 = size - 1; (carry !== 0 || i < length) && (it1 !== -1); it1--, i++) { carry += (256 * b58[it1]) >>> 0 b58[it1] = (carry % BASE) >>> 0 carry = (carry / BASE) >>> 0 @@ -56,38 +56,42 @@ this.baseX = function base (ALPHABET) { length = i pbegin++ } - // Skip leading zeroes in base58 result. - var it2 = size - length + // Skip leading zeroes in base58 result. + let it2 = size - length while (it2 !== size && b58[it2] === 0) { it2++ } - // Translate the result into a string. - var str = LEADER.repeat(zeroes) + // Translate the result into a string. + let str = LEADER.repeat(zeroes) for (; it2 < size; ++it2) { str += ALPHABET.charAt(b58[it2]) } return str } function decodeUnsafe (source) { if (typeof source !== 'string') { throw new TypeError('Expected String') } if (source.length === 0) { return new Uint8Array() } - var psz = 0 - // Skip and count leading '1's. - var zeroes = 0 - var length = 0 + let psz = 0 + // Skip and count leading '1's. + let zeroes = 0 + let length = 0 while (source[psz] === LEADER) { zeroes++ psz++ } - // Allocate enough space in big-endian base256 representation. - var size = (((source.length - psz) * FACTOR) + 1) >>> 0 // log(58) / log(256), rounded up. - var b256 = new Uint8Array(size) - // Process the characters. - while (source[psz]) { - // Decode character - var carry = BASE_MAP[source.charCodeAt(psz)] - // Invalid character + // Allocate enough space in big-endian base256 representation. + const size = (((source.length - psz) * FACTOR) + 1) >>> 0 // log(58) / log(256), rounded up. + const b256 = new Uint8Array(size) + // Process the characters. + while (psz < source.length) { + // Find code of next character + const charCode = source.charCodeAt(psz) + // Base map can not be indexed using char code + if (charCode > 255) { return } + // Decode character + let carry = BASE_MAP[charCode] + // Invalid character if (carry === 255) { return } - var i = 0 - for (var it3 = size - 1; (carry !== 0 || i < length) && (it3 !== -1); it3--, i++) { + let i = 0 + for (let it3 = size - 1; (carry !== 0 || i < length) && (it3 !== -1); it3--, i++) { carry += (BASE * b256[it3]) >>> 0 b256[it3] = (carry % 256) >>> 0 carry = (carry / 256) >>> 0 @@ -96,27 +100,27 @@ this.baseX = function base (ALPHABET) { length = i psz++ } - // Skip leading zeroes in b256. - var it4 = size - length + // Skip leading zeroes in b256. + let it4 = size - length while (it4 !== size && b256[it4] === 0) { it4++ } - var vch = new Uint8Array(zeroes + (size - it4)) - var j = zeroes + const vch = new Uint8Array(zeroes + (size - it4)) + let j = zeroes while (it4 !== size) { vch[j++] = b256[it4++] } return vch } function decode (string) { - var buffer = decodeUnsafe(string) + const buffer = decodeUnsafe(string) if (buffer) { return buffer } throw new Error('Non-base' + BASE + ' character') } return { - encode: encode, - decodeUnsafe: decodeUnsafe, - decode: decode + encode, + decodeUnsafe, + decode } } }).call(this); diff --git a/js/common.js b/js/common.js index 9e51f5e8..e75ce0b9 100644 --- a/js/common.js +++ b/js/common.js @@ -16,7 +16,7 @@ global.prettyPrint = window.PR.prettyPrint; global.prettyPrintOne = window.PR.prettyPrintOne; global.showdown = require('./showdown-2.1.0'); global.DOMPurify = require('./purify-3.2.6'); -global.baseX = require('./base-x-4.0.0').baseX; +global.baseX = require('./base-x-5.0.1').baseX; global.Legacy = require('./legacy').Legacy; require('./privatebin'); diff --git a/js/privatebin.js b/js/privatebin.js index fa465ec4..ecb6aaa0 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -10,7 +10,7 @@ * @namespace */ -// global Base64, DOMPurify, FileReader, bootstrap, history, navigator, prettyPrint, prettyPrintOne, showdown, kjua +// global Base64, DOMPurify, FileReader, baseX, bootstrap, history, navigator, prettyPrint, prettyPrintOne, showdown, kjua jQuery.fn.draghover = function() { 'use strict'; @@ -985,7 +985,7 @@ jQuery.PrivateBin = (function($) { * * @private */ - let base58 = new baseX('123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'); + const base58 = new baseX('123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'); /** * convert UTF-8 string stored in a DOMString to a standard UTF-16 DOMString diff --git a/lib/Configuration.php b/lib/Configuration.php index 97b49da3..2cb7ebed 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -108,7 +108,7 @@ class Configuration ), // update this array when adding/changing/removing js files 'sri' => array( - 'js/base-x-4.0.0.js' => 'sha512-nNPg5IGCwwrveZ8cA/yMGr5HiRS5Ps2H+s0J/mKTPjCPWUgFGGw7M5nqdnPD3VsRwCVysUh3Y8OWjeSKGkEQJQ==', + 'js/base-x-5.0.1.js' => 'sha512-FmhlnjIxQyxkkxQmzf0l6IRGsGbgyCdgqPxypFsEtHMF1naRqaLLo6mcyN5rEaT16nKx1PeJ4g7+07D6gnk/Tg==', 'js/bootstrap-3.4.1.js' => 'sha512-oBTprMeNEKCnqfuqKd6sbvFzmFQtlXS3e0C/RGFV0hD6QzhHV+ODfaQbAlmY6/q0ubbwlAM/nCJjkrgA3waLzg==', 'js/bootstrap-5.3.7.js' => 'sha512-UqmrCkPcp6WOB9cC/NB5GB7vQd2/sB70bLpFk0bqHz/WQIFucjAM0vFNI4xp8B7jJ8KIUWPblNAS/M30AHKSzA==', 'js/dark-mode-switch.js' => 'sha512-BhY7dNU14aDN5L+muoUmA66x0CkYUWkQT0nxhKBLP/o2d7jE025+dvWJa4OiYffBGEFgmhrD/Sp+QMkxGMTz2g==', @@ -116,7 +116,7 @@ class Configuration 'js/kjua-0.10.0.js' => 'sha512-BYj4xggowR7QD150VLSTRlzH62YPfhpIM+b/1EUEr7RQpdWAGKulxWnOvjFx1FUlba4m6ihpNYuQab51H6XlYg==', 'js/legacy.js' => 'sha512-UxW/TOZKon83n6dk/09GsYKIyeO5LeBHokxyIq+r7KFS5KMBeIB/EM7NrkVYIezwZBaovnyNtY2d9tKFicRlXg==', 'js/prettify.js' => 'sha512-puO0Ogy++IoA2Pb9IjSxV1n4+kQkKXYAEUtVzfZpQepyDPyXk8hokiYDS7ybMogYlyyEIwMLpZqVhCkARQWLMg==', - 'js/privatebin.js' => 'sha512-tMfKTpfpl98pim+FfMzyg7bHHRpcs/raK6zHIDrr5FdJk6u9oj6ldqzN5SAaxwyHPGyPAzk/ozk7w8/2X3X2nA==', + 'js/privatebin.js' => 'sha512-tEMoEpNQ36hksIPjp5y8go2RY0oQL9qY3Kzh1BKjOf1y35QIP7klUSHJqDhVkcLTyDc0CoZVEMMxSoMMc7EYCw==', 'js/purify-3.2.6.js' => 'sha512-zqwL4OoBLFx89QPewkz4Lz5CSA2ktU+f31fuECkF0iK3Id5qd3Zpq5dMby8KwHjIEpsUgOqwF58cnmcaNem0EA==', 'js/showdown-2.1.0.js' => 'sha512-WYXZgkTR0u/Y9SVIA4nTTOih0kXMEd8RRV6MLFdL6YU8ymhR528NLlYQt1nlJQbYz4EW+ZsS0fx1awhiQJme1Q==', 'js/zlib-1.3.1-1.js' => 'sha512-5bU9IIP4PgBrOKLZvGWJD4kgfQrkTz8Z3Iqeu058mbQzW3mCumOU6M3UVbVZU9rrVoVwaW4cZK8U8h5xjF88eQ==', diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index 078154d1..76264d78 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -51,7 +51,7 @@ if ($QRCODE) : endif; ?> _scriptTag('js/zlib-1.3.1-1.js', 'async'); ?> - _scriptTag('js/base-x-4.0.0.js', 'defer'); ?> + _scriptTag('js/base-x-5.0.1.js', 'defer'); ?> _scriptTag('js/bootstrap-3.4.1.js', 'defer'); ?> _scriptTag('js/zlib-1.3.1-1.js', 'defer'); ?> - _scriptTag('js/base-x-4.0.0.js', 'defer'); ?> + _scriptTag('js/base-x-5.0.1.js', 'defer'); ?> _scriptTag('js/bootstrap-5.3.7.js', 'async'); ?> _scriptTag('js/dark-mode-switch.js', 'defer'); ?>