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.

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

Prevent 'about:' protocol in _publisherTagUrl #1170

Merged
merged 9 commits into from
Jun 7, 2017
Merged

Prevent 'about:' protocol in _publisherTagUrl #1170

merged 9 commits into from
Jun 7, 2017

Conversation

tomraa
Copy link
Contributor

@tomraa tomraa commented May 2, 2017

Type of change

  • Bugfix

Description of change

Criteo adapter would pick up 'about:' as window.location.protocol when in an iframe with 'about:blank'. This code specifically checks for 'http:' and uses that, or 'https:' if not found. A tighter solution would be to (try to) recursively check every window.location.protocol up to top and use 'https:' if found on the way - this commit is a less thorough but safer and smaller solution. I have not written tests as it is a small change.

@jaiminpanchal27
Copy link
Collaborator

@tr-coull Please resolve the conflict.
Conflicts occurred because we recently switched to ESlint with stricter style code. #1111

@tomraa
Copy link
Contributor Author

tomraa commented May 19, 2017

Commit 1b4f21c resolves the issue.

Prebid.js/src/adapters/criteo.js
6:40  error  Infix operators must be spaced  space-infix-ops
✖ 1 problem (1 error, 0 warnings)
[10:53:33] 'lint' errored after 7.15 s
[10:53:33] ESLintError in plugin 'gulp-eslint'

@mkendall07
Copy link
Member

@tr-coull
please resolve the conflict as well so we can merge. Thanks

@tomraa
Copy link
Contributor Author

tomraa commented May 25, 2017

@mkendall07 resolved and all tests pass now. We got there eventually ;)

@protonate protonate added this to the Prebid 0.25.0 milestone Jun 2, 2017
@protonate protonate self-requested a review June 7, 2017 22:12
Copy link
Collaborator

@protonate protonate left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@protonate protonate merged commit 66089e3 into prebid:master Jun 7, 2017
vzhukovsky added a commit to aol/Prebid.js that referenced this pull request Sep 6, 2017
….24.0 to aolgithub-master

* commit '7a81386579a3c129617323ef32e1c8be0897c3c7': (31 commits)
  Added changelog entry.
  Added records in aolPartnersIds.json.
  Prebid 0.25.0 Release
  Added Unruly adapter (prebid#1264)
  Fixing Adyoulike adapter for Safari iOS7 (prebid#1296)
  hide overflow to prevent scrolling (prebid#1294)
  fix protocol detection in iframe (prebid#1293)
  Add eplanning adapter (prebid#1245)
  Use Renderer command queue to render outstream (prebid#1283)
  Generate no-bid response for ech bid request not matched by a bid (prebid#1216)
  New Cox adapter (prebid#1228)
  Carambola Adapter (prebid#1221)
  Pass through transactionId and set fd=1 (prebid#1259)
  Integration test page for adapters (prebid#1182)
  Getting DigiTrustID in GumGum adapter (prebid#1256)
  Trion adapter (prebid#1254)
  use request bidder code as default bidderCode for createBid (prebid#1235)
  Add drop pixels once feature to AOL Adapter (prebid#1224)
  Rubicon Adapter - Adding 320x150 (prebid#1279)
  Prevent 'about:' protocol in _publisherTagUrl (prebid#1170)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants