[trafficcontrol] branch master updated: fixed an issue with ipv4 whitelist being intialized for ipv6. (#4816)

[rawlin]

This is an automated email from the ASF dual-hosted git repository.

rawlin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new 8c45204  fixed an issue with ipv4 whitelist being intialized for ipv6. 
  (#4816)
8c45204 is described below

commit 8c452049fef7b6381a59133ac99ef2a7703902f4
Author: David Neuman <david.neuma...@gmail.com>
AuthorDate: Tue Jun 23 10:41:16 2020 -0600

    fixed an issue with ipv4 whitelist being intialized for ipv6.   (#4816)
    
    * fixed an issue with ipv4 whitelist being intialized for ipv6.  This 
closes #3661
    
    * added changelog entry
---
 CHANGELOG.md                                                          | 1 +
 .../cdn/traffic_control/traffic_router/core/loc/AnonymousIp.java      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eca4ac1..f28bc75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ The format is based on [Keep a 
Changelog](http://keepachangelog.com/en/1.0.0/).
 - Updated /deliveryservices/{{ID}}/servers/eligible to use multiple interfaces 
in API v3
 
 ### Fixed
+- Fixed #3661 - Anonymous Proxy ipv4 whitelist does not work
 - Fixed the `GET /api/x/jobs` and `GET /api/x/jobs/:id` Traffic Ops API routes 
to allow falling back to Perl via the routing blacklist
 - Fixed ORT config generation not using the coalesce_number_v6 Parameter.
 - Fixed POST deliveryservices/request (designed to simple send an email) 
regression which erroneously required deep caching type and routing name. 
[Related github issue](https://github.com/apache/trafficcontrol/issues/4735)
diff --git 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIp.java
 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIp.java
index 83abfe9..622c120 100644
--- 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIp.java
+++ 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/loc/AnonymousIp.java
@@ -105,8 +105,8 @@ public final class AnonymousIp {
        private static void parseIPv6Whitelist(final JsonNode config, final 
AnonymousIp anonymousIp) throws JsonUtilsException {
                if (config.has("ip6Whitelist")) {
                        try {
-                               anonymousIp.ipv4Whitelist = new 
AnonymousIpWhitelist();
-                               
anonymousIp.ipv4Whitelist.init(JsonUtils.getJsonNode(config, "ip6Whitelist"));
+                               anonymousIp.ipv6Whitelist = new 
AnonymousIpWhitelist();
+                               
anonymousIp.ipv6Whitelist.init(JsonUtils.getJsonNode(config, "ip6Whitelist"));
                        } catch (NetworkNodeException e) {
                                LOGGER.error("Anonymous Ip ERR: Network node 
err ", e);
                        }