theluyuan/shynet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ipware (fix CF IPs)

Browse Source
This commit is contained in:
R. Miles McCain 2022-09-13 12:19:43 -07:00
parent 1280433a49
commit 6f715b5b77
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
poetry.lock generated
View File

@ -353,7 +353,7 @@ test = ["pytest", "pytest-cov", "pytest-django", "celery", "redis"]
[[package]] [[package]]
name = "django-ipware" name = "django-ipware"
version = "3.0.7" version = "4.0.2"
description = "A Django application to retrieve user's IP address" description = "A Django application to retrieve user's IP address"
category = "main" category = "main"
optional = false optional = false
@ -974,7 +974,7 @@ multidict = ">=4.0"
[metadata] [metadata]
lock-version = "1.1" lock-version = "1.1"
python-versions = "^3.8" python-versions = "^3.8"
content-hash = "af3d0422c23c7381c78eaab410bdd1a0fa1ca2f19d615a4d365808b705e73188" content-hash = "21f01961cfb8400f3beaa3edde997911e344181bb49fb8f4040a599d0f17089b"
[metadata.files] [metadata.files]
aiohttp = [ aiohttp = [
@ -1099,10 +1099,7 @@ django-cors-headers = []
django-coverage-plugin = [] django-coverage-plugin = []
django-debug-toolbar = [] django-debug-toolbar = []
django-health-check = [] django-health-check = []
django-ipware = [ django-ipware = []
{file = "django-ipware-3.0.7.tar.gz", hash = "sha256:753f8214a16ccaac54ea977349a96e37b582a28a54065e00c1c46d530862c85e"},
{file = "django_ipware-3.0.7-py2.py3-none-any.whl", hash = "sha256:a18820ea2b98ff3f87b7530eb6346f5feb65d18e89397606aacc098fa7b93db2"},
]
django-npm = [ django-npm = [
{file = "django-npm-1.0.0.tar.gz", hash = "sha256:2e6bba65e728fa18b9db3c8dc0d4490b70cb7f43bacf60eb3654d7dcb6424272"}, {file = "django-npm-1.0.0.tar.gz", hash = "sha256:2e6bba65e728fa18b9db3c8dc0d4490b70cb7f43bacf60eb3654d7dcb6424272"},
] ]

2
pyproject.toml
View File

@ -12,7 +12,7 @@ django-allauth = "^0.45.0"
geoip2 = "^4.2.0" geoip2 = "^4.2.0"
whitenoise = "^5.3.0" whitenoise = "^5.3.0"
celery = "^5.2.2" celery = "^5.2.2"
django-ipware = "^3.0.2" django-ipware = "^4.0.2"
PyYAML = "^5.4.1" PyYAML = "^5.4.1"
user-agents = "^2.2.0" user-agents = "^2.2.0"
rules = "^3.0" rules = "^3.0"

14
shynet/shynet/settings.py
View File

@ -377,3 +377,17 @@ USE_RELATIVE_MAX_IN_BAR_VISUALIZATION = (
CORS_ALLOW_ALL_ORIGINS = True CORS_ALLOW_ALL_ORIGINS = True
CORS_ALLOW_METHODS = ["GET", "OPTIONS"] CORS_ALLOW_METHODS = ["GET", "OPTIONS"]
# IPWare Precedence Options
IPWARE_META_PRECEDENCE_ORDER = (
'HTTP_CF_CONNECTING_IP',
'HTTP_X_FORWARDED_FOR', 'X_FORWARDED_FOR', # client, proxy1, proxy2
'HTTP_CLIENT_IP',
'HTTP_X_REAL_IP',
'HTTP_X_FORWARDED',
'HTTP_X_CLUSTER_CLIENT_IP',
'HTTP_FORWARDED_FOR',
'HTTP_FORWARDED',
'HTTP_VIA',
'REMOTE_ADDR',
)