January 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <zypper> Adapted authetication callback for non-curl URLs (bnc #460970)
by Ján Kupec 27 Jan '09

27 Jan '09

commit 8b57dec7f64c5c259c2d3f45b8c8d53a8fcb9c0d Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Jan 27 14:02:39 2009 +0100 Adapted authetication callback for non-curl URLs (bnc #460970) --- src/callbacks/media.h | 81 ++++++++++++++++++++++++------------------------- 1 files changed, 40 insertions(+), 41 deletions(-) diff --git a/src/callbacks/media.h b/src/callbacks/media.h index 9a463d0..0cd9b6e 100644 --- a/src/callbacks/media.h +++ b/src/callbacks/media.h @@ -64,7 +64,7 @@ namespace ZmartRecipients const std::vector<std::string> & devices, unsigned int & index) { - /*std::cout << "detected devices: "; + /*std::cout << "detected devices: "; for (std::vector<std::string>::const_iterator it = devices.begin(); it != devices.end(); ++it) std::cout << *it << " "; @@ -75,7 +75,7 @@ namespace ZmartRecipients if (is_changeable_media(url) && error == MediaChangeReport::WRONG) { //cerr << endl; // may be in the middle of RepoReport or ProgressReport \todo check this - + std::string request = boost::str(boost::format( // TranslatorExplanation translate letters 'y' and 'n' to whathever is appropriate for your language. // Try to check what answers does zypper accept (it always accepts y/n at least) @@ -84,7 +84,7 @@ namespace ZmartRecipients _("Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation.")) % label % mediumNr); if (read_bool_answer(PROMPT_YN_MEDIA_CHANGE, request, false)) - return MediaChangeReport::RETRY; + return MediaChangeReport::RETRY; else return MediaChangeReport::ABORT; } @@ -131,7 +131,7 @@ namespace ZmartRecipients if (out.verbosity() < Out::HIGH && ( - // don't show download info unless show_media_progress_hack is used + // don't show download info unless show_media_progress_hack is used !Zypper::instance()->runtimeData().show_media_progress_hack || // don't report download of the media file (bnc #330614) zypp::Pathname(uri.getPathName()).basename() == "media" @@ -213,49 +213,48 @@ namespace ZmartRecipients } // curl authentication - zypp::media::CurlAuthData * auth_data_ptr = + zypp::media::CurlAuthData * curl_auth_data = dynamic_cast<zypp::media::CurlAuthData*> (&auth_data); - if (auth_data_ptr) - { - - // user name - - std::string username; - // expect the input from machine on stdin - if (Zypper::instance()->globalOpts().machine_readable) - { - Zypper::instance()->out().prompt( - PROMPT_AUTH_USERNAME, _("User Name"), PromptOptions(), description); - std::cin >> username; - } - // input from human using readline - else - { - std::cout << description << std::endl; - username = get_text(_("User Name") + std::string(": "), auth_data.username()); - } - auth_data_ptr->setUsername(username); - // password - + if (curl_auth_data) + curl_auth_data->setAuthType("basic,digest"); + + // user name + + std::string username; + // expect the input from machine on stdin + if (Zypper::instance()->globalOpts().machine_readable) + { Zypper::instance()->out().prompt( - PROMPT_AUTH_PASSWORD, _("Password"), PromptOptions()); + PROMPT_AUTH_USERNAME, _("User Name"), PromptOptions(), description); + std::cin >> username; + } + // input from human using readline + else + { + std::cout << description << std::endl; + username = get_text(_("User Name") + std::string(": "), auth_data.username()); + } + if (username.empty()) + return false; + auth_data.setUsername(username); - std::string password; - // expect the input from machine on stdin - if (Zypper::instance()->globalOpts().machine_readable) - std::cin >> password; - else - password = get_password(); - if (password.empty()) return false; - auth_data_ptr->setPassword(password); + // password - auth_data_ptr->setAuthType("basic,digest"); + Zypper::instance()->out().prompt( + PROMPT_AUTH_PASSWORD, _("Password"), PromptOptions()); - return true; - } + std::string password; + // expect the input from machine on stdin + if (Zypper::instance()->globalOpts().machine_readable) + std::cin >> password; + else + password = get_password(); + if (password.empty()) + return false; + auth_data.setPassword(password); - return false; + return true; } }; @@ -286,7 +285,7 @@ class MediaCallbacks { } }; -#endif +#endif // Local Variables: // mode: c++ // c-basic-offset: 2 -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> Enabled CredentialManager for MediaSMB (bnc #460970).
by Ján Kupec 27 Jan '09

27 Jan '09

commit 43f627691a123c2dac2352120dbfbfe8e3842c5d Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Jan 27 13:11:43 2009 +0100 Enabled CredentialManager for MediaSMB (bnc #460970). --- zypp/media/MediaSMB.cc | 238 ++++++++++++++++++++++++++++++++++++------------ zypp/media/MediaSMB.h | 6 +- 2 files changed, 186 insertions(+), 58 deletions(-) diff --git a/zypp/media/MediaSMB.cc b/zypp/media/MediaSMB.cc index 4f99775..8ba2b9d 100644 --- a/zypp/media/MediaSMB.cc +++ b/zypp/media/MediaSMB.cc @@ -14,9 +14,18 @@ #include <fstream> #include "zypp/base/Logger.h" +#include "zypp/base/Gettext.h" #include "zypp/TmpPath.h" #include "zypp/KVMap.h" #include "zypp/media/Mount.h" +#include "zypp/media/MediaUserAuth.h" +#include "zypp/media/CredentialManager.h" +#include "zypp/ZYppCallbacks.h" + +#warning FIXME: get rid of this dependency on Target +#include "zypp/ZYppFactory.h" // for target->root() +#include "zypp/Target.h" // for zypp->target->root() + #include "zypp/media/MediaSMB.h" #include <sys/types.h> @@ -41,19 +50,19 @@ namespace zypp { { if ( spath_r.empty() ) return string(); - + string share( spath_r.absolutename().asString() ); string::size_type sep = share.find( "/", 1 ); if ( sep == string::npos ) share = share.erase( 0, 1 ); // nothing but the share name in spath_r else share = share.substr( 1, sep-1 ); - + // deescape %2f in sharename while ( (sep = share.find( "%2f" )) != string::npos ) { share.replace( sep, 3, "/" ); } - + return share; } @@ -69,12 +78,12 @@ namespace zypp { { if ( spath_r.empty() ) return Pathname(); - + string striped( spath_r.absolutename().asString() ); string::size_type sep = striped.find( "/", 1 ); if ( sep == string::npos ) return "/"; // nothing but the share name in spath_r - + return striped.substr( sep ); } @@ -107,24 +116,30 @@ namespace zypp { // // METHOD NAME : MediaSMB::attachTo // METHOD TYPE : PMError - // - // DESCRIPTION : Asserted that not already attached, and attachPoint - // is a directory. - // - // NOTE: The implementation currently serves both, "smb" and - // and "cifs" URL's, but passes "cifs" to the mount command - // in any case. - // + /** + * Asserted that not already attached, and attachPoint is a directory. + * + * Authentication: credentials can be specified in the following few ways + * (the first has the highest preference). + * - URL username:password + * - mountoptions URL query parameter (see man mount.cifs) + * - CredentialManager - either previously saved credentials will be used + * or the user will be promted for them via AuthenticationReport callback. + * + * \note The implementation currently serves both, "smb" and + * and "cifs" URL's, but passes "cifs" to the mount command + * in any case. + */ void MediaSMB::attachTo(bool next) { if(_url.getHost().empty()) ZYPP_THROW(MediaBadUrlEmptyHostException(_url)); if(next) ZYPP_THROW(MediaNotSupportedException(_url)); - + string path = "//"; path += _url.getHost() + "/" + getShare( _url.getPathName() ); - + MediaSourceRef media( new MediaSource( _vfstype, path)); AttachedMedia ret( findAttachedMedia( media)); @@ -154,93 +169,134 @@ namespace zypp { } Mount mount; - + CredentialManager cm; + Mount::Options options( _url.getQueryParam("mountoptions") ); string username = _url.getUsername(); string password = _url.getPassword(); - + options["guest"]; // prevent smbmount from asking for password - + if ( ! options.has( "rw" ) ) { options["ro"]; } - - Mount::Options::iterator toEnv; - + + // look for a workgroup + /* + string workgroup = _url.getQueryParam("workgroup"); + if ( !workgroup.empty() ) + options["workgroup"] = workgroup; + */ + // extract 'username', do not overwrite any _url.username + + Mount::Options::iterator toEnv; toEnv = options.find("username"); if ( toEnv != options.end() ) { if ( username.empty() ) - username = toEnv->second; + username = toEnv->second; options.erase( toEnv ); } + toEnv = options.find("user"); // actually cifs specific if ( toEnv != options.end() ) { if ( username.empty() ) - username = toEnv->second; + username = toEnv->second; options.erase( toEnv ); } - + // extract 'password', do not overwrite any _url.password + toEnv = options.find("password"); if ( toEnv != options.end() ) { if ( password.empty() ) - password = toEnv->second; + password = toEnv->second; options.erase( toEnv ); } + toEnv = options.find("pass"); // actually cifs specific if ( toEnv != options.end() ) { if ( password.empty() ) - password = toEnv->second; + password = toEnv->second; options.erase( toEnv ); } - - // look for a workgroup - string workgroup = _url.getQueryParam("workgroup"); - if ( workgroup.size() ) { - options["workgroup"] = workgroup; + + if ( username.empty() || password.empty() ) + { + AuthData_Ptr c = cm.getCred(_url); + if (c) + { + username = c->username(); + password = c->password(); + } } - - // pass 'username' and 'password' via environment - Mount::Environment environment; - if ( username.size() ) - environment["USER"] = username; - if ( password.size() ) - environment["PASSWD"] = password; - - ////////////////////////////////////////////////////// - // In case we need a tmpfile, credentials will remove - // it in it's destructor after the mout call below. - filesystem::TmpPath credentials; - if ( username.size() || password.size() ) + + bool firstTry = true; + bool authRequired = false; + AuthData authdata; + do // repeat this while the mount returns "Permission denied" error + { + // get credentials from authenicate() + if ( !firstTry ) + { + username = authdata.username(); + password = authdata.password(); + } + + // pass 'username' and 'password' via environment + Mount::Environment environment; + if ( !username.empty() ) + environment["USER"] = username; + if ( !password.empty() ) + environment["PASSWD"] = password; + + ////////////////////////////////////////////////////// + // In case we need a tmpfile, credentials will remove + // it in it's destructor after the mout call below. + filesystem::TmpPath credentials; + if ( !username.empty() || !password.empty() ) { filesystem::TmpFile tmp; ofstream outs( tmp.path().asString().c_str() ); outs << "username=" << username << endl; outs << "password=" << password << endl; outs.close(); - + credentials = tmp; options["credentials"] = credentials.path().asString(); } - // - ////////////////////////////////////////////////////// - - mount.mount( path, mountpoint, _vfstype, - options.asString(), environment ); + // + ////////////////////////////////////////////////////// + + try + { + mount.mount( path, mountpoint, _vfstype, + options.asString(), environment ); + setMediaSource(media); + break; + } + catch (const MediaMountException & e) + { + ZYPP_CAUGHT( e ); - setMediaSource(media); + if ( e.mountError() == "Permission denied" ) + authRequired = authenticate( authdata, firstTry ); + else + ZYPP_RETHROW( e ); + } + + firstTry = false; + } + while ( authRequired ); // wait for /etc/mtab update ... // (shouldn't be needed) int limit = 3; bool mountsucceeded; while( !(mountsucceeded=isAttached()) && --limit) - { sleep(1); - } - if( !mountsucceeded) + if ( !mountsucceeded ) { setMediaSource(MediaSourceRef()); try @@ -253,7 +309,7 @@ namespace zypp { } ZYPP_THROW(MediaMountException( "Unable to verify that the media was mounted", - path, mountpoint + path, mountpoint )); } } @@ -346,7 +402,75 @@ namespace zypp { bool MediaSMB::getDoesFileExist( const Pathname & filename ) const { return MediaHandler::getDoesFileExist( filename ); - } - + } + + bool MediaSMB::authenticate(AuthData & authdata, bool firstTry) const + { + //! \todo need a way to pass different CredManagerOptions here + Target_Ptr target = zypp::getZYpp()->getTarget(); + CredentialManager cm(CredManagerOptions(target ? target->root() : "")); + + // get stored credentials + AuthData_Ptr cmcred = cm.getCred(_url); + + AuthData_Ptr smbcred; + smbcred.reset(new AuthData()); + callback::SendReport<AuthenticationReport> auth_report; + + // preset the username if present in current url + if (!_url.getUsername().empty() && firstTry) + smbcred->setUsername(_url.getUsername()); + // if CM has found some credentials, preset the username from there + else if (cmcred) + smbcred->setUsername(cmcred->username()); + + // indicate we have no good credentials from CM + cmcred.reset(); + + string prompt_msg = str::form( + //!\todo add comma to the message for the next release + _("Authentication required for '%s'"), _url.asString().c_str()); + + // ask user + if (auth_report->prompt(_url, prompt_msg, *smbcred)) + { + DBG << "callback answer: retry" << endl + << "AuthData: " << *smbcred << endl; + + if (smbcred->valid()) + { + cmcred = smbcred; + // if (credentials->username() != _url.getUsername()) + // _url.setUsername(credentials->username()); + /** + * \todo find a way to save the url with changed username + * back to repoinfo or dont store urls with username + * (and either forbid more repos with the same url and different + * user, or return a set of credentials from CM and try them one + * by one) + */ + } + } + else + DBG << "callback answer: cancel" << endl; + + // set username and password + if (cmcred) + { + authdata.setUsername(cmcred->username()); + authdata.setPassword(cmcred->password()); + + // save the credentials + cmcred->setUrl(_url); + cm.addCred(*cmcred); + cm.save(); + + return true; + } + + return false; + } + + } // namespace media } // namespace zypp diff --git a/zypp/media/MediaSMB.h b/zypp/media/MediaSMB.h index ce6f43e..04cf836 100644 --- a/zypp/media/MediaSMB.h +++ b/zypp/media/MediaSMB.h @@ -17,6 +17,8 @@ namespace zypp { namespace media { + class AuthData; + /////////////////////////////////////////////////////////////////// // // CLASS NAME : MediaSMB @@ -60,13 +62,15 @@ namespace zypp { void mountAsCIFS() { _vfstype = "cifs"; } public: - MediaSMB( const Url& url_r, const Pathname & attach_point_hint_r ); virtual ~MediaSMB() { try { release(); } catch(...) {} } virtual bool isAttached() const; + + private: + bool authenticate( AuthData & authdata, bool firstTry ) const; }; ///////////////////////////////////////////////////////////////////A -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> Ignore URL's username, password, and query string in AuthData comparator.
by Ján Kupec 27 Jan '09

27 Jan '09

commit 95b716e003d173fd90946d6a0f6e7ea116a42632 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Jan 27 12:43:23 2009 +0100 Ignore URL's username, password, and query string in AuthData comparator. --- zypp/media/CredentialManager.cc | 38 +++++++++++++++++++++++++++++------ zypp/media/CredentialManager.h | 41 +++++++++++++++++--------------------- 2 files changed, 49 insertions(+), 30 deletions(-) diff --git a/zypp/media/CredentialManager.cc b/zypp/media/CredentialManager.cc index 339094f..5e8ea09 100644 --- a/zypp/media/CredentialManager.cc +++ b/zypp/media/CredentialManager.cc @@ -27,16 +27,40 @@ using namespace std; ////////////////////////////////////////////////////////////////////// -namespace zypp +namespace zypp { //////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////// namespace media { //////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////// + // + // CLASS NAME : AuthDataComparator + // + ////////////////////////////////////////////////////////////////////// + + const url::ViewOption AuthDataComparator::vopt = + url::ViewOption::DEFAULTS + - url::ViewOption::WITH_USERNAME + - url::ViewOption::WITH_PASSWORD + - url::ViewOption::WITH_QUERY_STR; + + inline bool + AuthDataComparator::operator()( + const AuthData_Ptr & lhs, const AuthData_Ptr & rhs) + { + if (lhs->username() != rhs->username()) + return true; + + if (lhs->url().asString(vopt) != rhs->url().asString(vopt)) + return true; + + return false; + } ////////////////////////////////////////////////////////////////////// // - // CLASS NAME : CredManagerOptions + // CLASS NAME : CredManagerOptions // ////////////////////////////////////////////////////////////////////// @@ -52,7 +76,7 @@ namespace zypp ////////////////////////////////////////////////////////////////////// // - // CLASS NAME : CredentialManager::Impl + // CLASS NAME : CredentialManager::Impl // struct CredentialManager::Impl { @@ -60,7 +84,7 @@ namespace zypp ~Impl() {} - + void init_globalCredentials(); void init_userCredentials(); @@ -86,7 +110,7 @@ namespace zypp ////////////////////////////////////////////////////////////////////// // - // CLASS NAME : CredentialManager::Impl + // CLASS NAME : CredentialManager::Impl // ////////////////////////////////////////////////////////////////////// @@ -204,7 +228,7 @@ namespace zypp AuthData_Ptr CredentialManager::Impl::getCredFromFile(const Pathname & file) { AuthData_Ptr result; - + Pathname credfile; if (file.absolute()) // get from that file @@ -262,7 +286,7 @@ namespace zypp ////////////////////////////////////////////////////////////////////// // - // CLASS NAME : CredentialManager + // CLASS NAME : CredentialManager // ////////////////////////////////////////////////////////////////////// diff --git a/zypp/media/CredentialManager.h b/zypp/media/CredentialManager.h index 969f3ad..5ebcf76 100644 --- a/zypp/media/CredentialManager.h +++ b/zypp/media/CredentialManager.h @@ -14,13 +14,15 @@ #include <set> -#include "zypp/Url.h" #include "zypp/Pathname.h" #include "zypp/media/MediaUserAuth.h" ////////////////////////////////////////////////////////////////////// -namespace zypp +namespace zypp { //////////////////////////////////////////////////////////////////// + + class Url; + ////////////////////////////////////////////////////////////////////// namespace media { //////////////////////////////////////////////////////////////////// @@ -28,10 +30,10 @@ namespace zypp ////////////////////////////////////////////////////////////////////// // - // CLASS NAME : CredManagerOptions + // CLASS NAME : CredManagerOptions // /** - * \todo configurable cred file locations + * \todo configurable cred file locations */ struct CredManagerOptions { @@ -46,15 +48,8 @@ namespace zypp // comparator for CredentialSet struct AuthDataComparator { - public: bool operator()(const AuthData_Ptr & lhs, - const AuthData_Ptr & rhs) - { - if (lhs->username() < rhs->username()) - return true; - if (lhs->url() != rhs->url()) - return true; - return false; - } + static const url::ViewOption vopt; + bool operator()(const AuthData_Ptr & lhs, const AuthData_Ptr & rhs); }; ////////////////////////////////////////////////////////////////////// @@ -81,10 +76,10 @@ namespace zypp public: /** * Get credentials for the specified \a url. - * + * * If the URL contains also username, it will be used to find the match * for this user (in case mutliple are available). - * + * * \param url URL to find credentials for. * \return Pointer to retrieved authentication data on success or an empty * AuthData_Ptr otherwise. @@ -101,7 +96,7 @@ namespace zypp * Add new global credentials. */ void addGlobalCred(const AuthData & cred); - + /** * Add new user credentials. */ @@ -109,13 +104,13 @@ namespace zypp /** * Add new credentials with user callbacks. - * + * * If the cred->url() contains 'credentials' query parameter, the * credentials will be automatically saved to the specified file using the * \ref saveInFile() method. * * Otherwise a callback will be called asking whether to save to custom - * file, or to global or user's credentials catalog. + * file, or to global or user's credentials catalog. * * \todo Currently no callback is called, credentials are automatically * saved to user's credentials.cat if no 'credentials' parameter @@ -131,7 +126,7 @@ namespace zypp /** * Saves given \a cred to global credentials file. - * + * * \note Use this method to add just one piece of credentials. To add * multiple items at once, use addGlobalCred() followed * by save() @@ -139,8 +134,8 @@ namespace zypp void saveInGlobal(const AuthData & cred); /** - * Saves given \a cred to user's credentials file. - * + * Saves given \a cred to user's credentials file. + * * \note Use this method to add just one piece of credentials. To add * multiple items at once, use addUserCred() followed * by save() @@ -149,7 +144,7 @@ namespace zypp /** * Saves given \a cred to user specified credentials file. - * + * * If the credFile path is absolute, it will be saved at that precise * location. If \a credFile is just a filename, it will be saved * in \ref CredManagerOptions::customCredFileDir. Otherwise the current @@ -159,7 +154,7 @@ namespace zypp /** * Remove all global or user credentials from memory and disk. - * + * * \param global Whether to remove global or user credentials. */ void clearAll(bool global = false); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> changes
by Michael Andres 27 Jan '09

27 Jan '09

commit f5ae095f2c2c9a1eeddc70c45f7ca5a8868782f4 Author: Michael Andres <ma(a)suse.de> Date: Tue Jan 27 13:36:33 2009 +0100 changes --- package/libzypp.changes | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index d2793fd..cafad24 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 27 13:35:44 CET 2009 - ma(a)suse.de + +- Respect content-file DATDIR when downloading packages. (bnc #468612) + +------------------------------------------------------------------- Tue Jan 27 13:28:54 CET 2009 - jkupec(a)suse.cz - Enabled CredentialManager for MediaSMB (bnc #460970). -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> Respect content-file DATDIR when downloading packages. (bnc #468612)
by Michael Andres 27 Jan '09

27 Jan '09

commit ab71594a65d907620f9a6415a9acc214f7a0229f Author: Michael Andres <ma(a)suse.de> Date: Tue Jan 27 13:21:41 2009 +0100 Respect content-file DATDIR when downloading packages. (bnc #468612) --- zypp/sat/Solvable.cc | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/zypp/sat/Solvable.cc b/zypp/sat/Solvable.cc index 886979c..dae6d9f 100644 --- a/zypp/sat/Solvable.cc +++ b/zypp/sat/Solvable.cc @@ -211,22 +211,28 @@ namespace zypp OnMediaLocation ret; Pathname path; -#warning STILL HARDCODED /suse PREFIX in location - // (ma@) loading a susetags repo search for a solvable with attribute - // susetags:datadir. this is the prefix. store it in RepoInfo(?). - // (ma@) Just a quick'n'dirty solution as we wan't - // to get rid of susetags. static const sat::SolvAttr susetagsDatadir( "susetags:datadir" ); switch ( repository().info().type().toEnum() ) { case repo::RepoType::NONE_e: - if ( sat::LookupAttr( susetagsDatadir, repository() ).empty() ) - break; - // else set type and fall through - repository().info().setProbedType( repo::RepoType::YAST2_e ); + { + sat::LookupAttr datadir( susetagsDatadir, repository() ); + if ( ! datadir.empty() ) + { + repository().info().setProbedType( repo::RepoType::YAST2_e ); + path = datadir.begin().asString(); + } + path = datadir.empty() ? "suse" : datadir.begin().c_str(); + } + break; + case repo::RepoType::YAST2_e: - path = "suse"; + { + sat::LookupAttr datadir( susetagsDatadir, repository() ); + path = datadir.empty() ? "suse" : datadir.begin().c_str(); + } break; + default: break; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> changes
by Ján Kupec 27 Jan '09

27 Jan '09

commit 4bfb947f590b5dab683f241d2f2bd4c183741a07 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Jan 27 13:33:44 2009 +0100 changes --- package/libzypp.changes | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index eab47f7..d2793fd 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jan 27 13:28:54 CET 2009 - jkupec(a)suse.cz + +- Enabled CredentialManager for MediaSMB (bnc #460970). +- Ignore URL's username, password, and query string in AuthData + comparator in CredentialManager. + +------------------------------------------------------------------- Mon Jan 26 12:41:07 CET 2009 - ma(a)suse.de - Let vendor checks per default differ between 'openSUSE Build Service' -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> changes
by Michael Andres 27 Jan '09

27 Jan '09

commit d5d2af71b0e1411ac4474767d18c9b9d08a53381 Author: Michael Andres <ma(a)suse.de> Date: Tue Jan 27 13:21:53 2009 +0100 changes --- VERSION.cmake | 4 ++-- package/libzypp.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 4c0d95d..064650a 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "27") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 5.26.0 (23) +# LAST RELEASED: 5.27.1 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 91fc3b3..6cb1f0c 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 27 13:18:17 CET 2009 - ma(a)suse.de + +- Respect content-file DATDIR when downloading packages. (bnc #468612) +- version 5.27.1 (23) + +------------------------------------------------------------------- Mon Jan 26 17:56:40 CET 2009 - schubi(a)suse.de - Taking ALL translations for generating GMO files (bnc #458739) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> Respect content-file DATDIR when downloading packages. (bnc #468612)
by Michael Andres 27 Jan '09

27 Jan '09

commit 61d6488149bae9598e6b94f4250f7b900afa93cc Author: Michael Andres <ma(a)suse.de> Date: Tue Jan 27 13:21:41 2009 +0100 Respect content-file DATDIR when downloading packages. (bnc #468612) --- zypp/sat/Solvable.cc | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/zypp/sat/Solvable.cc b/zypp/sat/Solvable.cc index 886979c..dae6d9f 100644 --- a/zypp/sat/Solvable.cc +++ b/zypp/sat/Solvable.cc @@ -211,22 +211,28 @@ namespace zypp OnMediaLocation ret; Pathname path; -#warning STILL HARDCODED /suse PREFIX in location - // (ma@) loading a susetags repo search for a solvable with attribute - // susetags:datadir. this is the prefix. store it in RepoInfo(?). - // (ma@) Just a quick'n'dirty solution as we wan't - // to get rid of susetags. static const sat::SolvAttr susetagsDatadir( "susetags:datadir" ); switch ( repository().info().type().toEnum() ) { case repo::RepoType::NONE_e: - if ( sat::LookupAttr( susetagsDatadir, repository() ).empty() ) - break; - // else set type and fall through - repository().info().setProbedType( repo::RepoType::YAST2_e ); + { + sat::LookupAttr datadir( susetagsDatadir, repository() ); + if ( ! datadir.empty() ) + { + repository().info().setProbedType( repo::RepoType::YAST2_e ); + path = datadir.begin().asString(); + } + path = datadir.empty() ? "suse" : datadir.begin().c_str(); + } + break; + case repo::RepoType::YAST2_e: - path = "suse"; + { + sat::LookupAttr datadir( susetagsDatadir, repository() ); + path = datadir.empty() ? "suse" : datadir.begin().c_str(); + } break; + default: break; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <sat-solver> changes
by Michael Andres 27 Jan '09

27 Jan '09

commit d279b8aa2a7411bc82daf306dd4c3e92dca5682d Author: Michael Andres <ma(a)suse.de> Date: Tue Jan 27 13:13:30 2009 +0100 changes --- package/libsatsolver.changes | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes index d9a8196..53ba504 100644 --- a/package/libsatsolver.changes +++ b/package/libsatsolver.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 27 13:12:30 CET 2009 - ma(a)suse.de + +- Ignore trailing whitespace in content file parser. + +------------------------------------------------------------------- Mon Jan 26 13:55:35 CET 2009 - mls(a)suse.de - fix segfault caused by whatprovides reallocation [bnc#468313] -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> Enabled CredentialManager for MediaSMB (bnc #460970).
by Ján Kupec 27 Jan '09

27 Jan '09

commit 7c8cbb8e4b1bbd34627fbd6cb23186cb5ce938d3 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Jan 27 13:11:43 2009 +0100 Enabled CredentialManager for MediaSMB (bnc #460970). --- zypp/media/MediaSMB.cc | 238 ++++++++++++++++++++++++++++++++++++------------ zypp/media/MediaSMB.h | 6 +- 2 files changed, 186 insertions(+), 58 deletions(-) diff --git a/zypp/media/MediaSMB.cc b/zypp/media/MediaSMB.cc index 4f99775..8ba2b9d 100644 --- a/zypp/media/MediaSMB.cc +++ b/zypp/media/MediaSMB.cc @@ -14,9 +14,18 @@ #include <fstream> #include "zypp/base/Logger.h" +#include "zypp/base/Gettext.h" #include "zypp/TmpPath.h" #include "zypp/KVMap.h" #include "zypp/media/Mount.h" +#include "zypp/media/MediaUserAuth.h" +#include "zypp/media/CredentialManager.h" +#include "zypp/ZYppCallbacks.h" + +#warning FIXME: get rid of this dependency on Target +#include "zypp/ZYppFactory.h" // for target->root() +#include "zypp/Target.h" // for zypp->target->root() + #include "zypp/media/MediaSMB.h" #include <sys/types.h> @@ -41,19 +50,19 @@ namespace zypp { { if ( spath_r.empty() ) return string(); - + string share( spath_r.absolutename().asString() ); string::size_type sep = share.find( "/", 1 ); if ( sep == string::npos ) share = share.erase( 0, 1 ); // nothing but the share name in spath_r else share = share.substr( 1, sep-1 ); - + // deescape %2f in sharename while ( (sep = share.find( "%2f" )) != string::npos ) { share.replace( sep, 3, "/" ); } - + return share; } @@ -69,12 +78,12 @@ namespace zypp { { if ( spath_r.empty() ) return Pathname(); - + string striped( spath_r.absolutename().asString() ); string::size_type sep = striped.find( "/", 1 ); if ( sep == string::npos ) return "/"; // nothing but the share name in spath_r - + return striped.substr( sep ); } @@ -107,24 +116,30 @@ namespace zypp { // // METHOD NAME : MediaSMB::attachTo // METHOD TYPE : PMError - // - // DESCRIPTION : Asserted that not already attached, and attachPoint - // is a directory. - // - // NOTE: The implementation currently serves both, "smb" and - // and "cifs" URL's, but passes "cifs" to the mount command - // in any case. - // + /** + * Asserted that not already attached, and attachPoint is a directory. + * + * Authentication: credentials can be specified in the following few ways + * (the first has the highest preference). + * - URL username:password + * - mountoptions URL query parameter (see man mount.cifs) + * - CredentialManager - either previously saved credentials will be used + * or the user will be promted for them via AuthenticationReport callback. + * + * \note The implementation currently serves both, "smb" and + * and "cifs" URL's, but passes "cifs" to the mount command + * in any case. + */ void MediaSMB::attachTo(bool next) { if(_url.getHost().empty()) ZYPP_THROW(MediaBadUrlEmptyHostException(_url)); if(next) ZYPP_THROW(MediaNotSupportedException(_url)); - + string path = "//"; path += _url.getHost() + "/" + getShare( _url.getPathName() ); - + MediaSourceRef media( new MediaSource( _vfstype, path)); AttachedMedia ret( findAttachedMedia( media)); @@ -154,93 +169,134 @@ namespace zypp { } Mount mount; - + CredentialManager cm; + Mount::Options options( _url.getQueryParam("mountoptions") ); string username = _url.getUsername(); string password = _url.getPassword(); - + options["guest"]; // prevent smbmount from asking for password - + if ( ! options.has( "rw" ) ) { options["ro"]; } - - Mount::Options::iterator toEnv; - + + // look for a workgroup + /* + string workgroup = _url.getQueryParam("workgroup"); + if ( !workgroup.empty() ) + options["workgroup"] = workgroup; + */ + // extract 'username', do not overwrite any _url.username + + Mount::Options::iterator toEnv; toEnv = options.find("username"); if ( toEnv != options.end() ) { if ( username.empty() ) - username = toEnv->second; + username = toEnv->second; options.erase( toEnv ); } + toEnv = options.find("user"); // actually cifs specific if ( toEnv != options.end() ) { if ( username.empty() ) - username = toEnv->second; + username = toEnv->second; options.erase( toEnv ); } - + // extract 'password', do not overwrite any _url.password + toEnv = options.find("password"); if ( toEnv != options.end() ) { if ( password.empty() ) - password = toEnv->second; + password = toEnv->second; options.erase( toEnv ); } + toEnv = options.find("pass"); // actually cifs specific if ( toEnv != options.end() ) { if ( password.empty() ) - password = toEnv->second; + password = toEnv->second; options.erase( toEnv ); } - - // look for a workgroup - string workgroup = _url.getQueryParam("workgroup"); - if ( workgroup.size() ) { - options["workgroup"] = workgroup; + + if ( username.empty() || password.empty() ) + { + AuthData_Ptr c = cm.getCred(_url); + if (c) + { + username = c->username(); + password = c->password(); + } } - - // pass 'username' and 'password' via environment - Mount::Environment environment; - if ( username.size() ) - environment["USER"] = username; - if ( password.size() ) - environment["PASSWD"] = password; - - ////////////////////////////////////////////////////// - // In case we need a tmpfile, credentials will remove - // it in it's destructor after the mout call below. - filesystem::TmpPath credentials; - if ( username.size() || password.size() ) + + bool firstTry = true; + bool authRequired = false; + AuthData authdata; + do // repeat this while the mount returns "Permission denied" error + { + // get credentials from authenicate() + if ( !firstTry ) + { + username = authdata.username(); + password = authdata.password(); + } + + // pass 'username' and 'password' via environment + Mount::Environment environment; + if ( !username.empty() ) + environment["USER"] = username; + if ( !password.empty() ) + environment["PASSWD"] = password; + + ////////////////////////////////////////////////////// + // In case we need a tmpfile, credentials will remove + // it in it's destructor after the mout call below. + filesystem::TmpPath credentials; + if ( !username.empty() || !password.empty() ) { filesystem::TmpFile tmp; ofstream outs( tmp.path().asString().c_str() ); outs << "username=" << username << endl; outs << "password=" << password << endl; outs.close(); - + credentials = tmp; options["credentials"] = credentials.path().asString(); } - // - ////////////////////////////////////////////////////// - - mount.mount( path, mountpoint, _vfstype, - options.asString(), environment ); + // + ////////////////////////////////////////////////////// + + try + { + mount.mount( path, mountpoint, _vfstype, + options.asString(), environment ); + setMediaSource(media); + break; + } + catch (const MediaMountException & e) + { + ZYPP_CAUGHT( e ); - setMediaSource(media); + if ( e.mountError() == "Permission denied" ) + authRequired = authenticate( authdata, firstTry ); + else + ZYPP_RETHROW( e ); + } + + firstTry = false; + } + while ( authRequired ); // wait for /etc/mtab update ... // (shouldn't be needed) int limit = 3; bool mountsucceeded; while( !(mountsucceeded=isAttached()) && --limit) - { sleep(1); - } - if( !mountsucceeded) + if ( !mountsucceeded ) { setMediaSource(MediaSourceRef()); try @@ -253,7 +309,7 @@ namespace zypp { } ZYPP_THROW(MediaMountException( "Unable to verify that the media was mounted", - path, mountpoint + path, mountpoint )); } } @@ -346,7 +402,75 @@ namespace zypp { bool MediaSMB::getDoesFileExist( const Pathname & filename ) const { return MediaHandler::getDoesFileExist( filename ); - } - + } + + bool MediaSMB::authenticate(AuthData & authdata, bool firstTry) const + { + //! \todo need a way to pass different CredManagerOptions here + Target_Ptr target = zypp::getZYpp()->getTarget(); + CredentialManager cm(CredManagerOptions(target ? target->root() : "")); + + // get stored credentials + AuthData_Ptr cmcred = cm.getCred(_url); + + AuthData_Ptr smbcred; + smbcred.reset(new AuthData()); + callback::SendReport<AuthenticationReport> auth_report; + + // preset the username if present in current url + if (!_url.getUsername().empty() && firstTry) + smbcred->setUsername(_url.getUsername()); + // if CM has found some credentials, preset the username from there + else if (cmcred) + smbcred->setUsername(cmcred->username()); + + // indicate we have no good credentials from CM + cmcred.reset(); + + string prompt_msg = str::form( + //!\todo add comma to the message for the next release + _("Authentication required for '%s'"), _url.asString().c_str()); + + // ask user + if (auth_report->prompt(_url, prompt_msg, *smbcred)) + { + DBG << "callback answer: retry" << endl + << "AuthData: " << *smbcred << endl; + + if (smbcred->valid()) + { + cmcred = smbcred; + // if (credentials->username() != _url.getUsername()) + // _url.setUsername(credentials->username()); + /** + * \todo find a way to save the url with changed username + * back to repoinfo or dont store urls with username + * (and either forbid more repos with the same url and different + * user, or return a set of credentials from CM and try them one + * by one) + */ + } + } + else + DBG << "callback answer: cancel" << endl; + + // set username and password + if (cmcred) + { + authdata.setUsername(cmcred->username()); + authdata.setPassword(cmcred->password()); + + // save the credentials + cmcred->setUrl(_url); + cm.addCred(*cmcred); + cm.save(); + + return true; + } + + return false; + } + + } // namespace media } // namespace zypp diff --git a/zypp/media/MediaSMB.h b/zypp/media/MediaSMB.h index ce6f43e..04cf836 100644 --- a/zypp/media/MediaSMB.h +++ b/zypp/media/MediaSMB.h @@ -17,6 +17,8 @@ namespace zypp { namespace media { + class AuthData; + /////////////////////////////////////////////////////////////////// // // CLASS NAME : MediaSMB @@ -60,13 +62,15 @@ namespace zypp { void mountAsCIFS() { _vfstype = "cifs"; } public: - MediaSMB( const Url& url_r, const Pathname & attach_point_hint_r ); virtual ~MediaSMB() { try { release(); } catch(...) {} } virtual bool isAttached() const; + + private: + bool authenticate( AuthData & authdata, bool firstTry ) const; }; ///////////////////////////////////////////////////////////////////A -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0