dmart 0.1.10__py3-none-any.whl → 1.4.6__py3-none-any.whl

alembic/versions/eb5f1ec65156_adding_user_locked_to_device.py

@@ -23,7 +23,7 @@ depends_on: Union[str, Sequence[str], None] = None
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('users', schema=None) as batch_op:
-        batch_op.add_column(sa.Column('locked_to_device', sa.Boolean(),  nullable=False))
+        batch_op.add_column(sa.Column('locked_to_device', sa.Boolean(), nullable=False, server_default='false'))
 
     # ### end Alembic commands ###
 

api/managed/utils.py

@@ -3,6 +3,8 @@ from io import BytesIO
 from typing import Any
 
 from fastapi import status
+from models.api import Exception as API_Exception, Error as API_Error
+from utils import password_hashing
 from utils.generate_email import generate_email_from_template, generate_subject
 from data_adapters.file.custom_validations import validate_csv_with_schema, validate_jsonl_with_schema
 from utils.internal_error_code import InternalErrorCode
@@ -469,22 +471,23 @@ async def serve_request_update(request, owner_shortname: str):
                 schema_shortname=record_schema_shortname,
             )
 
-            requested_checksum = record.attributes.get("last_checksum_history")
-            if requested_checksum:
-                latest_history = await db.get_latest_history(
-                    space_name=request.space_name,
-                    subpath=record.subpath,
-                    shortname=record.shortname,
-                )
-                if latest_history and latest_history.last_checksum_history != requested_checksum:
-                    raise api.Exception(
-                        status.HTTP_409_CONFLICT,
-                        api.Error(
-                            type="request",
-                            code=InternalErrorCode.CONFLICT,
-                            message="Resource has been updated by another request!",
-                        ),
+            if settings.is_sha_required:
+                requested_checksum = record.attributes.get("last_checksum_history")
+                if requested_checksum:
+                    latest_history = await db.get_latest_history(
+                        space_name=request.space_name,
+                        subpath=record.subpath,
+                        shortname=record.shortname,
                     )
+                    if latest_history and latest_history.last_checksum_history != requested_checksum:
+                        raise api.Exception(
+                            status.HTTP_409_CONFLICT,
+                            api.Error(
+                                type="request",
+                                code=InternalErrorCode.CONFLICT,
+                                message="Resource has been updated by another request!",
+                            ),
+                        )
 
             # CHECK PERMISSION
             if not await access_control.check_access(
@@ -525,6 +528,26 @@ async def serve_request_update(request, owner_shortname: str):
                 else:
                     new_resource_payload_data = None
             else:
+                if 'password' in record.attributes:
+                    if 'old_password' not in record.attributes:
+                        raise API_Exception(
+                            status.HTTP_403_FORBIDDEN,
+                            API_Error(
+                                type="auth",
+                                code=InternalErrorCode.PASSWORD_RESET_ERROR,
+                                message="missing old_password!",
+                            ),
+                        )
+                    else:
+                        if not password_hashing.verify_password(record.attributes.get('old_password'), old_resource_obj.password):
+                            raise API_Exception(
+                                status.HTTP_403_FORBIDDEN,
+                                API_Error(
+                                    type="auth",
+                                    code=InternalErrorCode.PASSWORD_RESET_ERROR,
+                                    message="Wrong password have been provided!",
+                                ),
+                            )
                 new_resource_payload_data = resource_obj.update_from_record(
                     record=record,
                     old_body=old_resource_payload_body,
@@ -599,7 +622,12 @@ async def serve_request_update(request, owner_shortname: str):
 
             if (
                 isinstance(resource_obj, core.User) and
-                record.attributes.get("is_active", None) is not None
+                (
+                    record.attributes.get("is_active", None) is not None
+                    or (
+                        settings.logout_on_pwd_change and record.attributes.get("password", None) is not None
+                    )
+                )
             ):
                 if not record.attributes.get("is_active"):
                     await db.remove_user_session(record.shortname)
@@ -1534,22 +1562,23 @@ async def serve_space_update(request, record, owner_shortname: str, is_replace:
         user_shortname=owner_shortname,
     )
 
-    requested_checksum = record.attributes.get("last_checksum_history")
-    if requested_checksum:
-        latest_history = await db.get_latest_history(
-            space_name=space.shortname,
-            subpath=record.subpath,
-            shortname=space.shortname,
-        )
-        if latest_history and latest_history.last_checksum_history != requested_checksum:
-            raise api.Exception(
-                status.HTTP_409_CONFLICT,
-                api.Error(
-                    type="request",
-                    code=InternalErrorCode.CONFLICT,
-                    message="Resource has been updated by another request. Please refresh and try again.",
-                ),
+    if settings.is_sha_required:
+        requested_checksum = record.attributes.get("last_checksum_history")
+        if requested_checksum:
+            latest_history = await db.get_latest_history(
+                space_name=space.shortname,
+                subpath=record.subpath,
+                shortname=space.shortname,
             )
+            if latest_history and latest_history.last_checksum_history != requested_checksum:
+                raise api.Exception(
+                    status.HTTP_409_CONFLICT,
+                    api.Error(
+                        type="request",
+                        code=InternalErrorCode.CONFLICT,
+                        message="Resource has been updated by another request. Please refresh and try again.",
+                    ),
+                )
 
     old_flat = flatten_dict(old_space.model_dump())
     new_flat = flatten_dict(space.model_dump())

api/user/router.py

@@ -673,7 +673,16 @@ async def update_profile(
 
     old_version_flattened = flatten_dict(user.model_dump())
 
-    if profile_user.password and "old_password" in profile.attributes:
+    if profile_user.password:
+        if "old_password" not in profile.attributes:
+            raise Exception(
+                status.HTTP_403_FORBIDDEN,
+                Error(
+                    type="auth",
+                    code=InternalErrorCode.PASSWORD_RESET_ERROR,
+                    message="Wrong password have been provided!",
+                ),
+            )
         if not password_hashing.verify_password(
             profile.attributes["old_password"], user.password or ""
         ):
@@ -766,6 +775,9 @@ async def update_profile(
         retrieve_lock_status=profile.retrieve_lock_status,
     )
 
+    if settings.logout_on_pwd_change and profile_user.password:
+        await db.remove_user_session(shortname)
+
     await plugin_manager.after_action(
         core.Event(
             space_name=MANAGEMENT_SPACE,

bundler.py

@@ -2,7 +2,7 @@
 import json
 import subprocess
 import PyInstaller.__main__
-
+import os
 
 branch_cmd = "git rev-parse --abbrev-ref HEAD"
 result, _ = subprocess.Popen(branch_cmd.split(" "), stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
@@ -29,8 +29,7 @@ info = {
 
 json.dump(info, open('info.json', 'w'))
 
-
-PyInstaller.__main__.run([
+args = [
     'dmart.py',
     '--name=dmart',
     '--onefile',
@@ -41,4 +40,13 @@ PyInstaller.__main__.run([
     '--collect-submodules=concurrent_log_handler',
     '--collect-submodules=pythonjsonlogger',
     '--clean',
-])
+]
+
+cxb_path = 'cxb'
+if not os.path.isdir(cxb_path):
+    cxb_path = '../cxb/dist/client'
+
+if os.path.isdir(cxb_path):
+    args.append(f'--add-data={cxb_path}:cxb')
+
+PyInstaller.__main__.run(args)