From 97639b4032606caf5909e20dc6da20a9b18a137d Mon Sep 17 00:00:00 2001 From: tierno Date: Tue, 4 Aug 2020 12:48:15 +0000 Subject: [PATCH 1/1] enhanced role permission validation this commit avoid incompleted permission keys. For example command: osm role-update --add "vim_accoun: true" must fais, as it should be "vim_accounts: true" Change-Id: Ib5a5d88ae35120e99a43c80d20ccf8b207701780 Signed-off-by: tierno --- osm_nbi/admin_topics.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py index 998c12f..6e9f078 100644 --- a/osm_nbi/admin_topics.py +++ b/osm_nbi/admin_topics.py @@ -1078,9 +1078,9 @@ class RoleTopicAuth(BaseTopic): if role_def[-1] == ":": raise ValidationError("Operation cannot end with ':'") - role_def_matches = [op for op in operations if op.startswith(role_def)] + match = next((op for op in operations if op == role_def or op.startswith(role_def + ":")), None) - if len(role_def_matches) == 0: + if not match: raise ValidationError("Invalid permission '{}'".format(role_def)) def _validate_input_new(self, input, force=False): -- 2.17.1