simo 1.7.16__py3-none-any.whl → 1.7.17__py3-none-any.whl

simo/asgi.py

@@ -21,6 +21,8 @@ for name, app in apps.app_configs.items():
         if isinstance(item, list) and var_name == 'urlpatterns':
             urlpatterns.extend(item)
 
+from .on_http_start import *
+
 application = ProtocolTypeRouter({
     "http": get_asgi_application(),
     'websocket': AuthMiddlewareStack(

simo/core/app_widgets.py

@@ -89,3 +89,8 @@ class QuintupleSwitchWidget(BaseAppWidget):
     size = [4, 1]
 
 
+class LockWidget(BaseAppWidget):
+    uid = 'lock'
+    name = _("Lock")
+    size = [2, 2]
+

simo/core/controllers.py

@@ -1,3 +1,4 @@
+import sys
 import time
 import datetime
 import statistics
@@ -149,8 +150,10 @@ class ControllerBase(ABC):
         ]
 
     def _get_actor(self, to_value):
+        if self.component.change_init_fingerprint and self.component.change_init_fingerprint.user:
+            return self.component.change_init_fingerprint.user
         if self.component.change_init_by:
-            if self.component.change_init_date < timezone.now() - datetime.timedelta(seconds=5):
+            if self.component.change_init_date < timezone.now() - datetime.timedelta(seconds=30):
                 self.component.change_init_by = None
                 self.component.change_init_date = None
                 self.component.change_init_to = None
@@ -159,15 +162,15 @@ class ControllerBase(ABC):
                                    'change_init_to', 'alive']
                 )
                 return None
-            if self.component.change_init_to == to_value:
+            else:
                 return self.component.change_init_by
 
     def set(self, value, actor=None):
-        from .models import ComponentHistory
         if not actor:
             actor = self._get_actor(value)
         if not actor:
             actor = get_current_user()
+
         # Introducing user to this thread for changes that might happen to other components
         # in relation to the change of this component
         introduce(actor)
@@ -175,13 +178,13 @@ class ControllerBase(ABC):
         value = self.component.translate_before_set(value)
         value = self._validate_val(value, BEFORE_SET)
         self.component.refresh_from_db()
-        old_arm_status = self.component.arm_status
         if value != self.component.value:
             self.component.value_previous = self.component.value
         self.component.value = value
         self.component.change_init_by = None
         self.component.change_init_date = None
         self.component.change_init_to = None
+        self.component.change_init_fingerprint = None
         self.component.save()
 
     def _send_to_device(self, value):
@@ -214,9 +217,8 @@ class ControllerBase(ABC):
 
         self.component.change_init_by = get_current_user()
         self.component.change_init_date = timezone.now()
-        self.component.change_init_to = value
         self.component.save(
-            update_fields=['change_init_by', 'change_init_date', 'change_init_to']
+            update_fields=['change_init_by', 'change_init_date']
         )
         value = self._prepare_for_send(value)
         self._send_to_device(value)
@@ -668,9 +670,35 @@ class QuintupleSwitch(MultiSwitchBase):
 class Lock(Switch):
     name = _("Lock")
     base_type = 'lock'
+    app_widget = LockWidget
+    admin_widget_template = 'admin/controller_widgets/lock.html'
 
     def lock(self):
         self.turn_on()
 
     def unlock(self):
         self.turn_off()
+
+    def _receive_from_device(self, value, is_alive=True):
+        if type(value) in (int, bool):
+            if value:
+                value = 'locked'
+            else:
+                value = 'unlocked'
+        return super()._receive_from_device(value, is_alive=is_alive)
+
+    def _validate_val(self, value, occasion=None):
+        if occasion == BEFORE_SEND:
+            if type(value) != bool:
+                raise ValidationError("Boolean required to lock/unlock.")
+        else:
+            available_values = (
+                'locked', 'unlocked', 'locking', 'unlocking',
+                'operating', 'fault'
+            )
+            if value not in available_values:
+                raise ValidationError(
+                    f"Received value ({value}) that is not "
+                    f"one of available values [{available_values}] for lock."
+                )
+        return value

simo/core/migrations/0025_auto_20240122_1321.py

@@ -0,0 +1,32 @@
+# Generated by Django 3.2.9 on 2024-01-22 13:21
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('users', '0024_fingerprint'),
+        ('core', '0024_alter_instance_device_report_history_days'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='component',
+            name='change_init_fingerprint',
+            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to='users.fingerprint'),
+        ),
+        migrations.AddField(
+            model_name='instance',
+            name='learn_fingerprints',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='instance',
+            name='learn_fingerprints_start',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]

simo/core/models.py

@@ -107,6 +107,10 @@ class Instance(DirtyFieldsMixin, models.Model, SimoAdminMixin):
         help_text="How many days of user device reports log do we keep? "
                   "Use 0 if you do not want to keep these logs at all."
     )
+    learn_fingerprints_start = models.DateTimeField(null=True, blank=True)
+    learn_fingerprints = models.ForeignKey(
+        User, null=True, blank=True, on_delete=models.SET_NULL
+    )
 
     def __str__(self):
         return self.name
@@ -288,6 +292,10 @@ class Component(DirtyFieldsMixin, models.Model, SimoAdminMixin, OnChangeMixin):
     )
     change_init_date = models.DateTimeField(null=True, editable=False)
     change_init_to = models.JSONField(null=True, editable=False)
