Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

distgit: Improve error reporting to the client

Browse source 
There is a send_error method, which sends the error message back to the
client. (pyrpkg in our case)

Unfortunately, that method doesn't send back an error HTTP status code,
which I'm assuming must be interpreted as a "200 OK" status.

pyrpkg completely ignore the text sent back by the server, unless the
status code is not 200, which means all those errors are silently
ignored.

This commit makes sure the send_error method will always return an error
status ("500 Internal Server Error" by default), and moves all the error
handling code to use that method, specifying their own status code if
needed.
This commit is contained in:
Mathieu Bridon 2015-06-04 10:45:00 +02:00
parent 3108b3b1fe
commit 187de33c8a
1 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

35
roles/distgit/files/dist-git-upload.cgi
View file

@ -33,16 +33,21 @@ CACHE_DIR = '/srv/cache/lookaside/pkgs'
# Fedora Packager Group # Fedora Packager Group
PACKAGER_GROUP = 'packager' PACKAGER_GROUP = 'packager'
def send_error(text): def send_error(text, status='500 Internal Server Error'):
print 'Status: %s' % status
print 'Content-type: text/plain'
print
print text print text
sys.exit(1) sys.exit(0)
def check_form(form, var): def check_form(form, var):
ret = form.getvalue(var, None) ret = form.getvalue(var, None)
if ret is None: if ret is None:
send_error('Required field "%s" is not present.' % var) send_error('Required field "%s" is not present.' % var,
status='400 Bad Request')
if isinstance(ret, list): if isinstance(ret, list):
send_error('Multiple values given for "%s". Aborting.' % var) send_error('Multiple values given for "%s". Aborting.' % var,
status='400 Bad Request')
return ret return ret
def check_auth(username): def check_auth(username):
@ -59,11 +64,8 @@ def main():
username = os.environ.get('SSL_CLIENT_S_DN_CN', None) username = os.environ.get('SSL_CLIENT_S_DN_CN', None)
if not check_auth(username): if not check_auth(username):
print 'Status: 403 Forbidden' send_error('You must connect with a valid certificate and be in the %s group to upload.' % PACKAGER_GROUP,
print 'Content-type: text/plain' status='403 Forbidden')
print
print 'You must connect with a valid certificate and be in the %s group to upload.' % PACKAGER_GROUP
sys.exit(0)
print 'Content-Type: text/plain' print 'Content-Type: text/plain'
print print
@ -84,7 +86,8 @@ def main():
hash_type = "md5" hash_type = "md5"
else: else:
send_error('Required checksum is not present.') send_error('Required checksum is not present.',
status='400 Bad Request')
action = None action = None
upload_file = None upload_file = None
@ -103,10 +106,12 @@ def main():
if form.has_key('file'): if form.has_key('file'):
upload_file = form['file'] upload_file = form['file']
if not upload_file.file: if not upload_file.file:
send_error('No file given for upload. Aborting.') send_error('No file given for upload. Aborting.',
status='400 Bad Request')
filename = os.path.basename(upload_file.filename) filename = os.path.basename(upload_file.filename)
else: else:
send_error('Required field "file" is not present.') send_error('Required field "file" is not present.',
status='400 Bad Request')
print >> sys.stderr, '[username=%s] Processing upload request: NAME=%s FILENAME=%s %sSUM=%s' % (username, name, filename, hash_type.upper(), checksum) print >> sys.stderr, '[username=%s] Processing upload request: NAME=%s FILENAME=%s %sSUM=%s' % (username, name, filename, hash_type.upper(), checksum)
module_dir = os.path.join(CACHE_DIR, name) module_dir = os.path.join(CACHE_DIR, name)
@ -121,7 +126,8 @@ def main():
git_dir = os.path.join(GITREPO, '%s.git' % name) git_dir = os.path.join(GITREPO, '%s.git' % name)
if not os.path.isdir(git_dir): if not os.path.isdir(git_dir):
print >> sys.stderr, '[username=%s] Unknown module: %s' % (username, name) print >> sys.stderr, '[username=%s] Unknown module: %s' % (username, name)
send_error('Module "%s" does not exist!' % name) send_error('Module "%s" does not exist!' % name,
status='404 Not Found')
# try to see if we already have this file... # try to see if we already have this file...
dest_file = os.path.join(hash_dir, filename) dest_file = os.path.join(hash_dir, filename)
@ -163,7 +169,8 @@ def main():
check_checksum = m.hexdigest() check_checksum = m.hexdigest()
if checksum != check_checksum: if checksum != check_checksum:
os.unlink(tmpfile) os.unlink(tmpfile)
send_error("%s check failed. Received %s instead of %s." % (hash_type.upper(), check_checksum, checksum)) send_error("%s check failed. Received %s instead of %s." % (hash_type.upper(), check_checksum, checksum),
status='400 Bad Request')
# wow, even the checksum matches. make sure full path is valid now # wow, even the checksum matches. make sure full path is valid now
if not os.path.isdir(hash_dir): if not os.path.isdir(hash_dir):