transform_folder fails with "exceeded_depth" error. KC-827

Author: sk-keeper

keepercommander/commands/audit_alerts.py

@@ -641,7 +641,7 @@ def apply_recipient(recipient, options):
                         file_name = http_body[1:]
                         file_name = os.path.expanduser(file_name)
                         if os.path.isfile(file_name):
-                            with open(file_name, 'rt') as tf:
+                            with open(file_name, 'rt', encoding='utf-8') as tf:
                                 webhook_body = tf.read()
                         else:
                             raise CommandError('', f'File \"{file_name}\" not found')

keepercommander/commands/automator.py

@@ -378,7 +378,7 @@ def execute(self, params, **kwargs):  # type: (KeeperParams, **any) -> any
                             if parts[0].lower() == 'file':
                                 filename = parts[1].strip()
                                 if os.path.isfile(filename):
-                                    with open(filename, 'r') as f:
+                                    with open(filename, 'r', encoding='utf-8') as f:
                                         value = f.read()
                             if parts[0].lower() == 'base64':
                                 filename = parts[1].strip()

keepercommander/commands/base.py

@@ -780,3 +780,18 @@ def traverse_folder_tree(params, folder_uid, callback):
                 if folder.subfolders:
                     folders.extend(folder.subfolders)
                 callback(folder)
+
+    @staticmethod
+    def resolve_folder(params, folder_name):    # type: (KeeperParams, str) -> Optional[str]
+        if not folder_name:
+            return
+
+        if folder_name in params.folder_cache:
+            return folder_name
+        else:
+            rs = try_resolve_path(params, folder_name)
+            if rs is not None:
+                folder, record_name = rs
+                if folder and not record_name:
+                    if folder.uid:
+                        return folder.uid

keepercommander/commands/enterprise.py

@@ -1989,7 +1989,7 @@ def get_parser(self):
     def enforcement_value_from_file(filepath):
         filepath = os.path.expanduser(filepath)
         if os.path.isfile(filepath):
-            with open(filepath, 'r') as f:
+            with open(filepath, 'r', encoding='utf-8') as f:
                 enforcement_value = f.read()
                 if ':' in enforcement_value:
                     # Validate JSON
@@ -2671,7 +2671,7 @@ def execute(self, params, **kwargs):
                     json_roles = json_roles[0]
                 file_name = kwargs.get('output')
                 if file_name:
-                    with open(file_name, 'w') as f:
+                    with open(file_name, 'w', encoding='utf-8') as f:
                         json.dump(json_roles, f, indent=4)
                 else:
                     return json.dumps(json_roles, indent=4)

keepercommander/commands/enterprise_create_user.py

@@ -13,18 +13,16 @@
 import json
 import logging
 import re
-from typing import Optional
 from urllib.parse import urlunparse
 
-from .base import RecordMixin, raise_parse_exception, suppress_exit, try_resolve_path
+from .base import RecordMixin, FolderMixin, raise_parse_exception, suppress_exit
 from .enterprise import EnterpriseCommand
 from .register import OneTimeShareCreateCommand
 from .. import api, crypto, utils, generator, rest_api, vault, record_management, vault_extensions, constants
 from ..constants import EMAIL_PATTERN
+from ..error import CommandError
 from ..loginv3 import LoginV3API
-from ..params import KeeperParams
 from ..proto import enterprise_pb2
-from ..error import CommandError
 
 
 def register_commands(commands):
@@ -137,7 +135,7 @@ def execute(self, params, **kwargs):
         folder_uid = None
         folder_name = kwargs.get('folder')
         if folder_name:
-            folder_uid = self.resolve_folder(params, folder_name)
+            folder_uid = FolderMixin.resolve_folder(params, folder_name)
 
         keeper_url = urlunparse(('https', params.server, '/vault', None, None, f'email/{email}'))
         record = vault.TypedRecord()
@@ -173,21 +171,6 @@ def execute(self, params, **kwargs):
             logging.info('User \"%s\" credentials are stored to record \"%s\"', login_facade.login, login_facade.title)
             return record.record_uid
 
-    @staticmethod
-    def resolve_folder(params, folder_name):    # type: (KeeperParams, str) -> Optional[str]
-        if not folder_name:
-            return
-
-        if folder_name in params.folder_cache:
-            return folder_name
-        else:
-            rs = try_resolve_path(params, folder_name)
-            if rs is not None:
-                folder, record_name = rs
-                if folder and not record_name:
-                    if folder.uid:
-                        return folder.uid
-
 
 class StoreUserKeysCommand(EnterpriseCommand):
     def get_parser(self):

keepercommander/commands/enterprise_push.py

@@ -158,7 +158,7 @@ def execute(self, params, **kwargs):
 
         file_name = os.path.abspath(os.path.expanduser(name))
         if os.path.isfile(file_name):
-            with open(file_name, 'r') as f:
+            with open(file_name, 'r', encoding='utf-8') as f:
                 template_records = json.load(f)
         else:
             raise CommandError('enterprise-push', f'File {name} does not exists')