Author: jsuchome Date: Tue Aug 2 14:49:32 2011 New Revision: 65137 URL: http://svn.opensuse.org/viewcvs/yast?rev=65137&view=rev Log: - check LDAP connection before writing the settings (bnc#709236) - 2.21.9 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=65137&r1=65136&r2=65137&view=diff ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Tue Aug 2 14:49:32 2011 @@ -1 +1 @@ -2.21.8 +2.21.9 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-client.changes?rev=65137&r1=65136&r2=65137&view=diff ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Tue Aug 2 14:49:32 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 2 14:48:20 CEST 2011 - jsuchome@suse.cz + +- check LDAP connection before writing the settings (bnc#709236) +- 2.21.9 + +------------------------------------------------------------------- Fri Jul 22 15:07:22 CEST 2011 - locilka@suse.cz - Removed obsoleted X-KDE-SubstituteUID from desktop file Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=65137&r1=65136&r2=65137&view=diff ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Tue Aug 2 14:49:32 2011 @@ -327,6 +327,16 @@ // enumerate users/group global boolean sssd_enumerate = false; + global map ldap_error_hints = $[ + // hint to error message + -1 : _("Verify that the LDAP Server is running and reachable."), + // hint to error message + -11 : _("Failed to establish TLS encryption. +Verify that the correct CA Certificate is installed and the Server Certificate is valid."), + // hint to error message + 2 : _("Failed to establish TLS encryption. +Verify that the Server has StartTLS support enabled."), + ]; //---------------------------------------------------------------- /** @@ -1054,7 +1064,12 @@ */ global define map LDAPErrorMap () ``{ - return ((map)SCR::Read(.ldap.error)); + map ret = ((map)SCR::Read(.ldap.error)); + if (ldap_error_hints[ret["code"]:0]:"" != "") + { + ret["hint"] = ldap_error_hints[ret["code"]:0]:""; + } + return ret; } /** @@ -1066,7 +1081,7 @@ string error = err_map["msg"]:""; if (err_map["server_msg"]:"" != "") { - error = sformat ("%1\n%2", error, err_map["server_msg"]:""); + error = sformat ("%1\n(%2)", error, err_map["server_msg"]:""); } return error; } @@ -1164,6 +1179,96 @@ } /** + * Initializes LDAP agent; use the data passed as argument instead global values + * Returns whole error map, not just message + */ + global map LDAPInitArgs (map args) { + + map ret = $[]; + boolean init = (boolean) SCR::Execute (.ldap, args); + if (init == nil) + { + // error message + ret["msg"] = _("Unknown error. Perhaps 'yast2-ldap' is not available."); + } + else + { + ldap_initialized = init; + if (!init) + { + ret = LDAPErrorMap (); + } + else + { + tls_when_initialized= args["use_tls"]:"" == "yes"; + } + } + return ret; + } + + /** + * Check if LDAP connection can be established with given values. + */ + global boolean CheckLDAPConnection (map args) { + + LDAPClose (); + map errmap = LDAPInitArgs (args); + + if (errmap == $[]) + return true; + + string details = errmap["msg"]:""; + if (errmap["server_msg"]:"" != "") + details = sformat ("%1\n%2", details, errmap["server_msg"]:""); + string hint = errmap["hint"]:""; + + UI::OpenDialog (`HBox(`HSpacing (0.5), + `VBox( + `VSpacing (0.5), + // label + `Left (`Heading (Label::ErrorMsg())), + // error message + `Left (`Label (_("Connection to the LDAP server cannot be established."))), + `ReplacePoint (`id(`rp), `Empty()), + `VSpacing (0.2), + `Left (`CheckBox (`id(`details), `opt (`notify), + // checkbox label + _("&Show Details"), false)), + `VSpacing (), + hint != "" ? `VBox ( + `Left (`Label (hint)), + `VSpacing () + ) : `VBox (), + `Left (`Label ( + // question following error message (yes/no buttons follow) +_("Really keep this configuration?"))), + `HBox ( + `PushButton (`id(`yes), `opt(`key_F10,`default), Label::YesButton()), + `PushButton (`id(`no),`opt(`key_F9), Label::NoButton()) + ) + ), + `HSpacing(0.5)) + ); + any ret = nil; + do + { + ret = UI::UserInput(); + if (ret == `details) + { + if ((boolean)UI::QueryWidget (`id(`details), `Value)) + { + UI::ReplaceWidget (`id(`rp), `VBox (`Label (details))); + } + else + UI::ReplaceWidget (`id(`rp), `Empty()); + } + } + while (ret != `yes && ret != `no); + UI::CloseDialog (); + return ret == `yes; + } + + /** * popup shown after failed connection: ask for retry withou TLS (see bug 246397) * @return true if user wants to retry without TLS */ Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=65137&r1=65136&r2=65137&view=diff ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Tue Aug 2 14:49:32 2011 @@ -547,6 +547,24 @@ continue; } } + // test the connection in case of TLS + if (start && ldap_tls && Ldap::tls_when_initialized != ldap_tls) + { + map args = $[ + "hostname" : Ldap::GetFirstServer (server), + "port" : Ldap::GetFirstPort (server), + "version" : Ldap::ldap_v2 ? 2 : 3, + "use_tls" : ldap_tls ? "yes" : "no", + "cacertdir" : Ldap::tls_cacertdir, + "cacertfile" : Ldap::tls_cacertfile + ]; + if (!Ldap::CheckLDAPConnection (args)) + { + + result = `not_next; + continue; + } + } } } while (!contains ([`back, `next, `cancel, `abort, `advanced], result)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org