Merge pull request #36 from ktrushin/vendor_id_range

Fix isVendorAllowed() for zero vendor ID

Author: lanusau

src/main/java/com/iab/gdpr/consent/implementation/v1/ByteBufferBackedVendorConsent.java

@@ -112,7 +112,7 @@ public boolean isPurposeAllowed(Purpose purpose) {
     @Override
     public boolean isVendorAllowed(int vendorId) {
         final int maxVendorId = getMaxVendorId();
-        if (vendorId < 0 || vendorId > maxVendorId) return false;
+        if (vendorId < 1 || vendorId > maxVendorId) return false;
 
         if (encodingType() == VENDOR_ENCODING_RANGE) {
             final boolean defaultConsent = bits.getBit(DEFAULT_CONSENT_OFFSET);

src/test/java/com/iab/gdpr/consent/implementation/v1/ByteBufferBackedVendorConsentTest.java

@@ -237,6 +237,14 @@ public void testBitFieldEncoding() {
         assertFalse(vendorConsent.isVendorAllowed(3));
         assertFalse(vendorConsent.isVendorAllowed(31));
         assertFalse(vendorConsent.isVendorAllowed(32));
+
+        // Vendors outside range [1, MaxVendorId] are not allowed
+        assertFalse(vendorConsent.isVendorAllowed(-99));
+        assertFalse(vendorConsent.isVendorAllowed(-1));
+        assertFalse(vendorConsent.isVendorAllowed(0));
+        assertFalse(vendorConsent.isVendorAllowed(33));
+        assertFalse(vendorConsent.isVendorAllowed(34));
+        assertFalse(vendorConsent.isVendorAllowed(99));
     }
 
     @Test
@@ -275,6 +283,14 @@ public void testRangeEncodingDefaultFalse() {
         assertFalse(vendorConsent.isVendorAllowed(28));
         assertFalse(vendorConsent.isVendorAllowed(31));
         assertFalse(vendorConsent.isVendorAllowed(32));
+
+        // Vendors outside range [1, MaxVendorId] are not allowed
+        assertFalse(vendorConsent.isVendorAllowed(-99));
+        assertFalse(vendorConsent.isVendorAllowed(-1));
+        assertFalse(vendorConsent.isVendorAllowed(0));
+        assertFalse(vendorConsent.isVendorAllowed(33));
+        assertFalse(vendorConsent.isVendorAllowed(34));
+        assertFalse(vendorConsent.isVendorAllowed(99));
     }
 
     @Test
@@ -313,6 +329,14 @@ public void testRangeEncodingDefaultTrue() {
         assertTrue(vendorConsent.isVendorAllowed(15));
         assertTrue(vendorConsent.isVendorAllowed(31));
         assertTrue(vendorConsent.isVendorAllowed(32));
+
+        // Vendors outside range [1, MaxVendorId] are not allowed
+        assertFalse(vendorConsent.isVendorAllowed(-99));
+        assertFalse(vendorConsent.isVendorAllowed(-1));
+        assertFalse(vendorConsent.isVendorAllowed(0));
+        assertFalse(vendorConsent.isVendorAllowed(33));
+        assertFalse(vendorConsent.isVendorAllowed(34));
+        assertFalse(vendorConsent.isVendorAllowed(99));
     }
 
     @Test(expected = VendorConsentParseException.class)
@@ -548,4 +572,4 @@ public void testRealString6() {
         assertTrue(vendorConsent.isVendorAllowed(1000));
     }
 
-}
+}