Merge pull request #16 from icgood/bind

Fix the default bind hostname

Author: icgood

docker/Dockerfile

@@ -3,8 +3,9 @@ FROM python:3.8-alpine
 RUN pip install -U pip wheel setuptools typing-extensions
 
 ARG install_arg="proxy-protocol"
+ARG install_source=""
 RUN apk --update add --virtual build-dependencies python3-dev build-base \
-  && pip install ${install_arg} \
+  && pip install "${install_arg}${install_source}" \
   && apk del build-dependencies
 
 ENTRYPOINT ["proxyprotocol-server"]

docker/hooks/build

@@ -1,5 +1,5 @@
 #!/bin/bash
 set -ex
 
-export install_arg="$GITHUB_REPO/archive/$SOURCE_BRANCH.tar.gz"
-docker build --build-arg install_arg -f $DOCKERFILE_PATH -t $IMAGE_NAME .
+export install_source=" @ $GITHUB_REPO/archive/$SOURCE_BRANCH.tar.gz"
+docker build --build-arg install_source -f $DOCKERFILE_PATH -t $IMAGE_NAME .

proxyprotocol/server/__init__.py

@@ -22,7 +22,7 @@ class Address:
 
     """
 
-    def __init__(self, addr: str, *, server: bool) -> None:
+    def __init__(self, addr: str, *, server: bool = False) -> None:
         super().__init__()
         url = urlsplit(addr)
         if not url.scheme and not url.netloc:
@@ -39,7 +39,7 @@ def __init__(self, addr: str, *, server: bool) -> None:
     @property
     def host(self) -> str:
         """The hostname parsed from the address."""
-        return self.url.hostname or 'localhost'
+        return self.url.hostname or ''
 
     @property
     def port(self) -> Optional[int]:

proxyprotocol/server/echo.py

@@ -28,7 +28,7 @@ def main() -> int:
                         help='the PROXY protocol version')
     parser.add_argument('address', metavar='HOST:PORT',
                         type=partial(Address, server=True),
-                        nargs='?', default='localhost:10007',
+                        nargs='?', default=':10007',
                         help='the listener address')
     args = parser.parse_args()
 
@@ -44,7 +44,7 @@ async def run(pp: ProxyProtocol, address: Address) -> int:
     loop = asyncio.get_event_loop()
     callback = partial(run_conn, pp)
     server = await asyncio.start_server(
-        callback, address.host, address.port or 10007, ssl=address.ssl)
+        callback, address.host, address.port or 0, ssl=address.ssl)
     async with server:
         forever = asyncio.create_task(server.serve_forever())
         loop.add_signal_handler(signal.SIGINT, forever.cancel)

proxyprotocol/server/main.py

@@ -50,7 +50,7 @@ def main() -> int:
 
 async def run(pp: ProxyProtocol, args: Namespace) -> int:
     loop = asyncio.get_running_loop()
-    services = [(Address(source, server=True), Address(dest, server=False))
+    services = [(Address(source, server=True), Address(dest))
                 for (source, dest) in args.services]
     buf_len: int = args.buf_len
     new_server = partial(DownstreamProtocol, UpstreamProtocol,

setup.py

@@ -28,7 +28,7 @@
     license = f.read()
 
 setup(name='proxy-protocol',
-      version='0.5.5',
+      version='0.5.6',
       author='Ian Good',
       author_email='ian@icgood.net',
       description='PROXY protocol library with asyncio server implementation',