Pārlūkot izejas kodu

Evaluate client cert paths relative to config file

master
JustAnotherArchivist pirms 4 gadiem
vecāks
revīzija
b9b2eedcaf
1 mainītis faili ar 2 papildinājumiem un 0 dzēšanām
  1. +2
    -0
      http2irc.py

+ 2
- 0
http2irc.py Parādīt failu

@@ -96,6 +96,7 @@ class Config(dict):
if 'certfile' in obj['irc']: if 'certfile' in obj['irc']:
if not isinstance(obj['irc']['certfile'], str): if not isinstance(obj['irc']['certfile'], str):
raise InvalidConfig('Invalid certificate file: not a string') raise InvalidConfig('Invalid certificate file: not a string')
obj['irc']['certfile'] = os.path.abspath(os.path.join(os.path.dirname(self._filename), obj['irc']['certfile']))
if not os.path.isfile(obj['irc']['certfile']): if not os.path.isfile(obj['irc']['certfile']):
raise InvalidConfig('Invalid certificate file: not a regular file') raise InvalidConfig('Invalid certificate file: not a regular file')
if not is_valid_pem(obj['irc']['certfile'], True): if not is_valid_pem(obj['irc']['certfile'], True):
@@ -103,6 +104,7 @@ class Config(dict):
if 'certkeyfile' in obj['irc']: if 'certkeyfile' in obj['irc']:
if not isinstance(obj['irc']['certkeyfile'], str): if not isinstance(obj['irc']['certkeyfile'], str):
raise InvalidConfig('Invalid certificate key file: not a string') raise InvalidConfig('Invalid certificate key file: not a string')
obj['irc']['certkeyfile'] = os.path.abspath(os.path.join(os.path.dirname(self._filename), obj['irc']['certkeyfile']))
if not os.path.isfile(obj['irc']['certkeyfile']): if not os.path.isfile(obj['irc']['certkeyfile']):
raise InvalidConfig('Invalid certificate key file: not a regular file') raise InvalidConfig('Invalid certificate key file: not a regular file')
if not is_valid_pem(obj['irc']['certkeyfile'], False): if not is_valid_pem(obj['irc']['certkeyfile'], False):


Notiek ielāde…
Atcelt
Saglabāt