Skip to content

Commit

Permalink
Merge pull request #388 from freedomofpress/stop-validating-usb-device
Browse files Browse the repository at this point in the history
Remove check of usb export device in validate-config
  • Loading branch information
redshiftzero authored Dec 20, 2019
2 parents 58a40ce + 5e304c2 commit eebae51
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions scripts/validate-config
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ class SDWConfigValidator(object):
self.confirm_config_file_exists()
self.config = self.read_config_file()
self.confirm_onion_config_valid()
self.confirm_usb_export_device()
self.confirm_submission_privkey_file()
self.confirm_submission_privkey_fingerprint()

Expand Down Expand Up @@ -73,12 +72,6 @@ class SDWConfigValidator(object):
assert "key" in self.config["hidserv"]
assert re.match(TOR_V2_AUTH_COOKIE_REGEX, self.config["hidserv"]["key"])

def confirm_usb_export_device(self):
assert "usb" in self.config
assert "device" in self.config["usb"]
usb_config = self.config["usb"]["device"]
assert usb_config.startswith("sys-usb")

def confirm_submission_privkey_file(self):
secret_key_filename = "sd-journalist.sec"
assert os.path.exists(secret_key_filename)
Expand Down

0 comments on commit eebae51

Please sign in to comment.