Update cookiejar.py

Author: LamentXU123

Lib/http/cookiejar.py

@@ -29,14 +29,15 @@
            'FileCookieJar', 'LWPCookieJar', 'LoadError', 'MozillaCookieJar']
 
 import os
-import copy
-import datetime
 import re
+import copy
 import time
+import datetime
 import urllib.parse, urllib.request
 import threading as _threading
 import http.client  # only for the default HTTP port
 from calendar import timegm
+from ipaddress import ip_address
 
 debug = False   # set to True to enable debugging via the logging module
 logger = None
@@ -533,14 +534,21 @@ def parse_ns_headers(ns_headers):
 
 
 IPV4_RE = re.compile(r"\.\d+$", re.ASCII)
+def is_ip(text):
+    """Return True if text is a valid IP address."""
+    # This function is a replacement of regex `IPV4_RE` in previous versions.
+    try:
+        ip_address(text)
+        return True
+    except ValueError:
+        return False
 def is_HDN(text):
     """Return True if text is a host domain name."""
     # XXX
     # This may well be wrong.  Which RFC is HDN defined in, if any (for
     #  the purposes of RFC 2965)?
-    # For the current implementation, what about IPv6?  Remember to look
-    #  at other uses of IPV4_RE also, if change this.
-    if IPV4_RE.search(text):
+    # Both IPv4 and IPv6 are supported.
+    if is_ip(text):
         return False
     if text == "":
         return False
@@ -593,7 +601,7 @@ def liberal_is_HDN(text):
     For accepting/blocking domains.
 
     """
-    if IPV4_RE.search(text):
+    if is_ip(text):
         return False
     return True
 
@@ -607,9 +615,10 @@ def user_domain_match(A, B):
     B = B.lower()
     if not (liberal_is_HDN(A) and liberal_is_HDN(B)):
         if A == B:
-            # equal IP addresses
+            # equal IPv4 addresses
             return True
         return False
+    # A and B may be HDNs or a IPv6 addresses now
     initial_dot = B.startswith(".")
     if initial_dot and A.endswith(B):
         return True
@@ -641,7 +650,8 @@ def eff_request_host(request):
 
     """
     erhn = req_host = request_host(request)
-    if "." not in req_host:
+    if "." not in req_host and '[' not in req_host:
+        # detect '[' mainly for IPv6 addr like [::1]
         erhn = req_host + ".local"
     return req_host, erhn