forked from platypush/platypush
[core] The generation of RSA keys should be behind shared process locks.
This commit is contained in:
parent
cf813e4197
commit
2cbb005c67
1 changed files with 15 additions and 12 deletions
|
@ -14,6 +14,7 @@ import socket
|
|||
import ssl
|
||||
import time
|
||||
import urllib.request
|
||||
from collections import defaultdict
|
||||
from importlib.machinery import SourceFileLoader
|
||||
from importlib.util import spec_from_loader, module_from_spec
|
||||
from multiprocessing import Lock as PLock
|
||||
|
@ -29,6 +30,7 @@ logger = logging.getLogger('utils')
|
|||
Lock = Union[PLock, TLock] # type: ignore
|
||||
|
||||
redis_pools: dict[Tuple[str, int], ConnectionPool] = {}
|
||||
key_locks: dict[str, Lock] = defaultdict(PLock)
|
||||
|
||||
|
||||
def get_module_and_method_from_action(action):
|
||||
|
@ -564,6 +566,7 @@ def get_or_generate_stored_rsa_key_pair(
|
|||
priv_key_file = os.path.join(keydir, os.path.basename(keyfile))
|
||||
pub_key_file = priv_key_file + '.pub'
|
||||
|
||||
with key_locks[keyfile]:
|
||||
if os.path.isfile(priv_key_file) and os.path.isfile(pub_key_file):
|
||||
with open(pub_key_file, 'r') as f1, open(priv_key_file, 'r') as f2:
|
||||
return (
|
||||
|
|
Loading…
Reference in a new issue