ukui/apt
0
0
Fork 0
mirror of https://github.com/ukui/apt.git synced 2026-03-09 09:35:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

allow user@host (aka: no password) in URI parsing

Browse Source 
If the URI had no password the username was ignored
This commit is contained in:
David Kalnischkies
2016-08-01 21:45:29 +02:00
parent b9e6db821a
commit a1f3ac8aba
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apt-pkg/contrib/strutl.cc
+9 -7
View File
@@ -1639,13 +1639,15 @@ void URI::CopyFrom(const string &U)
I = FirstColon + 1;
if (I > SingleSlash)
I = SingleSlash;
for (; I < SingleSlash && *I != ':'; ++I);
string::const_iterator SecondColon = I;
// Search for the @ after the colon
for (; I < SingleSlash && *I != '@'; ++I);
string::const_iterator At = I;
// Search for the @ separating user:pass from host
auto const RevAt = std::find(
std::string::const_reverse_iterator(SingleSlash),
std::string::const_reverse_iterator(I), '@');
string::const_iterator const At = RevAt.base() == I ? SingleSlash : std::prev(RevAt.base());
// and then look for the colon between user and pass
string::const_iterator const SecondColon = std::find(I, At, ':');
// Now write the host and user/pass
if (At == SingleSlash)
{
test/libapt/uri_test.cc
+12
View File
@@ -28,6 +28,18 @@ TEST(URITest, BasicHTTP)
EXPECT_EQ("http://ualberta.ca", URI::SiteOnly(U));
EXPECT_EQ("http://ualberta.ca/blah", URI::ArchiveOnly(U));
EXPECT_EQ("http://ualberta.ca/blah", URI::NoUserPassword(U));
// just a user
U = URI("https://apt@example.org/blah");
EXPECT_EQ("https", U.Access);
EXPECT_EQ("apt", U.User);
EXPECT_EQ("", U.Password);
EXPECT_EQ(0, U.Port);
EXPECT_EQ("example.org", U.Host);
EXPECT_EQ("/blah", U.Path);
EXPECT_EQ("https://apt@example.org/blah", (std::string)U);
EXPECT_EQ("https://example.org", URI::SiteOnly(U));
EXPECT_EQ("https://example.org/blah", URI::ArchiveOnly(U));
EXPECT_EQ("https://example.org/blah", URI::NoUserPassword(U));
}
TEST(URITest, SingeSlashFile)
{