Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Change parsing cookies mechanism. (like Django instade of http.cookies.SimpleCookie)

Browse Source
This commit is contained in:
Yaser Amiri 2018-01-20 12:49:16 +03:30
parent 9bdf7a9980
commit ba1dbacd35
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sanic/request.py
View File

@ -1,8 +1,9 @@
import sys import sys
import json import json
import socket
from cgi import parse_header from cgi import parse_header
from collections import namedtuple from collections import namedtuple
from http.cookies import SimpleCookie from http import cookies
from httptools import parse_url from httptools import parse_url
from urllib.parse import parse_qs, urlunparse from urllib.parse import parse_qs, urlunparse
@ -157,13 +158,17 @@ class Request(dict):
def cookies(self): def cookies(self):
if self._cookies is None: if self._cookies is None:
cookie = self.headers.get('Cookie') cookie = self.headers.get('Cookie')
self._cookies = {}
if cookie is not None: if cookie is not None:
cookies = SimpleCookie() for chunk in cookie.split(';'):
cookies.load(cookie) if '=' in chunk:
self._cookies = {name: cookie.value key, val = chunk.split('=', 1)
for name, cookie in cookies.items()} else:
else: key, val = '', chunk
self._cookies = {} key, val = key.strip(), val.strip()
if key or val:
self._cookies[key] = cookies._unquote(val)
return self._cookies return self._cookies
@property @property
@ -181,13 +186,22 @@ class Request(dict):
@property @property
def socket(self): def socket(self):
if not hasattr(self, '_socket'): if not hasattr(self, '_socket'):
self._get_socket() self._get_address()
return self._socket return self._socket
def _get_address(self): def _get_address(self):
self._socket = (self.transport.get_extra_info('peername') or sock = self.transport.get_extra_info('socket')
(None, None))
self._ip, self._port = self._socket if sock.family == socket.AF_INET:
self._socket = (self.transport.get_extra_info('peername') or
(None, None))
self._ip, self._port = self._socket
elif sock.family == socket.AF_INET6:
self._socket = (self.transport.get_extra_info('peername') or
(None, None, None, None))
self._ip, self._port, *_ = self._socket
else:
self._ip, self._port = (None, None)
@property @property
def remote_addr(self): def remote_addr(self):