kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-08-16 11:20:10 +02:00
Code Activity

deploy: show HTTP errors when virustotal error fails.

Browse Source 
Otherwise, this was posting mystery JSON parsing errors because it was
trying to parse the HTTP error page as JSON.  This also moves the
virustotal API key to post data so it is not printed out in the stacktrace.
This commit is contained in:
Hans-Christoph Steiner 2019-03-22 10:54:28 +01:00
parent 9b44dcd073
commit 06ef99be6a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdroidserver/server.py
View File

@ -501,14 +501,14 @@ def upload_to_virustotal(repo_section, vt_apikey):
headers = {
"User-Agent": "F-Droid"
}
params = {
data = {
'apikey': vt_apikey,
'resource': package['hash'],
}
needs_file_upload = False
while True:
r = requests.post('https://www.virustotal.com/vtapi/v2/file/report',
params=params, headers=headers)
data=data, headers=headers)
if r.status_code == 200:
response = r.json()
if response['response_code'] == 0:
@ -535,7 +535,10 @@ def upload_to_virustotal(repo_section, vt_apikey):
'file': (filename, open(repofilename, 'rb'))
}
r = requests.post('https://www.virustotal.com/vtapi/v2/file/scan',
params=params, headers=headers, files=files)
data=data, headers=headers, files=files)
logging.debug('If this upload fails, try manually uploading here:\n'
+ 'https://www.virustotal.com/')
r.raise_for_status()
response = r.json()
logging.info(response['verbose_msg'] + " " + response['permalink'])