kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 14:30:11 +01:00
Code Activity

Improve validation of fdroid import page parsing

Browse Source
This commit is contained in:
Ciaran Gultnieks 2015-01-31 12:07:33 +00:00
parent e26ad377a6
commit 95ff6de599
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fdroidserver/import.py
View File

@ -226,6 +226,16 @@ def main():
logging.error("the manual for a list of supported formats, and supply one of those.") logging.error("the manual for a list of supported formats, and supply one of those.")
sys.exit(1) sys.exit(1)
# Ensure we have a sensible-looking repo address at this point. If not, we
# might have got a page format we weren't expecting. (Note that we
# specifically don't want git@...)
if ((repotype != 'bzr' and (not repo.startswith('http://') and
not repo.startswith('https://') and
not repo.startswith('git://'))) or
' ' in repo):
logging.error("Repo address '{0}' does not seem to be valid".format(repo))
sys.exit(1)
# Get a copy of the source so we can extract some info... # Get a copy of the source so we can extract some info...
logging.info('Getting source from ' + repotype + ' repo at ' + repo) logging.info('Getting source from ' + repotype + ' repo at ' + repo)
src_dir = os.path.join(tmp_dir, 'importer') src_dir = os.path.join(tmp_dir, 'importer')