morango 0.6.14__py2.py3-none-any.whl → 0.8.6__py2.py3-none-any.whl

morango/__init__.py

@@ -1,6 +1 @@
-from __future__ import absolute_import
-from __future__ import print_function
-from __future__ import unicode_literals
-
-default_app_config = "morango.apps.MorangoConfig"
-__version__ = "0.6.14"
+__version__ = "0.8.6"

morango/api/serializers.py

@@ -60,6 +60,9 @@ class NonceSerializer(serializers.ModelSerializer):
 
 
 class SyncSessionSerializer(serializers.ModelSerializer):
+    client_instance = serializers.CharField(source='client_instance_json')
+    server_instance = serializers.CharField(source='server_instance_json')
+
     class Meta:
         model = SyncSession
         fields = (

morango/api/viewsets.py

@@ -5,7 +5,7 @@ import uuid
 
 from django.core.exceptions import ValidationError
 from django.utils import timezone
-from ipware.ip import get_ip
+from ipware import get_client_ip
 from rest_framework import mixins
 from rest_framework import pagination
 from rest_framework import response
@@ -60,6 +60,11 @@ session_controller = SessionController.build()
 session_controller.signals.connect(controller_signal_logger)
 
 
+def get_ip(request):
+    client_ip, _ = get_client_ip(request)
+    return client_ip
+
+
 class CertificateChainViewSet(viewsets.ViewSet):
     permissions = (permissions.CertificatePushPermissions,)
 
@@ -236,7 +241,7 @@ class SyncSessionViewSet(
 
     def create(self, request):
 
-        instance_id, _ = InstanceIDModel.get_or_create_current_instance()
+        server_instance, _ = InstanceIDModel.get_or_create_current_instance()
 
         # verify and save the certificate chain to our cert store
         try:
@@ -287,6 +292,12 @@ class SyncSessionViewSet(
                 "Nonce is not valid", status=status.HTTP_403_FORBIDDEN
             )
 
+        client_instance_json = request.data.get("instance")
+        client_instance_id = None
+        if client_instance_json:
+            client_instance = json.loads(client_instance_json)
+            client_instance_id = client_instance.get("id")
+
         # build the data to be used for creation the syncsession
         data = {
             "id": request.data.get("id"),
@@ -301,9 +312,11 @@ class SyncSessionViewSet(
             "connection_path": request.data.get("connection_path"),
             "client_ip": get_ip(request) or "",
             "server_ip": request.data.get("server_ip") or "",
-            "client_instance": request.data.get("instance"),
-            "server_instance": json.dumps(
-                serializers.InstanceIDSerializer(instance_id).data
+            "client_instance_id": client_instance_id,
+            "client_instance_json": client_instance_json,
+            "server_instance_id": server_instance.id,
+            "server_instance_json": json.dumps(
+                serializers.InstanceIDSerializer(server_instance).data
             ),
         }
 
@@ -313,7 +326,7 @@ class SyncSessionViewSet(
 
         resp_data = {
             "signature": server_cert.sign(message),
-            "server_instance": data["server_instance"],
+            "server_instance": data["server_instance_json"],
         }
 
         return response.Response(resp_data, status=status.HTTP_201_CREATED)

morango/apps.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 from morango.registry import session_middleware
@@ -9,6 +7,7 @@ from morango.registry import syncable_models
 class MorangoConfig(AppConfig):
     name = "morango"
     verbose_name = "Morango"
+    default_auto_field = "django.db.models.AutoField"
 
     def ready(self):
         from morango.models.signals import add_to_deleted_models  # noqa: F401

morango/constants/transfer_stages.py

@@ -1,7 +1,7 @@
 """
 This module contains constants representing the possible stages of a transfer session.
 """
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 INITIALIZING = "initializing"
 SERIALIZING = "serializing"

morango/constants/transfer_statuses.py

@@ -1,7 +1,7 @@
 """
 This module contains constants representing the possible statuses of a transfer session stage.
 """
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 PENDING = "pending"
 STARTED = "started"

morango/management/commands/cleanupsyncs.py

@@ -1,5 +1,6 @@
 import datetime
 import logging
+import uuid
 
 from django.core.management.base import BaseCommand
 from django.db import transaction
@@ -29,6 +30,36 @@ class Command(BaseCommand):
             default=6,
             help="Number of hours of inactivity after which a session should be considered stale",
         )
+        parser.add_argument(
+            "--client-instance-id",
+            type=uuid.UUID,
+            default=None,
+            help="Filters the SyncSession models to those with matching 'client_instance_id'",
+        )
+        parser.add_argument(
+            "--server-instance-id",
+            type=uuid.UUID,
+            default=None,
+            help="Filters the SyncSession models to those with matching 'server_instance_id'",
+        )
+        parser.add_argument(
+            "--sync-filter",
+            type=str,
+            default=None,
+            help="Filters the TransferSession models to those with 'filters' starting with 'sync_filter'",
+        )
+        parser.add_argument(
+            "--push",
+            type=bool,
+            default=None,
+            help="Filters the TransferSession models to those with 'push' set to True",
+        )
+        parser.add_argument(
+            "--pull",
+            type=bool,
+            default=None,
+            help="Filters the TransferSession models to those with 'push' set to False",
+        )
 
     def handle(self, *args, **options):
 
@@ -37,10 +68,17 @@ class Command(BaseCommand):
 
         sync_sessions = SyncSession.objects.filter(active=True)
 
-        # if ids arg was passed, filter down sessions to only those IDs if included by expiration filter
+        # if ids arg was passed, filter down sessions to only those IDs
+        # if included by expiration filter
         if options["ids"]:
             sync_sessions = sync_sessions.filter(id__in=options["ids"])
 
+        if options["client_instance_id"]:
+            sync_sessions = sync_sessions.filter(client_instance_id=options["client_instance_id"])
+
+        if options["server_instance_id"]:
+            sync_sessions = sync_sessions.filter(server_instance_id=options["server_instance_id"])
+
         # retrieve all sessions still marked as active but with no activity since the cutoff
         transfer_sessions = TransferSession.objects.filter(
             sync_session_id__in=sync_sessions.values("id"),
@@ -48,11 +86,19 @@ class Command(BaseCommand):
             last_activity_timestamp__lt=cutoff,
         )
 
+        if options["sync_filter"]:
+            transfer_sessions = transfer_sessions.filter(filter__startswith=options["sync_filter"])
+
+        if options["push"] and not options["pull"]:
+            transfer_sessions = transfer_sessions.filter(push=True)
+
+        if options["pull"] and not options["push"]:
+            transfer_sessions = transfer_sessions.filter(push=False)
+
         transfer_count = transfer_sessions.count()
 
         # loop over the stale sessions one by one to close them out
-        for i in range(transfer_count):
-            transfer_session = transfer_sessions[0]
+        for i, transfer_session in enumerate(transfer_sessions):
             logger.info(
                 "TransferSession {} of {}: deleting {} Buffers and {} RMC Buffers...".format(
                     i + 1,
@@ -68,17 +114,21 @@ class Command(BaseCommand):
                 transfer_session.active = False
                 transfer_session.save()
 
+        # in order to close a sync session, it must have no active transfer sessions
+        # and must have no activity since the cutoff
+        sync_sessions = sync_sessions.filter(
+            last_activity_timestamp__lt=cutoff,
+        ).exclude(
+            transfersession__active=True,
+        )
         sync_count = sync_sessions.count()
 
-        # finally loop over sync sessions and close out if there are no other active transfer sessions
-        for i in range(sync_count):
-            sync_session = sync_sessions[0]
-            if not sync_session.transfersession_set.filter(active=True).exists():
-                logger.info(
-                    "Closing SyncSession {} of {}".format(
-                        i + 1,
-                        sync_count,
-                    )
+        for i, sync_session in enumerate(sync_sessions):
+            logger.info(
+                "Closing SyncSession {} of {}".format(
+                    i + 1,
+                    sync_count,
                 )
-                sync_session.active = False
-                sync_session.save()
+            )
+            sync_session.active = False
+            sync_session.save()

morango/migrations/0001_initial.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9 on 2017-05-08 23:42
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 import django.utils.timezone
 from django.db import migrations