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

Remove EID Name Validation #2701

Merged
merged 5 commits into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 10 additions & 25 deletions src/main/java/org/prebid/server/validation/RequestValidator.java
Original file line number Diff line number Diff line change
Expand Up @@ -349,26 +349,19 @@ private void validateExtBidPrebidData(ExtRequestPrebidData data, Map<String, Str

private void validateEidPermissions(List<ExtRequestPrebidDataEidPermissions> eidPermissions,
Map<String, String> aliases) throws ValidationException {
if (eidPermissions != null) {
final Set<String> uniqueEidsSources = new HashSet<>();
for (ExtRequestPrebidDataEidPermissions eidPermission : eidPermissions) {
validateEidPermission(eidPermission, aliases, uniqueEidsSources);
}
}
}

private void validateEidPermission(ExtRequestPrebidDataEidPermissions eidPermission,
Map<String, String> aliases,
Set<String> uniqueEidsSources)
throws ValidationException {
if (eidPermission == null) {
throw new ValidationException("request.ext.prebid.data.eidpermissions[] can't be null");
if (eidPermissions == null) {
return;
}
final String eidPermissionSource = eidPermission.getSource();

validateEidPermissionSource(eidPermissionSource);
validateDuplicatedSources(uniqueEidsSources, eidPermissionSource);
validateEidPermissionBidders(eidPermission.getBidders(), aliases);
for (ExtRequestPrebidDataEidPermissions eidPermission : eidPermissions) {
if (eidPermission == null) {
throw new ValidationException("request.ext.prebid.data.eidpermissions[i] can't be null");
}

validateEidPermissionSource(eidPermission.getSource());
validateEidPermissionBidders(eidPermission.getBidders(), aliases);
}
}

private void validateEidPermissionSource(String source) throws ValidationException {
Expand All @@ -377,14 +370,6 @@ private void validateEidPermissionSource(String source) throws ValidationExcepti
}
}

private void validateDuplicatedSources(Set<String> uniqueEidsSources, String eidSource) throws ValidationException {
if (uniqueEidsSources.contains(eidSource)) {
throw new ValidationException("Duplicate source %s in request.ext.prebid.data.eidpermissions[]"
.formatted(eidSource));
}
uniqueEidsSources.add(eidSource);
}

private void validateEidPermissionBidders(List<String> bidders,
Map<String, String> aliases) throws ValidationException {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ class Eid {
String source
List<Uid> uids

static Eid getDefaultEid() {
static Eid getDefaultEid(String source = PBSUtils.randomString) {
new Eid().tap {
source = PBSUtils.randomString
uids = [Uid.defaultUid]
it.source = source
it.uids = [Uid.defaultUid]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import org.prebid.server.functional.model.request.auction.App
import org.prebid.server.functional.model.request.auction.BidRequest
import org.prebid.server.functional.model.request.auction.DistributionChannel
import org.prebid.server.functional.model.request.auction.Dooh
import org.prebid.server.functional.model.request.auction.Eid
import org.prebid.server.functional.model.request.auction.MultiBid
import org.prebid.server.functional.model.request.auction.Site
import org.prebid.server.functional.model.request.auction.User
import org.prebid.server.functional.model.response.auction.Bid
import org.prebid.server.functional.model.response.auction.BidResponse
import org.prebid.server.functional.model.response.auction.ErrorType
Expand All @@ -16,6 +18,7 @@ import spock.lang.PendingFeature

import java.time.Instant

import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST
import static org.prebid.server.functional.model.bidder.BidderName.GENERIC
import static org.prebid.server.functional.model.request.auction.DistributionChannel.DOOH
import static org.prebid.server.functional.util.HttpUtil.REFERER_HEADER
Expand Down Expand Up @@ -256,4 +259,48 @@ class BidValidationSpec extends BaseSpec {
def metrics = defaultPbsService.sendCollectedMetricsRequest()
assert metrics["adapter.generic.requests.bid_validation"] == initialMetricValue + 1
}

def "PBS should throw error when two separate eids with same eids.source"() {
given: "Default bid request with user.eids"
def source = PBSUtils.randomString
def defaultEids = [Eid.getDefaultEid(source), Eid.getDefaultEid(source)]
def bidRequest = BidRequest.defaultBidRequest.tap {
user = User.defaultUser.tap {
eids = defaultEids
}
}

when: "PBS processes auction request"
defaultPbsService.sendAuctionRequest(bidRequest)

then: "PBS should fail the request"
def exception = thrown(PrebidServerException)
assert exception.statusCode == BAD_REQUEST.code()
assert exception.responseBody.contains("Invalid request format: request.user.eids must contain unique sources")
}

def "PBS shouldn't throw error when two separate eids with different eids.source"() {
given: "Default bid request with user.eids"
def defaultEids = [
Eid.getDefaultEid(PBSUtils.randomString),
Eid.getDefaultEid(PBSUtils.randomString)]
def bidRequest = BidRequest.defaultBidRequest.tap {
user = User.defaultUser.tap {
eids = defaultEids
}
}

when: "PBS processes auction request"
defaultPbsService.sendAuctionRequest(bidRequest)

then: "PBS should contain same eids as in request"
def bidderRequest = bidder.getBidderRequest(bidRequest.id)
assert bidderRequest.user.eids[0].source == defaultEids[0].source
assert bidderRequest.user.eids[0].uids[0].id == defaultEids[0].uids[0].id
assert bidderRequest.user.eids[0].uids[0].atype == defaultEids[0].uids[0].atype

assert bidderRequest.user.eids[1].source == defaultEids[1].source
assert bidderRequest.user.eids[1].uids[0].id == defaultEids[1].uids[0].id
assert bidderRequest.user.eids[1].uids[0].atype == defaultEids[1].uids[0].atype
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1544,7 +1544,7 @@ public void validateShouldReturnValidationMessageWhenEidsPermissionsHasNullEleme

// then
assertThat(result.getErrors()).hasSize(1)
.containsOnly("request.ext.prebid.data.eidpermissions[] can't be null");
.containsOnly("request.ext.prebid.data.eidpermissions[i] can't be null");
}

@Test
Expand Down Expand Up @@ -1649,7 +1649,7 @@ public void validateShouldNotReturnValidationErrorWhenBidderIsAlias() {
}

@Test
public void validateShouldNotReturenValidationErrorWhenBidderIsAterisk() {
public void validateShouldNotReturnValidationErrorWhenBidderIsAsterisk() {
// given
final BidRequest bidRequest = validBidRequestBuilder()
.ext(ExtRequest.of(ExtRequestPrebid.builder()
Expand Down Expand Up @@ -1685,26 +1685,6 @@ public void validateShouldReturnValidationMessageWhenEidsPermissionsHasMissingSo
.containsOnly("Missing required value request.ext.prebid.data.eidPermissions[].source");
}

@Test
public void validateShouldReturnValidationMessageWhenEidsPermissionsContainsDuplicatedSources() {
// given
final BidRequest bidRequest = validBidRequestBuilder()
.ext(ExtRequest.of(ExtRequestPrebid.builder()
.data(ExtRequestPrebidData.of(null,
asList(
ExtRequestPrebidDataEidPermissions.of("source", singletonList("*")),
ExtRequestPrebidDataEidPermissions.of("source", singletonList("*")))))
.build()))
.build();

// when
final ValidationResult result = target.validate(bidRequest, null);

// then
assertThat(result.getErrors()).hasSize(1)
.containsOnly("Duplicate source source in request.ext.prebid.data.eidpermissions[]");
}

@Test
public void validateShouldReturnValidationMessageWhenCantParseTargetingPriceGranularity() {
// given
Expand Down
Loading