+    change_init_fingerprint = models.ForeignKey(
+        'users.Fingerprint', null=True, editable=False,
+        on_delete=models.SET_NULL
+    )
     last_change = models.DateTimeField(
         null=True, editable=False, auto_now_add=True
     )

simo/core/socket_consumers.py

@@ -257,6 +257,7 @@ class ComponentController(SIMOWebsocketConsumer):
                 ))
 
     def receive(self, text_data=None, bytes_data=None, **kwargs):
+        introduce(self.scope['user'])
         json_data = json.loads(text_data)
         self.send_value = json_data.pop('send_value', False)
         for method, param in json_data.items():

simo/core/tasks.py

@@ -302,9 +302,21 @@ def update_latest_version_available():
     dynamic_settings['core__latest_version_available'] = latest
 
 
+@celery_app.task
+def drop_fingerprints_learn():
+    Instance.objects.filter(
+        learn_fingerprints__isnull=False,
+        learn_fingerprints_start__lt=timezone.now() - datetime.timedelta(minutes=5)
+    ).update(
+        learn_fingerprints=None,
+        learn_fingerprints_start=None
+    )
+
+
 @celery_app.on_after_finalize.connect
 def setup_periodic_tasks(sender, **kwargs):
     sender.add_periodic_task(1, watch_timers.s())
     sender.add_periodic_task(20, sync_with_remote.s())
     sender.add_periodic_task(60 * 60, clear_history.s())
     sender.add_periodic_task(60 * 60 * 6, update_latest_version_available.s())
+    sender.add_periodic_task(60, drop_fingerprints_learn.s())

simo/core/templates/admin/controller_widgets/lock.html

@@ -0,0 +1,11 @@
+<div class="component-controller" data-ws_url="{{ obj.get_socket_url|default_if_none:"" }}">
+  {% if obj.value == 'locked' %}
+    <i class="fas fa-toggle-on fa-2x component_switch action"
+       data-method="turn_off"
+    ></i>
+  {% else %}
+    <i class="fas fa-toggle-off fa-2x component_switch action"
+       data-method="turn_on"
+    ></i>
+  {% endif %}
+</div>

simo/core/templates/admin/controller_widgets/switch.html

@@ -1,5 +1,4 @@
-<div class="component-controller"
-       data-ws_url="{{ obj.get_socket_url|default_if_none:"" }}">
+<div class="component-controller" data-ws_url="{{ obj.get_socket_url|default_if_none:"" }}">
   {% if obj.value %}
     <i class="fas fa-toggle-on fa-2x component_switch action"
        data-method="turn_off"

simo/on_http_start.py

@@ -0,0 +1,78 @@
+import os
+import pwd
+import grp
+import subprocess
+from django.conf import settings
+from django.template.loader import render_to_string
+
+
+def prepare_mosquitto():
+    if os.geteuid() != 0:
+        return
+
+    from simo.users.models import User
+
+    users_file = '/etc/mosquitto/mosquitto_users'
+    if not os.path.exists(users_file):
+        with open(users_file, 'w') as f:
+            f.write('')
+
+        uid = pwd.getpwnam("mosquitto").pw_uid
+        gid = grp.getgrnam("mosquitto").gr_gid
+        os.chown(users_file, uid, gid)
+        os.chmod(users_file, 0o640)
+
+        acls_file = '/etc/mosquitto/acls.conf'
+        with open(acls_file, 'w') as f:
+            f.write('')
+
+        uid = pwd.getpwnam("mosquitto").pw_uid
+        gid = grp.getgrnam("mosquitto").gr_gid
+        os.chown(acls_file, uid, gid)
+        os.chmod(acls_file, 0o640)
+
+    ps = subprocess.Popen(
+        ['mosquitto_passwd /etc/mosquitto/mosquitto_users root'],
+        shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE
+    )
+    ps.communicate(f"{settings.SECRET_KEY}\n{settings.SECRET_KEY}".encode())
+
+    for user in User.objects.all():
+        user.update_mqtt_secret(reload=False)
+
+    from simo.users.utils import update_mqtt_acls
+
+    update_mqtt_acls()
+
+    if not os.path.exists('/etc/mosquitto/conf.d/simo.conf'):
+        with open('/etc/mosquitto/conf.d/simo.conf', 'w') as f:
+            f.write(render_to_string('conf/mosquitto.conf'))
+
+    subprocess.run(
+        ['service', 'mosquitto', 'reload'], stdout=subprocess.PIPE
+    )
+
+prepare_mosquitto()
+
+
+def update_auto_update():
+    import simo
+    auto_update_file_path = os.path.join(
+        os.path.dirname(simo.__file__), 'auto_update.py'
+    )
+    st = os.stat(auto_update_file_path)
+    os.chmod(auto_update_file_path, st.st_mode | 0o111)
+
+    executable_path = '/usr/local/bin/simo-auto-update'
+    if os.geteuid() == 0:
+        # We are running as root!
+        if not os.path.islink(executable_path):
+            # There is no symbolic link yet made for auto updates.
+            # Let's make it!
+            os.symlink(auto_update_file_path, executable_path)
+            auto_update_cron = f'0 * * * * {executable_path} \n'
+            cron_out = subprocess.Popen(['crontab', '-'], stdin=subprocess.PIPE)
+            cron_out.communicate(input=str.encode(auto_update_cron))
+
+
+update_auto_update()

