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'
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# This file is part of Beremiz.
# See COPYING file for copyrights details.
from __future__ import absolute_import
from plcopen.XSLTModelQuery import XSLTModelQuery
from plcopen.types_enums import *
class InstanceTagName(object):
"""Helpers object for generating instance tagname"""
def __init__(self):
self.TagName = None
def GetTagName(self):
return self.TagName
def ConfigTagName(self, context, *args):
self.TagName = ComputeConfigurationName(args[0][0])
def ResourceTagName(self, context, *args):
self.TagName = ComputeConfigurationResourceName(args[0][0], args[1][0])
def PouTagName(self, context, *args):
self.TagName = ComputePouName(args[0][0])
def ActionTagName(self, context, *args):
self.TagName = ComputePouActionName(args[0][0], args[0][1])
def TransitionTagName(self, context, *args):
self.TagName = ComputePouTransitionName(args[0][0], args[0][1])
class InstanceTagnameCollector(XSLTModelQuery):
""" object for collecting instances path list"""
def __init__(self, controller):
XSLTModelQuery.__init__(self,
controller,
"instance_tagname.xslt",
[(name, self.FactoryCaller(name))
for name in ["ConfigTagName",
"ResourceTagName",
"PouTagName",
"ActionTagName",
"TransitionTagName"]])
def FactoryCaller(self, funcname):
def CallFactory(*args):
return getattr(self.factory, funcname)(*args)
return CallFactory
def Collect(self, root, debug, instance_path):
self.factory = InstanceTagName()
self._process_xslt(root, debug, instance_path=instance_path)
res = self.factory.GetTagName()
self.factory = None
return res