release-engineering/dist-git
1
0
Fork 0
mirror of https://github.com/release-engineering/dist-git.git synced 2025-02-23 15:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move form hash parsing to its own function

Browse source
This commit is contained in:
Jakub Kadlcik 2020-05-01 13:30:50 +02:00
parent 77dccfad21
commit 5c4de58f41
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
scripts/httpd/upload.cgi
View file

@ -122,6 +122,24 @@ def ensure_namespaced(name, namespace):
return name
def get_checksum_and_hash_type(form):
# Search for the file hash, start with stronger hash functions
if 'sha512sum' in form:
checksum = check_form(form, 'sha512sum')
hash_type = "sha512"
elif 'md5sum' in form:
# Fallback on md5
checksum = check_form(form, 'md5sum')
hash_type = "md5"
else:
send_error('Required checksum is not present',
status='400 Bad Request')
return checksum, hash_type
def emit_fedmsg(config, name, checksum, filename, username, msgpath):
# Emit a fedmsg message. Load the config to talk to the fedmsg-relay.
if config.getboolean('upload', 'fedmsgs', fallback=True):
@ -168,20 +186,7 @@ def main():
assert os.environ['REQUEST_URI'].split('/')[1] == 'repo'
name = check_form(form, 'name').strip('/')
# Search for the file hash, start with stronger hash functions
if 'sha512sum' in form:
checksum = check_form(form, 'sha512sum')
hash_type = "sha512"
elif 'md5sum' in form:
# Fallback on md5, as it's what we currently use
checksum = check_form(form, 'md5sum')
hash_type = "md5"
else:
send_error('Required checksum is not present.',
status='400 Bad Request')
checksum, hash_type = get_checksum_and_hash_type(form)
action = None
upload_file = None