horsemeat 2.22.10__tar.gz → 2.22.12__tar.gz

{horsemeat-2.22.10 → horsemeat-2.22.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: horsemeat
-Version: 2.22.10
+Version: 2.22.12
 Summary: Web framework for the damned.  The mad.
 Home-page: https://github.com/216software/horsemeat
 Author: 216 Software, LLC

{horsemeat-2.22.10 → horsemeat-2.22.12}/horsemeat/configwrapper.py

@@ -193,8 +193,7 @@ class ConfigWrapper(object):
             user=self.database_user,
             password=self.database_password)
 
-        log.info("Just made postgresql connection {0}.".format(
-            pgconn))
+        log.info(f"Just made postgresql connection {pgconn} (composite types registered: {register_composite_types}.")
 
         psycopg2.extras.register_uuid()
         psycopg2.extras.register_hstore(pgconn, globally=True)

{horsemeat-2.22.10 → horsemeat-2.22.12}/horsemeat/model/session.py

@@ -177,8 +177,52 @@ class Session(object):
         self.inserted = inserted
         self.updated = updated
 
+    def expire(self, pgconn):
+
+        """
+        This sets the expires field to right now, which means they are
+        now logged out of this session.
+        """
+
+        cursor = pgconn.cursor()
+
+        cursor.execute(textwrap.dedent("""
+            update webapp_sessions
+            set expires = current_timestamp
+            where session_uuid = (%(session_uuid)s)
+            and expires > current_timestamp
+            returning expires
+            """), {'session_uuid': self.session_uuid})
+
+        if cursor.rowcount:
+            return cursor.fetchone().expires
+
+    @classmethod
+    def expire_all_sessions_for_user(cls, pgconn, person_uuid):
+
+        cursor = pgconn.cursor()
+
+        cursor.execute(textwrap.dedent("""
+            update webapp_sessions
+            set expires = current_timestamp
+            where person_uuid = (%(person_uuid)s)
+            and expires > current_timestamp
+            returning (webapp_sessions.*)::webapp_sessions as expired_session
+            """), {'person_uuid': self.person_uuid})
+
+        if cursor.rowcount:
+            return cursor
+
+
     def maybe_update_session_expires_time(self, pgconn):
 
+        """
+        This resets the expires field to the default, which is now() +
+        interval '1 hour'.
+
+        Use this to keep somebody logged in for another hour.
+        """
+
         cursor = pgconn.cursor()
 
         cursor.execute(textwrap.dedent("""
@@ -187,7 +231,7 @@ class Session(object):
             where session_uuid = (%(session_uuid)s)
             and expires > current_timestamp
             returning expires
-        """), {'session_uuid': self.session_uuid})
+            """), {'session_uuid': self.session_uuid})
 
         if cursor.rowcount:
             return cursor.fetchone().expires

{horsemeat-2.22.10 → horsemeat-2.22.12}/horsemeat/pg.py

@@ -1,6 +1,7 @@
 # vim: set expandtab ts=4 sw=4 filetype=python fileencoding=utf8:
 
 import logging
+import textwrap
 
 log = logging.getLogger(__name__)
 

{horsemeat-2.22.10 → horsemeat-2.22.12}/horsemeat/version.py

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

{horsemeat-2.22.10 → horsemeat-2.22.12}/horsemeat/webapp/request.py

@@ -1,7 +1,7 @@
 # vim: set expandtab ts=4 sw=4 filetype=python fileencoding=utf8:
 
 import cgi
-import collections
+import collections.abc
 import http.cookies
 import hashlib
 import hmac
@@ -20,7 +20,7 @@ from werkzeug.wrappers import Request as WerkzeugRequest
 
 log = logging.getLogger(__name__)
 
-class Request(collections.abc.MutableMapping if sys.version_info >= (3,10) else collections.MutableMapping):
+class Request(collections.abc.MutableMapping):
 
     """
     Wraps up the environ dictionary in an object with lots of cute

{horsemeat-2.22.10 → horsemeat-2.22.12}/horsemeat.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: horsemeat
-Version: 2.22.10
+Version: 2.22.12
 Summary: Web framework for the damned.  The mad.
 Home-page: https://github.com/216software/horsemeat
 Author: 216 Software, LLC