Skip to content

Commit f7f2f99

Browse files
AntoxaAntoxicAntoxaAntoxic
committed
Support GPP USNat v2
1 parent 6e46054 commit f7f2f99

6 files changed

Lines changed: 54 additions & 11 deletions

File tree

‎src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/inner/USNatSyncUser.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ private static boolean checkKnownChildSensitiveDataConsents(USNatGppReader gppRe
8888

8989
return equalsAtIndex(KnownChildSensitiveDataConsent.NO_CONSENT, knownChildSensitiveDataConsents, 0)
9090
|| equalsAtIndex(KnownChildSensitiveDataConsent.NO_CONSENT, knownChildSensitiveDataConsents, 1)
91+
|| equalsAtIndex(KnownChildSensitiveDataConsent.NO_CONSENT, knownChildSensitiveDataConsents, 2)
9192
|| equalsAtIndex(KnownChildSensitiveDataConsent.CONSENT, knownChildSensitiveDataConsents, 1);
9293
}
9394

‎src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/inner/USNatTransmitGeo.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ private static boolean checkKnownChildSensitiveDataConsents(USNatGppReader gppRe
6161

6262
return equalsAtIndex(KnownChildSensitiveDataConsent.NO_CONSENT, knownChildSensitiveDataConsents, 0)
6363
|| equalsAtIndex(KnownChildSensitiveDataConsent.NO_CONSENT, knownChildSensitiveDataConsents, 1)
64+
|| equalsAtIndex(KnownChildSensitiveDataConsent.NO_CONSENT, knownChildSensitiveDataConsents, 2)
6465
|| equalsAtIndex(KnownChildSensitiveDataConsent.CONSENT, knownChildSensitiveDataConsents, 1);
6566
}
6667

‎src/main/java/org/prebid/server/activity/infrastructure/privacy/usnat/inner/USNatTransmitUfpd.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@
2929

