Repository: incubator-ranger Updated Branches: refs/heads/master 906099e1e -> bc1cf982e
RANGER-846: Ranger deviates from Hadoop usernames Signed-off-by: Gautam Borad <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/bc1cf982 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/bc1cf982 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/bc1cf982 Branch: refs/heads/master Commit: bc1cf982efa86d0248f7a4351b2233baf1aa6c03 Parents: 906099e Author: Mehul Parikh <[email protected]> Authored: Wed Feb 17 17:21:30 2016 +0530 Committer: Gautam Borad <[email protected]> Committed: Fri Apr 15 11:27:45 2016 +0530 ---------------------------------------------------------------------- security-admin/src/main/webapp/scripts/prelogin/XAPrelogin.js | 3 ++- security-admin/src/main/webapp/scripts/views/users/UserForm.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/bc1cf982/security-admin/src/main/webapp/scripts/prelogin/XAPrelogin.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/prelogin/XAPrelogin.js b/security-admin/src/main/webapp/scripts/prelogin/XAPrelogin.js index c226d63..f54246f 100644 --- a/security-admin/src/main/webapp/scripts/prelogin/XAPrelogin.js +++ b/security-admin/src/main/webapp/scripts/prelogin/XAPrelogin.js @@ -45,9 +45,10 @@ function doLogin() { } var regexEmail = /^([a-zA-Z0-9_\.\-\+])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/; - var regexPlain = /^([a-zA-Z0-9_\.\-\+ ])+$/; + var regexPlain = /^([a-zA-Z0-9_\.\-\+@/ ])+$/; if(!regexPlain.test(userName)){ if(!regexEmail.test(userName)){ + $('#errorBox .errorMsg').text("Invalid username."); $('#errorBox').show(); return false; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/bc1cf982/security-admin/src/main/webapp/scripts/views/users/UserForm.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/users/UserForm.js b/security-admin/src/main/webapp/scripts/views/users/UserForm.js index d15765b..8319901 100644 --- a/security-admin/src/main/webapp/scripts/views/users/UserForm.js +++ b/security-admin/src/main/webapp/scripts/views/users/UserForm.js @@ -63,7 +63,7 @@ define(function(require){ name : { type : 'Text', title : localization.tt("lbl.userName") +' *', - validators : ['required',{type:'regexp',regexp:/^[a-z0-9][a-z0-9,._'-+]+$/i,message :"Name should start with alpha/numeric letters and can have special characters ,.+_'-"}], + validators : ['required',{type:'regexp',regexp:/^[a-z0-9][a-z0-9,._\-'+/@]+$/i,message :"Name should start with alpha/numeric letters and can have special characters ,.+_'-/@"}], editorAttrs :{'maxlength': 32} }, password : {
