horsemeat 2.25.0__tar.gz → 2.26.1__tar.gz

{horsemeat-2.25.0 → horsemeat-2.26.1}/PKG-INFO

@@ -1,8 +1,13 @@
 Metadata-Version: 2.1
 Name: horsemeat
-Version: 2.25.0
+Version: 2.26.1
 Summary: Web framework for the damned.  The mad.
 Home-page: https://github.com/216software/horsemeat
 Author: 216 Software, LLC
 Author-email: info@216software.com
+License: UNKNOWN
+Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
+
+UNKNOWN
+

{horsemeat-2.25.0 → horsemeat-2.26.1}/horsemeat/__init__.py

@@ -55,3 +55,38 @@ fancyjsondumps = functools.partial(
     sort_keys=True,
     indent=4,
     separators=(',', ': '))
+
+
+
+class CookieWrapper:
+
+    """
+    This CookieWrapper allows us to be backwards compatible with https
+    SimpleCookie.
+
+    We need to switch to werkzeug cookie because google and facebook
+    have recently been using malformed cookies, which breaks the reading
+    of our cookies
+
+    """
+
+
+    def __repr__(self):
+        return str(self._cookies)
+
+    def __init__(self, cookie_dict):
+        self._cookies = cookie_dict
+
+    def __getitem__(self, key):
+        return MockMorsel(self._cookies[key])
+
+    def __contains__(self, key):
+        return key in self._cookies
+
+    def get(self, key, default=None):
+        value = self._cookies.get(key, default)
+        return MockMorsel(value) if value is not None else None
+
+class MockMorsel:
+    def __init__(self, value):
+        self.value = value

{horsemeat-2.25.0 → horsemeat-2.26.1}/horsemeat/version.py

@@ -22,4 +22,4 @@ hasn't been installed yet.
 
 """
 
-__version__ = '2.25.0'
+__version__ = '2.26.1'

{horsemeat-2.25.0 → horsemeat-2.26.1}/horsemeat/webapp/handler.py

@@ -285,34 +285,6 @@ class Handler(object):
 
         pass
 
-    @staticmethod
-    @decorator.decorator
-    def only_allow_superusers(handle_method, self, req):
-
-        """
-        Add this to a handle method like this::
-
-            @Handler.only_allow_superusers
-            def handle(self, req):
-                ...
-
-        And then, if the request isn't from a signed-in superuser,
-        they'll get a JSON reply below.
-
-        If the request is from a signed-in superuser, then your handle
-        method is normal.
-        """
-
-        if not req.user or not req.user.is_superuser:
-
-            return Response.json(dict(
-                message="Sorry, superusers only!",
-                success=False,
-                reply_timestamp=datetime.datetime.now()))
-
-        else:
-            return handle_method(self, req)
-
     @property
     def four_zero_four_template(self):
         return 'framework_templates/404.html'
@@ -335,7 +307,7 @@ class Handler(object):
         they'll get a JSON reply that says nope.
 
         If the request is from a signed-in user, then your handle
-        method is normal.
+        method runs like normal.
         """
 
         if not req.user:
@@ -348,6 +320,8 @@ class Handler(object):
 
             resp.status = '401 UNAUTHORIZED'
 
+            return resp
+
         elif not req.user.is_superuser:
 
             resp = self.Response.json(dict(
@@ -361,6 +335,9 @@ class Handler(object):
             return resp
 
         else:
+
+            log.debug("Returning...")
+
             return handler_method(self, req)
 
     @staticmethod

{horsemeat-2.25.0 → horsemeat-2.26.1}/horsemeat/webapp/request.py

@@ -15,7 +15,10 @@ import urllib.parse
 import warnings
 import wsgiref.util
 
+from horsemeat import CookieWrapper
+
 from werkzeug.wrappers import Request as WerkzeugRequest
+from werkzeug.http import parse_cookie
 
 log = logging.getLogger(__name__)
 
@@ -94,13 +97,23 @@ class Request(collections.abc.MutableMapping):
         self['parsed_QS'] = parsed_qs
         return parsed_qs
 
+
     @property
     def parsed_cookie(self):
 
+        """
+        Switched from Simple Cookie to werkzeug cookie, with a cookie
+        wrapper to maintain functionality
+        """
+
         if self.HTTP_COOKIE:
-            c = http.cookies.SimpleCookie()
-            c.load(self.HTTP_COOKIE)
-            return c
+            #c = http.cookies.SimpleCookie()
+            #c.load(self.HTTP_COOKIE)
+
+            c = parse_cookie(self.HTTP_COOKIE)
+            if c:
+                return CookieWrapper(c)
+
 
     @property
     def body(self):

{horsemeat-2.25.0 → horsemeat-2.26.1}/horsemeat.egg-info/PKG-INFO

@@ -1,8 +1,13 @@
 Metadata-Version: 2.1
 Name: horsemeat
-Version: 2.25.0
+Version: 2.26.1
 Summary: Web framework for the damned.  The mad.
 Home-page: https://github.com/216software/horsemeat
 Author: 216 Software, LLC
 Author-email: info@216software.com
+License: UNKNOWN
+Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
+
+UNKNOWN
+

{horsemeat-2.25.0 → horsemeat-2.26.1}/horsemeat.egg-info/requires.txt

@@ -2,5 +2,5 @@ Jinja2>=2.6
 PyYAML>=3.10
 Werkzeug>=0.10.1
 decorator>=3.4.0
-gunicorn
 psycopg2>=2.7
+gunicorn