Merge pull request #992 from r0fls/968

remove port from ip

docs/sanic/request_data.md

@@ -75,6 +75,10 @@ The following variables are accessible as properties on `Request` objects:
 
 - `ip` (str) - IP address of the requester.
 
+- `port` (str) - Port address of the requester.
+
+- `socket` (tuple) - (IP, port) of the requester.
+
 - `app` - a reference to the Sanic application object that is handling this request. This is useful when inside blueprints or other handlers in modules that do not have access to the global `app` object.
 
   ```python

sanic/app.py

@@ -574,7 +574,7 @@ class Sanic:
             try:
                 response = await self._run_response_middleware(request,
                                                                response)
-            except:
+            except BaseException:
                 error_logger.exception(
                     'Exception occured in one of response middleware handlers'
                 )
@@ -642,7 +642,7 @@ class Sanic:
                 serve(**server_settings)
             else:
                 serve_multiple(server_settings, workers)
-        except:
+        except BaseException:
             error_logger.exception(
                 'Experienced exception while trying to serve')
             raise

sanic/request.py

@@ -46,7 +46,8 @@ class Request(dict):
     __slots__ = (
         'app', 'headers', 'version', 'method', '_cookies', 'transport',
         'body', 'parsed_json', 'parsed_args', 'parsed_form', 'parsed_files',
-        '_ip', '_parsed_url', 'uri_template', 'stream', '_remote_addr'
+        '_ip', '_parsed_url', 'uri_template', 'stream', '_remote_addr',
+        '_socket', '_port'
     )
 
     def __init__(self, url_bytes, headers, version, method, transport):
@@ -167,11 +168,27 @@ class Request(dict):
 
     @property
     def ip(self):
-        if not hasattr(self, '_ip'):
+        if not hasattr(self, '_socket'):
-            self._ip = (self.transport.get_extra_info('peername') or
+            self._get_address()
-                        (None, None))
         return self._ip
 
+    @property
+    def port(self):
+        if not hasattr(self, '_socket'):
+            self._get_address()
+        return self._port
+
+    @property
+    def socket(self):
+        if not hasattr(self, '_socket'):
+            self._get_socket()
+        return self._socket
+
+    def _get_address(self):
+        self._socket = (self.transport.get_extra_info('peername') or
+                        (None, None))
+        self._ip, self._port = self._socket
+
     @property
     def remote_addr(self):
         """Attempt to return the original client ip based on X-Forwarded-For.

sanic/response.py

@@ -3,7 +3,7 @@ from os import path
 
 try:
     from ujson import dumps as json_dumps
-except:
+except BaseException:
     from json import dumps as json_dumps
 
 from aiofiles import open as open_async

sanic/server.py

@@ -588,7 +588,7 @@ def serve(host, port, request_handler, error_handler, before_start=None,
 
     try:
         http_server = loop.run_until_complete(server_coroutine)
-    except:
+    except BaseException:
         logger.exception("Unable to start server")
         return
 

sanic/testing.py

@@ -76,14 +76,14 @@ class SanicTestClient:
             try:
                 request, response = results
                 return request, response
-            except:
+            except BaseException:
                 raise ValueError(
                     "Request and response object expected, got ({})".format(
                         results))
         else:
             try:
                 return results[-1]
-            except:
+            except BaseException:
                 raise ValueError(
                     "Request object expected, got ({})".format(results))
 

sanic/worker.py

@@ -74,13 +74,13 @@ class GunicornWorker(base.Worker):
             trigger_events(self._server_settings.get('before_stop', []),
                            self.loop)
             self.loop.run_until_complete(self.close())
-        except:
+        except BaseException:
             traceback.print_exc()
         finally:
             try:
                 trigger_events(self._server_settings.get('after_stop', []),
                                self.loop)
-            except:
+            except BaseException:
                 traceback.print_exc()
             finally:
                 self.loop.close()

tests/test_requests.py

@@ -27,6 +27,16 @@ def test_sync():
 
     assert response.text == 'Hello'
 
+def test_remote_address():
+    app = Sanic('test_text')
+
+    @app.route('/')
+    def handler(request):
+        return text("{}".format(request.ip))
+
+    request, response = app.test_client.get('/')
+
+    assert response.text == '127.0.0.1'
 
 def test_text():
     app = Sanic('test_text')