beremiz

python runtime: Wamp client now parses PSK file to extract secret from it instead of using the whole file as a secret.
py2compat
15 months ago, Edouard Tisserant
3463e068d069
Parents a0117428183a
Children 7bcc4186e3a7
python runtime: Wamp client now parses PSK file to extract secret from it instead of using the whole file as a secret.
3 files changed, 20 insertions(+), 6 deletions(-)
  • +6 -1
    runtime/PLCObject.py
  • +3 -4
    runtime/Stunnel.py
  • +11 -1
    runtime/WampClient.py
    • --- a/runtime/PLCObject.py Wed Feb 26 16:17:15 2025 +0100
    +++ b/runtime/PLCObject.py Wed Feb 26 16:24:35 2025 +0100
    @@ -573,7 +573,12 @@
    @RunInMain
    def GetPLCID(self):
    - return getPSKID(partial(self.LogMessage, 0))
    + try:
    + res = getPSKID()
    + except Exception as e:
    + self.LogMessage(0, str(e))
    + return ("","")
    + return res
    def _init_blobs(self):
    self.blobs = {} # dict of list
    --- a/runtime/Stunnel.py Wed Feb 26 16:17:15 2025 +0100
    +++ b/runtime/Stunnel.py Wed Feb 26 16:24:35 2025 +0100
    @@ -44,13 +44,12 @@
    PSKgen(ID, PSKpath)
    -def getPSKID(errorlog):
    +def getPSKID():
    if _PSKpath is not None:
    if not os.path.exists(_PSKpath):
    - errorlog(
    + raise Exception(
    '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
    + return ("","")
    --- a/runtime/WampClient.py Wed Feb 26 16:17:15 2025 +0100
    +++ b/runtime/WampClient.py Wed Feb 26 16:24:35 2025 +0100
    @@ -45,6 +45,7 @@
    import formless
    from nevow import tags, url, static
    from runtime import GetPLCObjectSingleton
    +from runtime.Stunnel import getPSKID
    mandatoryConfigItems = ["ID", "active", "realm", "url"]
    @@ -308,7 +309,16 @@
    _WampSecret = wampsecret
    if _WampSecret is not None:
    - WampClientConf["secret"] = LoadWampSecret(_WampSecret)
    + if _WampSecret == _WampSecretDefault:
    + # secret from project dir is raw (no ID prefix)
    + secret = LoadWampSecret(_WampSecret)
    + else:
    + # secret from command line is formated ID:PSK
    + # fall back to PSK data (works because wampsecret is PSKpath)
    + _ID, secret = getPSKID()
    +
    + WampClientConf["secret"] = secret
    +
    else:
    print(_("WAMP authentication has no secret configured"))
    _WampSecret = _WampSecretDefault