MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved fix for ../ in usage URL

Browse Source 
This actually works for complex URLs since we normalise just the path
portion that we are adding instead of trying it on the URL after
composing it.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2013-03-27 16:17:49 +00:00
parent 2804211f8f
commit 333ee2a94e
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
layerindex/models.py
View File

@ -10,26 +10,8 @@ from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
import os.path
import re
import urlparse
import posixpath
# Borrowed from http://stackoverflow.com/questions/4317242/python-how-to-resolve-urls-containing
def resolveComponents(url):
"""
>>> resolveComponents('http://www.example.com/foo/bar/../../baz/bux/')
'http://www.example.com/baz/bux/'
>>> resolveComponents('http://www.example.com/some/path/../file.ext')
'http://www.example.com/some/file.ext'
"""
parsed = urlparse.urlparse(url)
new_path = posixpath.normpath(parsed.path)
if parsed.path.endswith('/'):
# Compensate for issue1707768
new_path += '/'
cleaned = parsed._replace(path=new_path)
return cleaned.geturl()
class Branch(models.Model):
name = models.CharField(max_length=50)
@ -138,6 +120,12 @@ class LayerBranch(models.Model):
if self.vcs_subdir:
if path:
extra_path = self.vcs_subdir + '/' + path
# Normalise out ../ in path for usage URL
extra_path = posixpath.normpath(extra_path)
# Minor workaround to handle case where subdirectory has been added between branches
# (should probably support usage URL per branch to handle this... sigh...)
if extra_path.startswith('../'):
extra_path = extra_path[3:]
else:
extra_path = self.vcs_subdir
else: