simo 2.4.2__py3-none-any.whl → 2.5.2__py3-none-any.whl

simo/notifications/utils.py

@@ -1,8 +1,27 @@
-from simo.users.models import User
+from simo.core.middleware import get_current_instance
 from .models import Notification, UserNotification
 
 
-def notify_users(instance, severity, title, body=None, component=None, users=None):
+def notify_users(severity, title, body=None, component=None, instance_users=None, instance=None):
+    '''
+    Sends a notification to specified users with a given severity level and message details.
+    :param severity: One of: 'info', 'warning', 'alarm'
+    :param title: A short, descriptive title of the event.
+    :param body: (Optional) A more detailed description of the event.
+    :param component: (Optional) simo.core.Component linked to this event.
+    :param instance_users: List of instance users to receive this notification. All active instance users will receive the message if not specified.
+    :return:
+    '''
+    if not instance:
+        if component:
+            instance = component.zone.instance
+        else:
+            instance = get_current_instance()
+    if not instance:
+        return
+    if component and component.zone.instance != instance:
+        # something is completely wrong!
+        return
     assert severity in ('info', 'warning', 'alarm')
     notification = Notification.objects.create(
         instance=instance,
@@ -10,20 +29,19 @@ def notify_users(instance, severity, title, body=None, component=None, users=Non
         severity=severity, body=body,
         component=component
     )
-    if not users:
-        users = User.objects.filter(
-            instance_roles__instance=instance,
-            instance_roles__is_active=True
-        )
-    for user in users:
+    if not instance_users:
+        instance_users = instance.instance_users.filter(
+            is_active=True
+        ).select_related('user')
+    for iuser in instance_users:
         # do not send emails to system users
-        if user.email.endswith('simo.io'):
+        if iuser.user.email.endswith('simo.io'):
             continue
-        if instance not in user.instances:
+        if iuser.instance.id != instance.id:
             continue
-        if component and not component.can_write(user):
+        if component and not component.can_read(iuser.user):
             continue
         UserNotification.objects.create(
-            user=user, notification=notification,
+            user=iuser.user, notification=notification,
         )
     notification.dispatch()

simo/scripting.py

@@ -1,13 +1,13 @@
 from django.utils import timezone
 from suntime import Sun
-from simo.core.models import Instance
+from simo.core.middleware import get_current_instance
 
 
 class LocalSun(Sun):
 
     def __init__(self, instance=None):
         if not instance:
-            instance = Instance.objects.all().first()
+            instance = get_current_instance()
         coordinates = instance.location.split(',')
         try:
             lat = float(coordinates[0])

simo/users/api.py

@@ -4,17 +4,18 @@ from rest_framework import viewsets, mixins, status
 from rest_framework.serializers import Serializer
 from rest_framework.decorators import action
 from rest_framework.response import Response as RESTResponse
-from rest_framework.exceptions import ValidationError
+from rest_framework.exceptions import ValidationError, PermissionDenied
 from django.contrib.gis.geos import Point
 from django.utils import timezone
+from django_filters.rest_framework import DjangoFilterBackend
 from simo.core.api import InstanceMixin
 from .models import (
     User, UserDevice, UserDeviceReportLog, PermissionsRole, InstanceInvitation,
-    Fingerprint
+    Fingerprint, ComponentPermission, InstanceUser
 )
 from .serializers import (
     UserSerializer, PermissionsRoleSerializer, InstanceInvitationSerializer,
-    FingerprintSerializer
+    FingerprintSerializer, ComponentPermissionSerializer
 )
 
 
@@ -63,9 +64,6 @@ class UsersViewSet(mixins.RetrieveModelMixin,
                 request.data.pop(key)
 
 
-        target_user.set_instance(self.instance)
-
-
         serializer = self.get_serializer(
             target_user, data=request.data, partial=partial
         )
@@ -135,12 +133,38 @@ class RolesViewsets(InstanceMixin, viewsets.ReadOnlyModelViewSet):
     url = 'users/roles'
     basename = 'roles'
     serializer_class = PermissionsRoleSerializer
-    queryset = PermissionsRole.objects.all()
 
     def get_queryset(self):
         return PermissionsRole.objects.filter(instance=self.instance)
 
 
+class ComponentPermissionViewsets(
+    InstanceMixin,
+    mixins.RetrieveModelMixin, mixins.UpdateModelMixin,
+    mixins.ListModelMixin, viewsets.GenericViewSet
+):
+    url = 'users/componentpermissions'
+    basename = 'componentpermissions'
+    serializer_class = ComponentPermissionSerializer
+    filter_backends = [DjangoFilterBackend]
+    filterset_fields = ['component', 'role']
+
+    def get_queryset(self):
+        return ComponentPermission.objects.filter(role__instance=self.instance)
+
+    def update(self, request, *args, **kwargs):
+        if request.user.is_master:
+            return super().update(request, *args, **kwargs)
+        iuser = InstanceUser.objects.get(
+            instance=self.instance, user=request.user
+        ).select_related('role')
+        if not iuser.is_active:
+            raise PermissionDenied()
+        if iuser.role.is_owner or iuser.role.is_superuser:
+            return super().update(request, *args, **kwargs)
+        raise PermissionDenied()
+
+
 class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
     url = 'users'
     basename = 'device_report'
@@ -188,6 +212,11 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
             ).exclude(id=user_device.id).update(is_primary=False)
         user_device.save()
 
+        for iu in request.user.instance_roles.filter(is_active=True):
+            iu.last_seen_location = user_device.last_seen_location
+            iu.last_seen_location_datetime = user_device.last_seen
+            iu.save()
+
         request.user.last_seen_location = user_device.last_seen_location
         request.user.last_seen_location_datetime = user_device.last_seen
         request.user.save()

simo/users/managers.py

@@ -1,7 +1,11 @@
 from django.db import models
+from simo.core.middleware import get_current_instance
 
 
 class ActiveInstanceManager(models.Manager):
 
     def get_queryset(self):
-        return super().get_queryset().filter(instance__is_active=True)
+        instance = get_current_instance()
+        return super().get_queryset().filter(
+            instance__is_active=True, instance=instance
+        )

simo/users/migrations/0034_instanceuser_last_seen_location_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.10 on 2024-10-18 08:00
+
+from django.db import migrations, models
+import location_field.models.plain
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0033_alter_user_ssh_key'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='instanceuser',
+            name='last_seen_location',
+            field=location_field.models.plain.PlainLocationField(blank=True, help_text='Sent by user mobile app', max_length=63, null=True),
+        ),
+        migrations.AddField(
+            model_name='instanceuser',
+            name='last_seen_location_datetime',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]

