summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--module/plugins/hooks/XMPPInterface.py140
1 files changed, 73 insertions, 67 deletions
diff --git a/module/plugins/hooks/XMPPInterface.py b/module/plugins/hooks/XMPPInterface.py
index dc6928127..8b186ec98 100644
--- a/module/plugins/hooks/XMPPInterface.py
+++ b/module/plugins/hooks/XMPPInterface.py
@@ -18,7 +18,8 @@
@interface-version: 0.2
"""
-from pyxmpp.all import JID,Message
+from pyxmpp import streamtls
+from pyxmpp.all import JID, Message
from pyxmpp.jabber.client import JabberClient
from pyxmpp.interface import implements
from pyxmpp.interfaces import *
@@ -30,81 +31,87 @@ class XMPPInterface(IRCInterface, JabberClient):
__version__ = "0.1"
__description__ = """connect to jabber and let owner perform different tasks"""
__config__ = [("activated", "bool", "Activated", "False"),
- ("jid", "str", "Jabber ID", "user@exmaple-jabber-server.org"),
- ("pw", "str", "Password", ""),
- ("owners", "str", "List of JIDs accepting commands from", "me@icq-gateway.org;some@msn-gateway.org"),
- ("info_file", "bool", "Inform about every file finished", "False"),
- ("info_pack", "bool", "Inform about every package finished", "True"),
- ("captcha", "bool", "Send captcha requests", "True")]
+ ("jid", "str", "Jabber ID", "user@exmaple-jabber-server.org"),
+ ("pw", "str", "Password", ""),
+ ("tls", "bool", "Use TLS", False),
+ ("owners", "str", "List of JIDs accepting commands from", "me@icq-gateway.org;some@msn-gateway.org"),
+ ("info_file", "bool", "Inform about every file finished", "False"),
+ ("info_pack", "bool", "Inform about every package finished", "True"),
+ ("captcha", "bool", "Send captcha requests", "True")]
__author_name__ = ("RaNaN")
__author_mail__ = ("RaNaN@pyload.org")
-
+
implements(IMessageHandlersProvider)
-
+
def __init__(self, core):
IRCInterface.__init__(self, core)
-
+
self.jid = JID(self.getConfig("jid"))
password = self.getConfig("pw")
-
+
# if bare JID is provided add a resource -- it is required
if not self.jid.resource:
- self.jid=JID(self.jid.node, self.jid.domain, "pyLoad")
-
- tls_settings = None
+ self.jid = JID(self.jid.node, self.jid.domain, "pyLoad")
+
+ if self.getConfig("tls"):
+ tls_settings = streamtls.TLSSettings(require=True, verify_peer=False)
+ auth = ("sasl:PLAIN", "sasl:DIGEST-MD5")
+ else:
+ tls_settings = None
+ auth = ("sasl:DIGEST-MD5", "digest")
# setup client with provided connection information
# and identity data
JabberClient.__init__(self, self.jid, password,
- disco_name="pyLoad XMPP Client", disco_type="bot",
- tls_settings = tls_settings)
+ disco_name="pyLoad XMPP Client", disco_type="bot",
+ tls_settings=tls_settings, auth_methods=auth)
self.interface_providers = [
VersionHandler(self),
self,
- ]
-
+ ]
+
def coreReady(self):
self.new_package = {}
-
+
self.start()
-
+
def packageFinished(self, pypack):
-
try:
if self.getConfig("info_pack"):
self.announce(_("Package finished: %s") % pypack.name)
except:
pass
-
+
def downloadFinished(self, pyfile):
try:
if self.getConfig("info_file"):
- self.announce(_("Download finished: %(name)s @ %(plugin)s") % {"name": pyfile.name, "plugin": pyfile.pluginname} )
+ self.announce(
+ _("Download finished: %(name)s @ %(plugin)s") % {"name": pyfile.name, "plugin": pyfile.pluginname})
except:
pass
-
+
def run(self):
# connect to IRC etc.
self.connect()
- try:
+ try:
self.loop(1)
except Exception, ex:
self.core.log.error("pyLoad XMPP: %s" % str(ex))
-
- def stream_state_changed(self,state,arg):
+
+ def stream_state_changed(self, state, arg):
"""This one is called when the state of stream connecting the component
to a server changes. This will usually be used to let the user
know what is going on."""
- self.log.debug("pyLoad XMPP: *** State changed: %s %r ***" % (state,arg) )
+ self.log.debug("pyLoad XMPP: *** State changed: %s %r ***" % (state, arg))
def disconnected(self):
self.log.debug("pyLoad XMPP: Client was disconnected")
- def stream_closed(self,stream):
+ def stream_closed(self, stream):
self.log.debug("pyLoad XMPP: Stream was closed | %s" % stream)
- def stream_error(self,err):
+ def stream_error(self, err):
self.log.debug("pyLoad XMPP: Stream Error: %s" % err)
def get_message_handlers(self):
@@ -113,36 +120,35 @@ class XMPPInterface(IRCInterface, JabberClient):
The handlers returned will be called when matching message is received
in a client session."""
return [
- ("normal", self.message),
- ]
+ ("normal", self.message),
+ ]
- def message(self,stanza):
+ def message(self, stanza):
"""Message handler for the component."""
- subject=stanza.get_subject()
- body=stanza.get_body()
- t=stanza.get_type()
- self.log.debug(u'pyLoad XMPP: Message from %s received.' % (unicode(stanza.get_from(),)))
- self.log.debug(u'pyLoad XMPP: Body: %s Subject: %s Type: %s' % (body,subject,t))
-
- if t=="headline":
+ subject = stanza.get_subject()
+ body = stanza.get_body()
+ t = stanza.get_type()
+ self.log.debug(u'pyLoad XMPP: Message from %s received.' % (unicode(stanza.get_from(), )))
+ self.log.debug(u'pyLoad XMPP: Body: %s Subject: %s Type: %s' % (body, subject, t))
+
+ if t == "headline":
# 'headline' messages should never be replied to
return True
if subject:
- subject=u"Re: "+subject
-
+ subject = u"Re: " + subject
+
to_jid = stanza.get_from()
from_jid = stanza.get_to()
#j = JID()
to_name = to_jid.as_utf8()
from_name = from_jid.as_utf8()
-
+
names = self.getConfig("owners").split(";")
-
- if to_name in names or to_jid.node+"@"+to_jid.domain in names:
-
+
+ if to_name in names or to_jid.node + "@" + to_jid.domain in names:
messages = []
-
+
trigger = "pass"
args = None
@@ -153,38 +159,37 @@ class XMPPInterface(IRCInterface, JabberClient):
args = temp[1:]
except:
pass
-
+
handler = getattr(self, "event_%s" % trigger, self.event_pass)
try:
res = handler(args)
for line in res:
- m=Message(
+ m = Message(
to_jid=to_jid,
from_jid=from_jid,
stanza_type=stanza.get_type(),
subject=subject,
body=line)
-
+
messages.append(m)
except Exception, e:
- self.log.error("pyLoad XMPP: "+ repr(e))
-
+ self.log.error("pyLoad XMPP: " + repr(e))
+
return messages
-
+
else:
return True
def response(self, msg, origin=""):
return self.announce(msg)
-
+
def announce(self, message):
""" send message to all owners"""
for user in self.getConfig("owners").split(";"):
-
self.log.debug("pyLoad XMPP: Send message to %s" % user)
-
+
to_jid = JID(user)
-
+
m = Message(from_jid=self.jid,
to_jid=to_jid,
stanza_type="chat",
@@ -194,7 +199,7 @@ class XMPPInterface(IRCInterface, JabberClient):
if not stream:
self.connect()
stream = self.get_stream()
-
+
stream.send(m)
def beforeReconnecting(self, ip):
@@ -202,13 +207,14 @@ class XMPPInterface(IRCInterface, JabberClient):
def afterReconnecting(self, ip):
self.connect()
-
+
+
class VersionHandler(object):
"""Provides handler for a version query.
This class will answer version query and announce 'jabber:iq:version' namespace
in the client's disco#info results."""
-
+
implements(IIqHandlersProvider, IFeaturesProvider)
def __init__(self, client):
@@ -224,22 +230,22 @@ class VersionHandler(object):
"""Return list of tuples (element_name, namespace, handler) describing
handlers of <iq type='get'/> stanzas"""
return [
- ("query", "jabber:iq:version", self.get_version),
- ]
+ ("query", "jabber:iq:version", self.get_version),
+ ]
def get_iq_set_handlers(self):
"""Return empty list, as this class provides no <iq type='set'/> stanza handler."""
return []
- def get_version(self,iq):
+ def get_version(self, iq):
"""Handler for jabber:iq:version queries.
jabber:iq:version queries are not supported directly by PyXMPP, so the
XML node is accessed directly through the libxml2 API. This should be
used very carefully!"""
- iq=iq.make_result_response()
- q=iq.new_query("jabber:iq:version")
- q.newTextChild(q.ns(),"name","Echo component")
- q.newTextChild(q.ns(),"version","1.0")
+ iq = iq.make_result_response()
+ q = iq.new_query("jabber:iq:version")
+ q.newTextChild(q.ns(), "name", "Echo component")
+ q.newTextChild(q.ns(), "version", "1.0")
return iq
\ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-23 04:54:31 +0100