paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Transition to new library for finding IPs from the Django request

Browse Source
This commit is contained in:
Trenton H 2023-05-11 08:58:32 -07:00
parent 311c0ba4f1
commit 17144c45e5
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Pipfile
View File

@ -21,7 +21,6 @@ django-extensions = "*"
django-filter = "~=22.1" django-filter = "~=22.1"
djangorestframework = "~=3.14" djangorestframework = "~=3.14"
djangorestframework-guardian = "*" djangorestframework-guardian = "*"
django-ipware = "*"
filelock = "*" filelock = "*"
gunicorn = "*" gunicorn = "*"
imap-tools = "*" imap-tools = "*"
@ -33,6 +32,7 @@ python-gnupg = "*"
python-dotenv = "*" python-dotenv = "*"
python-dateutil = "*" python-dateutil = "*"
python-magic = "*" python-magic = "*"
python-ipware = "*"
psycopg2 = "*" psycopg2 = "*"
rapidfuzz = "*" rapidfuzz = "*"
redis = {extras = ["hiredis"], version = "*"} redis = {extras = ["hiredis"], version = "*"}
@ -51,7 +51,6 @@ channels = "~=3.0"
channels-redis = "*" channels-redis = "*"
uvicorn = {extras = ["standard"], version = "*"} uvicorn = {extras = ["standard"], version = "*"}
concurrent-log-handler = "*" concurrent-log-handler = "*"
pyzbar = "*" pyzbar = "*"
mysqlclient = "*" mysqlclient = "*"
celery = {extras = ["redis"], version = "*"} celery = {extras = ["redis"], version = "*"}

18
Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "8fecf74dce093fa66c1027ae9230da1afb1c61d80eab7264823884e005e7284b" "sha256": "6aeae592dcf1d7737a6cb6886db1ff7387a9daf3796f782531d25f2e22d608d9"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": {}, "requires": {},
@ -543,14 +543,6 @@
"index": "pypi", "index": "pypi",
"version": "==2.4.0" "version": "==2.4.0"
}, },
"django-ipware": {
"hashes": [
"sha256:4fa5607ee85e12ee5e158bc7569ff1e134fb1579681aa1ff3f0ed04be21be153",
"sha256:80b52a3f571a371519cc552798f1015b934dd5dd7738bfad87e101e861bd21b8"
],
"index": "pypi",
"version": "==5.0.0"
},
"djangorestframework": { "djangorestframework": {
"hashes": [ "hashes": [
"sha256:579a333e6256b09489cbe0a067e66abe55c6595d8926be6b99423786334350c8", "sha256:579a333e6256b09489cbe0a067e66abe55c6595d8926be6b99423786334350c8",
@ -1301,6 +1293,14 @@
"index": "pypi", "index": "pypi",
"version": "==0.5.0" "version": "==0.5.0"
}, },
"python-ipware": {
"hashes": [
"sha256:01b9fa589521c29d7573f69fc4855c6b95687f0029601b78fffef1eb17f1de27",
"sha256:ee84cd16c2cf862faae197ad5f8fae6c75e4b1f40bb13357944a5d63ddc2a373"
],
"index": "pypi",
"version": "==0.9.0"
},
"python-magic": { "python-magic": {
"hashes": [ "hashes": [
"sha256:c1ba14b08e4a5f5c31a302b7721239695b2f0f058d125bd5ce1ee36b9d9d3c3b", "sha256:c1ba14b08e4a5f5c31a302b7721239695b2f0f058d125bd5ce1ee36b9d9d3c3b",

11
src/paperless/signals.py
View File

@ -1,24 +1,25 @@
import logging import logging
from django.conf import settings from django.conf import settings
from ipware import get_client_ip from ipware import IpWare
logger = logging.getLogger("paperless.auth") logger = logging.getLogger("paperless.auth")
# https://docs.djangoproject.com/en/4.1/ref/contrib/auth/#django.contrib.auth.signals.user_login_failed # https://docs.djangoproject.com/en/4.1/ref/contrib/auth/#django.contrib.auth.signals.user_login_failed
def handle_failed_login(sender, credentials, request, **kwargs): def handle_failed_login(sender, credentials, request, **kwargs):
client_ip, is_routable = get_client_ip( ipware = IpWare(proxy_trusted_list=settings.TRUSTED_PROXIES)
request, client_ip, _ = ipware.get_client_ip(
proxy_trusted_ips=settings.TRUSTED_PROXIES, meta=request.META,
) )
if client_ip is None: if client_ip is None:
logger.info( logger.info(
f"Login failed for user `{credentials['username']}`." f"Login failed for user `{credentials['username']}`."
" Unable to determine IP address.", " Unable to determine IP address.",
) )
else: else:
if is_routable: if client_ip.is_global:
# We got the client's IP address # We got the client's IP address
logger.info( logger.info(
f"Login failed for user `{credentials['username']}`" f"Login failed for user `{credentials['username']}`"