mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

deploy: detect virustotal size limits while uploading

Browse source 
This prevents the size limits from blocking the whole deploy.
This commit is contained in:
Hans-Christoph Steiner 2019-12-19 10:36:15 +01:00
parent 058b47e484
commit 4fa11ef4fc
No known key found for this signature in database
GPG key ID: 3E177817BA1B9BFA
1 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

35
fdroidserver/server.py
View file

@ -25,6 +25,7 @@ import pwd
import re import re
import subprocess import subprocess
import time import time
import urllib
from argparse import ArgumentParser from argparse import ArgumentParser
import logging import logging
import shutil import shutil
@ -536,18 +537,40 @@ def upload_to_virustotal(repo_section, virustotal_apikey):
elif r.status_code == 204: elif r.status_code == 204:
time.sleep(10) # wait for public API rate limiting time.sleep(10) # wait for public API rate limiting
upload_url = None
if needs_file_upload: if needs_file_upload:
logging.info('Uploading ' + repofilename + ' to virustotal') manual_url = 'https://www.virustotal.com/'
size = os.path.getsize(repofilename)
if size > 200000000:
# VirusTotal API 200MB hard limit
logging.error(_('{path} more than 200MB, manually upload: {url}')
.format(path=repofilename, url=manual_url))
elif size > 32000000:
# VirusTotal API requires fetching a URL to upload bigger files
r = requests.get('https://www.virustotal.com/vtapi/v2/file/scan/upload_url?'
+ urllib.parse.urlencode(data), headers=headers)
if r.status_code == 200:
upload_url = r.json().get('upload_url')
elif r.status_code == 403:
logging.error(_('VirusTotal API key cannot upload files larger than 32MB, '
+ 'use {url} to upload {path}.')
.format(path=repofilename, url=manual_url))
else:
r.raise_for_status()
else:
upload_url = 'https://www.virustotal.com/vtapi/v2/file/scan'
if upload_url:
logging.info(_('Uploading {apkfilename} to virustotal')
.format(apkfilename=repofilename))
files = { files = {
'file': (filename, open(repofilename, 'rb')) 'file': (filename, open(repofilename, 'rb'))
} }
r = requests.post('https://www.virustotal.com/vtapi/v2/file/scan', r = requests.post(upload_url, data=data, headers=headers, files=files)
data=data, headers=headers, files=files) logging.debug(_('If this upload fails, try manually uploading to {url}')
logging.debug('If this upload fails, try manually uploading here:\n' .format(url=manual_url))
+ 'https://www.virustotal.com/')
r.raise_for_status() r.raise_for_status()
response = r.json() response = r.json()
logging.info(response['verbose_msg'] + " " + response['permalink']) logging.info(response['verbose_msg'] + " " + response['permalink'])