From bd84fb445845bffc03109f3c69201c45da46fd48 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Mon, 16 Apr 2012 12:22:34 +0200 Subject: User is notified that password needs to be reset in forms-based login Forms-based login procedure detects if 401 unauthorized response contains 'X-IPA-Rejection-Reason' http header with 'password-expired' value. If so it displays an error message that user needs to reset his password. https://fedorahosted.org/freeipa/ticket/2608 --- install/ui/ipa.js | 36 +++++++++++++++++++++++++++++------- install/ui/login.html | 9 ++++++++- install/ui/login.js | 39 ++++++++++++++++++++++++++++++--------- 3 files changed, 67 insertions(+), 17 deletions(-) diff --git a/install/ui/ipa.js b/install/ui/ipa.js index eeac03053..ed380d9cb 100644 --- a/install/ui/ipa.js +++ b/install/ui/ipa.js @@ -359,10 +359,23 @@ IPA.logout = function() { IPA.login_password = function(username, password) { - var success = false; + var result = 'invalid'; function success_handler(data, text_status, xhr) { - success = true; + result = 'success'; + } + + function error_handler(xhr, text_status, error_thrown) { + + if (xhr.status === 401) { + var reason = xhr.getResponseHeader("X-IPA-Rejection-Reason"); + + //change result from invalid only if we have a header which we + //understand + if (reason === 'password-expired') { + result = 'expired'; + } + } } var data = { @@ -378,14 +391,15 @@ IPA.login_password = function(username, password) { dataType: 'html', async: false, type: 'POST', - success: success_handler + success: success_handler, + error: error_handler }; IPA.display_activity_icon(); $.ajax(request); IPA.hide_activity_icon(); - return success; + return result; }; /** @@ -1340,6 +1354,10 @@ IPA.unauthorized_dialog = function(spec) { "Please try again (make sure your caps lock is off).

" + "

If the problem persists, contact your administrator.

"; + that.password_expired = "

Password expired

" + + "

Please run kinit to reset the password and then try to login again.

" + + "

If the problem persists, contact your administrator.

"; + that.create = function() { that.krb_message_contatiner = $('').appendTo(that.container); @@ -1482,13 +1500,17 @@ IPA.unauthorized_dialog = function(spec) { IPA.display_activity_icon(); - var success = IPA.login_password(record.username[0], record.password[0]); + var result = IPA.login_password(record.username[0], record.password[0]); IPA.hide_activity_icon(); - if (success) { + if (result === 'success') { that.on_login_success(); - } else { + } else if (result === 'expired') { + that.error_box.html(that.password_expired); + that.error_box.css('display', 'block'); + }else { + that.error_box.html(that.form_auth_failed); that.error_box.css('display', 'block'); } }; diff --git a/install/ui/login.html b/install/ui/login.html index d88ee0eeb..9902466a7 100644 --- a/install/ui/login.html +++ b/install/ui/login.html @@ -21,12 +21,19 @@

Login

-