diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2014-01-16 15:55:19 +0100 | 
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-18 23:29:07 +0000 | 
| commit | a99fa6ded13a62c3552d37563b1d299e2522d02a (patch) | |
| tree | 58401c1ab2c9001333975a80abf20fd0873b2a2c /bitbake/lib/bb/tests/fetch.py | |
| parent | 19c75e92a1b8eac8cb24ae8f1d5f99cf9df913ff (diff) | |
| download | poky-a99fa6ded13a62c3552d37563b1d299e2522d02a.tar.gz | |
bitbake: fetch2: Don't allow '/' in user:pass, fix branch containing '@'
* currently decode_url regexp parses branch=@foo as username so it ends like this:
  - ('git', '', 'foo', 'git.openembedded.org/bitbake;branch=', '', {})
  + ('git', 'git.openembedded.org', '/bitbake', '', '', {'branch': '@foo'})
* http://hg.python.org/cpython/file/2.7/Lib/urlparse.py also assumes
  that there is at least one '/' as separator between netloc and path,
  params, so it looks reasonable to prevent including '/' in username
(Bitbake rev: 2c82742114091cb55055328b54223686816582f2)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/tests/fetch.py')
| -rw-r--r-- | bitbake/lib/bb/tests/fetch.py | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index 4bcff543fc..e134a31f12 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py  | |||
| @@ -407,7 +407,8 @@ class URLHandle(unittest.TestCase): | |||
| 407 | datatable = { | 407 | datatable = { | 
| 408 | "http://www.google.com/index.html" : ('http', 'www.google.com', '/index.html', '', '', {}), | 408 | "http://www.google.com/index.html" : ('http', 'www.google.com', '/index.html', '', '', {}), | 
| 409 | "cvs://anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', '', {'module': 'familiar/dist/ipkg'}), | 409 | "cvs://anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', '', {'module': 'familiar/dist/ipkg'}), | 
| 410 | "cvs://anoncvs:anonymous@cvs.handhelds.org/cvs;tag=V0-99-81;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', 'anonymous', {'tag': 'V0-99-81', 'module': 'familiar/dist/ipkg'}) | 410 | "cvs://anoncvs:anonymous@cvs.handhelds.org/cvs;tag=V0-99-81;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', 'anonymous', {'tag': 'V0-99-81', 'module': 'familiar/dist/ipkg'}), | 
| 411 | "git://git.openembedded.org/bitbake;branch=@foo" : ('git', 'git.openembedded.org', '/bitbake', '', '', {'branch': '@foo'}) | ||
| 411 | } | 412 | } | 
| 412 | 413 | ||
| 413 | def test_decodeurl(self): | 414 | def test_decodeurl(self): | 
