User.confirmation_code TTL added

Author: Kulv3r

genesis_core/common/constants.py

@@ -20,6 +20,7 @@
 GLOBAL_SERVICE_NAME = "genesis_core"
 SERVICE_PROJECT_ID = sys_uuid.UUID("00000000-0000-0000-0000-000000000000")
 DEFAULT_DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S.%f"
+DEFAULT_SQL_LIMIT = 100
 
 WORK_DIR = "/var/lib/genesis"
 NODE_UUID_PATH = os.path.join(WORK_DIR, "node-id")

genesis_core/config/constants.py

@@ -17,7 +17,6 @@
 import enum
 import typing as tp
 
-DEFAULT_SQL_LIMIT = 100
 CONFIG_KIND = "config"
 RENDER_KIND = "render"
 

genesis_core/config/dm/models.py

@@ -28,6 +28,7 @@
 
 from genesis_core.common.dm import models as cm
 from genesis_core.node.dm import models as nm
+from genesis_core.common import constants as c
 from genesis_core.config import constants as cc
 
 
@@ -209,21 +210,21 @@ def render(self, node: sys_uuid.UUID) -> ua_models.TargetResource:
 
     @classmethod
     def get_new_configs(
-        cls, limit: int = cc.DEFAULT_SQL_LIMIT
+        cls, limit: int = c.DEFAULT_SQL_LIMIT
     ) -> list["Config"]:
         return cls.get_new_entities(cls.__tablename__, cc.CONFIG_KIND, limit)
 
     @classmethod
     def get_updated_configs(
-        cls, limit: int = cc.DEFAULT_SQL_LIMIT
+        cls, limit: int = c.DEFAULT_SQL_LIMIT
     ) -> list["Config"]:
         return cls.get_updated_entities(
             cls.__tablename__, cc.CONFIG_KIND, limit
         )
 
     @classmethod
     def get_deleted_config_renders(
-        cls, limit: int = cc.DEFAULT_SQL_LIMIT
+        cls, limit: int = c.DEFAULT_SQL_LIMIT
     ) -> list[ua_models.TargetResource]:
         return cls.get_deleted_target_resources(
             cls.__tablename__, cc.CONFIG_KIND, limit

genesis_core/config/service.py

@@ -29,6 +29,7 @@
 
 from genesis_core.node.dm import models as node_models
 from genesis_core.config.dm import models
+from genesis_core.common import constants as c
 from genesis_core.config import constants as cc
 
 
@@ -41,25 +42,25 @@ class ConfigServiceBuilder(basic.BasicService):
 
     def _get_new_configs(
         self,
-        limit: int = cc.DEFAULT_SQL_LIMIT,
+        limit: int = c.DEFAULT_SQL_LIMIT,
     ) -> list[models.Config]:
         return models.Config.get_new_configs(limit=limit)
 
     def _get_changed_configs(
         self,
-        limit: int = cc.DEFAULT_SQL_LIMIT,
+        limit: int = c.DEFAULT_SQL_LIMIT,
     ) -> list[models.Config]:
         return models.Config.get_updated_configs(limit=limit)
 
     def _get_deleted_configs(
         self,
-        limit: int = cc.DEFAULT_SQL_LIMIT,
+        limit: int = c.DEFAULT_SQL_LIMIT,
     ) -> list[ua_models.TargetResource]:
         return models.Config.get_deleted_config_renders(limit=limit)
 
     def _get_outdated_renders(
         self,
-        limit: int = cc.DEFAULT_SQL_LIMIT,
+        limit: int = c.DEFAULT_SQL_LIMIT,
     ) -> dict[
         sys_uuid.UUID,
         list[tuple[ua_models.TargetResource, ua_models.Resource]],

genesis_core/gservice/service.py

@@ -28,6 +28,7 @@
 from genesis_core.network import service as n_network_service
 from genesis_core.config import service as config_service
 from genesis_core.secret import service as secret_service
+from genesis_core.janitor import service as janitor_service
 
 
 LOG = logging.getLogger(__name__)
@@ -78,6 +79,10 @@ def __init__(self, iter_min_period=1, iter_pause=0.1):
         em_builder = em_builders.ElementManagerBuilder(
             iter_min_period=1, iter_pause=0.1
         )
+        janitor = janitor_service.ExpiredEmailConfirmationCodeJanitorService(
+            iter_min_period=60 * 60,
+            iter_pause=0,
+        )
 
         self._services = [
             n_scheduler,
@@ -88,6 +93,7 @@ def __init__(self, iter_min_period=1, iter_pause=0.1):
             secret_svc,
             event_sender,
             em_builder,
+            janitor,
         ]
 
     def _setup(self):

genesis_core/janitor/__init__.py

@@ -0,0 +1,59 @@
+import logging
+from datetime import datetime, timezone
+
+from gcl_looper.services import basic
+from restalchemy.dm import filters as dm_filters
+from restalchemy.common import contexts
+
+from genesis_core.common import constants as c
+from genesis_core.user_api.iam.dm import models
+from genesis_core.user_api.iam import constants as iam_c
+
+LOG = logging.getLogger(__name__)
+
+
+class ExpiredEmailConfirmationCodeJanitorService(basic.BasicService):
+    """
+    Cleans up expired email confirmation codes from Users table.
+    """
+
+    def __init__(self, limit=c.DEFAULT_SQL_LIMIT, *args, **kwargs):
+        self._limit = limit
+        super().__init__(*args, **kwargs)
+
+    def _clean_bad_confirmation_codes(self):
+        now = datetime.now(tz=timezone.utc)
+        expiration_time = now - iam_c.USER_CONFIRMATION_CODE_TTL
+        LOG.info("Starting to clean codes older than %s", expiration_time)
+        filters = dm_filters.AND(
+            dm_filters.OR(
+                # actually expired codes:
+                dm_filters.AND(
+                    {
+                        "confirmation_code_made_at": dm_filters.LT(
+                            expiration_time
+                        )
+                    }
+                ),
+                # self-heal codes without timestamps:
+                dm_filters.AND(
+                    {
+                        "confirmation_code_made_at": dm_filters.Is(None),
+                        "confirmation_code": dm_filters.IsNot(None),
+                    }
+                ),
+            )
+        )
+        users = models.User.objects.get_all(
+            filters=filters,
+            limit=self._limit,
+            order_by={"confirmation_code_made_at": "asc"},
+        )
+        for user in users:
+            user.clear_confirmation_code()
+
+        LOG.info("Users cleaned: %s" % len(users))
+
+    def _iteration(self):
+        with contexts.Context().session_manager():
+            self._clean_bad_confirmation_codes()

genesis_core/janitor/service.py

@@ -16,7 +16,6 @@
 
 import enum
 
-DEFAULT_SQL_LIMIT = 100
 PASSWORD_KIND = "password"
 CERTIFICATE_KIND = "certificate"
 

genesis_core/secret/constants.py

@@ -25,6 +25,7 @@
 from gcl_sdk.agents.universal.dm import models as ua_models
 
 from genesis_core.common.dm import models as cm
+from genesis_core.common import constants as c
 from genesis_core.secret import constants as sc
 
 
@@ -92,21 +93,21 @@ def get_resource_target_fields(self) -> set[str]:
 
     @classmethod
     def get_new_passwords(
-        cls, limit: int = sc.DEFAULT_SQL_LIMIT
+        cls, limit: int = c.DEFAULT_SQL_LIMIT
     ) -> list["Password"]:
         return cls.get_new_entities(cls.__tablename__, sc.PASSWORD_KIND, limit)
 
     @classmethod
     def get_updated_passwords(
-        cls, limit: int = sc.DEFAULT_SQL_LIMIT
+        cls, limit: int = c.DEFAULT_SQL_LIMIT
     ) -> list["Password"]:
         return cls.get_updated_entities(
             cls.__tablename__, sc.PASSWORD_KIND, limit
         )
 
     @classmethod
     def get_deleted_passwords(
-        cls, limit: int = sc.DEFAULT_SQL_LIMIT
+        cls, limit: int = c.DEFAULT_SQL_LIMIT
     ) -> list[ua_models.TargetResource]:
         return cls.get_deleted_target_resources(
             cls.__tablename__, sc.PASSWORD_KIND, limit
@@ -185,23 +186,23 @@ def get_resource_target_fields(self) -> set[str]:
 
     @classmethod
     def get_new_certificates(
-        cls, limit: int = sc.DEFAULT_SQL_LIMIT
+        cls, limit: int = c.DEFAULT_SQL_LIMIT
     ) -> list["Certificate"]:
         return cls.get_new_entities(
             cls.__tablename__, sc.CERTIFICATE_KIND, limit
         )
 
     @classmethod
     def get_updated_certificates(
-        cls, limit: int = sc.DEFAULT_SQL_LIMIT
+        cls, limit: int = c.DEFAULT_SQL_LIMIT
     ) -> list["Certificate"]:
         return cls.get_updated_entities(
             cls.__tablename__, sc.CERTIFICATE_KIND, limit
         )
 
     @classmethod
     def get_deleted_certificates(
-        cls, limit: int = sc.DEFAULT_SQL_LIMIT
+        cls, limit: int = c.DEFAULT_SQL_LIMIT
     ) -> list[ua_models.TargetResource]:
         return cls.get_deleted_target_resources(
             cls.__tablename__, sc.CERTIFICATE_KIND, limit

genesis_core/secret/dm/models.py

@@ -25,6 +25,7 @@
 from gcl_sdk.agents.universal.dm import models as ua_models
 
 from genesis_core.secret.dm import models
+from genesis_core.common import constants as c
 from genesis_core.secret import constants as sc
 
 
@@ -35,44 +36,44 @@ class SecretServiceBuilder(basic.BasicService):
 
     def _get_new_passwords(
         self,
-        limit: int = sc.DEFAULT_SQL_LIMIT,
+        limit: int = c.DEFAULT_SQL_LIMIT,
     ) -> list[models.Password]:
         return models.Password.get_new_passwords(limit=limit)
 
     def _get_changed_passwords(
         self,
-        limit: int = sc.DEFAULT_SQL_LIMIT,
+        limit: int = c.DEFAULT_SQL_LIMIT,
     ) -> list[models.Password]:
         return models.Password.get_updated_passwords(limit=limit)
 
     def _get_deleted_passwords(
         self,
-        limit: int = sc.DEFAULT_SQL_LIMIT,
+        limit: int = c.DEFAULT_SQL_LIMIT,
     ) -> list[ua_models.TargetResource]:
         return models.Password.get_deleted_passwords(limit=limit)
 
     def _get_new_certificates(
         self,
-        limit: int = sc.DEFAULT_SQL_LIMIT,
+        limit: int = c.DEFAULT_SQL_LIMIT,
     ) -> list[models.Certificate]:
         return models.Certificate.get_new_certificates(limit=limit)
 
     def _get_changed_certificates(
         self,
-        limit: int = sc.DEFAULT_SQL_LIMIT,
+        limit: int = c.DEFAULT_SQL_LIMIT,
     ) -> list[models.Certificate]:
         return models.Certificate.get_updated_certificates(limit=limit)
 
     def _get_deleted_certificates(
         self,
-        limit: int = sc.DEFAULT_SQL_LIMIT,
+        limit: int = c.DEFAULT_SQL_LIMIT,
     ) -> list[ua_models.TargetResource]:
         return models.Certificate.get_deleted_certificates(limit=limit)
 
     def _get_outdated_resources(
         self,
         kind: str,
-        limit: int = sc.DEFAULT_SQL_LIMIT,
+        limit: int = c.DEFAULT_SQL_LIMIT,
     ) -> dict[
         sys_uuid.UUID,  # Resource UUID
         tuple[ua_models.TargetResource, ua_models.Resource],