Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added HTTP_CF_CONNECTING_IP to ip header #115

Closed
wants to merge 35 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
86cb317
use python-ipware
un33k Nov 22, 2023
de8a5e4
format
un33k Nov 22, 2023
8d2b3e6
logic
un33k Nov 22, 2023
549363d
format
un33k Nov 22, 2023
82cb843
readme
un33k Nov 22, 2023
ad8b2f7
add more tests
un33k Nov 22, 2023
8c9dcee
format
un33k Nov 22, 2023
7b89b79
omit version in coverage
un33k Nov 22, 2023
2ef8573
changelog
un33k Nov 22, 2023
6e4fc90
ci/cd
un33k Nov 22, 2023
94a2e83
coverall exclude
un33k Nov 22, 2023
c7e409a
omit coverall
un33k Nov 22, 2023
4f71957
omit coverall
un33k Nov 22, 2023
ff256e9
omit coverall revert
un33k Nov 22, 2023
5851f88
toml
un33k Nov 22, 2023
bd4194d
add deps
un33k Nov 23, 2023
9629ca9
add deps
un33k Nov 23, 2023
9056776
django install order
un33k Nov 23, 2023
c191689
revert toml
un33k Nov 23, 2023
f7cee2b
format
un33k Nov 23, 2023
1bcfebe
format
un33k Nov 23, 2023
c8e0dbc
setup
un33k Nov 23, 2023
186b9cc
actions
un33k Nov 23, 2023
0fb6bdc
Merge branch 'master' into dev
un33k Nov 23, 2023
4e8d16e
Merge branch 'master' into dev
un33k Nov 29, 2023
f400693
Merge branch 'master' into dev
un33k Feb 4, 2024
2430b9c
Add types for get_client_ip parameters (#110)
federicobond Feb 4, 2024
a831870
up version 6.0.4
un33k Feb 4, 2024
25b2138
up version ci action
un33k Feb 4, 2024
73b448b
Merge branch 'ci' into dev
un33k Feb 4, 2024
3993ee9
coverallapp
un33k Feb 4, 2024
d0c7b40
Merge branch 'master' into dev
un33k Feb 4, 2024
f32da14
Merge branch 'master' into dev
un33k Apr 11, 2024
151eb22
Add HTTP_CF_CONNECTING_IP to ip header list
un33k Apr 11, 2024
335b7bb
downgrade python,checkout
un33k Apr 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ 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` [`<client>, <proxy1>, <proxy2>`])
"X_FORWARDED_FOR", # Load balancers or proxies such as AWS ELB (default client is `left-most` [`<client>, <proxy1>, <proxy2>`])
"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.
"HTTP_X_FORWARDED", # Squid and others
"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
Expand Down
2 changes: 1 addition & 1 deletion ipware/__version__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}
Expand Down
Loading