beremiz

fd9bfe601d10
WAMP: enhance feedback for connection problems from IDE or CLI

In case of authentication or TLS error, explicit warning is addressed to user through log messages.
import os
from binascii import b2a_base64
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):
# secret string length is 256
# b2a_base64 output len is 4/3 input len
secret = os.urandom(192) # int(256/1.3333)
secretstring = b2a_base64(secret)
PSKstring = ID+":"+secretstring.decode()
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():
if _PSKpath is not None:
if not os.path.exists(_PSKpath):
raise Exception(
'Error: Pre-Shared-Key Secret in %s is missing!\n' % _PSKpath)
ID, _sep, PSK = open(_PSKpath).read().partition(':')
PSK = PSK.rstrip('\n\r')
return (ID, PSK)
return ("","")