3030
public class USNatTransmitUfpd implements PrivacyModule, Loggable {
3131

32-
private static final Set<Integer> SENSITIVE_DATA_INDICES_SET_1 = Set.of(0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11);
33-
private static final Set<Integer> SENSITIVE_DATA_INDICES_SET_2 = Set.of(0, 1, 2, 3, 4, 10);
34-
private static final Set<Integer> SENSITIVE_DATA_INDICES_SET_3 = Set.of(5, 6, 8, 9, 11);
32+
private static final Set<Integer> SENSITIVE_DATA_INDICES_SET_1 = Set.of(
33+
0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15);
34+
private static final Set<Integer> SENSITIVE_DATA_INDICES_SET_2 = Set.of(0, 1, 2, 3, 4, 10, 12, 14);
35+
private static final Set<Integer> SENSITIVE_DATA_INDICES_SET_3 = Set.of(5, 6, 8, 9, 11, 13, 15);
3536

3637
private final USNatGppReader gppReader;
3738
private final Result result;
@@ -124,6 +125,7 @@ private static boolean checkKnownChildSensitiveDataConsents(USNatGppReader gppRe
124125

125126
return equalsAtIndex(KnownChildSensitiveDataConsent.NO_CONSENT, knownChildSensitiveDataConsents, 0)
126127
|| equalsAtIndex(KnownChildSensitiveDataConsent.NO_CONSENT, knownChildSensitiveDataConsents, 1)
128+
|| equalsAtIndex(KnownChildSensitiveDataConsent.NO_CONSENT, knownChildSensitiveDataConsents, 2)
127129
|| equalsAtIndex(KnownChildSensitiveDataConsent.CONSENT, knownChildSensitiveDataConsents, 1);
128130
}
129131

‎src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/inner/USNatSyncUserTest.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,19 @@ public void proceedShouldDisallowIfKnownChildSensitiveDataConsents2Equals2() {
231231
assertThat(result).isEqualTo(Rule.Result.DISALLOW);
232232
}
233233

234+
@Test
235+
public void proceedShouldDisallowIfKnownChildSensitiveDataConsents3Equals1() {
236+
// given
237+
given(gppReader.getKnownChildSensitiveDataConsents()).willReturn(asList(3, 3, 1));
238+
final PrivacyModule target = new USNatSyncUser(gppReader);
239+
240+
// when
241+
final Rule.Result result = target.proceed(null);
242+
243+
// then
244+
assertThat(result).isEqualTo(Rule.Result.DISALLOW);
245+
}
246+
234247
@Test
235248
public void proceedShouldDisallowIfPersonalDataConsentsEquals2() {
236249
// given

‎src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/inner/USNatTransmitGeoTest.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,19 @@ public void proceedShouldDisallowIfKnownChildSensitiveDataConsents2Equals2() {
153153
assertThat(result).isEqualTo(Rule.Result.DISALLOW);
154154
}
155155

156+
@Test
157+
public void proceedShouldDisallowIfKnownChildSensitiveDataConsents3Equals1() {
158+
// given
159+
given(gppReader.getKnownChildSensitiveDataConsents()).willReturn(asList(3, 3, 1));
160+
final PrivacyModule target = new USNatTransmitGeo(gppReader);
161+
162+
// when
163+
final Rule.Result result = target.proceed(null);
164+
165+
// then
166+
assertThat(result).isEqualTo(Rule.Result.DISALLOW);
167+
}
168+
156169
@Test
157170
public void proceedShouldDisallowIfPersonalDataConsentsEquals2() {
158171
// given

‎src/test/java/org/prebid/server/activity/infrastructure/privacy/usnat/inner/USNatTransmitUfpdTest.java‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,11 @@ public void proceedShouldDisallowIfSensitiveDataProcessingOptOutNoticeEquals2()
209209

210210
@Test
211211
public void proceedShouldDisallowIfSensitiveDataProcessingOptOutNoticeEquals0AndOnCertainSensitiveDataProcessing() {
212-
for (int i : Set.of(0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11)) {
212+
for (int i : Set.of(0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15)) {
213213
// given
214214
given(gppReader.getSensitiveDataProcessingOptOutNotice()).willReturn(0);
215215

216-
final ArrayList<Integer> data = new ArrayList<>(asList(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
216+
final ArrayList<Integer> data = new ArrayList<>(asList(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
217217
data.remove(i);
218218
data.add(i, 2);
219219
given(gppReader.getSensitiveDataProcessing()).willReturn(data);
@@ -230,11 +230,11 @@ public void proceedShouldDisallowIfSensitiveDataProcessingOptOutNoticeEquals0And
230230

231231
@Test
232232
public void proceedShouldDisallowIfSensitiveDataLimitUseNoticeEquals0AndOnCertainSensitiveDataProcessing() {
233-
for (int i : Set.of(0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11)) {
233+
for (int i : Set.of(0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15)) {
234234
// given
235235
given(gppReader.getSensitiveDataLimitUseNotice()).willReturn(0);
236236

237-
final ArrayList<Integer> data = new ArrayList<>(asList(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
237+
final ArrayList<Integer> data = new ArrayList<>(asList(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
238238
data.remove(i);
239239
data.add(i, 2);
240240
given(gppReader.getSensitiveDataProcessing()).willReturn(data);
@@ -251,9 +251,9 @@ public void proceedShouldDisallowIfSensitiveDataLimitUseNoticeEquals0AndOnCertai
251251

252252
@Test
253253
public void proceedShouldDisallowIfSensitiveDataProcessingAtCertainIndicesEquals1() {
254-
for (int i : Set.of(0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11)) {
254+
for (int i : Set.of(0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15)) {
255255
// given
256-
final ArrayList<Integer> data = new ArrayList<>(asList(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
256+
final ArrayList<Integer> data = new ArrayList<>(asList(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
257257
data.remove(i);
258258
data.add(i, 1);
259259
given(gppReader.getSensitiveDataProcessing()).willReturn(data);
@@ -270,9 +270,9 @@ public void proceedShouldDisallowIfSensitiveDataProcessingAtCertainIndicesEquals
270270

271271
@Test
272272
public void proceedShouldDisallowIfSensitiveDataProcessingAtCertainIndicesEquals2() {
273-
for (int i : Set.of(5, 6, 8, 9, 11)) {
273+
for (int i : Set.of(5, 6, 8, 9, 11, 13, 15)) {
274274
// given
275-
final ArrayList<Integer> data = new ArrayList<>(asList(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
275+
final ArrayList<Integer> data = new ArrayList<>(asList(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
276276
data.remove(i);
277277
data.add(i, 2);
278278
given(gppReader.getSensitiveDataProcessing()).willReturn(data);
@@ -313,6 +313,19 @@ public void proceedShouldDisallowIfKnownChildSensitiveDataConsents2NotEquals0()
313313
assertThat(result).isEqualTo(Rule.Result.DISALLOW);
314314
}
315315

316+
@Test
317+
public void proceedShouldDisallowIfKnownChildSensitiveDataConsents3Equals1() {
318+
// given
319+
given(gppReader.getKnownChildSensitiveDataConsents()).willReturn(asList(3, 3, 1));
320+
final PrivacyModule target = new USNatTransmitUfpd(gppReader);
321+
322+
// when
323+
final Rule.Result result = target.proceed(null);
324+
325+
// then
326+
assertThat(result).isEqualTo(Rule.Result.DISALLOW);
327+
}
328+
316329
@Test
317330
public void proceedShouldDisallowIfPersonalDataConsentsEquals2() {
318331
// given

0 commit comments

Comments
 (0)