beremiz

Fix crash in runtime if PSK secret is missing

2019-03-13, Andrey Skvortsov
a3ec35ee94e7
Fix crash in runtime if PSK secret is missing

./Beremiz_service.py -s $PWD/psk2.txt -n beremiz /tmp/beremiz
Beremiz_service: 1.2-1378c18402c3+

Traceback (most recent call last):
File "./Beremiz_service.py", line 511, in
ensurePSK(servicename, PSKpath)
File "/home/developer/WorkData/PLC/beremiz/beremiz/runtime/Stunnel.py", line 32, in ensurePSK
PSKgen(ID, PSKpath)
File "/home/developer/WorkData/PLC/beremiz/beremiz/runtime/Stunnel.py", line 23, in PSKgen
call(restart_stunnel_cmdline)
File "/home/developer/WorkData/PLC/beremiz/beremiz/runtime/spawn_subprocess.py", line 116, in call
pid = posix_spawn.posix_spawnp(cmd[0], cmd)
File "/home/developer/.local/lib/python2.7/site-packages/posix_spawn/_impl.py", line 120, in posix_spawnp
return _posix_spawn(lib.posix_spawnp, *args, **kwargs)
File "/home/developer/.local/lib/python2.7/site-packages/posix_spawn/_impl.py", line 111, in _posix_spawn
_check_error(res, path)
File "/home/developer/.local/lib/python2.7/site-packages/posix_spawn/_impl.py", line 10, in _check_error
raise OSError(errno, os.strerror(errno), path)
OSError: [Errno 2] No such file or directory: '/etc/init.d/S50stunnel'
from __future__ import absolute_import
from __future__ import print_function
import os
from binascii import b2a_hqx
try:
from runtime.spawn_subprocess import call
except ImportError:
from subprocess import call
restart_stunnel_cmdline = ["/etc/init.d/S50stunnel", "restart"]
_PSKpath = None
def restartStunnel():
"""
Restart stunnel service using SysV init stript
to apply new generated credentials
"""
try:
call(restart_stunnel_cmdline)
except OSError:
print(_("Couldn't restart stunnel service"))
def PSKgen(ID, PSKpath):
# b2a_hqx output len is 4/3 input len
secret = os.urandom(192) # int(256/1.3333)
secretstring = b2a_hqx(secret)
PSKstring = ID+":"+secretstring
with open(PSKpath, 'w') as f:
f.write(PSKstring)
restartStunnel()
def ensurePSK(ID, PSKpath):
global _PSKpath
_PSKpath = PSKpath
# check if already there
if not os.path.exists(PSKpath):
# create if needed
PSKgen(ID, PSKpath)
def getPSKID(errorlog):
if _PSKpath is not None:
if not os.path.exists(_PSKpath):
errorlog(
'Error: Pre-Shared-Key Secret in %s is missing!\n' % _PSKpath)
return None
ID, _sep, PSK = open(_PSKpath).read().partition(':')
PSK = PSK.rstrip('\n\r')
return (ID, PSK)
return None