Repository: ranger Updated Branches: refs/heads/master f54723676 -> 282c1d55d
RANGER-2123 : Different error msg on backend/frontend login validation Change-Id: Ib0a4cee426b14313dc1eede0bd55249156337f4e Signed-off-by: Mehul Parikh <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/282c1d55 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/282c1d55 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/282c1d55 Branch: refs/heads/master Commit: 282c1d55d9c5aab4611c3a859169b594c9180b0f Parents: f547236 Author: Daniel Voros <[email protected]> Authored: Wed Jun 6 14:57:25 2018 +0200 Committer: Mehul Parikh <[email protected]> Committed: Tue Jun 12 12:28:02 2018 +0530 ---------------------------------------------------------------------- .../web/authentication/RangerAuthFailureHandler.java | 8 ++++---- .../src/main/webapp/scripts/prelogin/XAPrelogin.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/282c1d55/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java index 35d7543..d8194a5 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java +++ b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java @@ -85,17 +85,17 @@ ExceptionMappingAuthenticationFailureHandler { if (msg != null && !msg.isEmpty()) { if (CLIUtil.getMessage("AbstractUserDetailsAuthenticationProvider.badCredentials",request).equalsIgnoreCase(msg)) { vXResponse.setStatusCode(HttpServletResponse.SC_UNAUTHORIZED); - vXResponse.setMsgDesc("The username or password you entered is incorrect..."); + vXResponse.setMsgDesc("The username or password you entered is incorrect."); logger.info("Error Message : " + msg); } else if (msg.contains("Could not get JDBC Connection; nested exception is java.sql.SQLException: Connections could not be acquired from the underlying database!")) { vXResponse.setStatusCode(HttpServletResponse.SC_UNAUTHORIZED); - vXResponse.setMsgDesc("Unable to connect to DB..."); + vXResponse.setMsgDesc("Unable to connect to DB."); } else if (msg.contains("Communications link failure")) { vXResponse.setStatusCode(HttpServletResponse.SC_UNAUTHORIZED); - vXResponse.setMsgDesc("Unable to connect to DB..."); + vXResponse.setMsgDesc("Unable to connect to DB."); } else if (CLIUtil.getMessage("AbstractUserDetailsAuthenticationProvider.disabled",request).equalsIgnoreCase(msg)) { vXResponse.setStatusCode(HttpServletResponse.SC_UNAUTHORIZED); - vXResponse.setMsgDesc("The username or password you entered is disable..."); + vXResponse.setMsgDesc("The username or password you entered is disabled."); } } jsonResp = jsonUtil.writeObjectAsString(vXResponse); http://git-wip-us.apache.org/repos/asf/ranger/blob/282c1d55/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 b2e5515..0ca24fc 100644 --- a/security-admin/src/main/webapp/scripts/prelogin/XAPrelogin.js +++ b/security-admin/src/main/webapp/scripts/prelogin/XAPrelogin.js @@ -40,7 +40,7 @@ function doLogin() { $('#errorBox').show(); $('#signInLoading').hide(); $('#signIn').removeAttr('disabled'); - $('#errorBox .errorMsg').text("The username or password you entered is incorrect.."); + $('#errorBox .errorMsg').text("The username or password you entered is incorrect."); return false; }
