GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bug #540

Browse source 
- fixed issue with user names containing @ characters
- updated ChangeLog
- updated task-sync.5
This commit is contained in:
Johannes Schlatow 2010-12-24 01:00:03 +01:00
parent d44e592635
commit ee77debfce
4 changed files with 103 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

98
src/Uri.cpp
View file

@ -198,54 +198,74 @@ void Uri::parse ()
}
std::string::size_type pos;
std::string uripart;
std::string pathDelimiter = "/";
std::string uripart;
std::string pathDelimiter = "/";
user = "";
port = "";
user = "";
port = "";
// skip ^.*://
if ((pos = data.find ("://")) != std::string::npos)
{
protocol = data.substr(0, pos);
data = data.substr (pos+3);
// standard syntax: protocol://[user@]host.xz[:port]/path/to/undo.data
pathDelimiter = "/";
}
else
{
protocol = "ssh";
// scp-like syntax: [user@]host.xz:path/to/undo.data
pathDelimiter = ":";
}
{
protocol = data.substr(0, pos);
data = data.substr (pos+3);
// standard syntax: protocol://[user@]host.xz[:port]/path/to/undo.data
pathDelimiter = "/";
}
else
{
protocol = "ssh";
// scp-like syntax: [user@]host.xz:path/to/undo.data
pathDelimiter = ":";
}
// get host part
if ((pos = data.find (pathDelimiter)) != std::string::npos)
{
host = data.substr (0, pos);
path = data.substr (pos+1);
}
else
{
// user delimited by single quotes?
if ( data[0] == '\''
&& (pos = data.find("'", 1)) != std::string::npos )
{
if (data[pos+1] == '@')
{
// end of user name
user = data.substr (1, pos-1);
data = data.substr (pos+2);
}
else
{
throw std::string ("Could not parse uri '") + data + "', wrong usage of single quotes.";
}
}
else
{
// find user name
if ((pos = data.find ("@")) != std::string::npos)
{
user = data.substr (0, pos);
data = data.substr (pos+1);
}
}
// get host, port and path
if ((pos = data.find (pathDelimiter)) != std::string::npos)
{
host = data.substr (0, pos);
path = data.substr (pos+1);
}
else
{
throw std::string ("The uri '") + data + "' is not in the expected format.";
}
}
// parse host
if ((pos = host.find ("@")) != std::string::npos)
{
user = host.substr (0, pos);
host = host.substr (pos+1);
}
// remark: this find() will never be != npos for scp-like syntax
// because we found pathDelimiter, which is ":", before
if ((pos = host.find (":")) != std::string::npos)
{
port = host.substr (pos+1);
host = host.substr (0,pos);
}
// port specified?
// remark: this find() will never be != npos for scp-like syntax
// because we found pathDelimiter, which is ":", before
if ((pos = host.find (":")) != std::string::npos)
{
port = host.substr (pos+1);
host = host.substr (0,pos);
}
parsed = true;
}
////////////////////////////////////////////////////////////////////////////////
// vim: et ts=2 sw=2