Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix url parsing bug

Browse source
This commit is contained in:
Daniel Larimer 2014-06-07 18:53:39 -04:00
parent b379449cda
commit fe997232f6
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/network/url.cpp
View file

@ -3,6 +3,7 @@
#include <fc/io/sstream.hpp> #include <fc/io/sstream.hpp>
#include <fc/exception/exception.hpp> #include <fc/exception/exception.hpp>
#include <fc/log/logger.hpp> #include <fc/log/logger.hpp>
#include <sstream>
namespace fc namespace fc
{ {
@ -13,19 +14,19 @@ namespace fc
public: public:
void parse( const fc::string& s ) void parse( const fc::string& s )
{ {
fc::stringstream ss(s); std::stringstream ss(s);
fc::string skip,_lpath,_largs,luser,lpass; std::string skip,_lpath,_largs,luser,lpass;
fc::getline( ss, _proto, ':' ); std::getline( ss, _proto, ':' );
fc::getline( ss, skip, '/' ); std::getline( ss, skip, '/' );
fc::getline( ss, skip, '/' ); std::getline( ss, skip, '/' );
if( s.find('@') != size_t(fc::string::npos) ) { if( s.find('@') != size_t(fc::string::npos) ) {
fc::string user_pass; fc::string user_pass;
fc::getline( ss, user_pass, '@' ); std::getline( ss, user_pass, '@' );
fc::stringstream upss(user_pass); std::stringstream upss(user_pass);
if( user_pass.find( ':' ) != size_t(fc::string::npos) ) { if( user_pass.find( ':' ) != size_t(fc::string::npos) ) {
fc::getline( upss, luser, ':' ); std::getline( upss, luser, ':' );
fc::getline( upss, lpass, ':' ); std::getline( upss, lpass, ':' );
_user = fc::move(luser); _user = fc::move(luser);
_pass = fc::move(lpass); _pass = fc::move(lpass);
} else { } else {
@ -33,7 +34,7 @@ namespace fc
} }
} }
fc::string host_port; fc::string host_port;
fc::getline( ss, host_port, '/' ); std::getline( ss, host_port, '/' );
auto pos = host_port.find( ':' ); auto pos = host_port.find( ':' );
if( pos != fc::string::npos ) { if( pos != fc::string::npos ) {
try { try {
@ -45,7 +46,7 @@ namespace fc
} else { } else {
_host = fc::move(host_port); _host = fc::move(host_port);
} }
fc::getline( ss, _lpath, '?' ); std::getline( ss, _lpath, '?' );
#ifdef WIN32 #ifdef WIN32
// On windows, a URL like file:///c:/autoexec.bat would result in _lpath = c:/autoexec.bat // On windows, a URL like file:///c:/autoexec.bat would result in _lpath = c:/autoexec.bat
// which is what we really want (it's already an absolute path) // which is what we really want (it's already an absolute path)
@ -58,7 +59,7 @@ namespace fc
// but we really want to make it the absolute path /etc/rc.local // but we really want to make it the absolute path /etc/rc.local
_path = fc::path( "/" ) / _lpath; _path = fc::path( "/" ) / _lpath;
#endif #endif
fc::getline( ss, _largs ); std::getline( ss, _largs );
if( _args.valid() && _args->size() ) if( _args.valid() && _args->size() )
{ {
// TODO: args = fc::move(_args); // TODO: args = fc::move(_args);
@ -86,7 +87,7 @@ namespace fc
url::operator string()const url::operator string()const
{ {
fc::stringstream ss; std::stringstream ss;
ss<<my->_proto<<"://"; ss<<my->_proto<<"://";
if( my->_user.valid() ) { if( my->_user.valid() ) {
ss << *my->_user; ss << *my->_user;