Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added option to url parser to ignore decoding entire url #4938

Merged
merged 4 commits into from
Mar 10, 2020
Merged

added option to url parser to ignore decoding entire url #4938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d119784
added option to url parser to ignore decoding entire url
Mar 6, 2020
2b342d8
add try catch just in case
Mar 6, 2020
f8916a8
Merge branch 'master' of https://github.com/prebid/Prebid.js into rub…
Mar 9, 2020
eb473da
updated to test
Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions modules/rubiconAnalyticsAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,14 @@ const cache = {
timeouts: {},
};

let referrerHostname;

function getHostNameFromReferer(referer) {
referrerHostname = urlLib.parse(referer).hostname;
return referrerHostname;
export function getHostNameFromReferer(referer) {
try {
rubiconAdapter.referrerHostname = urlLib.parse(referer, {noDecodeWholeURL: true}).hostname;
} catch (e) {
utils.logError('Rubicon Analytics: Unable to parse hostname from supplied url: ', referer, e);
rubiconAdapter.referrerHostname = '';
}
return rubiconAdapter.referrerHostname
};

function stringProperties(obj) {
Expand Down Expand Up @@ -124,7 +127,7 @@ function sendMessage(auctionId, bidWonId) {
integration: config.getConfig('rubicon.int_type') || DEFAULT_INTEGRATION,
version: '$prebid.version$',
referrerUri: referrer,
referrerHostname: referrerHostname || getHostNameFromReferer(referrer)
referrerHostname: rubiconAdapter.referrerHostname || getHostNameFromReferer(referrer)
};
const wrapperName = config.getConfig('rubicon.wrapperName');
if (wrapperName) {
Expand Down Expand Up @@ -269,6 +272,7 @@ function setRubiconAliases(aliasRegistry) {

let baseAdapter = adapter({analyticsType: 'endpoint'});
let rubiconAdapter = Object.assign({}, baseAdapter, {
referrerHostname: '',
enableAnalytics(config = {}) {
let error = false;
samplingFactor = 1;
Expand Down
29 changes: 24 additions & 5 deletions test/spec/modules/rubiconAnalyticsAdapter_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import rubiconAnalyticsAdapter, { SEND_TIMEOUT, parseBidResponse } from 'modules/rubiconAnalyticsAdapter.js';
import rubiconAnalyticsAdapter, {
SEND_TIMEOUT,
parseBidResponse,
getHostNameFromReferer,
} from 'modules/rubiconAnalyticsAdapter.js';
import CONSTANTS from 'src/constants.json';
import { config } from 'src/config.js';
import { server } from 'test/mocks/xhr.js';
Expand All @@ -22,9 +26,8 @@ function validate(message) {
}

// using es6 "import * as events from 'src/events.js'" causes the events.getEvents stub not to work...
let events = require('src/events');
let ajax = require('src/ajax');
let utils = require('src/utils');
let events = require('src/events.js');
let utils = require('src/utils.js');

const {
EVENTS: {
Expand Down Expand Up @@ -477,7 +480,6 @@ function performStandardAuction() {

describe('rubicon analytics adapter', function () {
let sandbox;
let oldScreen;
let clock;

beforeEach(function () {
Expand All @@ -487,6 +489,8 @@ describe('rubicon analytics adapter', function () {

clock = sandbox.useFakeTimers(1519767013781);

rubiconAnalyticsAdapter.referrerHostname = '';

config.setConfig({
s2sConfig: {
timeout: 1000,
Expand Down Expand Up @@ -841,4 +845,19 @@ describe('rubicon analytics adapter', function () {
rubiconAnalyticsAdapter.disableAnalytics();
});
});

it('getHostNameFromReferer correctly grabs hostname from an input URL', function () {
let inputUrl = 'https://www.prebid.org/some/path?pbjs_debug=true';
expect(getHostNameFromReferer(inputUrl)).to.equal('www.prebid.org');
inputUrl = 'https://www.prebid.com/some/path?pbjs_debug=true';
expect(getHostNameFromReferer(inputUrl)).to.equal('www.prebid.com');
inputUrl = 'https://prebid.org/some/path?pbjs_debug=true';
expect(getHostNameFromReferer(inputUrl)).to.equal('prebid.org');
inputUrl = 'http://xn--p8j9a0d9c9a.xn--q9jyb4c/';
expect(getHostNameFromReferer(inputUrl)).to.equal('xn--p8j9a0d9c9a.xn--q9jyb4c');

// not non-UTF char's in query / path which break if noDecodeWholeURL not set
inputUrl = 'https://prebid.org/search_results/%95x%8Em%92%CA/?category=000';
expect(getHostNameFromReferer(inputUrl)).to.equal('prebid.org');
});
});