*
*/
#include <iostream>
-#include "zypp/base/Logger.h"
+#include "zypp/base/LogTools.h"
+#include "zypp/base/String.h"
+#include "zypp/base/Regex.h"
#include "zypp/base/InputStream.h"
#include "zypp/base/UserRequestException.h"
#include "zypp/parser/RepoFileReader.h"
using std::endl;
-using zypp::parser::IniDict;
///////////////////////////////////////////////////////////////////
namespace zypp
-{ /////////////////////////////////////////////////////////////////
+{
///////////////////////////////////////////////////////////////////
namespace parser
- { /////////////////////////////////////////////////////////////////
+ {
+ ///////////////////////////////////////////////////////////////////
+ namespace {
+
+ ///////////////////////////////////////////////////////////////////
+ /// \class RepoFileParser
+ /// \brief Modified \ref IniDict to allow parsing multiple 'baseurl=' entries
+ ///////////////////////////////////////////////////////////////////
+ class RepoFileParser : public IniDict
+ {
+ public:
+ RepoFileParser( const InputStream & is_r )
+ { read( is_r ); }
+
+ using IniDict::consume; // don't hide overloads we don't redefine here
+
+ virtual void consume( const std::string & section_r, const std::string & key_r, const std::string & value_r )
+ {
+ if ( key_r == "baseurl" )
+ {
+ _inMultiline = MultiLine::baseurl;
+ _baseurls[section_r].push_back( Url(value_r) );
+ }
+ else if ( key_r == "gpgkey" )
+ {
+ _inMultiline = MultiLine::gpgkey;
+ legacyStoreUrl( _gpgkeys[section_r], value_r );
+ }
+ else
+ {
+ _inMultiline = MultiLine::none;
+ IniDict::consume( section_r, key_r, value_r );
+ }
+ }
+
+ virtual void garbageLine( const std::string & section_r, const std::string & line_r )
+ {
+ switch ( _inMultiline )
+ {
+ case MultiLine::baseurl:
+ _baseurls[section_r].push_back( Url(line_r) );
+ break;
+
+ case MultiLine::gpgkey:
+ legacyStoreUrl( _gpgkeys[section_r], line_r );
+ break;
+
+ case MultiLine::none:
+ IniDict::garbageLine( section_r, line_r ); // throw
+ break;
+ }
+ }
+
+ std::list<Url> & baseurls( const std::string & section_r )
+ { return _baseurls[section_r]; }
+
+ std::list<Url> & gpgkeys( const std::string & section_r )
+ { return _gpgkeys[section_r]; }
+
+ private:
+ void legacyStoreUrl( std::list<Url> & store_r, const std::string & line_r )
+ {
+ // Legacy:
+ // commit 4ef65a442038caf7a1e310bc719e329b34dbdb67
+ // - split the gpgkey line and take the first one as url to avoid
+ // crash when creating an url from the line, as Fedora hat the
+ // *BRILLIANT* idea of using more than one url per line.
+ std::vector<std::string> keys;
+ str::split( line_r, std::back_inserter(keys) );
+ for ( auto && str : keys )
+ store_r.push_back( Url(std::move(str)) );
+ }
+
+ enum class MultiLine { none, baseurl, gpgkey };
+ MultiLine _inMultiline = MultiLine::none;
+
+ std::map<std::string,std::list<Url>> _baseurls;
+ std::map<std::string,std::list<Url>> _gpgkeys;
+ };
+
+ } //namespace
+ ///////////////////////////////////////////////////////////////////
/**
* \short List of RepoInfo's from a file.
* \param file pathname of the file to read.
*/
- static void repositories_in_file( const Pathname &file,
- const RepoFileReader::ProcessRepo &callback,
- const ProgressData::ReceiverFnc &progress )
+ static void repositories_in_stream( const InputStream &is,
+ const RepoFileReader::ProcessRepo &callback,
+ const ProgressData::ReceiverFnc &progress )
{
- InputStream is(file);
- parser::IniDict dict(is);
- for ( parser::IniDict::section_const_iterator its = dict.sectionsBegin();
- its != dict.sectionsEnd();
- ++its )
+ RepoFileParser dict(is);
+ for_( its, dict.sectionsBegin(), dict.sectionsEnd() )
{
- MIL << (*its) << endl;
-
RepoInfo info;
info.setAlias(*its);
-
- for ( IniDict::entry_const_iterator it = dict.entriesBegin(*its);
- it != dict.entriesEnd(*its);
- ++it )
+ std::string proxy;
+ std::string proxyport;
+
+ for_( it, dict.entriesBegin(*its), dict.entriesEnd(*its) )
{
-
//MIL << (*it).first << endl;
if (it->first == "name" )
info.setName(it-> second);
else if ( it->first == "enabled" )
- info.setEnabled( it->second == "1" );
- else if ( it->first == "baseurl" )
- info.addBaseUrl( Url(it->second) );
+ info.setEnabled( str::strToTrue( it->second ) );
+ else if ( it->first == "priority" )
+ info.setPriority( str::strtonum<unsigned>( it->second ) );
else if ( it->first == "path" )
info.setPath( Pathname(it->second) );
else if ( it->first == "type" )
info.setType(repo::RepoType(it->second));
else if ( it->first == "autorefresh" )
- info.setAutorefresh( it->second == "1" );
- else if ( it->first == "mirrorlist" )
+ info.setAutorefresh( str::strToTrue( it->second ) );
+ else if ( it->first == "mirrorlist" && !it->second.empty())
info.setMirrorListUrl(Url(it->second));
- else if ( it->first == "gpgkey" )
- info.setGpgKeyUrl( Url(it->second) );
+ else if ( it->first == "metalink" && !it->second.empty())
+ info.setMetalinkUrl(Url(it->second));
else if ( it->first == "gpgcheck" )
- info.setGpgCheck( it->second == "1" );
+ info.setGpgCheck( str::strToTriBool( it->second ) );
+ else if ( it->first == "repo_gpgcheck" )
+ info.setRepoGpgCheck( str::strToTrue( it->second ) );
+ else if ( it->first == "pkg_gpgcheck" )
+ info.setPkgGpgCheck( str::strToTrue( it->second ) );
+ else if ( it->first == "keeppackages" )
+ info.setKeepPackages( str::strToTrue( it->second ) );
+ else if ( it->first == "service" )
+ info.setService( it->second );
+ else if ( it->first == "proxy" )
+ {
+ // Translate it into baseurl queryparams
+ // NOTE: The hack here does not add proxy to mirrorlist urls but the
+ // original code worked without complains, so keep it for now.
+ static const str::regex ex( ":[0-9]+$" ); // portspec
+ str::smatch what;
+ if ( str::regex_match( it->second, what, ex ) )
+ {
+ proxy = it->second.substr( 0, it->second.size() - what[0].size() );
+ proxyport = what[0].substr( 1 );
+ }
+ else
+ {
+ proxy = it->second;
+ }
+ }
else
- ERR << "Unknown attribute " << it->second << " ignored" << endl;
+ ERR << "Unknown attribute in [" << *its << "]: " << it->first << "=" << it->second << " ignored" << endl;
}
- MIL << "Linking repo info with file " << file << endl;
- info.setFilepath(file);
+
+ for ( auto & url : dict.baseurls( *its ) )
+ {
+ if ( ! proxy.empty() && url.getQueryParam( "proxy" ).empty() )
+ {
+ url.setQueryParam( "proxy", proxy );
+ url.setQueryParam( "proxyport", proxyport );
+ }
+ info.addBaseUrl( url );
+ }
+
+ info.setGpgKeyUrls( std::move(dict.gpgkeys( *its )) );
+
+ info.setFilepath(is.path());
+ MIL << info << endl;
// add it to the list.
callback(info);
//if (!progress.tick())
const ProgressData::ReceiverFnc &progress )
: _callback(callback)
{
- repositories_in_file(repo_file, _callback, progress);
- //MIL << "Done" << endl;
+ repositories_in_stream(InputStream(repo_file), _callback, progress);
+ }
+
+ RepoFileReader::RepoFileReader( const InputStream &is,
+ const ProcessRepo & callback,
+ const ProgressData::ReceiverFnc &progress )
+ : _callback(callback)
+ {
+ repositories_in_stream(is, _callback, progress);
}
RepoFileReader::~RepoFileReader()
{}
+
std::ostream & operator<<( std::ostream & str, const RepoFileReader & obj )
{
return str;
}
- /////////////////////////////////////////////////////////////////
} // namespace parser
///////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////
} // namespace zypp
///////////////////////////////////////////////////////////////////
projects / platform / upstream / libzypp.git / blobdiff