0001-add-a-fargo-cleanup-command-22682.patch

Benjamin Dauvergne, 23 mars 2018 17:02

Voir les différences: en ligne côte à côte

Subject: [PATCH] add a fargo-cleanup command (#22682)

 debian/fargo.cron.hourly                           |  1 +
 fargo/fargo/management/__init__.py                 |  0
 fargo/fargo/management/commands/__init__.py        |  0
 fargo/fargo/management/commands/fargo-cleanup.py   | 11 +++++
 fargo/fargo/managers.py                            | 15 ++++--
 .../migrations/0015_document_creation_date.py      | 20 ++++++++
 fargo/fargo/models.py                              |  3 ++
 fargo/fargo/utils.py                               | 14 ++++++
 fargo/oauth2/migrations/0004_auto_20180323_1530.py | 21 +++++++++
 fargo/oauth2/models.py                             | 27 ++++++++++-
 fargo/settings.py                                  |  1 +
 tests/test_commands.py                             | 54 ++++++++++++++++++++++
 tox.ini                                            |  1 +
 13 files changed, 163 insertions(+), 5 deletions(-)
 create mode 100644 fargo/fargo/management/__init__.py
 create mode 100644 fargo/fargo/management/commands/__init__.py
 create mode 100644 fargo/fargo/management/commands/fargo-cleanup.py
 create mode 100644 fargo/fargo/migrations/0015_document_creation_date.py
 create mode 100644 fargo/oauth2/migrations/0004_auto_20180323_1530.py
 create mode 100644 tests/test_commands.py

debian/fargo.cron.hourly
1	1	#!/bin/sh
2	2
3	3	sudo -u fargo /usr/bin/fargo-manage tenant_command clearsessions --all
	4	sudo -u fargo /usr/bin/fargo-manage tenant_command fargo-cleanup --all

     from django.core.management.base import NoArgsCommand
     from fargo.fargo.utils import cleanup
     class Command(NoArgsCommand):
         help = 'Clean expired models of authentic2.'
         def handle_noargs(self, **options):
             cleanup()

     import datetime
     from django.db import models
     from django.utils.timezone import now
     from . import utils
     class DocumentManager(models.Manager):
         def clean(self):
             '''Remove all documents not linked to an user'''
             qs = self.filter(user_documents__isnull=True)
         def cleanup(self, n=None):
             '''Delete all orphaned documents'''
             n = n or now()
             # use a window of 60 seconds to be sure this document will never be used
             qs = self.filter(creation_date__lt=n - datetime.timedelta(seconds=60))
             qs = qs.filter(user_documents__isnull=True,
                            oauth2_tempfiles__isnull=True)
             for document in qs:
                 qs.content.delete(False)
                 document.content.delete(False)
             qs.delete()
         def get_by_file(self, f):

     # -*- coding: utf-8 -*-
     # Generated by Django 1.11.11 on 2018-03-23 15:30
     from __future__ import unicode_literals
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('fargo', '0014_auto_20171016_0854'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='document',
                 name='creation_date',
                 field=models.DateTimeField(auto_now=True),
             ),
+        ]

                     self.document.mime_type.split('/')[0],
                     re.sub('[/\.+-]', '-', self.document.mime_type))
     class Validation(models.Model):
         '''Validation of a document as special kind for an user,
            the data field contains metadata extracted from the document.
-...
         mime_type = models.CharField(
             max_length=256,
             blank=True)
         creation_date = models.DateTimeField(auto_now=True)
         objects = managers.DocumentManager()
-...
                              instance.thumbnail_full_path])
         threading.Thread(target=do).start()
     @receiver(post_delete, sender=Document)
     def delete_file(sender, instance, **kwargs):
         if instance.content:

     import hashlib
     from django.utils.timezone import utc
     from django.db import models
     def to_isodate(dt):
-...
         for chunk in f.chunks():
             hasher.update(chunk)
         return hasher.hexdigest()
     def cleanup_model(model, n=None):
         manager = getattr(model, 'objects', None)
         if hasattr(manager, 'cleanup'):
             manager.cleanup(n=n)
     def cleanup(n=None):
         for app in models.get_apps():
             for model in models.get_models(app):
                 cleanup_model(model, n=n)

     # -*- coding: utf-8 -*-
     # Generated by Django 1.11.11 on 2018-03-23 15:30
     from __future__ import unicode_literals
     from django.db import migrations, models
     import django.db.models.deletion
     class Migration(migrations.Migration):
         dependencies = [
             ('oauth2', '0003_auto_20180322_1016'),
+        ]
         operations = [
             migrations.AlterField(
                 model_name='oauth2tempfile',
                 name='document',
                 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='oauth2_tempfiles', to='fargo.Document'),
             ),
+        ]

     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import uuid
     import datetime
     from django.conf import settings
     from django.core.exceptions import ValidationError
     from django.core.validators import URLValidator
     from django.db import models
     from django.utils.translation import ugettext_lazy as _
     from django.db.models.query import QuerySet
     from django.utils.timezone import now
     from fargo.fargo.models import Document, UserDocument
-...
             return self.client_name
     class CleanupQuerySet(QuerySet):
         def cleanup(self, n=None):
             n = n or now()
             threshold = n - datetime.timedelta(seconds=2 * self.model.get_lifetime())
             self.filter(creation_date__lt=threshold).delete()
     class OAuth2Authorize(models.Model):
         client = models.ForeignKey(OAuth2Client)
         user_document = models.ForeignKey(UserDocument)
-...
         code = models.CharField(max_length=255, default=generate_uuid)
         creation_date = models.DateTimeField(auto_now=True)
         objects = CleanupQuerySet.as_manager()
         @classmethod
         def get_lifetime(cls):
             return max(
                 settings.FARGO_CODE_LIFETIME,
                 settings.FARGO_ACCESS_TOKEN_LIFETIME)
         def __repr__(self):
             return 'OAuth2Authorize for document %r' % self.user_document
-...
     class OAuth2TempFile(models.Model):
         uuid = models.CharField(max_length=16, default=generate_uuid, primary_key=True)
         client = models.ForeignKey(OAuth2Client)
         document = models.ForeignKey(Document)
         document = models.ForeignKey(Document, related_name='oauth2_tempfiles')
         filename = models.CharField(max_length=512)
         creation_date = models.DateTimeField(auto_now=True)
         objects = CleanupQuerySet.as_manager()
         @classmethod
         def get_lifetime(cls):
             return settings.FARGO_OAUTH2_TEMPFILE_LIFETIME

fargo/settings.py
228	228
229	229	FARGO_CODE_LIFETIME = 300
230	230	FARGO_ACCESS_TOKEN_LIFETIME = 3600
	231	FARGO_OAUTH2_TEMPFILE_LIFETIME = 86400
231	232
232	233	local_settings_file = os.environ.get('FARGO_SETTINGS_FILE',
233	234	os.path.join(

     import datetime
     from django.core.management import call_command
     from django.contrib.auth.models import User
     from fargo.fargo.models import UserDocument, Document
     from fargo.oauth2.models import OAuth2TempFile, OAuth2Client
     from django.core.files.base import ContentFile
     def test_cleanup(freezer, john_doe):
         start = freezer()
         client = OAuth2Client.objects.create(client_name='c', redirect_uris='')
         foo = Document.objects.create(content=ContentFile('foo', name='foo.txt'))
         bar = Document.objects.create(content=ContentFile('bar', name='bar.txt'))
         UserDocument.objects.create(user=john_doe,
                                     document=foo,
                                     filename='foo.txt',
                                     title='',
                                     description='')
         OAuth2TempFile.objects.create(document=bar, client=client, filename='bar.txt')
         call_command('fargo-cleanup')
         assert UserDocument.objects.all().count()
         assert OAuth2TempFile.objects.all().count()
         assert Document.objects.all().count() == 2
         User.objects.all().delete()
         assert not UserDocument.objects.all().count()
         assert Document.objects.all().count() == 2
         call_command('fargo-cleanup')
         assert Document.objects.all().count() == 2
         freezer.move_to(start + datetime.timedelta(seconds=120))
         call_command('fargo-cleanup')
         assert Document.objects.all().count() == 1
         freezer.move_to(start + datetime.timedelta(days=3))
         call_command('fargo-cleanup')
         assert not OAuth2TempFile.objects.count()
         assert Document.objects.count()
         call_command('fargo-cleanup')
         assert not Document.objects.count()

     	pytest-random
     	pytest-mock
     	pytest-django
             pytest-freezegun
     	django-webtest
     	WebTest
     	djangorestframework>=3.3,<3.4
+    -

Projet

Général

Profil

Produits Entr'ouvert » Fargo

0001-add-a-fargo-cleanup-command-22682.patch