danvics/python-validity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implements uunicorn/python-validity#26: Verify hash of downloaded drivers.

Browse source
This commit is contained in:
Arvid Norlander 2020-08-18 16:59:17 +02:00
parent 64438d613a
commit 367df46166
No known key found for this signature in database
GPG key ID: E824A8E5D8D29AA0
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bin/validity-sensors-firmware
View file

@ -19,6 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import argparse import argparse
import hashlib
import os import os
import shutil import shutil
import subprocess import subprocess
@ -28,15 +29,15 @@ import urllib.request
from usb import core as usb_core from usb import core as usb_core
from validitysensor.usb import SupportedDevices
from validitysensor.firmware_tables import FIRMWARE_NAMES, FIRMWARE_URIS from validitysensor.firmware_tables import FIRMWARE_NAMES, FIRMWARE_URIS
from validitysensor.usb import SupportedDevices
python_validity_data = '/usr/share/python-validity/' python_validity_data = '/usr/share/python-validity/'
def download_and_extract_fw(dev_type, fwdir, fwuri=None): def download_and_extract_fw(dev_type, fwdir, fwuri=None):
fwuri = fwuri if fwuri else FIRMWARE_URIS[dev_type]['driver'] fwuri = fwuri if fwuri else FIRMWARE_URIS[dev_type]['driver']
expected_hash = FIRMWARE_URIS[dev_type]['sha512']
fwarchive = os.path.join(fwdir, 'fwinstaller.exe') fwarchive = os.path.join(fwdir, 'fwinstaller.exe')
fwname = FIRMWARE_NAMES[dev_type] fwname = FIRMWARE_NAMES[dev_type]
@ -46,9 +47,17 @@ def download_and_extract_fw(dev_type, fwdir, fwuri=None):
req.add_header('Referer', FIRMWARE_URIS[dev_type].get('referral', '')) req.add_header('Referer', FIRMWARE_URIS[dev_type].get('referral', ''))
req.add_header('User-Agent', 'Mozilla/5.0 (X11; U; Linux)') req.add_header('User-Agent', 'Mozilla/5.0 (X11; U; Linux)')
hash = hashlib.sha512()
with urllib.request.urlopen(req) as response: with urllib.request.urlopen(req) as response:
with open(fwarchive, 'wb') as out_file: with open(fwarchive, 'wb') as out_file:
out_file.write(response.read()) data = response.read()
hash.update(data)
out_file.write(data)
actual_hash = hash.hexdigest()
if actual_hash != expected_hash:
raise Exception('Hash mismatch for driver download! Expected {}, got {}'.format(
expected_hash, actual_hash))
subprocess.check_call([ subprocess.check_call([
'innoextract', '--output-dir', fwdir, '--include', fwname, '--collisions', 'overwrite', 'innoextract', '--output-dir', fwdir, '--include', fwname, '--collisions', 'overwrite',

7
validitysensor/firmware_tables.py
View file

@ -6,14 +6,17 @@ FIRMWARE_URIS = {
SupportedDevices.DEV_90: { SupportedDevices.DEV_90: {
'driver': 'https://download.lenovo.com/pccbbs/mobiles/n1cgn08w.exe', 'driver': 'https://download.lenovo.com/pccbbs/mobiles/n1cgn08w.exe',
'referral': 'https://support.lenovo.com/us/en/downloads/DS120491', 'referral': 'https://support.lenovo.com/us/en/downloads/DS120491',
'sha512': 'd839fa65adf4c952ecb4a5c4b2fc5b5bdedd8e02a421564bdc7fae1d281be4ea26fcde2333f2ab78d56cef0fdccce0a3cf429300b89544cdc9cfee6d0fe0db55'
}, },
SupportedDevices.DEV_97: { SupportedDevices.DEV_97: {
'driver': 'https://download.lenovo.com/pccbbs/mobiles/nz3gf07w.exe', 'driver': 'https://download.lenovo.com/pccbbs/mobiles/nz3gf07w.exe',
'referral': 'https://download.lenovo.com/pccbbs/mobiles/nz3gf07w.exe' 'referral': 'https://download.lenovo.com/pccbbs/mobiles/nz3gf07w.exe',
'sha512': 'a4a4e6058b1ea8ab721953d2cfd775a1e7bc589863d160e5ebbb90344858f147d695103677a8df0b2de0c95345df108bda97196245b067f45630038fb7c807cd'
}, },
SupportedDevices.DEV_9a: { SupportedDevices.DEV_9a: {
'driver': 'https://download.lenovo.com/pccbbs/mobiles/nz3gf07w.exe', 'driver': 'https://download.lenovo.com/pccbbs/mobiles/nz3gf07w.exe',
'referral': 'https://download.lenovo.com/pccbbs/mobiles/nz3gf07w.exe' 'referral': 'https://download.lenovo.com/pccbbs/mobiles/nz3gf07w.exe',
'sha512': 'a4a4e6058b1ea8ab721953d2cfd775a1e7bc589863d160e5ebbb90344858f147d695103677a8df0b2de0c95345df108bda97196245b067f45630038fb7c807cd'
} }
} }