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.

Sign up for GitHub

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

Jump to bottom

Corrected --proxy-headers client ip/host when using a unix socket #636

Merged
merged 11 commits into from Jul 28, 2020
Merged

Corrected --proxy-headers client ip/host when using a unix socket #636

Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bfb7a6c
Added AF_UNIX type socket to get client filled
euri10 Apr 14, 2020
2d62aa5
Removed travis debug
euri10 Apr 14, 2020
6f7de0c
Added travis verbose pytest for windows fail check
euri10 Apr 14, 2020
455e182
Added travis verbose pytest for windows fail check
euri10 Apr 14, 2020
8c5646a
No more tests output in travis now it's fixed on windows
euri10 Apr 14, 2020
8b4f7ee
Merge branch 'master' into 634_supervisord
euri10 May 4, 2020
5cb106f
Useing a top level constant
euri10 May 19, 2020
74369eb
Lint
euri10 May 19, 2020
c5efdf3
Merge branch 'master' into 634_supervisord
euri10 May 19, 2020
9e111af
Merge branch 'master' into 634_supervisord
euri10 Jul 22, 2020
df8bdb6
Merge branch 'master' into 634_supervisord
euri10 Jul 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 13 additions & 4 deletions uvicorn/protocols/utils.py
View file
Open in desktop
@@ -1,4 +1,5 @@
import socket
import sys


def get_remote_addr(transport):
Expand All @@ -14,8 +15,12 @@ def get_remote_addr(transport):
else:
family = socket_info.family

if family in (socket.AF_INET, socket.AF_INET6):
return (str(info[0]), int(info[1]))
if not sys.platform.startswith("win"):
rafalp marked this conversation as resolved.
Show resolved Hide resolved
if family in (socket.AF_INET, socket.AF_INET6, socket.AF_UNIX):
euri10 marked this conversation as resolved.
Show resolved Hide resolved
return (str(info[0]), int(info[1]))
else:
if family in (socket.AF_INET, socket.AF_INET6):
return (str(info[0]), int(info[1]))
return None
info = transport.get_extra_info("peername")
if info is not None and isinstance(info, (list, tuple)) and len(info) == 2:
Expand All @@ -28,8 +33,12 @@ def get_local_addr(transport):
if socket_info is not None:
info = socket_info.getsockname()
family = socket_info.family
if family in (socket.AF_INET, socket.AF_INET6):
return (str(info[0]), int(info[1]))
if not sys.platform.startswith("win"):
if family in (socket.AF_INET, socket.AF_INET6, socket.AF_UNIX):
return (str(info[0]), int(info[1]))
else:
if family in (socket.AF_INET, socket.AF_INET6):
return (str(info[0]), int(info[1]))
return None
info = transport.get_extra_info("sockname")
if info is not None and isinstance(info, (list, tuple)) and len(info) == 2:
Expand Down