Add error checking in places, set up automatic relay provisioning and fix starting bots
This commit is contained in:
@@ -1,14 +1,16 @@
|
||||
from twisted.internet.ssl import DefaultOpenSSLContextFactory
|
||||
import json
|
||||
|
||||
import modules.alias as alias
|
||||
from twisted.internet import reactor
|
||||
from core.bot import IRCBot, IRCBotFactory
|
||||
from twisted.internet.ssl import DefaultOpenSSLContextFactory
|
||||
import main
|
||||
from utils.logging.log import *
|
||||
from utils.getrelay import getRelay
|
||||
|
||||
class Network:
|
||||
def __init__(self, name, host, port, security, auth):
|
||||
self.name = name
|
||||
def __init__(self, net, host, port, security, auth):
|
||||
self.net = net
|
||||
self.host = host
|
||||
self.port = port
|
||||
self.security = security
|
||||
@@ -18,40 +20,39 @@ class Network:
|
||||
self.relays = {}
|
||||
self.aliases = {}
|
||||
|
||||
def add_relay(self, host, port, user, password):
|
||||
self.last += 1
|
||||
self.relays[self.last] = {
|
||||
"host": host,
|
||||
"port": port,
|
||||
"user": user,
|
||||
"password": password,
|
||||
def add_relay(self, num=None):
|
||||
if not num:
|
||||
self.last += 1
|
||||
num = self.last
|
||||
self.relays[num] = {
|
||||
"enabled": False,
|
||||
"net": self.name,
|
||||
"id": self.last
|
||||
"net": self.net,
|
||||
"id": num
|
||||
}
|
||||
self.aliases[self.last] = alias.generate_alias()
|
||||
return self.last, self.aliases[self.last]["nick"]
|
||||
self.aliases[num] = alias.generate_alias()
|
||||
return num, self.aliases[num]["nick"]
|
||||
|
||||
def delete_relay(self, id):
|
||||
del self.relays[id]
|
||||
del self.aliases[id]
|
||||
|
||||
def start_bot(self, relay):
|
||||
def start_bot(self, num):
|
||||
# a single name is given to relays in the backend
|
||||
# e.g. freenode1 for the first relay on freenode network
|
||||
name = self.name + relay
|
||||
keyFN = main.certPath+main.config["Key"]
|
||||
certFN = main.certPath+main.config["Certificate"]
|
||||
contextFactory = DefaultOpenSSLContextFactory(keyFN.encode("utf-8", "replace"), certFN.encode("utf-8", "replace"))
|
||||
bot = IRCBotFactory(name)
|
||||
rct = reactor.connectSSL(k, port, bot, contextFactory)
|
||||
|
||||
bot = IRCBotFactory(self.net, num)
|
||||
#host, port = self.relays[num]["host"], self.relays[num]["port"]
|
||||
host, port = getRelay(num)
|
||||
rct = reactor.connectSSL(host, port, bot, contextFactory)
|
||||
name = self.net + str(num)
|
||||
main.ReactorPool[name] = rct
|
||||
main.FactoryPool[name] = bot
|
||||
|
||||
log("Started bot on relay %s on %s", (relay, self.host))
|
||||
log("Started bot on relay %s on %s" % (num, self.host))
|
||||
|
||||
def start_bots(self):
|
||||
for relay in self.relays:
|
||||
if relay["enabled"]:
|
||||
start_bot(relay)
|
||||
for num in self.relays.keys():
|
||||
if self.relays[num]["enabled"]:
|
||||
self.start_bot(num)
|
||||
|
||||
@@ -1,36 +1,35 @@
|
||||
import main
|
||||
from core.bot import deliverRelayCommands
|
||||
from utils.logging.log import *
|
||||
from core.helper import startBot
|
||||
|
||||
def provisionUserData(relay, alias, nick, altnick, ident, realname, password):
|
||||
def provisionUserData(num, nick, altnick, ident, realname, unused): # last field is password, which we don't want to inherit here, but still want to use * expansion, so this is a bit of a hack
|
||||
commands = {}
|
||||
commands["controlpanel"] = []
|
||||
commands["controlpanel"].append("AddUser %s %s" % (alias, password))
|
||||
commands["controlpanel"].append("Set Nick %s %s" % (alias, nick))
|
||||
commands["controlpanel"].append("Set Altnick %s %s" % (alias, altnick))
|
||||
commands["controlpanel"].append("Set Ident %s %s" % (alias, ident))
|
||||
commands["controlpanel"].append("Set RealName %s %s" % (alias, realname))
|
||||
deliverRelayCommands(relay, commands)
|
||||
commands["controlpanel"].append("AddUser %s %s" % (nick, main.config["Relay"]["Password"]))
|
||||
commands["controlpanel"].append("Set Nick %s %s" % (nick, nick))
|
||||
commands["controlpanel"].append("Set Altnick %s %s" % (nick, altnick))
|
||||
commands["controlpanel"].append("Set Ident %s %s" % (nick, ident))
|
||||
commands["controlpanel"].append("Set RealName %s %s" % (nick, realname))
|
||||
deliverRelayCommands(num, commands)
|
||||
return
|
||||
|
||||
def provisionNetworkData(relay, alias, network, host, port, security, auth, password):
|
||||
def provisionNetworkData(num, nick, network, host, port, security, auth, password):
|
||||
commands = {}
|
||||
stage2commands = {}
|
||||
stage3commands = {}
|
||||
commands["controlpanel"] = []
|
||||
commands["controlpanel"].append("AddNetwork %s %s" % (alias, network))
|
||||
commands["controlpanel"].append("AddNetwork %s %s" % (nick, network))
|
||||
if security == "ssl":
|
||||
commands["controlpanel"].append("SetNetwork TrustAllCerts %s %s true" % (alias, network)) # Don't judge me
|
||||
commands["controlpanel"].append("AddServer %s %s %s +%s" % (alias, network, host, port))
|
||||
commands["controlpanel"].append("SetNetwork TrustAllCerts %s %s true" % (nick, network)) # Don't judge me
|
||||
commands["controlpanel"].append("AddServer %s %s %s +%s" % (nick, network, host, port))
|
||||
elif security == "plain":
|
||||
commands["controlpanel"].append("AddServer %s %s %s %s" % (alias, network, host, port))
|
||||
commands["controlpanel"].append("AddServer %s %s %s %s" % (nick, network, host, port))
|
||||
if auth == "sasl":
|
||||
stage2commands["status"] = []
|
||||
stage2commands["sasl"] = []
|
||||
stage2commands["status"].append("LoadMod sasl")
|
||||
stage2commands["sasl"].append("Mechanism plain")
|
||||
stage2commands["sasl"].append("Set %s %s" % (alias, password))
|
||||
stage2commands["sasl"].append("Set %s %s" % (nick, password))
|
||||
elif auth == "ns":
|
||||
stage2commands["status"] = []
|
||||
stage2commands["nickserv"] = []
|
||||
@@ -43,60 +42,23 @@ def provisionNetworkData(relay, alias, network, host, port, security, auth, pass
|
||||
stage2commands["status"] = []
|
||||
stage2commands["status"].append("LoadMod disconkick")
|
||||
stage2commands["status"].append("LoadMod chansaver")
|
||||
deliverRelayCommands(relay, commands,
|
||||
stage2=[[alias+"/"+network, stage2commands],
|
||||
[alias+"/"+network, stage3commands]])
|
||||
deliverRelayCommands(num, commands,
|
||||
stage2=[[nick+"/"+network, stage2commands],
|
||||
[nick+"/"+network, stage3commands]])
|
||||
return
|
||||
|
||||
def provisionRelayForAlias(relay, alias):
|
||||
#if "users" in main.relay[relay].keys():
|
||||
# if alias in main.relay[relay]["users"]:
|
||||
# return "PROVISIONED"
|
||||
#else:
|
||||
# main.relay[relay]["users"] = []
|
||||
#main.relay[relay]["users"].append(alias)
|
||||
provisionUserData(relay, alias, main.alias[alias]["nick"],
|
||||
main.alias[alias]["altnick"],
|
||||
main.alias[alias]["ident"],
|
||||
main.alias[alias]["realname"],
|
||||
main.relay[relay]["password"])
|
||||
#main.saveConf("relay")
|
||||
return True
|
||||
def provisionRelayForNetwork(num, alias, network):
|
||||
provisionNetworkData(num, alias, network,
|
||||
main.network[network].host,
|
||||
main.network[network].port,
|
||||
main.network[network].security,
|
||||
main.network[network].auth,
|
||||
main.network[network].aliases[num]["password"])
|
||||
return
|
||||
|
||||
def provisionRelayForNetwork(relay, alias, network):
|
||||
#if set(["users", "networks"]).issubset(main.relay[relay].keys()):
|
||||
# if network in main.relay[relay]["networks"] and alias in main.relay[relay]["users"]:
|
||||
# return "PROVISIONED"
|
||||
#else:
|
||||
# main.relay[relay]["networks"] = []
|
||||
#main.relay[relay]["networks"].append(network)
|
||||
provisionNetworkData(relay, alias, network,
|
||||
main.network[network]["host"],
|
||||
main.network[network]["port"],
|
||||
main.network[network]["security"],
|
||||
main.network[network]["auth"],
|
||||
main.alias[alias]["password"])
|
||||
#main.saveConf("relay")
|
||||
storedNetwork = False
|
||||
num = 1
|
||||
while not storedNetwork:
|
||||
i = str(num)
|
||||
if num == 1000:
|
||||
error("Iteration limit exceeded while trying to choose name for r: %s a: %s n: %s" % (relay, alias, network))
|
||||
return False
|
||||
|
||||
if network+i in main.pool.keys():
|
||||
if main.pool[network+i]["alias"] == alias and main.pool[network+i]["relay"] == relay:
|
||||
return "DUPLICATE"
|
||||
num += 1
|
||||
else:
|
||||
main.pool[network+i] = {"relay": relay,
|
||||
"alias": alias,
|
||||
"network": network,
|
||||
"enabled": main.config["ConnectOnCreate"]}
|
||||
main.saveConf("pool")
|
||||
if main.config["ConnectOnCreate"]:
|
||||
startBot(network+i)
|
||||
|
||||
storedNetwork = True
|
||||
return network+i
|
||||
def provisionRelay(num, network):
|
||||
aliasObj = main.network[network].aliases[num]
|
||||
alias = aliasObj["nick"]
|
||||
provisionUserData(num, *aliasObj.values())
|
||||
provisionRelayForNetwork(num, alias, network)
|
||||
return alias
|
||||
|
||||
Reference in New Issue
Block a user