From e541e59a79e87410b61d6a269de6bd4f8cdb2ede Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 21 May 2026 16:14:43 +0300 Subject: [PATCH 1/6] scribd.com: add skipMixins query --- plugins/domains/scribd.com/scribd.com.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/domains/scribd.com/scribd.com.js b/plugins/domains/scribd.com/scribd.com.js index 85a5d0987..5a07701d5 100644 --- a/plugins/domains/scribd.com/scribd.com.js +++ b/plugins/domains/scribd.com/scribd.com.js @@ -55,7 +55,8 @@ export default { tests: [{ noFeeds: true, - skipMethods: ['getData'] + skipMethods: ['getData'], + skipMixins: ['query'] }, "https://www.scribd.com/doc/116154615/Australia-Council-Arts-Funding-Guide-2013", "https://www.scribd.com/document/399637688/Prestons-Advert" From 2be8da1919f5b69a5fe0a6586122f2acab4fcd80 Mon Sep 17 00:00:00 2001 From: Ivan Paramonau Date: Mon, 25 May 2026 10:57:49 -0400 Subject: [PATCH 2/6] delete scribd fallback --- .../domains/scribd.com/scribd.com-error.js | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 plugins/domains/scribd.com/scribd.com-error.js diff --git a/plugins/domains/scribd.com/scribd.com-error.js b/plugins/domains/scribd.com/scribd.com-error.js deleted file mode 100644 index ab231ea53..000000000 --- a/plugins/domains/scribd.com/scribd.com-error.js +++ /dev/null @@ -1,48 +0,0 @@ -import * as URL from "url"; - -export default { - - re: 'scribd.com', - - provides: ["scribdData"], - - getData: function(oembedError, cb, url, options, urlMatch, request) { - - if (oembedError === 401 && /(\?|&)secret_password=/.test(url)) { - - var secret = URL.parse(url, true).query["secret_password"]; - - request({ - uri: `https://www.scribd.com/doc-page/embed-modal-props/${urlMatch[2]}?secret_password=${secret}`, - json: true, - prepareResult: function(error, b, data, callback) { - - if (error) { - return cb(error); - } - - if (data.access_key) { - - return cb(null, { - scribdData: { - href: `https://www.scribd.com/embeds/${urlMatch[2]}/content?start_page=1&view_mode=scroll&access_key=${data.access_key}`, - aspect: data.aspect_ratio - }, - }) - - } else { - - return cb(null, { - message: "Scribd doesn't support embedding of private documents" - }) - - } - } - }, cb); - } else { - return cb(null, null) - } - - }, - -}; From 0d654168500a09408691da3dfae5c5c999570424 Mon Sep 17 00:00:00 2001 From: Nazar Leush Date: Mon, 25 May 2026 19:22:27 +0300 Subject: [PATCH 3/6] fix audit --- pnpm-lock.yaml | 15 +++++++-------- pnpm-workspace.yaml | 3 +-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aa947b0c2..6ad584193 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,8 +14,7 @@ overrides: minimatch@>=10.0.0 <10.2.3: '>=10.2.3' multiparty@<=4.2.3: '>=4.3.0' path-to-regexp@>=8.0.0 <8.4.0: '>=8.4.0' - qs@<6.14.1: '>=6.14.1' - qs@>=6.7.0 <=6.14.1: '>=6.14.2' + qs@<6.15.1: '>=6.15.2' redis@>=2.6.0 <3.1.1: '>=3.1.1' serialize-javascript@<7.0.5: '>=7.0.5' underscore@<=1.13.7: '>=1.13.8' @@ -1079,8 +1078,8 @@ packages: resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} engines: {node: '>=6'} - qs@6.15.0: - resolution: {integrity: sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==} + qs@6.15.2: + resolution: {integrity: sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==} engines: {node: '>=0.6'} quick-lru@5.1.1: @@ -1427,7 +1426,7 @@ snapshots: http-errors: 2.0.0 iconv-lite: 0.7.0 on-finished: 2.4.1 - qs: 6.15.0 + qs: 6.15.2 raw-body: 3.0.1 type-is: 2.0.1 transitivePeerDependencies: @@ -1743,7 +1742,7 @@ snapshots: once: 1.4.0 parseurl: 1.3.3 proxy-addr: 2.0.7 - qs: 6.15.0 + qs: 6.15.2 range-parser: 1.2.1 router: 2.2.0 send: 1.2.0 @@ -2300,7 +2299,7 @@ snapshots: punycode@2.3.0: {} - qs@6.15.0: + qs@6.15.2: dependencies: side-channel: 1.1.0 @@ -2499,7 +2498,7 @@ snapshots: formidable: 3.5.4 methods: 1.1.2 mime: 2.6.0 - qs: 6.15.0 + qs: 6.15.2 transitivePeerDependencies: - supports-color diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 02d80d9e0..4826d41a1 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -8,8 +8,7 @@ overrides: minimatch@>=10.0.0 <10.2.3: '>=10.2.3' multiparty@<=4.2.3: '>=4.3.0' path-to-regexp@>=8.0.0 <8.4.0: '>=8.4.0' - qs@<6.14.1: '>=6.14.1' - qs@>=6.7.0 <=6.14.1: '>=6.14.2' + qs@<6.15.1: '>=6.15.2' redis@>=2.6.0 <3.1.1: '>=3.1.1' serialize-javascript@<7.0.5: '>=7.0.5' underscore@<=1.13.7: '>=1.13.8' From 23b6003ca284004a1307194ea5b684c7528a06ee Mon Sep 17 00:00:00 2001 From: Ivan Paramonau Date: Mon, 25 May 2026 15:40:21 -0400 Subject: [PATCH 4/6] Revert "delete scribd fallback" This reverts commit 2be8da1919f5b69a5fe0a6586122f2acab4fcd80. --- .../domains/scribd.com/scribd.com-error.js | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 plugins/domains/scribd.com/scribd.com-error.js diff --git a/plugins/domains/scribd.com/scribd.com-error.js b/plugins/domains/scribd.com/scribd.com-error.js new file mode 100644 index 000000000..ab231ea53 --- /dev/null +++ b/plugins/domains/scribd.com/scribd.com-error.js @@ -0,0 +1,48 @@ +import * as URL from "url"; + +export default { + + re: 'scribd.com', + + provides: ["scribdData"], + + getData: function(oembedError, cb, url, options, urlMatch, request) { + + if (oembedError === 401 && /(\?|&)secret_password=/.test(url)) { + + var secret = URL.parse(url, true).query["secret_password"]; + + request({ + uri: `https://www.scribd.com/doc-page/embed-modal-props/${urlMatch[2]}?secret_password=${secret}`, + json: true, + prepareResult: function(error, b, data, callback) { + + if (error) { + return cb(error); + } + + if (data.access_key) { + + return cb(null, { + scribdData: { + href: `https://www.scribd.com/embeds/${urlMatch[2]}/content?start_page=1&view_mode=scroll&access_key=${data.access_key}`, + aspect: data.aspect_ratio + }, + }) + + } else { + + return cb(null, { + message: "Scribd doesn't support embedding of private documents" + }) + + } + } + }, cb); + } else { + return cb(null, null) + } + + }, + +}; From 51d2fa64b6dd2b741a93484a6200c917990a434e Mon Sep 17 00:00:00 2001 From: Ivan Paramonau Date: Mon, 25 May 2026 15:53:10 -0400 Subject: [PATCH 5/6] do not validate scribd --- plugins/domains/scribd.com/scribd.com.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/domains/scribd.com/scribd.com.js b/plugins/domains/scribd.com/scribd.com.js index 5a07701d5..8d86151c0 100644 --- a/plugins/domains/scribd.com/scribd.com.js +++ b/plugins/domains/scribd.com/scribd.com.js @@ -29,7 +29,7 @@ export default { return { href: iframe.assignQuerystring(params), - accept: CONFIG.T.text_html, + type: CONFIG.T.text_html, rel: slideshow ? [CONFIG.R.player, CONFIG.R.slideshow, CONFIG.R.oembed] : [CONFIG.R.reader, CONFIG.R.oembed], 'aspect-ratio': iframe['data-aspect-ratio'], 'padding-bottom': 45, // toolbar From 2a51a4bd3400bfffedb5193e27261cc567a10772 Mon Sep 17 00:00:00 2001 From: Ivan Paramonau Date: Mon, 25 May 2026 15:57:27 -0400 Subject: [PATCH 6/6] Revert "do not validate scribd" This reverts commit 51d2fa64b6dd2b741a93484a6200c917990a434e. --- plugins/domains/scribd.com/scribd.com.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/domains/scribd.com/scribd.com.js b/plugins/domains/scribd.com/scribd.com.js index 8d86151c0..5a07701d5 100644 --- a/plugins/domains/scribd.com/scribd.com.js +++ b/plugins/domains/scribd.com/scribd.com.js @@ -29,7 +29,7 @@ export default { return { href: iframe.assignQuerystring(params), - type: CONFIG.T.text_html, + accept: CONFIG.T.text_html, rel: slideshow ? [CONFIG.R.player, CONFIG.R.slideshow, CONFIG.R.oembed] : [CONFIG.R.reader, CONFIG.R.oembed], 'aspect-ratio': iframe['data-aspect-ratio'], 'padding-bottom': 45, // toolbar