From 5849923a7a4207cd77b2defe63958b6dcee131a4 Mon Sep 17 00:00:00 2001 From: Andrea Cimbalo Date: Sun, 3 Sep 2017 21:35:30 +0200 Subject: [PATCH] permit password change --- lilikusers.py | 13 ++++++-- server.py | 9 ++++-- static/index.html | 53 ++++++++++++++++++++++++++++++-- static/views/changePassword.html | 30 ++++++++++++++++++ static/views/edit.html | 15 ++++++--- static/views/show.html | 17 ++++++++-- 6 files changed, 125 insertions(+), 12 deletions(-) create mode 100644 static/views/changePassword.html diff --git a/lilikusers.py b/lilikusers.py index 113ba3d..95fba2a 100644 --- a/lilikusers.py +++ b/lilikusers.py @@ -56,12 +56,17 @@ class LILiK_USER(object): def to_dict(self): return self.__dict__ + @admin_connection_decorator + def diff(self, conn, new_lilik_user): + user_cn = utils.ldap_path('uid=%s'%self.uid, config.PEOPLE, config.DOMAIN) + return utils.DictDiffer(new_lilik_user, self.__dict__) + @admin_connection_decorator def update(self, conn, new_lilik_user): user_cn = utils.ldap_path('uid=%s'%self.uid, config.PEOPLE, config.DOMAIN) diff = utils.DictDiffer(new_lilik_user, self.__dict__) modifiers = {user_cn: {}} - if 'userPassword' in diff.added(): + if 'userPassword' in diff.added() and new_lilik_user['userPassword']: modifiers[user_cn]['userPassword'] = [(ldap3.MODIFY_REPLACE, [new_lilik_user['userPassword']])] #TODO add hash encryption? for changed in diff.changed(): if changed == 'services': @@ -97,8 +102,12 @@ class LILiK_USER(object): modifiers[user_cn]['givenname'] = [(ldap3.MODIFY_REPLACE, [firstname])] modifiers[user_cn][changed] = [(ldap3.MODIFY_REPLACE, [new_lilik_user[changed]])] for entry_cn, modifier in modifiers.items(): + print(modifier.keys()) if modifier: - print(entry_cn, modifier) + if 'userPassword' in modifier.keys(): + print(entry_cn, list(modifier.keys())[0], '****** (HIDDEN)') + else: + print(entry_cn, modifier) conn.modify(entry_cn, modifier) check_result(conn) print(conn.result) diff --git a/server.py b/server.py index 76a4e82..09b470a 100755 --- a/server.py +++ b/server.py @@ -77,10 +77,15 @@ def get_user(user, user_name): @app.route('/api/users/', methods=['PUT']) @requires_auth -@requires_admin_auth +@requires_same_user_or_admin_auth def update_user(user, user_name): new_lilik_user = request.get_json() - lilik_ldap.get_user(user_name).update(new_lilik_user) + user_to_edit = lilik_ldap.get_user(user_name) + diff = user_to_edit.diff(new_lilik_user) + is_permitted_self_changes = diff.changed() <= set(['cn']) and diff.removed() == set() and diff.added() <= set(['userPassword']) + print(user.uid) + if user.services['admin'] or is_permitted_self_changes: + user_to_edit.update(new_lilik_user) return jsonify(lilik_ldap.get_user(user_name).to_dict()) @app.route('/api/users', methods=['POST']) diff --git a/static/index.html b/static/index.html index 00a6130..0c46112 100644 --- a/static/index.html +++ b/static/index.html @@ -34,7 +34,7 @@ templateUrl: 'views/login.html', hideMenus: true }).when('/users/:ID', { - // controller: 'HomeController', + controller: 'EditController', templateUrl: 'views/show.html' }).when('/users/:ID/edit', { controller: 'EditController', @@ -109,8 +109,9 @@ $location.path('/login'); } }); - }]).controller('EditController', ['$scope', '$routeParams', '$http', function($scope, $routeParams, $http) { + }]).controller('EditController', ['$scope', '$routeParams', '$http', '$mdDialog', function($scope, $routeParams, $http, $mdDialog) { console.log($routeParams.ID); + $scope.password = {}; if ($routeParams.ID == $scope.globals.currentUser.username){ $scope.user = $scope.logged_user; }else{ @@ -120,12 +121,60 @@ }); } $scope.save = function(){ + console.log($scope.user); + if ($scope.password.new == $scope.password.confirm){ + $scope.user.userPassword = $scope.password.new; + } $http.put("/api/users/"+$routeParams.ID, $scope.user).then(function(response) { console.log(response.data); + $scope.password = {}; + $mdDialog.hide(); }); }; + + + $scope.changePassword = function(ev) { + $scope.password = {}; + // Appending dialog to document.body to cover sidenav in docs app + var confirm = { + clickOutsideToClose: true, + targetEvent: ev, + templateUrl: 'views/changePassword.html', + scope: $scope, + preserveScope: true, + } + + $mdDialog.show(confirm).then(function(result) { + console.log(result); + // $http.post("/api/users", {uid: result}).then(function(response) { + // console.log(response.data); + // $rootScope.editUser(result); + // }); + }, function(){}); + }; + + $scope.closeDialog = function() { + $mdDialog.hide(); + }; }]);; + app.directive('valueMatches', ['$parse', function ($parse) { + return { + require: 'ngModel', + link: function (scope, elm, attrs, ngModel) { + var originalModel = $parse(attrs.valueMatches), + secondModel = $parse(attrs.ngModel); + // Watch for changes to this input + scope.$watch(attrs.ngModel, function (newValue) { + ngModel.$setValidity(attrs.name, newValue === originalModel(scope)); + }); + // Watch for changes to the value-matches model's value + scope.$watch(attrs.valueMatches, function (newValue) { + ngModel.$setValidity(attrs.name, newValue === secondModel(scope)); + }); + } + }; + }]); // controller("myCtrl", function($scope, $http, authService) { // $scope.$on('event:auth-loginRequired', function() { // console.log(54546); diff --git a/static/views/changePassword.html b/static/views/changePassword.html new file mode 100644 index 0000000..33dc34f --- /dev/null +++ b/static/views/changePassword.html @@ -0,0 +1,30 @@ + + +

Change {{ user.uid }}'s password

+
+ + + +
+ Please enter a new password, it must be at least 6 characters long. +
+ + + + +
+ Please enter the same password again to confirm. +
+ + + Cancel + Save + +
+ + diff --git a/static/views/edit.html b/static/views/edit.html index 4cd4345..37dda9d 100644 --- a/static/views/edit.html +++ b/static/views/edit.html @@ -5,10 +5,17 @@ - - - - +
+
+ + + + +
+
+ Change password +
+

Services

{{service}} diff --git a/static/views/show.html b/static/views/show.html index 142c49b..6db1e28 100644 --- a/static/views/show.html +++ b/static/views/show.html @@ -5,6 +5,19 @@
-
- +
+
+ +
+
+
+
+
+ Change password +
+
+