|
|
@@ -15,6 +15,7 @@
|
|
|
# See the License for the specific language governing permissions and
|
|
|
# limitations under the License.
|
|
|
|
|
|
+from builtins import str
|
|
|
import json
|
|
|
import logging
|
|
|
import time
|
|
|
@@ -111,14 +112,14 @@ def list_sentry_roles_by_group(request):
|
|
|
result['roles'] = sorted(roles, key=lambda role: role['name'])
|
|
|
result['message'] = ''
|
|
|
result['status'] = 0
|
|
|
- except Exception, e:
|
|
|
+ except Exception as e:
|
|
|
LOG.exception("could not retrieve roles")
|
|
|
|
|
|
if "couldn't be retrieved." in str(e):
|
|
|
result['roles'] = []
|
|
|
result['status'] = 0
|
|
|
else:
|
|
|
- result['message'] = unicode(str(e), "utf8")
|
|
|
+ result['message'] = str(e)
|
|
|
|
|
|
return JsonResponse(result)
|
|
|
|
|
|
@@ -136,10 +137,10 @@ def list_sentry_privileges_by_role(request):
|
|
|
result['sentry_privileges'] = sorted(sentry_privileges, key=lambda privilege: '.'.join([auth['name'] for auth in privilege['authorizables']]))
|
|
|
result['message'] = ''
|
|
|
result['status'] = 0
|
|
|
- except Exception, e:
|
|
|
+ except Exception as e:
|
|
|
LOG.exception("could not list sentry privileges")
|
|
|
|
|
|
- result['message'] = unicode(str(e), "utf8")
|
|
|
+ result['message'] = str(e)
|
|
|
|
|
|
return JsonResponse(result)
|
|
|
|
|
|
@@ -227,10 +228,10 @@ def create_role(request):
|
|
|
|
|
|
result['message'] = _('Role created!')
|
|
|
result['status'] = 0
|
|
|
- except Exception, e:
|
|
|
+ except Exception as e:
|
|
|
LOG.exception("could not create role")
|
|
|
|
|
|
- result['message'] = unicode(str(e), "utf8")
|
|
|
+ result['message'] = str(e)
|
|
|
|
|
|
return JsonResponse(result)
|
|
|
|
|
|
@@ -254,10 +255,10 @@ def update_role_groups(request):
|
|
|
|
|
|
result['message'] = ''
|
|
|
result['status'] = 0
|
|
|
- except Exception, e:
|
|
|
+ except Exception as e:
|
|
|
LOG.exception("could not update role groups")
|
|
|
|
|
|
- result['message'] = unicode(str(e), "utf8")
|
|
|
+ result['message'] = str(e)
|
|
|
|
|
|
return JsonResponse(result)
|
|
|
|
|
|
@@ -285,10 +286,10 @@ def save_privileges(request):
|
|
|
|
|
|
result['message'] = _('Privileges updated')
|
|
|
result['status'] = 0
|
|
|
- except Exception, e:
|
|
|
+ except Exception as e:
|
|
|
LOG.exception("could not save privileges")
|
|
|
|
|
|
- result['message'] = unicode(str(e), "utf8")
|
|
|
+ result['message'] = str(e)
|
|
|
|
|
|
return JsonResponse(result)
|
|
|
|
|
|
@@ -305,10 +306,10 @@ def grant_privilege(request):
|
|
|
|
|
|
result['message'] = _('Privilege granted successfully to %s.') % roleName
|
|
|
result['status'] = 0
|
|
|
- except Exception, e:
|
|
|
+ except Exception as e:
|
|
|
LOG.exception("could not grant privileges")
|
|
|
|
|
|
- result['message'] = unicode(str(e), "utf8")
|
|
|
+ result['message'] = str(e)
|
|
|
|
|
|
return JsonResponse(result)
|
|
|
|
|
|
@@ -323,10 +324,10 @@ def create_sentry_role(request):
|
|
|
get_api(request.user, component).create_sentry_role(roleName)
|
|
|
result['message'] = _('Role and privileges created.')
|
|
|
result['status'] = 0
|
|
|
- except Exception, e:
|
|
|
+ except Exception as e:
|
|
|
LOG.exception("could not create role")
|
|
|
|
|
|
- result['message'] = unicode(str(e), "utf8")
|
|
|
+ result['message'] = str(e)
|
|
|
|
|
|
return JsonResponse(result)
|
|
|
|
|
|
@@ -341,10 +342,10 @@ def drop_sentry_role(request):
|
|
|
get_api(request.user, component).drop_sentry_role(roleName)
|
|
|
result['message'] = _('Role and privileges deleted.')
|
|
|
result['status'] = 0
|
|
|
- except Exception, e:
|
|
|
+ except Exception as e:
|
|
|
LOG.exception("could not drop role")
|
|
|
|
|
|
- result['message'] = unicode(str(e), "utf8")
|
|
|
+ result['message'] = str(e)
|
|
|
|
|
|
return JsonResponse(result)
|
|
|
|
|
|
@@ -361,7 +362,7 @@ def list_sentry_privileges_by_authorizable(request):
|
|
|
_privileges = []
|
|
|
|
|
|
for authorizable, roles in get_api(request.user, component).list_sentry_privileges_by_authorizable(serviceName=serviceName, authorizableSet=authorizableSet, groups=groups):
|
|
|
- for role, privileges in roles.iteritems():
|
|
|
+ for role, privileges in roles.items():
|
|
|
for privilege in privileges:
|
|
|
privilege['roleName'] = role
|
|
|
_privileges.append(privilege)
|
|
|
@@ -370,10 +371,10 @@ def list_sentry_privileges_by_authorizable(request):
|
|
|
|
|
|
result['message'] = ''
|
|
|
result['status'] = 0
|
|
|
- except Exception, e:
|
|
|
+ except Exception as e:
|
|
|
LOG.exception("could not list privileges by authorizable")
|
|
|
|
|
|
- result['message'] = unicode(str(e), "utf8")
|
|
|
+ result['message'] = str(e)
|
|
|
|
|
|
return JsonResponse(result)
|
|
|
|
|
|
@@ -396,10 +397,10 @@ def bulk_delete_privileges(request):
|
|
|
get_api(request.user, component).drop_sentry_privileges(authorizableHierarchy)
|
|
|
result['message'] = _('Privileges deleted.')
|
|
|
result['status'] = 0
|
|
|
- except Exception, e:
|
|
|
+ except Exception as e:
|
|
|
LOG.exception("could not bulk delete privileges")
|
|
|
|
|
|
- result['message'] = unicode(str(e), "utf8")
|
|
|
+ result['message'] = str(e)
|
|
|
|
|
|
return JsonResponse(result)
|
|
|
|
|
|
@@ -434,10 +435,10 @@ def bulk_add_privileges(request):
|
|
|
|
|
|
result['message'] = _('Privileges added.')
|
|
|
result['status'] = 0
|
|
|
- except Exception, e:
|
|
|
+ except Exception as e:
|
|
|
LOG.exception("could not bulk add privileges")
|
|
|
|
|
|
- result['message'] = unicode(str(e), "utf8")
|
|
|
+ result['message'] = str(e)
|
|
|
|
|
|
return JsonResponse(result)
|
|
|
|
|
|
@@ -453,10 +454,10 @@ def rename_sentry_privilege(request):
|
|
|
get_api(request.user, component).rename_sentry_privilege(oldAuthorizable, newAuthorizable)
|
|
|
result['message'] = _('Privilege deleted.')
|
|
|
result['status'] = 0
|
|
|
- except Exception, e:
|
|
|
+ except Exception as e:
|
|
|
LOG.exception("could not rename privilege")
|
|
|
|
|
|
- result['message'] = unicode(str(e), "utf8")
|
|
|
+ result['message'] = str(e)
|
|
|
|
|
|
return JsonResponse(result)
|
|
|
|
|
|
@@ -474,9 +475,9 @@ def list_sentry_privileges_for_provider(request):
|
|
|
result['sentry_privileges'] = sentry_privileges
|
|
|
result['message'] = ''
|
|
|
result['status'] = 0
|
|
|
- except Exception, e:
|
|
|
+ except Exception as e:
|
|
|
LOG.exception("could not list privileges for provider")
|
|
|
|
|
|
- result['message'] = unicode(str(e), "utf8")
|
|
|
+ result['message'] = str(e)
|
|
|
|
|
|
return JsonResponse(result)
|