simo/users/models.py

@@ -22,6 +22,7 @@ from simo.conf import dynamic_settings
 from simo.core.utils.mixins import SimoAdminMixin
 from simo.core.utils.helpers import get_random_string
 from simo.core.events import OnChangeMixin
+from simo.core.middleware import get_current_instance
 from .middleware import get_current_user
 from .utils import rebuild_authorized_keys
 from .managers import ActiveInstanceManager
@@ -98,6 +99,12 @@ class InstanceUser(DirtyFieldsMixin, models.Model, OnChangeMixin):
     role = models.ForeignKey(PermissionsRole, on_delete=models.CASCADE)
     at_home = models.BooleanField(default=False, db_index=True)
     is_active = models.BooleanField(default=True, db_index=True)
+    last_seen_location = PlainLocationField(
+        zoom=7, null=True, blank=True, help_text="Sent by user mobile app"
+    )
+    last_seen_location_datetime = models.DateTimeField(
+        null=True, blank=True,
+    )
 
     objects = ActiveInstanceManager()
 
@@ -123,17 +130,18 @@ def post_instance_user_save(sender, instance, created, **kwargs):
         return
     from simo.core.events import ObjectChangeEvent
     dirty_fields = instance.get_dirty_fields()
-    if 'at_home' in dirty_fields:
+    if 'at_home' in dirty_fields or 'last_seen_location' in dirty_fields:
         def post_update():