simo/users/migrations/0024_fingerprint.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.2.9 on 2024-01-22 13:21
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0023_auto_20240105_0719'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Fingerprint',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('value', models.CharField(db_index=True, max_length=200, unique=True)),
+                ('date_created', models.DateTimeField(auto_now_add=True)),
+                ('name', models.CharField(blank=True, max_length=100, null=True)),
+                ('is_valid', models.BooleanField(db_index=True, default=True)),
+                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='fingerprints', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

simo/users/models.py

@@ -120,7 +120,6 @@ def post_instance_user_save(sender, instance, created, **kwargs):
         rebuild_mqtt_acls.delay()
 
 
-
 class User(AbstractBaseUser, SimoAdminMixin):
     name = models.CharField(_('name'), max_length=150)
     email = models.EmailField(_('email address'), unique=True)
@@ -354,6 +353,17 @@ class User(AbstractBaseUser, SimoAdminMixin):
         return components
 
 
+class Fingerprint(models.Model):
+    value = models.CharField(max_length=200, db_index=True, unique=True)
+    user = models.ForeignKey(
+        User, on_delete=models.CASCADE, null=True, blank=True,
+        related_name='fingerprints'
+    )
+    date_created = models.DateTimeField(auto_now_add=True)
+    name = models.CharField(max_length=100, null=True, blank=True)
+    is_valid = models.BooleanField(default=True, db_index=True)
+
+
 class UserDevice(models.Model, SimoAdminMixin):
     user = models.ForeignKey(
         User, on_delete=models.CASCADE, related_name='devices'
@@ -557,4 +567,4 @@ class InstanceInvitation(models.Model):
         return response
 
     def get_absolute_url(self):
-        return reverse('accept_invitation', kwargs={'token': self.token})
+        return reverse('accept_invitation', kwargs={'token': self.token})

{simo-1.7.16.dist-info → simo-1.7.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 1.7.16
+Version: 1.7.17
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io
@@ -37,7 +37,6 @@ Requires-Dist: webservices ==0.7
 Requires-Dist: opencv-python ==4.5.4.60
 Requires-Dist: geopy ==2.2.0
 Requires-Dist: requests ==2.26.0
-Requires-Dist: click ==8.0.3
 Requires-Dist: suntime ==1.2.5
 Requires-Dist: django-location-field ==2.1.0
 Requires-Dist: django-taggit ==2.0.0

{simo-1.7.16.dist-info → simo-1.7.17.dist-info}/RECORD

@@ -1,16 +1,18 @@
 simo/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-simo/asgi.py,sha256=L8CUVZLM32IMzWDZ4IShdDN-m69t7oxAUeHods4-xNM,822
+simo/asgi.py,sha256=625LsYcpGk0jKWUwZwjKNJx4btrzVCp6LThS2gga6Qo,852
 simo/auto_update.py,sha256=KfYosx6_V0VvtASBED29l7HAyAIzMyLSob9OmAjyYxQ,2026
 simo/celeryc.py,sha256=eab7_e9rw0c__DCeoUFUh_tjAGVlulxVrk75BaJf57Q,1512
 simo/cli.py,sha256=kB1dhZ30Pnq7mDawWGbX5WnCuoZ6qNMcnWH-c8XxcaU,2233
 simo/conf.py,sha256=H2BhXAV8MEDVXF8AbkaLSfR4ULd-9_bS4bnhE5sE5fg,112
+simo/on_http_start.py,sha256=PJQlKYeZbtGCxRjDV6zcCqyA5Ns9d5NND30Tb6vIav4,2358
 simo/scripting.py,sha256=PVIkGsiMDWj4CNTbOM3rq7pJ6ruavuns-ZMU7VudLa4,923
 simo/settings.py,sha256=pMT2rdYKNpvXLxBFNWbqnRNkw8eVCW28u6DbI05AibM,6791
 simo/urls.py,sha256=cmegi8VcNCq22k9v2rUYWDEcr2_ND2YQFUvpzISK7y0,2553
 simo/__pycache__/__init__.cpython-38.pyc,sha256=j81de0BqHMr6bs0C7cuYrXl7HwtK_vv8hDEtAdSwDJc,153
-simo/__pycache__/asgi.cpython-38.pyc,sha256=bOdmI-G4socquYp4aZk2H-v5JSPcjKrGgPjEodme7NQ,845
+simo/__pycache__/asgi.cpython-38.pyc,sha256=h60ZAnfczA1UpvJ1JofmQkC-DzmXSkFWOMyISyiABA8,880
 simo/__pycache__/celeryc.cpython-38.pyc,sha256=eSRoaKwfYlxVaxAiwqpQ2ndEcx7W-VpZtbxRFSV8UYg,1653
 simo/__pycache__/conf.cpython-38.pyc,sha256=MYP2yk3ULxiYwZsZR6tCLjKnU-z03A3avzQzIn66y3k,273
+simo/__pycache__/on_http_start.cpython-38.pyc,sha256=QDNZHnJnLNmP3TSZ6oiySy2SbSgZ9LBs5m2KSwQPmAI,2067
 simo/__pycache__/settings.cpython-38.pyc,sha256=lyN4n0YWf5paUvhBHZwAeg2TB2iqCjSuc5uxSZjxZLM,6040
 simo/__pycache__/urls.cpython-38.pyc,sha256=_jjBuEJRAf7oXHOqt3MUElK2-uaYRL2jWK7l2StnUhQ,2210
 simo/_hub_template/hub/asgi.py,sha256=ElN_fdeSkf0Ysa7pS9rJVmZ1HmLhFxb8jFaMLqe1220,126
@@ -24,13 +26,12 @@ simo/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/core/admin.py,sha256=4l2XFoI9yUoOuQkyYdpwxt-PGj-VTVcMb-BiA_NHYok,16588
 simo/core/api.py,sha256=Hv-Dy9Lc8H1hZXlz4Uoqx7CNVFoHy6ZbiHs1xEIaNCA,19157
 simo/core/api_auth.py,sha256=2MRmCid_Fy67chKiJEt6_UaJZmb1PDF8KdbBlkA7YgU,1139
-simo/core/app_widgets.py,sha256=SP1txwI8_robAapIjalciS1cnJGoPH6udi6-k3fGC-g,1928
-simo/core/apps.py,sha256=CbkdIxKG5geo3ObOI4bkp55yA-3Yjs7RFk0Q3blrAqc,1046
+simo/core/app_widgets.py,sha256=EEQOto3fGR0syDqpJE38tQrx8DoTTyg26nF5kYzHY38,2018
 simo/core/auto_urls.py,sha256=YZcvHqmAs4_azA_F_yz3CBsxrHAGijOPHib3SJCAoR0,1089
 simo/core/autocomplete_views.py,sha256=ygbVEOfyygWNy2BanB46Ov0NfWxBFAwwKp5CqAkrGMc,3849
 simo/core/base_types.py,sha256=OkRoAHp8P3r79k3IlUzkhycqlHDkeq7AAhOgsz7qGz8,552
 simo/core/context.py,sha256=xmGQ5h6HXw9-_XTuJSXyNiWDRHAVauqGCxmSJo0mxjE,1261
-simo/core/controllers.py,sha256=tJif3k3aJNFEks929BK99qZ1b_gSedrXDKhiYGUIT-M,22474
+simo/core/controllers.py,sha256=-6WAduDDoXPoRk2za3LpSRUYrn-50X_kjgf1rMBJLFs,23493
 simo/core/dynamic_settings.py,sha256=U2WNL96JzVXdZh0EqMPWrxqO6BaRR2Eo5KTDqz7MC4o,1943
 simo/core/events.py,sha256=gfew3bduIjiFusbnIoQg1LhOXRIfyLTilNMc0ROfpr8,4198
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
@@ -38,14 +39,14 @@ simo/core/forms.py,sha256=s-Cjw--vibCmxk6IQ_4M5IQOMuE3Z8re75NFPPmi4O4,19735
 simo/core/gateways.py,sha256=MblN73zJC_6dBNJQel8KBblO4UvR-wLetea3FTrkWeE,3081
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/middleware.py,sha256=VKt9OBYU2o8BUjc5MESjt2vx_HixwprozmCRkAQDwZI,1252
-simo/core/models.py,sha256=HzpkUsmBwBIhFzvkIfMPlIX9wmkO-DGPNOC8H4ngPyw,18110
+simo/core/models.py,sha256=pnvSB-8HkdL6FWHvIxdb0gd-XuA3oBamZ8D2EIxjC5A,18443
 simo/core/permissions.py,sha256=1GI59JZxl_sL9qzSt2uhoOnYnORDmcOJ8Fb37LbrhJE,576
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
 simo/core/serializers.py,sha256=styX6kt-h4k3GNu31RWEYIJ7I-u6BGRLfC0zhrtYV-U,4181
 simo/core/signal_receivers.py,sha256=tyIljxTqvzBgYzcKDsSHeyFw9mKQiwA6NA1iJZEvL6I,2593
-simo/core/socket_consumers.py,sha256=5kUaUlmeKF3V6tZaV9MFaezRNMPHwGvdpx1XaA3eJFc,9789
+simo/core/socket_consumers.py,sha256=y5I5BclO5i_pFGhh-oVxXSObVSMfvwQueQZfSZYSUTM,9827
 simo/core/storage.py,sha256=YlxmdRs-zhShWtFKgpJ0qp2NDBuIkJGYC1OJzqkbttQ,572
-simo/core/tasks.py,sha256=TSMI2jijUxXqQ9AwamLFc1wGFcR_qLw13kfW4kYf9II,10330
+simo/core/tasks.py,sha256=vvjXZGHfDqZl2eQxYedNPTqSE5tUcTFSqoy6T6SJQI4,10688
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=Vr4eyLLIbxyPld-mOWH-hn0iqFfAbrK2jCHo_7nhvYE,5420
@@ -57,14 +58,13 @@ simo/core/__pycache__/admin.cpython-38.pyc,sha256=ZgDx7HuLwuV_9j6xEx090AU1-35jiA
 simo/core/__pycache__/api.cpython-37.pyc,sha256=srtJhR4q9LU9VmVxkTC2YgjBiqFvSWytHmQiX9W897c,1780
 simo/core/__pycache__/api.cpython-38.pyc,sha256=7oxM_bKV_uCAzcIasshtZYEOkzRbFPU4LNgsxS-DcUU,14480
 simo/core/__pycache__/api_auth.cpython-38.pyc,sha256=Df2nEIBP9BU4XB3NxlI335eIYOXjG6rjfLWQR-Jki7k,1627
-simo/core/__pycache__/app_widgets.cpython-38.pyc,sha256=4oI7IrXxPx2esGzEpAGikyJlDYYYtLaQK4yeBQHRqlA,3290
-simo/core/__pycache__/apps.cpython-38.pyc,sha256=p5MFXSBz2sEDRiuelD_hMIAzin2XSiJRLPbBPfJXr1w,1133
+simo/core/__pycache__/app_widgets.cpython-38.pyc,sha256=o122Qpv-RrR61gsJVs29yNTVT7MmwxuqrqBHpFCPG_4,3465
 simo/core/__pycache__/auto_urls.cpython-38.pyc,sha256=LmdNUMSWfwNXzyoxG4Ki82B6tegLSHn1ethfnPSRR5Y,836
 simo/core/__pycache__/autocomplete_views.cpython-38.pyc,sha256=Rrrx6jwbhYDa9sU1eia9xBuTx-0H4F1aBsMvrK8cIz0,3861
 simo/core/__pycache__/base_types.cpython-38.pyc,sha256=LyaOjfDh0ZQNUbYNoJwOAyeBOy1qoEyBvdV0aYV8w7E,693
 simo/core/__pycache__/context.cpython-38.pyc,sha256=Dq_Z-4U7ppQhu8T-7kqu7LjT6DgbRI9bWbQ17rwX-Us,1184
 simo/core/__pycache__/controllers.cpython-37.pyc,sha256=18C2XXXvrzaipTVWRx_KFDHP5TmeWM-xnTnqVkzy8as,1663
-simo/core/__pycache__/controllers.cpython-38.pyc,sha256=d2EajsCcWnZQtV-58J8-JoQJ9em2xy7VU60NRXmqQJo,20659
+simo/core/__pycache__/controllers.cpython-38.pyc,sha256=79kYGOmaJpZ8eqqcYfnmy-lKtmp0lQDXh8RG7Nf2y94,21360
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=P14nFp70tx6eCkyQN0ZxLaX21DiUc3TeZ4bs3h8XJgA,2476
 simo/core/__pycache__/events.cpython-37.pyc,sha256=E17-McBIoKrqwv1Qjh0WaVKYvcL-xzGRXvCg70uRUgs,3154
 simo/core/__pycache__/events.cpython-38.pyc,sha256=5EJe1jSpBzqSuH_hCKAY7vsNIfeYX0KUtPaU-cIjX6w,4973
@@ -76,16 +76,16 @@ simo/core/__pycache__/gateways.cpython-38.pyc,sha256=YyscgVM5eGIE7dL5GcaSco6NzsF
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/middleware.cpython-38.pyc,sha256=vRjRp2hUrMLNvP2dExBVpP4T7wa6owWPCJbq5jPqY00,1480
 simo/core/__pycache__/models.cpython-37.pyc,sha256=kJ1wVtRlrDNAD6svKaiDTNRx7d4t5ect_hsDgpgzb0M,4240
-simo/core/__pycache__/models.cpython-38.pyc,sha256=JoFoaTq5mDvvImzSsVKscbEfaYYXsE6s5DDL7YjeNCM,15957
+simo/core/__pycache__/models.cpython-38.pyc,sha256=VCiK_tFooJKrohW6Rmn1bZUySJLMFvHmEe5vYWL17iU,16139
 simo/core/__pycache__/permissions.cpython-38.pyc,sha256=BBstKtFelsJz8oTC3b3M2Z2XUi7cYFjnBaTuvcRraoo,850
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=SnHuviYlYSp1pBON71-14yWa4jg5GDo8ksjfS5n1Gmk,591
 simo/core/__pycache__/scripts.cpython-37.pyc,sha256=aVttBA4V6xl6hwaFNbhIp45VbP0wId0vIC6iTvvw7iQ,613
 simo/core/__pycache__/serializers.cpython-37.pyc,sha256=SraS2BK9PTfrSXZGE7IeT6VvnuYDxrONwuDPba2Vcz8,3129
 simo/core/__pycache__/serializers.cpython-38.pyc,sha256=MhbEoC3bxpiqJc2iPmZRKnlclRdVWiwCLn6baoXNfXQ,5762
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=BihR5Qnr9P72Xx4M9QWwCoxPa33ekDpLbQgS0kM0LC8,2321
-simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=YqoBkpezPLw5GIfuqVz0uTqjV1QjBvRmWJkN7pngAls,8808
+simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=Xw_9Y0WcvO9vacbHA4uNHPW2dF2XcMG1nb0jiS8cRzs,8839
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=BTkYH8QQyjqI0WOtJC8fHNtgu0YA1vjqZclXjC2vCVI,1116
-simo/core/__pycache__/tasks.cpython-38.pyc,sha256=BaRm0XSvTc4OBEiYQvC8ZnLFxxGTUQw_dS5Gmrdq8K8,7678
+simo/core/__pycache__/tasks.cpython-38.pyc,sha256=vtkxATYpSP6hB0zh5hJykUM5HYS4MAHb1jN0P-t3imE,8048
 simo/core/__pycache__/todos.cpython-38.pyc,sha256=CkHQ6v8gmynr83KQsJY6VPR3OnLZnHvVCX5R1Dr8J9Q,245
 simo/core/__pycache__/views.cpython-38.pyc,sha256=I75ChNeoySYr2uXV0PScwpVWsOoPpyzP9cHKkTJfWAc,3825
 simo/core/__pycache__/widgets.cpython-37.pyc,sha256=myov4OZi5dkR2dYs2hBAVgMIgOTJT5jdLiM93PI8gvw,688
@@ -127,6 +127,7 @@ simo/core/migrations/0021_auto_20231020_1041.py,sha256=OmXoVeWfb8HPvGlP0iC1ZYqBy
 simo/core/migrations/0022_auto_20231221_0735.py,sha256=XR4rfCHy6_oZkybvzcba_Oxx8HST-vSCKy8pPVxX8cs,23525
 simo/core/migrations/0023_auto_20231229_1352.py,sha256=TuCDRtgmFDLW7e1oIs_3Ndxn-ub2rV87VAzZ_1U0bwQ,1267
 simo/core/migrations/0024_alter_instance_device_report_history_days.py,sha256=CqCWl3GQNeFnNMr0hfdlQG9LcXbN9dILqxw0peHVihs,530
+simo/core/migrations/0025_auto_20240122_1321.py,sha256=ocRAPsO2QRUBn8tOwtXNcc82fA0KHLsclDy2Nz5X-ds,1111
 simo/core/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/core/migrations/__pycache__/0001_initial.cpython-38.pyc,sha256=ftWpf_RgprbqNo_syjYdeblvFH5nIEc87XEpdi1INHo,5373
 simo/core/migrations/__pycache__/0002_load_icons.cpython-38.pyc,sha256=gYV4sH0cXffvNtVyFgRQQ1A4I5DeIRnZX9eUrTpEhlk,2115
@@ -152,6 +153,7 @@ simo/core/migrations/__pycache__/0021_auto_20231020_1041.cpython-38.pyc,sha256=p
 simo/core/migrations/__pycache__/0022_auto_20231221_0735.cpython-38.pyc,sha256=RvnYOHFuY8siQ69Fed3oHoXbiF17Vr54YXRYyJFwp-4,16477
 simo/core/migrations/__pycache__/0023_auto_20231229_1352.cpython-38.pyc,sha256=NYA0kVuQGWjz2epoLH0XG7FgyaC6JXW28J18bjRAqCk,1281
 simo/core/migrations/__pycache__/0024_alter_instance_device_report_history_days.cpython-38.pyc,sha256=ALrhitBQRd-y9Ragwa0_ZuJ9DDkUIgw72A0CZpWznmE,777
+simo/core/migrations/__pycache__/0025_auto_20240122_1321.cpython-38.pyc,sha256=u6tcFJClTrrgPrYhtKPea9IIwG4O2yWjjoUCR7_dQ60,1090
 simo/core/migrations/__pycache__/__init__.cpython-38.pyc,sha256=a0yc0qWaV-D5f64GdcpP54haEDBzwmAWRGyErHeHztU,161
 simo/core/static/ansi_styles.css,sha256=4ieJGrjZPKyPSago9FdB_gflHoGE1vxCHi8qVn5tY-Y,37352
 simo/core/static/admin/Img/plus.svg,sha256=2NpSFPWqGIjpAQGFI7LDQHPKagEhYkJiJX95ufCoZaI,741
@@ -10058,8 +10060,9 @@ simo/core/templates/admin/zone_table_row.html,sha256=4XCgDsnrvn6s9ac0_e74pPsjDFd
 simo/core/templates/admin/controller_widgets/binary_sensor.html,sha256=PTwoLyppBIH8VL3-PKXCT4SWFQOeWqrzfsriWyROnzU,277
 simo/core/templates/admin/controller_widgets/generic.html,sha256=4TNLI0ri2qpuXNy4IIi4CTN4L98JtmERE0D16a4wCNE,163
 simo/core/templates/admin/controller_widgets/knob.html,sha256=ukTJoQBZfly0gLUx0vJdqHbnggaiDV6jS5tM8Jd8JuA,221
+simo/core/templates/admin/controller_widgets/lock.html,sha256=JyIB5CIaXBb4cKLSg53lWBRjNIeTxVaHBJTuOI4nYkQ,363
 simo/core/templates/admin/controller_widgets/rgb.html,sha256=3xRjo_d1jALiJabWYk5kTLhdwhylzOA-iwyDNfSKlgw,224
-simo/core/templates/admin/controller_widgets/switch.html,sha256=pCXJ7k6TFbeSU_2rBSc50cqtRpLmCoyb8ON37T1tcIM,358
+simo/core/templates/admin/controller_widgets/switch.html,sha256=fyNEZgxO0dY61QVSrnsSYt7-JsS9RQTGkPXaeMyNNWM,351
 simo/core/templates/admin/core/icon_preview.html,sha256=D1FS0PwKRopFQgy4NlUPtQp7n78opB6XMRVf2CAAtaM,605
 simo/core/templates/admin/gateway_control/widget.html,sha256=hJ8oL0wZjhwQXiVDCXVAqb-nJQUkSYPtfKoaAUl0Hwc,163
 simo/core/templates/admin/gateway_control/widget_internals.html,sha256=6UsVKQtHWM2W29Rf1SLiLdNdkxL6P_WGZUKhHzcw48k,1262
@@ -10283,12 +10286,11 @@ simo/notifications/migrations/__pycache__/__init__.cpython-38.pyc,sha256=wXGUV-i
 simo/users/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/admin.py,sha256=XpUrz1zIVLuK3Y9MF7kCJBExHpMEMkU3iNZG1YZdxO0,6560
 simo/users/api.py,sha256=_1Z8m4pU-9LAbLfSdZ6qXLj0amgulVPqmLX2kRGJWF4,7886
-simo/users/apps.py,sha256=rf_6OOpkiwTrOTY8pIsozrVUlx-0wpOheLEPj0lIYsU,1728
 simo/users/auth_backends.py,sha256=I5pnaTa20-Lxfw_dFG8471xDITb0_fQl1PVhJalp5vU,3992
 simo/users/auto_urls.py,sha256=ee0d6fWABkJY5mQOTC8KhrqDI6d8xZkYZ4ja-gZJ-rw,269
 simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCaM,570
 simo/users/middleware.py,sha256=9epN8xDcnYAMoEjAeJGg4W9e54szTgh48LKz3rlywFI,1287
-simo/users/models.py,sha256=kSBRc7Y-P15q6LwJJLOVhtc5z7tooaFvNFWvyUtPrtU,18121
+simo/users/models.py,sha256=HyN4Euh4j4dQqToR0LOBLHphztHGdQgDN41lSLarlRU,18552
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=Mh2pWmsKDp7CNIxK2OTw3CfVkteZHiVoXWNF1fluvX8,2161
 simo/users/sso_urls.py,sha256=pcb_GhYHRtmairxJhMXE1bdcTma0BcYfKU3nCRtHQMQ,244
@@ -10299,12 +10301,11 @@ simo/users/views.py,sha256=dOQVvmlHG7ihWKJLFUBcqKOA0UDctlMKR0pTc36JZqg,3487
 simo/users/__pycache__/__init__.cpython-38.pyc,sha256=9otuYxq331c4lGy0DR8pigaPpzq0lQ4nrNLhlYiFAF0,159
 simo/users/__pycache__/admin.cpython-38.pyc,sha256=ggaIuUdEjvYZ6Y5msOlhP_LmYnqUQpkJeS6FuZr6ass,7274
 simo/users/__pycache__/api.cpython-38.pyc,sha256=W_VuG6hotcDA2iIsbO1p01ouqcWIl7C3JZbAk4Wp3l8,6676
-simo/users/__pycache__/apps.cpython-38.pyc,sha256=E14VsKsNu8V3dPk089YREOzWUB_1xGLgprEbpMh2kMw,1694
 simo/users/__pycache__/auth_backends.cpython-38.pyc,sha256=MuOieBIXt6lrDx83-UQtdDyI_U8kE3pU9XR4yFLKBnE,3007
 simo/users/__pycache__/auto_urls.cpython-38.pyc,sha256=q8SFA5EN-tpypBzfiAsorpWdXlrC_kt4HgMCZS9bcoI,431
 simo/users/__pycache__/dynamic_settings.cpython-38.pyc,sha256=6F8JBjZkHykySnmZjNEzjS0ijbmPdcp9yUAZ5kqq_Fo,864
 simo/users/__pycache__/middleware.cpython-38.pyc,sha256=U2ENmFDCHK4qtf2Q6xLqe-VNmM6dN-sUb6q70epSgZs,1165
-simo/users/__pycache__/models.cpython-38.pyc,sha256=PVjKOiTNQAT4cV6L0_U3_kJAV2B9YZJKCjtL2jnPTaw,17102
+simo/users/__pycache__/models.cpython-38.pyc,sha256=KH1jIoLIZgG22dYuuZqnVCSsnPfe4D74k76gGQdw9jk,17498
 simo/users/__pycache__/permissions.cpython-38.pyc,sha256=ez5NxoL_JUeeH6GsKhvFreuA3FCBgGf9floSypdXUtM,633
 simo/users/__pycache__/serializers.cpython-38.pyc,sha256=rCAdmyL95NkChqspE-FmAtJ6vAWjdJnPa2jrd8e6hUo,2868
 simo/users/__pycache__/sso_urls.cpython-38.pyc,sha256=9TkKOWZugSPhwModg5yJn2IE3YgvMQA8Vm3WGznoOuk,403
@@ -10335,6 +10336,7 @@ simo/users/migrations/0020_rename_is_god_user_is_master.py,sha256=opZkM36xt6sKuJ
 simo/users/migrations/0021_alter_permissionsrole_instance.py,sha256=Taw2fdHy6U1PlThC3QIWaL_ADbx7gchWsJcGxoMMElo,630
 simo/users/migrations/0022_userdevicereportlog_instance.py,sha256=h0ue6uMcIyVs2o58Aj0PyjGLPvCCfS28HfPIiIu_VLc,549
 simo/users/migrations/0023_auto_20240105_0719.py,sha256=OAkWJusXjzT6dx4EgwjvNvMEgrP_zvcG8zgi774pYG0,700
+simo/users/migrations/0024_fingerprint.py,sha256=0wfplJ3iHv_6heJx7yIQYX3D68Nf9pLPlIZoM5NcPk8,1021
 simo/users/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/migrations/__pycache__/0001_initial.cpython-38.pyc,sha256=ngXA1QR-Qc2VS-BTTZWybVXiEfifIgKaVS6bADiN8nU,4269
 simo/users/migrations/__pycache__/0002_componentpermission.cpython-38.pyc,sha256=pknJnpic8p6Vdx9DX41FfODXNnvexDswJtUCmC5w1tg,995
@@ -10359,6 +10361,7 @@ simo/users/migrations/__pycache__/0020_rename_is_god_user_is_master.cpython-38.p
 simo/users/migrations/__pycache__/0021_alter_permissionsrole_instance.cpython-38.pyc,sha256=aC1h7lz5JZbpZU55X9GdW_XJ_JixSxh0_I7TCheO_rM,863
 simo/users/migrations/__pycache__/0022_userdevicereportlog_instance.cpython-38.pyc,sha256=xGtWss6Blm02eNE-sBYQxwbRydqii2YcSGJNh1zseEw,785
 simo/users/migrations/__pycache__/0023_auto_20240105_0719.cpython-38.pyc,sha256=VOc5g9AlyhnB3QhU6GmOw6RPWUh4WhtLIOypCYb4jXY,739
+simo/users/migrations/__pycache__/0024_fingerprint.cpython-38.pyc,sha256=y7usfd4nuqXG2ZKq2hEVPq8ukEeszGpLfNFOzeLX9yU,1132
 simo/users/migrations/__pycache__/__init__.cpython-38.pyc,sha256=NKq7WLgktK8WV1oOqCPbAbdkrPV5GRGhYx4VxxI4dcs,170
 simo/users/templates/conf/mosquitto.conf,sha256=1eIGNuRu4Y3hfAU6qiWix648eCRrw0oOT24PnyFI4ys,189
 simo/users/templates/conf/mosquitto_acls.conf,sha256=ga44caTDNQE0CBKw55iM2jOuna6-9fKGwAhjyERZdRE,500
@@ -10368,8 +10371,8 @@ simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCe
 simo/users/templates/invitations/expired_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo-1.7.16.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-1.7.16.dist-info/METADATA,sha256=zEGTcyYdQQs9AeLo_HOSbBmyJd0uTaver9BFk4OCnzU,1749
-simo-1.7.16.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-simo-1.7.16.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-1.7.16.dist-info/RECORD,,
+simo-1.7.17.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-1.7.17.dist-info/METADATA,sha256=pzt1U0wzNjr7EQHueQkcGXm1ZLAQ_0gDysSogCWA7pQ,1720
+simo-1.7.17.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+simo-1.7.17.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-1.7.17.dist-info/RECORD,,

simo/core/apps.py

@@ -1,28 +0,0 @@
-import os
-import subprocess
-from django.conf import settings
-from django.template.loader import render_to_string
-from django.apps import AppConfig
-
-
-class CoreAppConfig(AppConfig):
-    name = 'simo.core'
-
-    def ready(self):
-        import simo
-        auto_update_file_path = os.path.join(
-            os.path.dirname(simo.__file__), 'auto_update.py'
-        )
-        st = os.stat(auto_update_file_path)
-        os.chmod(auto_update_file_path, st.st_mode | 0o111)
-
-        executable_path = '/usr/local/bin/simo-auto-update'
-        if os.geteuid() == 0:
-            # We are running as root!
-            if not os.path.islink(executable_path):
-                # There is no symbolic link yet made for auto updates.
-                # Let's make it!
-                os.symlink(auto_update_file_path, executable_path)
-                auto_update_cron = f'0 * * * * {executable_path} \n'
-                cron_out = subprocess.Popen(['crontab', '-'], stdin=subprocess.PIPE)
-                cron_out.communicate(input=str.encode(auto_update_cron))

simo/users/apps.py

@@ -1,56 +0,0 @@
-import os
-import pwd
-import grp
-import subprocess
-from django.conf import settings
-from django.template.loader import render_to_string
-from django.apps import AppConfig
-
-
-class CoreAppConfig(AppConfig):
-    name = 'simo.users'
-
-    def ready(self):
-        if os.geteuid() != 0:
-            return
-
-        from .models import User
-        users_file = '/etc/mosquitto/mosquitto_users'
-        if not os.path.exists(users_file):
-            with open(users_file, 'w') as f:
-                f.write('')
-
-            uid = pwd.getpwnam("mosquitto").pw_uid
-            gid = grp.getgrnam("mosquitto").gr_gid
-            os.chown(users_file, uid, gid)
-            os.chmod(users_file, 0o640)
-
-            acls_file = '/etc/mosquitto/acls.conf'
-            with open(acls_file, 'w') as f:
-                f.write('')
-
-            uid = pwd.getpwnam("mosquitto").pw_uid
-            gid = grp.getgrnam("mosquitto").gr_gid
-            os.chown(acls_file, uid, gid)
-            os.chmod(acls_file, 0o640)
-
-
-        ps = subprocess.Popen(
-            ['mosquitto_passwd /etc/mosquitto/mosquitto_users root'],
-            shell=True, stdin=subprocess.PIPE,stdout=subprocess.PIPE
-        )
-        ps.communicate(f"{settings.SECRET_KEY}\n{settings.SECRET_KEY}".encode())
-
-        for user in User.objects.all():
-            user.update_mqtt_secret(reload=False)
-
-        from .utils import update_mqtt_acls
-        update_mqtt_acls()
-
-        if not os.path.exists('/etc/mosquitto/conf.d/simo.conf'):
-            with open('/etc/mosquitto/conf.d/simo.conf', 'w') as f:
-                f.write(render_to_string('conf/mosquitto.conf'))
-
-        subprocess.run(
-            ['service', 'mosquitto', 'reload'], stdout=subprocess.PIPE
-        )