beremiz: comparison runtime/WampClient.py

equal deleted inserted replaced

-:921ba5658183
+:d9353e440887
 ("ResetLogCount", {})
 ]
 # de-activated dumb wamp config
 defaultWampConfig = {
 "ID": "wamptest",
 "active": False,
 "realm": "Automation",
 "url": "ws://127.0.0.1:8888"
 }
 # Those two lists are meant to be filled by customized runtime
 # or User python code.
 """ things to do on join (callables) """
 DoOnJoin = []
 lastKnownConfig = None
 def GetCallee(name):
 """ Get Callee or Subscriber corresponding to '.' spearated object path """
 names = name.split('.')
 obj = _PySrv.plcobj
 obj = getattr(obj, names.pop(0))
 return obj
 class WampSession(wamp.ApplicationSession):
 def onConnect(self):
 if "secret" in self.config.extra:
 user = self.config.extra["ID"]
 self.join(u"Automation", [u"wampcra"], user)
 else:
 def onChallenge(self, challenge):
 if challenge.method == u"wampcra":
 if "secret" in self.config.extra:
 secret = self.config.extra["secret"].encode('utf8')
-signature = auth.compute_wcs(secret, challenge.extra['challenge'].encode('utf8'))
+signature = auth.compute_wcs(
+secret, challenge.extra['challenge'].encode('utf8'))
 return signature.decode("ascii")
 else:
 raise Exception("no secret given for authentication")
 else:
-raise Exception("don't know how to handle authmethod {}".format(challenge.method))
+raise Exception(
+"don't know how to handle authmethod {}".format(challenge.method))
 @inlineCallbacks
 def onJoin(self, details):
 global _WampSession
 _WampSession = self
 _transportFactory = None
 print(_('WAMP session left'))
 class ReconnectingWampWebSocketClientFactory(WampWebSocketClientFactory, ReconnectingClientFactory):
 def __init__(self, config, *args, **kwargs):
 global _transportFactory
 WampWebSocketClientFactory.__init__(self, *args, **kwargs)
 try:
 self.resetDelay()
 return ReconnectingClientFactory.buildProtocol(self, addr)
 def clientConnectionFailed(self, connector, reason):
 if self.continueTrying:
-print(_("WAMP Client connection failed (%s) .. retrying ..") % time.ctime())
+print(_("WAMP Client connection failed (%s) .. retrying ..") %
-super(ReconnectingWampWebSocketClientFactory, self).clientConnectionFailed(connector, reason)
+time.ctime())
+super(ReconnectingWampWebSocketClientFactory,
+self).clientConnectionFailed(connector, reason)
 else:
 del connector
 def clientConnectionLost(self, connector, reason):
 if self.continueTrying:
-print(_("WAMP Client connection lost (%s) .. retrying ..") % time.ctime())
+print(_("WAMP Client connection lost (%s) .. retrying ..") %
-super(ReconnectingWampWebSocketClientFactory, self).clientConnectionFailed(connector, reason)
+time.ctime())
+super(ReconnectingWampWebSocketClientFactory,
+self).clientConnectionFailed(connector, reason)
 else:
 del connector
 def CheckConfiguration(WampClientConf):
 url = WampClientConf["url"]
 if not IsCorrectUri(url):
 raise annotate.ValidateError(
-{"url":"Invalid URL: {}".format(url)},
+{"url": "Invalid URL: {}".format(url)},
 _("WAMP configuration error:"))
 def GetConfiguration():
 global lastKnownConfig
 if os.path.exists(_WampConf):
 WampClientConf = json.load(open(_WampConf))
 else:
 WampClientConf = defaultWampConfig.copy()
 for itemName in mandatoryConfigItems:
-if WampClientConf.get(itemName, None) is None :
+if WampClientConf.get(itemName, None) is None:
-raise Exception(_("WAMP configuration error : missing '{}' parameter.").format(itemName))
+raise Exception(
+_("WAMP configuration error : missing '{}' parameter.").format(itemName))
 CheckConfiguration(WampClientConf)
 lastKnownConfig = WampClientConf.copy()
 return WampClientConf
 def SetWampSecret(wampSecret):
 with open(os.path.realpath(_WampSecret), 'w') as f:
 f.write(wampSecret)
 def SetConfiguration(WampClientConf):
 global lastKnownConfig
 CheckConfiguration(WampClientConf)
 lastKnownConfig = WampClientConf.copy()
 with open(os.path.realpath(_WampConf), 'w') as f:
 json.dump(WampClientConf, f, sort_keys=True, indent=4)
 if 'active' in WampClientConf and WampClientConf['active']:
 if _transportFactory and _WampSession:
 StopReconnectWampClient()
 return WampClientConf
 def LoadWampSecret(secretfname):
 WSClientWampSecret = open(secretfname, 'rb').read()
-if len(WSClientWampSecret) == 0 :
+if len(WSClientWampSecret) == 0:
 raise Exception(_("WAMP secret empty"))
 return WSClientWampSecret
 def IsCorrectUri(uri):
 WampClientConf = GetConfiguration()
 # set secret file path only if not already set
 if _WampSecret is None:
-# default project's wamp secret also has precedance over commandline given
+# default project's wamp secret also
+# has precedance over commandline given
 if os.path.exists(_WampSecretDefault):
 _WampSecret = _WampSecretDefault
 else:
 _WampSecret = wampsecret
 if _WampSecret is not None:
 WampClientConf["secret"] = LoadWampSecret(_WampSecret)
-else :
+else:
 print(_("WAMP authentication has no secret configured"))
 _WampSecret = _WampSecretDefault
 if not WampClientConf["active"]:
 print(_("WAMP deactivated in configuration"))
 url=WampClientConf["url"],
 serializers=[MsgPackSerializer()])
 # start the client from a Twisted endpoint
 if _transportFactory:
-conn = connectWS(_transportFactory)
+connectWS(_transportFactory)
 print(_("WAMP client connecting to :"), WampClientConf["url"])
 return True
 else:
 print(_("WAMP client can not connect to :"), WampClientConf["url"])
 return False
 def StopReconnectWampClient():
-if _transportFactory is not None :
+if _transportFactory is not None:
 _transportFactory.stopTrying()
-if _WampSession is not None :
+if _WampSession is not None:
 _WampSession.leave()
 def StartReconnectWampClient():
 if _WampSession:
 def GetSession():
 return _WampSession
 def getWampStatus():
-if _transportFactory is not None :
+if _transportFactory is not None:
-if _WampSession is not None :
+if _WampSession is not None:
-if _WampSession.is_attached() :
+if _WampSession.is_attached():
 return "Attached"
 return "Established"
 return "Connecting"
 return "Disconnected"
 def SetServer(pysrv):
 _PySrv = pysrv
-#### WEB CONFIGURATION INTERFACE ####
+# WEB CONFIGURATION INTERFACE
 WAMP_SECRET_URL = "secret"
 webExposedConfigItems = ['active', 'url', 'ID']
-def wampConfigDefault(ctx,argument):
-if lastKnownConfig is not None :
+def wampConfigDefault(ctx, argument):
+if lastKnownConfig is not None:
 return lastKnownConfig.get(argument.name, None)
 def wampConfig(**kwargs):
 secretfile_field = kwargs["secretfile"]
 if secretfile_field is not None:
 secretfile = getattr(secretfile_field, "file", None)
 SetWampSecret(secret)
 newConfig = lastKnownConfig.copy()
 for argname in webExposedConfigItems:
 arg = kwargs.get(argname, None)
-if arg is not None :
+if arg is not None:
 newConfig[argname] = arg
 SetConfiguration(newConfig)
 class FileUploadDownload(annotate.FileUpload):
 pass
 class FileUploadDownloadRenderer(webform.FileUploadRenderer):
 def input(self, context, slot, data, name, value):
+# pylint: disable=expression-not-assigned
 slot[_("Upload:")]
-slot = webform.FileUploadRenderer.input(self, context, slot, data, name, value)
+slot = webform.FileUploadRenderer.input(
+self, context, slot, data, name, value)
 download_url = data.typedValue.getAttribute('download_url')
 return slot[tags.a(href=download_url)[_("Download")]]
-registerAdapter(FileUploadDownloadRenderer, FileUploadDownload, formless.iformless.ITypedRenderer)
+registerAdapter(FileUploadDownloadRenderer, FileUploadDownload,
+formless.iformless.ITypedRenderer)
 def getDownloadUrl(ctx, argument):
-if lastKnownConfig is not None :
+if lastKnownConfig is not None:
 return url.URL.fromContext(ctx).\
 child(WAMP_SECRET_URL).\
-child(lastKnownConfig["ID"]+".secret")
+child(lastKnownConfig["ID"] + ".secret")
 webFormInterface = [
 ("status",
 annotate.String(label=_("Current status"),
-immutable = True,
+immutable=True,
-default = lambda *k:getWampStatus())),
+default=lambda *k:getWampStatus())),
 ("ID",
 annotate.String(label=_("ID"),
-default = wampConfigDefault)),
+default=wampConfigDefault)),
 ("secretfile",
-FileUploadDownload(
+FileUploadDownload(label=_("File containing secret for that ID"),
-label = _("File containing secret for that ID"),
+download_url=getDownloadUrl)),
-download_url = getDownloadUrl,
-)),
 ("active",
 annotate.Boolean(label=_("Enable WAMP connection"),
 default=wampConfigDefault)),
 ("url",
 annotate.String(label=_("WAMP Server URL"),
 default=wampConfigDefault))]
 def deliverWampSecret(ctx, segments):
-filename = segments[1].decode('utf-8')
+# filename = segments[1].decode('utf-8')
 # FIXME: compare filename to ID+".secret"
 # for now all url under /secret returns the secret
-# TODO: make beutifull message in case of exception
+# TODO: make beautifull message in case of exception
 # while loading secret (if empty or dont exist)
 secret = LoadWampSecret(_WampSecret)
-return static.Data(secret, 'application/octet-stream'),()
+return static.Data(secret, 'application/octet-stream'), ()
 def RegisterWebSettings(NS):
 NS.ConfigurableSettings.addExtension(
 "wamp",
 _("Wamp Settings"),
 webFormInterface,
 _("Set"),
 wampConfig)
 NS.customSettingsURLs[WAMP_SECRET_URL] = deliverWampSecret

changeset 2248	d9353e440887
parent 2223	909216419e45
child 2260	74205edac761