Skip to content

Improve definitions for new-user flag in Enterprise Role #2249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lthievenaz-keeper wants to merge 1 commit into
base: release
Choose a base branch
from
Open

Improve definitions for new-user flag in Enterprise Role #2249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions keepercommander/commands/enterprise.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ def register_command_info(aliases, command_info):
enterprise_role_parser.add_argument('--copy', dest='copy', action='store_true', help='copy role with enforcements')
enterprise_role_parser.add_argument('--clone', dest='clone', action='store_true', help='copy role with users and enforcements')
#enterprise_role_parser.add_argument('--visible-below', dest='visible_below', action='store', choices=['on', 'off'], help='visible to all nodes. \'add\' only')
enterprise_role_parser.add_argument('--new-user', dest='new_user', action='store', choices=['on', 'off'], help='assign this role to new users. \'add\' only')
enterprise_role_parser.add_argument('--default', dest='default', action='store', choices=['on', 'off'], help='Set this role as default for nodes and subnodes')
enterprise_role_parser.add_argument('--delete', dest='delete', action='store_true', help='delete role')
enterprise_role_parser.add_argument('--node', dest='node', action='store', help='node Name or ID')
enterprise_role_parser.add_argument('--name', dest='name', action='store', help='role\'s new name')
Expand Down Expand Up @@ -2323,7 +2323,7 @@ def execute(self, params, **kwargs):
"node_id": node_id,
"encrypted_data": utils.base64_url_encode(crypto.encrypt_aes_v1(data, tree_key)),
"visible_below": (kwargs.get('visible_below') == 'on') or False,
"new_user_inherit": (kwargs.get('new_user') == 'on') or False,
"new_user_inherit": (kwargs.get('default') == 'on') or False,
"role_name": role_name
}
request_batch.append(rq)
Expand Down Expand Up @@ -2898,15 +2898,15 @@ def execute(self, params, **kwargs):
}
request_batch.append(rq)

elif node_id or kwargs.get('visible_below') or kwargs.get('new_user') or kwargs.get('name'):
elif node_id or kwargs.get('visible_below') or kwargs.get('default') or kwargs.get('name'):
if kwargs.get('name') and len(matched_roles) > 1:
logging.warning('Cannot assign the same name to %s roles', len(matched_roles))
kwargs['name'] = None

if kwargs.get('name') and not is_valid_name_length(kwargs.get('name'), 'Role name', 'enterprise-role'):
kwargs['name'] = None

if not (node_id or kwargs.get('visible_below') or kwargs.get('new_user') or kwargs.get('name')):
if not (node_id or kwargs.get('visible_below') or kwargs.get('default') or kwargs.get('name')):
return

for role in matched_roles:
Expand All @@ -2924,8 +2924,8 @@ def execute(self, params, **kwargs):
}
if kwargs.get('visible_below'):
rq['visible_below'] = kwargs.get('visible_below') == 'on'
if kwargs.get('new_user'):
rq['new_user_inherit'] = kwargs['new_user'] == 'on'
if kwargs.get('default'):
rq['new_user_inherit'] = kwargs['default'] == 'on'
request_batch.append(rq)

if request_batch:
Expand Down
Loading