Author: aschnell Date: Tue Dec 18 12:34:31 2007 New Revision: 8118 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8118&view=rev Log: - fixed password handling in URLs (bug #347273) Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/tests/repo/RepoVariables_test.cc trunk/libzypp/zypp/RepoInfo.cc trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/Url.cc trunk/libzypp/zypp/repo/RepoType.h trunk/libzypp/zypp/repo/RepoVariables.cc trunk/libzypp/zypp/repo/RepoVariables.h trunk/libzypp/zypp/url/UrlBase.cc Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=8118&r1=8117&r2=8118&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Tue Dec 18 12:34:31 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Dec 18 12:28:22 CET 2007 - aschnell@suse.de + +- fixed password handling in URLs (bug #347273) + +------------------------------------------------------------------- Mon Dec 17 13:47:44 CET 2007 - ma@suse.de - Fixed default text locale detection not to use static variables. (#346872) Modified: trunk/libzypp/tests/repo/RepoVariables_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/RepoVariables_test.cc?rev=8118&r1=8117&r2=8118&view=diff ============================================================================== --- trunk/libzypp/tests/repo/RepoVariables_test.cc (original) +++ trunk/libzypp/tests/repo/RepoVariables_test.cc Tue Dec 18 12:34:31 2007 @@ -24,14 +24,29 @@ void replace_test(const string &dir) { - RepoVariablesStringReplacer replacer; - - BOOST_CHECK_EQUAL(replacer("http://foo/$arch/bar"), + /* check RepoVariablesStringReplacer */ + + RepoVariablesStringReplacer replacer1; + + BOOST_CHECK_EQUAL(replacer1("http://foo/$arch/bar"), "http://foo/"+ ZConfig::instance().systemArchitecture().asString() + "/bar"); getZYpp()->setArchitecture(Arch("i686")); - BOOST_CHECK_EQUAL(replacer("http://foo/$arch/bar/$basearch"), + BOOST_CHECK_EQUAL(replacer1("http://foo/$arch/bar/$basearch"), "http://foo/i686/bar/i386"); + + /* check RepoVariablesUrlReplacer */ + + RepoVariablesUrlReplacer replacer2; + + BOOST_CHECK_EQUAL(replacer2(Url("ftp://user:secret@site.org/$arch/")).asCompleteString(), + "ftp://user:secret@site.org/i686/"); + + BOOST_CHECK_EQUAL(replacer2(Url("http://user:my$arch@site.org/$basearch/")).asCompleteString(), + "http://user:my$arch@site.org/i386/"); + + BOOST_CHECK_EQUAL(replacer2(Url("http://site.org/update/?arch=$arch")).asCompleteString(), + "http://site.org/update/?arch=i686"); } test_suite* @@ -45,15 +60,15 @@ cout << "RepoVariables_test:" " path to directory with test data required as parameter. Using " << datadir << endl; //return (test_suite *)0; - + } else { datadir = argv[1]; } - + test_suite* test= BOOST_TEST_SUITE("RepoVariables"); - + std::string const params[] = { datadir }; test->add(BOOST_PARAM_TEST_CASE(&replace_test, (std::string const*)params, params+1)); Modified: trunk/libzypp/zypp/RepoInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoInfo.cc?rev=8118&r1=8117&r2=8118&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoInfo.cc (original) +++ trunk/libzypp/zypp/RepoInfo.cc Tue Dec 18 12:34:31 2007 @@ -191,7 +191,7 @@ { return alias(); } - + repo::RepoVariablesStringReplacer replacer; return replacer(_pimpl->name); } Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=8118&r1=8117&r2=8118&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Tue Dec 18 12:34:31 2007 @@ -117,17 +117,17 @@ if ( !store.isCached(info.alias()) ) return; - + MIL << info.alias() << " cleaning cache..." << endl; data::RecordId id = store.lookupRepository(info.alias()); - + CombinedProgressData subprogrcv(progress); - + store.cleanRepository(id, subprogrcv); } - + //////////////////////////////////////////////////////////////////////////// - + /** * Reads RepoInfo's from a repo file. * @@ -249,7 +249,7 @@ static shared_ptr<Impl> _nullimpl( new Impl ); return _nullimpl; } - + private: friend Impl * rwcowClone<Impl>( const Impl * rhs ); /** clone for RWCOW_pointer */ @@ -312,7 +312,7 @@ } //////////////////////////////////////////////////////////////////////////// - + RepoStatus RepoManager::metadataStatus( const RepoInfo &info ) const { Pathname rawpath = rawcache_path_for_repoinfo( _pimpl->options, info ); @@ -519,7 +519,7 @@ ERR << "refresh check failed for " << url << endl; ZYPP_RETHROW(e); } - + return true; // default } @@ -624,7 +624,7 @@ { ZYPP_CAUGHT(e); ERR << "Trying another url..." << endl; - + // remember the exception caught for the *first URL* // if all other URLs fail, the rexception will be thrown with the // cause of the problem of the first URL remembered @@ -680,7 +680,7 @@ MIL << info.alias() << " cache rebuild is forced" << endl; } } - + needs_cleaning = true; } @@ -709,7 +709,7 @@ break; } - + switch ( repokind.toEnum() ) { case RepoType::RPMMD_e : @@ -769,7 +769,7 @@ return repo::RepoType::RPMMD; if ( access.doesFileExist("/content") ) return repo::RepoType::YAST2; - + // if it is a local url of type dir if ( (! media::MediaManager::downloads(url)) && ( url.getScheme() == "dir" ) ) { @@ -798,9 +798,9 @@ return repo::RepoType::NONE; } - + //////////////////////////////////////////////////////////////////////////// - + void RepoManager::cleanCache( const RepoInfo &info, const ProgressData::ReceiverFnc & progressrcv ) { @@ -833,7 +833,7 @@ progress.sendTo(ProgressReportAdaptor( progressrcv, report )); //progress.sendTo( progressrcv ); progress.name(str::form(_("Reading repository '%s' cache"), info.name().c_str())); - + cache::CacheStore store(_pimpl->options.repoCachePath); if ( ! store.isCached( info.alias() ) ) @@ -842,9 +842,9 @@ MIL << "Repository " << info.alias() << " is cached" << endl; data::RecordId id = store.lookupRepository(info.alias()); - + CombinedProgressData subprogrcv(progress); - + repo::cached::RepoOptions opts( info, _pimpl->options.repoCachePath, id ); opts.readingResolvablesProgress = subprogrcv; repo::cached::RepoImpl::Ptr repoimpl = @@ -1031,7 +1031,7 @@ callback::SendReport<ProgressReport> report; progress.sendTo( ProgressReportAdaptor( progressrcv, report ) ); progress.name(str::form(_("Removing repository '%s'"), info.name().c_str())); - + MIL << "Going to delete repo " << info.alias() << endl; std::list<RepoInfo> repos = knownRepositories(); Modified: trunk/libzypp/zypp/Url.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Url.cc?rev=8118&r1=8117&r2=8118&view=diff ============================================================================== --- trunk/libzypp/zypp/Url.cc (original) +++ trunk/libzypp/zypp/Url.cc Tue Dec 18 12:34:31 2007 @@ -9,6 +9,7 @@ /** * \file zypp/Url.cc */ + #include #include #include @@ -804,12 +805,12 @@ { return (lhs.asCompleteString() == rhs.asCompleteString()); } - + bool operator!=( const Url &lhs, const Url &rhs ) { return (lhs.asCompleteString() != rhs.asCompleteString()); } - + //////////////////////////////////////////////////////////////////// } // namespace zypp ////////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/repo/RepoType.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoType.h?rev=8118&r1=8117&r2=8118&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/RepoType.h (original) +++ trunk/libzypp/zypp/repo/RepoType.h Tue Dec 18 12:34:31 2007 @@ -11,7 +11,7 @@ #define ZYPP_REPO_TYPE_H_ #include <iosfwd> -#include<string> +#include <string> namespace zypp { Modified: trunk/libzypp/zypp/repo/RepoVariables.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoVariables.cc?rev=8118&r1=8117&r2=8118&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/RepoVariables.cc (original) +++ trunk/libzypp/zypp/repo/RepoVariables.cc Tue Dec 18 12:34:31 2007 @@ -21,7 +21,7 @@ { namespace repo { - + RepoVariablesStringReplacer::RepoVariablesStringReplacer() {} @@ -31,19 +31,19 @@ std::string RepoVariablesStringReplacer::operator()( const std::string &value ) const { string newvalue(value); - + // $arch newvalue = str::gsub( newvalue, "$arch", ZConfig::instance().systemArchitecture().asString() ); // $basearch - + Arch::CompatSet cset( Arch::compatSet( ZConfig::instance().systemArchitecture() ) ); Arch::CompatSet::const_iterator it = cset.end(); --it; // now at noarch --it; - + Arch basearch = *it; if ( basearch == Arch_noarch ) { @@ -64,21 +64,20 @@ RepoVariablesUrlReplacer::~RepoVariablesUrlReplacer() {} - +/* + * Replaces '$arch' and '$basearch' in the path and query part of the URL + * with the global ZYpp values. Examples: + * + * ftp://user:secret@site.net/$arch/ -> ftp://user:secret@site.net/i686/ + * http://site.net/?basearch=$basearch -> http://site.net/?basearch=i386 + */ Url RepoVariablesUrlReplacer::operator()( const Url &value ) const { + Url newurl = value; RepoVariablesStringReplacer replacer; - string transformed = replacer(value.asString()); - Url newurl; - try { - newurl = Url(transformed); - } - catch ( const Exception &e ) - { - ZYPP_CAUGHT(e); - // just return what we got - return value; - } + newurl.setPathData(replacer(value.getPathData())); + newurl.setQueryString(replacer(value.getQueryString())); + return newurl; } Modified: trunk/libzypp/zypp/repo/RepoVariables.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoVariables.h?rev=8118&r1=8117&r2=8118&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/RepoVariables.h (original) +++ trunk/libzypp/zypp/repo/RepoVariables.h Tue Dec 18 12:34:31 2007 @@ -11,7 +11,7 @@ #define ZYPP_REPO_VARIABLES_H_ #include <iosfwd> -#include<string> +#include <string> #include "zypp/Url.h" @@ -28,7 +28,7 @@ struct RepoVariablesStringReplacer : public std::unary_function { RepoVariablesStringReplacer(); - + std::string operator()( const std::string &value ) const; ~RepoVariablesStringReplacer(); @@ -42,12 +42,12 @@ struct RepoVariablesUrlReplacer : public std::unary_function { RepoVariablesUrlReplacer(); - + Url operator()( const Url &url ) const; - + ~RepoVariablesUrlReplacer(); }; - + } // ns repo } // ns zypp Modified: trunk/libzypp/zypp/url/UrlBase.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/url/UrlBase.cc?rev=8118&r1=8117&r2=8118&view=diff ============================================================================== --- trunk/libzypp/zypp/url/UrlBase.cc (original) +++ trunk/libzypp/zypp/url/UrlBase.cc Tue Dec 18 12:34:31 2007 @@ -1320,7 +1320,7 @@ { struct in6_addr ip; std::string temp( host.substr(1, host.size()-2)); - + return inet_pton(AF_INET6, temp.c_str(), &ip) > 0; } else -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org