-
Notifications
You must be signed in to change notification settings - Fork 801
Fix Beachfront data race condition #1915
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
7b09f06
Fix Beachfront data race condition
mansinahar 5b2f164
Add coverage for the data race fix
mansinahar 60bfad9
Corrects malformed bundle value in a test and adds a test for alphanu…
d6743f7
Updates bundle id in supplimental/adm-video-app-alphanum-bundle to iO…
5cc9bcc
Updated malformed bundle test
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
adapters/beachfront/beachfronttest/supplemental/adm-video-app-malformed-bundle.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| { | ||
| "mockBidRequest": { | ||
| "id": "adm-video", | ||
| "imp": [ | ||
| { | ||
| "id": "video1", | ||
| "ext": { | ||
| "bidder": { | ||
| "bidfloor": 3.01, | ||
| "appId": "videoAppId1" | ||
| } | ||
| }, | ||
| "video": { | ||
| "mimes": [ | ||
| "video/mp4" | ||
| ], | ||
| "context": "instream", | ||
| "w": 300, | ||
| "h": 250 | ||
| } | ||
| } | ||
| ], | ||
| "app": { | ||
| "bundle": "some.domain.us/some/page.html" | ||
| }, | ||
| "device":{ | ||
| "ip":"192.168.168.168" | ||
| } | ||
| }, | ||
|
|
||
| "httpCalls": [ | ||
| { | ||
| "expectedRequest": { | ||
| "uri": "https://qa.beachrtb.com/bid.json?exchange_id=videoAppId1", | ||
| "body": { | ||
| "id": "adm-video", | ||
| "imp": [ | ||
| { | ||
| "video": { | ||
| "w": 300, | ||
| "h": 250, | ||
| "mimes": [ | ||
| "video/mp4" | ||
| ] | ||
| }, | ||
| "bidfloor": 3.01, | ||
| "id": "video1", | ||
| "secure": 0 | ||
| } | ||
| ], | ||
| "app": { | ||
| "bundle": "qwerty" | ||
| }, | ||
| "cur": [ | ||
| "USD" | ||
| ], | ||
| "device":{ | ||
| "devicetype": 1, | ||
| "ip":"192.168.168.168" | ||
| } | ||
| } | ||
| }, | ||
| "mockResponse": { | ||
| "status": 200, | ||
| "body": { | ||
| "id": "adm-video", | ||
| "seatBid": [ | ||
| { | ||
| "bid": [ | ||
| { | ||
| "id": "5fd7c8a6ff2f1f0d42ee6427", | ||
| "impid": "video1", | ||
| "price": 20, | ||
| "adm": "<VAST version=\"2.0\"><Ad><Wrapper>http://example.com/vast.xml</Wrapper></Ad></VAST>", | ||
| "adid": "1088", | ||
| "adomain": [ | ||
| "beachfront.io" | ||
| ], | ||
| "cid": "277", | ||
| "crid": "532", | ||
| "w": 300, | ||
| "h": 250, | ||
| "ext": { | ||
| "duration": 30 | ||
| } | ||
| } | ||
| ], | ||
| "seat": "bfio-s-1" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| ], | ||
|
|
||
| "expectedBidResponses": [ | ||
| { | ||
| "currency": "USD", | ||
| "bids": [ | ||
| { | ||
| "bid": { | ||
| "id": "video1AdmVideo", | ||
| "impid": "video1", | ||
| "price": 20, | ||
| "adm": "<VAST version=\"2.0\"><Ad><Wrapper>http://example.com/vast.xml</Wrapper></Ad></VAST>", | ||
| "adid": "1088", | ||
| "adomain": [ | ||
| "beachfront.io" | ||
| ], | ||
| "cid": "277", | ||
| "crid": "532", | ||
| "w": 300, | ||
| "h": 250, | ||
| "ext": { | ||
| "duration": 30 | ||
| } | ||
| }, | ||
| "type": "video" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@muncha thanks for the clarification. I pushed your commits on this branch but I believe this test will fail because based on the malformed
bundleabove, the domain here will get set to:domain.some. It might be worth it to add some validation for the app bundle in the code in order to avoid thisThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mansinahar
Please try again with the most recent commit, which is the one that I thought was up there, but apparently it was not.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mansinahar
"It might be worth it to add some validation for the app bundle in the code in order to avoid this"
Agreed.
Just Googled a bit, and the Android bundle is not required to start with a TLD, which might be an expensive thing to validate completely without false positives. Say someone has an app developed by the Vatican - .va has to pass, but what about .lu?
It's much simpler than that.
Maybe this suggests some validation at an application level?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@muncha Well, Prebid Server just passes the app bundle information as is. In this case the beachfront adapter is using that to resolve the app domain and if sending an invalid app domain would cause the request to be marked invalid on your end then I'd say it'd be the beachfront adapter's responsibility to do that validation. If this won't affect anything on your side and you're okay with an invalid domain being sent in case of an invalid app bundle then the way you have the code right now should be fine.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mansinahar
Cool. I'll check what effect an invalid domain may have on our ad server end. I think it is not a problem, but if it is I'll put an issue in and get on it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mansinahar ...or just add it in here if needed, if you think that's better.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mansinahar
I went ahead and did a bundle validation branch off of this one:
https://github.com/beachfront/prebid-server/tree/validateBundle
It seems to do what it needs to do. Maybe you want to merge it in here, maybe I do a PR once this is merged?
I still need to find out from beachfront if I should delete seemingly invalid bundle values or just pass it on, plus a test or two.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mansinahar
They say if I can't figure out what it is, pass it anyway. validateBundle branch is now updated accordingly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@muncha So let's get this one in and you can do a follow-up PR for validation as needed. We are cutting out a tag today and I would like to get this in if possible