commit 5f3e8e311013d76db1dc62b21f66f0f3ce371c44 Author: Arturo Filastò arturo@filasto.net Date: Tue Sep 13 13:00:11 2016 +0200
The updater needs to be updated --- data/updater.py | 6 +++--- ooni/ui/web/client/index.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/updater.py b/data/updater.py index f7225dd..4cacf3d 100755 --- a/data/updater.py +++ b/data/updater.py @@ -133,7 +133,7 @@ class InvalidPublicKey(Exception): pass
-def verify_file(signature_path, signer_pk_path): +def verify_file(signature_path, file_path, signer_pk_path): tmp_dir = tempfile.mkdtemp() tmp_key = os.path.join(tmp_dir, "signing-key.gpg")
@@ -148,7 +148,7 @@ def verify_file(signature_path, signer_pk_path): output = check_output(["gpg", "--batch", "--status-fd", "1", "--no-default-keyring", "--keyring", tmp_key, "--trust-model", "always", - "--verify", signature_path]) + "--verify", signature_path, file_path]) except CalledProcessError: raise InvalidSignature
@@ -188,7 +188,7 @@ def perform_update(version, skip_verification=False):
if skip_verification is not True: try: - verify_file(updater_sig_path, PUBLIC_KEY_PATH) + verify_file(updater_sig_path, updater_path, PUBLIC_KEY_PATH) except InvalidSignature: logging.error("Found an invalid signature. Bailing") raise UpdateFailed diff --git a/ooni/ui/web/client/index.html b/ooni/ui/web/client/index.html index ecb4cdb..357b6eb 100644 --- a/ooni/ui/web/client/index.html +++ b/ooni/ui/web/client/index.html @@ -13,5 +13,5 @@ <app> Loading... </app> - <script type="text/javascript" src="app.bundle.js?5432cc07ccbd2f5613be"></script></body> + <script type="text/javascript" src="app.bundle.js?43676d3982a3c11023d3"></script></body> </html>