-            if instance.at_home:
-                verb = 'came home'
-            else:
-                verb = 'left'
-            action.send(
-                instance.user, verb=verb,
-                instance_id=instance.instance.id,
-                action_type='user_presence', value=instance.at_home
-            )
+            if 'at_home' in dirty_fields:
+                if instance.at_home:
+                    verb = 'came home'
+                else:
+                    verb = 'left'
+                action.send(
+                    instance.user, verb=verb,
+                    instance_id=instance.instance.id,
+                    action_type='user_presence', value=instance.at_home
+                )
             ObjectChangeEvent(
                 instance.instance, instance,  dirty_fields=dirty_fields
             ).publish()
@@ -182,8 +190,6 @@ class User(AbstractBaseUser, SimoAdminMixin):
     USERNAME_FIELD = 'email'
     REQUIRED_FIELDS = ['name']
 
-    _instance = None
-
     class Meta:
         verbose_name = _('user')
         verbose_name_plural = _('users')
@@ -206,12 +212,10 @@ class User(AbstractBaseUser, SimoAdminMixin):
         obj = super().save(*args, **kwargs)
 
         if org:
-            if org.can_ssh() != self.can_ssh():
+            if org.can_ssh() != self.can_ssh() or org.ssh_key != self.ssh_key:
                 rebuild_authorized_keys()
         elif self.can_ssh():
             rebuild_authorized_keys()
-        elif org and org.ssh_key != self.ssh_key:
-            rebuild_authorized_keys()
 
         if not org or (org.secret_key != self.secret_key):
             self.update_mqtt_secret()
@@ -230,7 +234,7 @@ class User(AbstractBaseUser, SimoAdminMixin):
             )
 
     def can_ssh(self):
-        return self.is_active and self.ssh_key and self.is_master
+        return self.is_active and self.is_master
 
     def get_role(self, instance):
         cache_key = f'user-{self.id}_instance-{instance.id}_role'
@@ -244,19 +248,17 @@ class User(AbstractBaseUser, SimoAdminMixin):
             cache.set(cache_key, role, 20)
         return role
 
-    def set_instance(self, instance):
-        self._instance = instance
-
     @property
     def role_id(self):
         '''Used by API serializer to get users role on a given instance.'''
-        if not self._instance:
+        instance = get_current_instance()
+        if not instance:
             return None
-        cache_key = f'user-{self.id}_instance-{self._instance.id}-role-id'
+        cache_key = f'user-{self.id}_instance-{instance.id}-role-id'
         cached_val = cache.get(cache_key, 'expired')
         if cached_val == 'expired':
             for role in self.roles.all().select_related('instance'):
-                if role.instance == self._instance:
+                if role.instance == instance:
                     cached_val = role.id
                     cache.set(cache_key, role.id, 20)
                     return cached_val
@@ -264,16 +266,17 @@ class User(AbstractBaseUser, SimoAdminMixin):
 
     @role_id.setter
     def role_id(self, id):
