From 013c5f764f0065400c46e77985db1d864780849b Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Tue, 14 May 2024 13:38:45 -0400 Subject: [PATCH 1/4] Update adloader.js --- src/adloader.js | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/adloader.js b/src/adloader.js index 4e63e3aebda..b46ce9184a3 100644 --- a/src/adloader.js +++ b/src/adloader.js @@ -4,35 +4,36 @@ import { logError, logWarn, insertElement, setScriptAttributes } from './utils.j const _requestCache = new WeakMap(); // The below list contains modules or vendors whom Prebid allows to load external JS. const _approvedLoadExternalJSList = [ + // Prebid maintained modules: 'debugging', - 'adloox', - 'criteo', - 'outstream', + // Bid Modules: 'adagio', - 'browsi', - 'brandmetrics', - 'justtag', - 'tncId', - 'akamaidap', - 'ftrackId', - 'inskin', - 'hadron', - 'medianet', 'improvedigital', - 'azerionedge', + 'lucead', + // RTD modules: 'aaxBlockmeter', - 'confiant', + 'adloox', + 'akamaidap', 'arcspan', 'airgrid', + 'browsi', + 'brandmetrics', 'clean.io', + 'confiant', + 'contxtful', + 'hadron', + 'mediafilter', + 'medianet', + 'azerionedge', 'a1Media', 'geoedge', - 'mediafilter', 'qortex', 'dynamicAdBoost', - 'contxtful', + // UserId Submodules + 'justtag', + 'tncId', + 'ftrackId', 'id5', - 'lucead', ]; /** From bf53d3fecc83f7bcd0be5fe5d0167792d2089195 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Tue, 14 May 2024 13:42:28 -0400 Subject: [PATCH 2/4] Update adloader.js --- src/adloader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/adloader.js b/src/adloader.js index b46ce9184a3..09e34ab6051 100644 --- a/src/adloader.js +++ b/src/adloader.js @@ -6,14 +6,14 @@ const _requestCache = new WeakMap(); const _approvedLoadExternalJSList = [ // Prebid maintained modules: 'debugging', - // Bid Modules: + // Bid Modules: 'adagio', 'improvedigital', 'lucead', // RTD modules: 'aaxBlockmeter', 'adloox', - 'akamaidap', + 'akamaidap', 'arcspan', 'airgrid', 'browsi', From ed8d3928aec982ccc9c4ae693fec59fd59bf9540 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Tue, 14 May 2024 13:51:15 -0400 Subject: [PATCH 3/4] Update adloader_spec.js --- test/spec/adloader_spec.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/spec/adloader_spec.js b/test/spec/adloader_spec.js index b775ec76e9b..fcc388c2d3b 100644 --- a/test/spec/adloader_spec.js +++ b/test/spec/adloader_spec.js @@ -23,19 +23,19 @@ describe('adLoader', function () { }); it('only allows whitelisted vendors to load scripts', function () { - adLoader.loadExternalScript('someURL', 'criteo'); + adLoader.loadExternalScript('someURL', 'debugging'); expect(utilsLogErrorStub.called).to.be.false; expect(utilsinsertElementStub.called).to.be.true; }); it('should not load cached script again', function() { - adLoader.loadExternalScript('someURL', 'criteo'); + adLoader.loadExternalScript('someURL', 'debugging'); expect(utilsinsertElementStub.called).to.be.false; }); it('callback function can be passed to the function', function() { let callback = function() {}; - adLoader.loadExternalScript('someURL1', 'criteo', callback); + adLoader.loadExternalScript('someURL1', 'debugging', callback); expect(utilsinsertElementStub.called).to.be.true; }); @@ -61,11 +61,11 @@ describe('adLoader', function () { } const doc1 = getDocSpec(); const doc2 = getDocSpec(); - adLoader.loadExternalScript('someURL', 'criteo', () => {}, doc1); - adLoader.loadExternalScript('someURL', 'criteo', () => {}, doc1); - adLoader.loadExternalScript('someURL', 'criteo', () => {}, doc1); - adLoader.loadExternalScript('someURL', 'criteo', () => {}, doc2); - adLoader.loadExternalScript('someURL', 'criteo', () => {}, doc2); + adLoader.loadExternalScript('someURL', 'debugging', () => {}, doc1); + adLoader.loadExternalScript('someURL', 'debugging', () => {}, doc1); + adLoader.loadExternalScript('someURL', 'debugging', () => {}, doc1); + adLoader.loadExternalScript('someURL', 'debugging', () => {}, doc2); + adLoader.loadExternalScript('someURL', 'debugging', () => {}, doc2); expect(utilsinsertElementStub.callCount).to.equal(2); }); }); @@ -88,7 +88,7 @@ describe('adLoader', function () { } }, attrs = {'z': 'A', 'y': 2}; - let script = adLoader.loadExternalScript('someUrl', 'criteo', undefined, doc, attrs); + let script = adLoader.loadExternalScript('someUrl', 'debugging', undefined, doc, attrs); expect(script.z).to.equal('A'); expect(script.y).to.equal(2); }); From 069c53c74da53f53d22c043ae8137086616159d8 Mon Sep 17 00:00:00 2001 From: Patrick McCann Date: Tue, 14 May 2024 14:20:45 -0400 Subject: [PATCH 4/4] Update adloader.js --- src/adloader.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/adloader.js b/src/adloader.js index 09e34ab6051..5d091901b73 100644 --- a/src/adloader.js +++ b/src/adloader.js @@ -6,6 +6,7 @@ const _requestCache = new WeakMap(); const _approvedLoadExternalJSList = [ // Prebid maintained modules: 'debugging', + 'outstream', // Bid Modules: 'adagio', 'improvedigital',