EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix too-strict url filter

pull/1/head
eric 2016-03-07 15:47:53 -05:00
parent abe04a02c7
commit 0d4930a238
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/models.py
View File

@ -3,14 +3,22 @@ from django.db import models
#https://github.com/GITenberg/Adventures-of-Huckleberry-Finn_76/raw/master/metadata.yaml #https://github.com/GITenberg/Adventures-of-Huckleberry-Finn_76/raw/master/metadata.yaml
#or https://raw.githubusercontent.com/GITenberg/Free-Russia_51117/master/metadata.yaml
def repo_allowed(repo_url): def repo_allowed(repo_url):
if not repo_url.startswith('https://github.com/'): if repo_url.startswith('https://github.com/'):
return (False, "repo url must start with 'https://github.com/'")
try: try:
(org,repo_name,raw,branch,filename) = repo_url[19:].split('/') (org,repo_name,raw,branch,filename) = repo_url[19:].split('/')
except ValueError: except ValueError:
return (False, "repo url must be well formed, metadata at top repo level") return (False, "repo url must be well formed, metadata at top repo level")
elif repo_url.startswith('https://raw.githubusercontent.com/'):
try:
(org,repo_name,branch,filename) = repo_url[34:].split('/')
raw = 'raw'
except ValueError:
return (False, "repo url must be well formed, metadata at top repo level")
else:
return (False, "repo url must start with 'https://github.com/' or 'https://raw.githubusercontent.com/'")
if not raw == 'raw': if not raw == 'raw':
return (False, "repo url must point at 'raw' file") return (False, "repo url must point at 'raw' file")
if not filename == 'metadata.yaml': if not filename == 'metadata.yaml':