From c11034b9bcf8e555b6613f7ffb163c66d423e14b Mon Sep 17 00:00:00 2001 From: kevgliss Date: Mon, 16 May 2016 09:23:48 -0700 Subject: [PATCH] Fixes various issues. (#317) --- lemur/authorities/schemas.py | 9 +- lemur/authorities/views.py | 10 +- lemur/roles/schemas.py | 4 +- lemur/schemas.py | 2 +- .../authorities/authority/edit.tpl.html | 113 +++++++++--------- .../certificates/certificate/edit.tpl.html | 74 ++++++------ .../app/angular/destinations/view/view.js | 2 +- .../app/angular/notifications/view/view.js | 2 +- lemur/static/app/angular/roles/role/role.js | 19 ++- .../app/angular/roles/role/role.tpl.html | 2 +- lemur/static/app/angular/sources/view/view.js | 2 +- lemur/tests/test_authorities.py | 4 +- lemur/users/schemas.py | 8 ++ 13 files changed, 140 insertions(+), 111 deletions(-) diff --git a/lemur/authorities/schemas.py b/lemur/authorities/schemas.py index f1213a68..d70d1cac 100644 --- a/lemur/authorities/schemas.py +++ b/lemur/authorities/schemas.py @@ -60,8 +60,15 @@ class AuthorityInputSchema(LemurInputSchema): raise ValidationError("If generating a subca parent 'authority' must be specified.") +class AuthorityUpdateSchema(LemurInputSchema): + owner = fields.Email() + description = fields.String() + roles = fields.Nested(AssociatedRoleSchema(many=True)) + + class AuthorityOutputSchema(LemurOutputSchema): id = fields.Integer() + description = fields.String() name = fields.String() owner = fields.Email() not_before = fields.DateTime() @@ -73,7 +80,7 @@ class AuthorityOutputSchema(LemurOutputSchema): options = fields.Dict() roles = fields.List(fields.Nested(AssociatedRoleSchema)) - +authority_update_schema = AuthorityUpdateSchema() authority_input_schema = AuthorityInputSchema() authority_output_schema = AuthorityOutputSchema() authorities_output_schema = AuthorityOutputSchema(many=True) diff --git a/lemur/authorities/views.py b/lemur/authorities/views.py index 2f1ca9a7..12ce62bc 100644 --- a/lemur/authorities/views.py +++ b/lemur/authorities/views.py @@ -17,7 +17,7 @@ from lemur.roles import service as role_service from lemur.certificates import service as certificate_service from lemur.authorities import service -from lemur.authorities.schemas import authority_input_schema, authority_output_schema, authorities_output_schema +from lemur.authorities.schemas import authority_input_schema, authority_output_schema, authorities_output_schema, authority_update_schema mod = Blueprint('authorities', __name__) @@ -218,7 +218,7 @@ class Authorities(AuthenticatedResource): """ return service.get(authority_id) - @validate_schema(authority_input_schema, authority_output_schema) + @validate_schema(authority_update_schema, authority_output_schema) def put(self, authority_id, data=None): """ .. http:put:: /authorities/1 @@ -266,6 +266,10 @@ class Authorities(AuthenticatedResource): :statuscode 403: unauthenticated """ authority = service.get(authority_id) + + if not authority: + return dict(message='Not Found'), 404 + role = role_service.get_by_name(authority.owner) # all the authority role members should be allowed @@ -277,7 +281,7 @@ class Authorities(AuthenticatedResource): # we want to make sure that we cannot add roles that we are not members of if not g.current_user.is_admin: - role_ids = set([r['id'] for r in data['roles']]) + role_ids = set([r.id for r in data['roles']]) user_role_ids = set([r.id for r in g.current_user.roles]) if not role_ids.issubset(user_role_ids): diff --git a/lemur/roles/schemas.py b/lemur/roles/schemas.py index b2ee3e26..52dfac10 100644 --- a/lemur/roles/schemas.py +++ b/lemur/roles/schemas.py @@ -6,7 +6,7 @@ .. moduleauthor:: Kevin Glisson """ from marshmallow import fields -from lemur.users.schemas import UserOutputSchema +from lemur.users.schemas import UserNestedOutputSchema from lemur.authorities.schemas import AuthorityOutputSchema from lemur.common.schema import LemurInputSchema, LemurOutputSchema from lemur.schemas import AssociatedUserSchema, AssociatedAuthoritySchema @@ -27,7 +27,7 @@ class RoleOutputSchema(LemurOutputSchema): name = fields.String() description = fields.String() authorities = fields.Nested(AuthorityOutputSchema, many=True) - users = fields.Nested(UserOutputSchema, many=True) + users = fields.Nested(UserNestedOutputSchema, many=True) role_input_schema = RoleInputSchema() diff --git a/lemur/schemas.py b/lemur/schemas.py index 3569e242..f86eb3ec 100644 --- a/lemur/schemas.py +++ b/lemur/schemas.py @@ -113,7 +113,7 @@ class PluginOutputSchema(LemurOutputSchema): label = fields.String() description = fields.String() active = fields.Boolean() - plugin_options = fields.List(fields.Dict()) + options = fields.List(fields.Dict(), dump_to='pluginOptions') slug = fields.String() title = fields.String() diff --git a/lemur/static/app/angular/authorities/authority/edit.tpl.html b/lemur/static/app/angular/authorities/authority/edit.tpl.html index 796b4b63..5397bbfd 100644 --- a/lemur/static/app/angular/authorities/authority/edit.tpl.html +++ b/lemur/static/app/angular/authorities/authority/edit.tpl.html @@ -1,65 +1,62 @@
-
- -

Edit {{ authority.name }}

-
-
-
-
- -
- + +

Edit {{ authority.name }}

+
+ +
+ +
+ -

Enter a valid - email.

-
+

Enter a valid + email.

-
- -
- -

You must give a short description about this authority will be used for, this description should only include alphanumeric characters

-
+
+
+ +
+ +

You must give a short description about this authority will be used for, this description should only include alphanumeric characters

-
- -
-
- - - - -
- - - - - - -
{{ role.name }}{{ role.description }} - -
+
+
+ +
+
+ + + +
+ + + + + + +
{{ role.name }}{{ role.description }} + +
- -
-
- - -
+
+ +
+
+ +
diff --git a/lemur/static/app/angular/certificates/certificate/edit.tpl.html b/lemur/static/app/angular/certificates/certificate/edit.tpl.html index 7221bae4..7aa4e53a 100644 --- a/lemur/static/app/angular/certificates/certificate/edit.tpl.html +++ b/lemur/static/app/angular/certificates/certificate/edit.tpl.html @@ -1,40 +1,38 @@
-
- -

Edit {{ certificate.name }}

-
-
-
-
- -
- - -

Enter a valid - email.

-
-
-
- -
- -

You must give a short description about this authority will be used for, this description should only include alphanumeric characters

-
-
-
-
-
-
-
-
- - -
+ +

Edit {{ certificate.name }}

+
+
+
+
+ +
+ + +

Enter a valid + email.

+
+
+
+ +
+ +

You must give a short description about this authority will be used for, this description should only include alphanumeric characters

+
+
+
+
+
+
+
+
+ +
diff --git a/lemur/static/app/angular/destinations/view/view.js b/lemur/static/app/angular/destinations/view/view.js index 943ff9d1..b4447a3f 100644 --- a/lemur/static/app/angular/destinations/view/view.js +++ b/lemur/static/app/angular/destinations/view/view.js @@ -40,7 +40,7 @@ angular.module('lemur') toaster.pop({ type: 'error', title: 'Opps', - body: 'I see what you did there' + response.data.message + body: 'I see what you did there: ' + response.data.message }); } ); diff --git a/lemur/static/app/angular/notifications/view/view.js b/lemur/static/app/angular/notifications/view/view.js index ba2a59c4..512ddc9d 100644 --- a/lemur/static/app/angular/notifications/view/view.js +++ b/lemur/static/app/angular/notifications/view/view.js @@ -46,7 +46,7 @@ angular.module('lemur') toaster.pop({ type: 'error', title: 'Opps', - body: 'I see what you did there' + response.data.message + body: 'I see what you did there: ' + response.data.message }); } ); diff --git a/lemur/static/app/angular/roles/role/role.js b/lemur/static/app/angular/roles/role/role.js index 1b4b2476..052e4163 100644 --- a/lemur/static/app/angular/roles/role/role.js +++ b/lemur/static/app/angular/roles/role/role.js @@ -5,7 +5,6 @@ angular.module('lemur') .controller('RolesEditController', function ($scope, $uibModalInstance, RoleApi, RoleService, UserService, toaster, editId) { RoleApi.get(editId).then(function (role) { $scope.role = role; - RoleService.getUsers(role); }); $scope.save = function (role) { @@ -40,7 +39,23 @@ angular.module('lemur') }; $scope.userService = UserService; - $scope.roleService = RoleService; + + $scope.loadPassword = function (role) { + RoleService.loadPassword(role).then( + function (response) { + $scope.role.password = response.password; + $scope.role.username = response.username; + }, function (response) { + toaster.pop({ + type: 'error', + title: role.name, + body: 'lemur-bad-request', + bodyOutputType: 'directive', + directiveData: response.data, + timeout: 100000 + }); + }); + }; }) .controller('RolesCreateController', function ($scope,$uibModalInstance, RoleApi, RoleService, UserService, LemurRestangular, toaster) { diff --git a/lemur/static/app/angular/roles/role/role.tpl.html b/lemur/static/app/angular/roles/role/role.tpl.html index 2aedef57..d41e8e3a 100644 --- a/lemur/static/app/angular/roles/role/role.tpl.html +++ b/lemur/static/app/angular/roles/role/role.tpl.html @@ -78,7 +78,7 @@
- +
diff --git a/lemur/static/app/angular/sources/view/view.js b/lemur/static/app/angular/sources/view/view.js index b3dc250e..d5eaf916 100644 --- a/lemur/static/app/angular/sources/view/view.js +++ b/lemur/static/app/angular/sources/view/view.js @@ -40,7 +40,7 @@ angular.module('lemur') toaster.pop({ type: 'error', title: 'Opps', - body: 'I see what you did there' + response.data.message + body: 'I see what you did there: ' + response.data.message }); } ); diff --git a/lemur/tests/test_authorities.py b/lemur/tests/test_authorities.py index 78c1fbb2..0f7096b9 100644 --- a/lemur/tests/test_authorities.py +++ b/lemur/tests/test_authorities.py @@ -44,8 +44,8 @@ def test_authority_post(client, token, status): @pytest.mark.parametrize("token,status", [ - (VALID_USER_HEADER_TOKEN, 400), - (VALID_ADMIN_HEADER_TOKEN, 400), + (VALID_USER_HEADER_TOKEN, 200), + (VALID_ADMIN_HEADER_TOKEN, 200), ('', 401) ]) def test_authority_put(client, token, status): diff --git a/lemur/users/schemas.py b/lemur/users/schemas.py index 9960a339..d203c077 100644 --- a/lemur/users/schemas.py +++ b/lemur/users/schemas.py @@ -30,6 +30,14 @@ class UserOutputSchema(LemurOutputSchema): authorities = fields.Nested(AssociatedAuthoritySchema, many=True) +class UserNestedOutputSchema(LemurOutputSchema): + __envelope__ = False + id = fields.Integer() + username = fields.String() + email = fields.Email() + active = fields.Boolean() + + user_input_schema = UserInputSchema() user_output_schema = UserOutputSchema() users_output_schema = UserOutputSchema(many=True)