Ticket #18194: sessions-cleanup-files-1.patch

django/contrib/sessions/backends/base.py

@@ -281 +281 @@
         Loads the session data and returns a dictionary.
         """
         raise NotImplementedError
+
+    @classmethod
+    def cleanup(cls):
+        """
+        Cleaunp the expired sessions
+        """
+        raise NotImplementedError

django/contrib/sessions/backends/db.py

@@ -72 +72 @@
         except Session.DoesNotExist:
             pass
 
+    @classmethod
+    def cleanup(cls):
+        Session.objects.filter(expire_date__lt=timezone.now()).delete()
+        transaction.commit_unless_managed()
 
 # At bottom to avoid circular import
 from django.contrib.sessions.models import Session

django/contrib/sessions/backends/file.py

@@ -142 +142 @@
 
     def clean(self):
         pass
+
+    @classmethod
+    def cleanup(cls):
+        storage_path = getattr(settings, "SESSION_FILE_PATH", tempfile.gettempdir())
+        file_prefix = settings.SESSION_COOKIE_NAME
+
+        # Get all file sessions stored
+        sessions = [cls(session[len(file_prefix):])
+                        for session in os.listdir(storage_path)
+                        if session.startswith(file_prefix)]
+
+        for session in sessions:
+            old_key = session.session_key
+            session.load()
+            new_key = session.session_key
+
+            # The key was changed i.e. new session created, so the existing one
+            # was invalid. Lests clean it all up
+            if old_key != new_key:
+                session.delete(old_key)
+                session.delete(new_key)

django/core/management/commands/cleanup.py

@@ -1 +1 @@
 from django.core.management.base import NoArgsCommand
-from django.utils import timezone
+from django.utils.importlib import import_module
+from django.conf import settings
 
 class Command(NoArgsCommand):
     help = "Can be run as a cronjob or directly to clean out old data from the database (only expired sessions at the moment)."
 
     def handle_noargs(self, **options):
-        from django.db import transaction
-        from django.contrib.sessions.models import Session
-        Session.objects.filter(expire_date__lt=timezone.now()).delete()
-        transaction.commit_unless_managed()
+        engine = import_module(settings.SESSION_ENGINE)
+        engine.SessionStore.cleanup()