diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-10-17 14:46:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-17 14:46:17 +0100 |
| commit | 7216c76654bbb57bc0ebc27498de7eda247f8ffb (patch) | |
| tree | d8eab4dc12de21a062b67c9bbd5fa54fc6de223c /synapse/config/tls.py | |
| parent | Merge pull request #2546 from matrix-org/rav/remove_dead_event_injector (diff) | |
| download | synapse-7216c76654bbb57bc0ebc27498de7eda247f8ffb.tar.xz | |
Improve error handling for missing files (#2551)
`os.path.exists` doesn't allow us to distinguish between permissions errors and the path actually not existing, which repeatedly confuses people. It also means that we try to overwrite existing key files, which is super-confusing. (cf issues #2455, #2379). Use os.stat instead. Also, don't recomemnd the the use of --generate-config, which screws everything up if you're using debian (cf #2455).
Diffstat (limited to 'synapse/config/tls.py')
| -rw-r--r-- | synapse/config/tls.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py index e081840a83..247f18f454 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -126,7 +126,7 @@ class TlsConfig(Config): tls_private_key_path = config["tls_private_key_path"] tls_dh_params_path = config["tls_dh_params_path"] - if not os.path.exists(tls_private_key_path): + if not self.path_exists(tls_private_key_path): with open(tls_private_key_path, "w") as private_key_file: tls_private_key = crypto.PKey() tls_private_key.generate_key(crypto.TYPE_RSA, 2048) @@ -141,7 +141,7 @@ class TlsConfig(Config): crypto.FILETYPE_PEM, private_key_pem ) - if not os.path.exists(tls_certificate_path): + if not self.path_exists(tls_certificate_path): with open(tls_certificate_path, "w") as certificate_file: cert = crypto.X509() subject = cert.get_subject() @@ -159,7 +159,7 @@ class TlsConfig(Config): certificate_file.write(cert_pem) - if not os.path.exists(tls_dh_params_path): + if not self.path_exists(tls_dh_params_path): if GENERATE_DH_PARAMS: subprocess.check_call([ "openssl", "dhparam", |