diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 339cfc6..9d1f7c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,9 +36,9 @@ jobs: django-version: 5.0 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: setup python - uses: actions/setup-python@v5 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -52,6 +52,6 @@ jobs: - name: Run test run: coverage run --source=ipware manage.py test - name: Coveralls - uses: coverallsapp/github-action@v2 + run: coveralls --service=github env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 2468a4c..a1346c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# 6.0.5 + +Enhance: +- Add `HTTP_CF_CONNECTING_IP` to list of known ip headers (Adam M.) +- Remove `HTTP_VIA` header support (unreliable IP information) (@yourcelf) +- Up-version python-ipware to 2.0.3 + # 6.0.4 Enhancement: diff --git a/README.md b/README.md index d812a38..5dfc822 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Please use ipware `ONLY` as a complement to your `firewall` security measures! ```python # The default meta precedence order (update as needed) IPWARE_META_PRECEDENCE_ORDER = ( - "X_FORWARDED_FOR", # AWS ELB (default client is `left-most` [`, , `]) + "X_FORWARDED_FOR", # Load balancers or proxies such as AWS ELB (default client is `left-most` [`, , `]) "HTTP_X_FORWARDED_FOR", # Similar to X_FORWARDED_TO "HTTP_CLIENT_IP", # Standard headers used by providers such as Amazon EC2, Heroku etc. "HTTP_X_REAL_IP", # Standard headers used by providers such as Amazon EC2, Heroku etc. @@ -72,7 +72,7 @@ Please use ipware `ONLY` as a complement to your `firewall` security measures! "HTTP_X_CLUSTER_CLIENT_IP", # Rackspace LB and Riverbed Stingray "HTTP_FORWARDED_FOR", # RFC 7239 "HTTP_FORWARDED", # RFC 7239 - "HTTP_VIA", # Squid and others + "HTTP_CF_CONNECTING_IP", # CloudFlare "X-CLIENT-IP", # Microsoft Azure "X-REAL-IP", # NGINX "X-CLUSTER-CLIENT-IP", # Rackspace Cloud Load Balancers diff --git a/ipware/__version__.py b/ipware/__version__.py index 7a25cf8..18cf66e 100644 --- a/ipware/__version__.py +++ b/ipware/__version__.py @@ -5,4 +5,4 @@ __url__ = 'https://github.com/un33k/django-ipware' __license__ = 'MIT' __copyright__ = 'Copyright 2023 Val Neekman @ Neekware Inc.' -__version__ = '6.0.4' +__version__ = '6.0.5' diff --git a/setup.py b/setup.py index bf5978d..3a6b0ab 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ python_requires = ">=3.8" here = os.path.abspath(os.path.dirname(__file__)) -requires = ['python-ipware>=2.0.0'] +requires = ['python-ipware>=2.0.3'] test_requirements = [] about = {}