-        if not self._instance:
+        instance = get_current_instance()
+        if not instance:
             return
         role = PermissionsRole.objects.filter(
-            id=id, instance=self._instance
+            id=id, instance=instance
         ).first()
         if not role:
             raise ValueError("There is no such a role on this instance")
 
         InstanceUser.objects.update_or_create(
-            user=self, instance=self._instance, defaults={
+            user=self, instance=instance, defaults={
                 'role': role
             }
         )
@@ -305,20 +308,21 @@ class User(AbstractBaseUser, SimoAdminMixin):
 
     @property
     def is_active(self):
-        if not self._instance:
+        instance = get_current_instance()
+        if not instance:
             cache_key = f'user-{self.id}_is_active'
         else:
-            cache_key = f'user-{self.id}_is_active_instance-{self._instance.id}'
+            cache_key = f'user-{self.id}_is_active_instance-{instance.id}'
         cached_value = cache.get(cache_key, 'expired')
         if cached_value == 'expired':
             if self.is_master and not self.instance_roles.all():
                 # Master who have no roles on any instance are in GOD mode!
                 # It can not be disabled by anybody, nor it is seen by anybody. :)
                 cached_value = True
-            elif self._instance:
+            elif instance:
                 cached_value = bool(
                     self.instance_roles.filter(
-                        instance=self._instance, is_active=True
+                        instance=instance, is_active=True
                     ).first()
                 )
             else:
@@ -331,13 +335,14 @@ class User(AbstractBaseUser, SimoAdminMixin):
 
     @is_active.setter
     def is_active(self, val):
-        if not self._instance:
+        instance = get_current_instance()
+        if not instance:
             return
 
         self.instance_roles.filter(
-            instance=self._instance
+            instance=instance
         ).update(is_active=bool(val))
-        cache_key = f'user-{self.id}_is_active_instance-{self._instance.id}'
+        cache_key = f'user-{self.id}_is_active_instance-{instance.id}'
         try:
             cache.delete(cache_key)
         except:

simo/users/serializers.py

@@ -1,9 +1,10 @@
 from rest_framework import serializers
 from collections.abc import Iterable
-from simo.core.middleware import get_current_request
+from simo.core.middleware import get_current_request, get_current_instance
 from simo.core.utils.api import ReadWriteSerializerMethodField
 from .models import (
-    User, PermissionsRole, InstanceInvitation, InstanceUser, Fingerprint
+    User, PermissionsRole, ComponentPermission,
+    InstanceInvitation, InstanceUser, Fingerprint
 )
 
 
@@ -15,11 +16,6 @@ class UserSerializer(serializers.ModelSerializer):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if isinstance(self.instance, Iterable):
-            for inst in self.instance:
-                inst.set_instance(self.context['instance'])
-        elif self.instance:
-            self.instance.set_instance(self.context['instance'])
 
     class Meta:
         model = User
@@ -53,7 +49,7 @@ class UserSerializer(serializers.ModelSerializer):
 
     def get_at_home(self, obj):
         iu = InstanceUser.objects.filter(
-            user=obj, instance=obj._instance
+            user=obj, instance=get_current_instance()
         ).first()
         if iu:
             return iu.at_home
@@ -68,6 +64,13 @@ class PermissionsRoleSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
 
+class ComponentPermissionSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = ComponentPermission
+        fields = '__all__'
+
+
 class InstanceInvitationSerializer(serializers.ModelSerializer):
 
     class Meta:

simo/users/utils.py

@@ -29,10 +29,21 @@ def rebuild_authorized_keys():
     try:
         with open('/root/.ssh/authorized_keys', 'w') as keys_file:
             for user in User.objects.filter(
-                ssh_key__isnull=False
+                ssh_key__isnull=False, is_master=True
             ):
-                if user.is_active and user.is_master:
-                    keys_file.write(user.ssh_key + '\n')
+                has_roles = user.instance_roles.filter(
+                    instance__is_active=True
+                ).first()
+                has_active_roles = user.instance_roles.filter(
+                    instance__is_active=True, is_active=True
+                ).first()
+                # if master user has active roles on some instances
+                # but no longer has a single active role on an instance
+                # he is most probably has been disabled by the property owner
+                # therefore he should no longer be able to ssh in to this hub!
+                if has_roles and not has_active_roles:
+                    continue
+                keys_file.write(user.ssh_key + '\n')
     except:
         print(traceback.format_exc(), file=sys.stderr)
         pass

{simo-2.4.2.dist-info → simo-2.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.4.2
+Version: 2.5.2
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io