|
|
@ -872,53 +872,102 @@ class Helper(object):
|
|
|
|
return
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
elif cmd == "add":
|
|
|
|
elif cmd == "add":
|
|
|
|
if length == 6:
|
|
|
|
if length > 6:
|
|
|
|
|
|
|
|
failure("Too many arguments")
|
|
|
|
if spl[1] in pool.keys():
|
|
|
|
return
|
|
|
|
failure("Name already exists: %s" % spl[1])
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
protocol = spl[4].lower()
|
|
|
|
if length > 1:
|
|
|
|
|
|
|
|
name = spl[1]
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
incUsage("add")
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
if length > 2:
|
|
|
|
|
|
|
|
host = spl[2]
|
|
|
|
|
|
|
|
if length > 3:
|
|
|
|
|
|
|
|
port = spl[3]
|
|
|
|
|
|
|
|
if length > 4:
|
|
|
|
|
|
|
|
protocol = spl[4]
|
|
|
|
|
|
|
|
if length > 5:
|
|
|
|
|
|
|
|
nickname = spl[5]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
toFail = False
|
|
|
|
|
|
|
|
if length < 6:
|
|
|
|
|
|
|
|
if config["Default"]["nickname"] == None:
|
|
|
|
|
|
|
|
failure("Choose a nickname, or configure one in defaults")
|
|
|
|
|
|
|
|
toFail = True
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
nickname = config["Default"]["nickname"]
|
|
|
|
|
|
|
|
|
|
|
|
if not protocol in ["ssl", "plain"]:
|
|
|
|
if length < 5:
|
|
|
|
incUsage("connect")
|
|
|
|
if config["Default"]["protocol"] == None:
|
|
|
|
return
|
|
|
|
failure("Choose a protocol, or configure one in defaults")
|
|
|
|
|
|
|
|
toFail = True
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
protocol = config["Default"]["protocol"]
|
|
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
if length < 4:
|
|
|
|
int(spl[3])
|
|
|
|
if config["Default"]["port"] == None:
|
|
|
|
except:
|
|
|
|
failure("Choose a port, or configure one in defaults")
|
|
|
|
failure("Port must be an integer, not %s" % spl[3])
|
|
|
|
toFail = True
|
|
|
|
return
|
|
|
|
else:
|
|
|
|
|
|
|
|
port = config["Default"]["port"]
|
|
|
|
|
|
|
|
|
|
|
|
pool[spl[1]] = { "host": spl[2],
|
|
|
|
if length < 3:
|
|
|
|
"port": spl[3],
|
|
|
|
if config["Default"]["host"] == None:
|
|
|
|
"protocol": protocol,
|
|
|
|
failure("Choose a host, or configure one in defaults")
|
|
|
|
"bind": None,
|
|
|
|
toFail = True
|
|
|
|
"timeout": 30,
|
|
|
|
else:
|
|
|
|
"nickname": spl[5],
|
|
|
|
host = config["Default"]["host"]
|
|
|
|
"username": config["Default"]["username"],
|
|
|
|
if toFail:
|
|
|
|
"realname": None,
|
|
|
|
failure("Stopping due to previous error(s)")
|
|
|
|
"userinfo": None,
|
|
|
|
|
|
|
|
"finger": None,
|
|
|
|
|
|
|
|
"version": None,
|
|
|
|
|
|
|
|
"source": None,
|
|
|
|
|
|
|
|
"autojoin": [],
|
|
|
|
|
|
|
|
"authtype": config["Default"]["authtype"],
|
|
|
|
|
|
|
|
"password": config["Default"]["password"],
|
|
|
|
|
|
|
|
"authentity": "NickServ",
|
|
|
|
|
|
|
|
"key": config["ListenerKey"],
|
|
|
|
|
|
|
|
"certificate": config["ListenerCertificate"],
|
|
|
|
|
|
|
|
"enabled": config["ConnectOnCreate"],
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if config["ConnectOnCreate"] == True:
|
|
|
|
|
|
|
|
self.addBot(spl[1])
|
|
|
|
|
|
|
|
success("Successfully created bot")
|
|
|
|
|
|
|
|
self.savePool()
|
|
|
|
|
|
|
|
return
|
|
|
|
return
|
|
|
|
else:
|
|
|
|
|
|
|
|
|
|
|
|
if length < 2:
|
|
|
|
incUsage("add")
|
|
|
|
incUsage("add")
|
|
|
|
return
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if name in pool.keys():
|
|
|
|
|
|
|
|
failure("Name already exists: %s" % name)
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
protocol = protocol.lower()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if not protocol in ["ssl", "plain"]:
|
|
|
|
|
|
|
|
failure("Protocol must be ssl or plain, not %s" % protocol)
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
int(port)
|
|
|
|
|
|
|
|
except:
|
|
|
|
|
|
|
|
failure("Port must be an integer, not %s" % port)
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pool[name] = { "host": host,
|
|
|
|
|
|
|
|
"port": port,
|
|
|
|
|
|
|
|
"protocol": protocol,
|
|
|
|
|
|
|
|
"bind": config["Default"]["bind"],
|
|
|
|
|
|
|
|
"timeout": config["Default"]["timeout"],
|
|
|
|
|
|
|
|
"nickname": nickname,
|
|
|
|
|
|
|
|
"username": config["Default"]["username"],
|
|
|
|
|
|
|
|
"realname": config["Default"]["realname"],
|
|
|
|
|
|
|
|
"userinfo": config["Default"]["userinfo"],
|
|
|
|
|
|
|
|
"finger": config["Default"]["finger"],
|
|
|
|
|
|
|
|
"version": config["Default"]["version"],
|
|
|
|
|
|
|
|
"source": config["Default"]["source"],
|
|
|
|
|
|
|
|
"autojoin": config["Default"]["autojoin"],
|
|
|
|
|
|
|
|
"authtype": config["Default"]["authtype"],
|
|
|
|
|
|
|
|
"password": config["Default"]["password"],
|
|
|
|
|
|
|
|
"authentity": config["Default"]["authentity"],
|
|
|
|
|
|
|
|
"key": config["ListenerKey"],
|
|
|
|
|
|
|
|
"certificate": config["ListenerCertificate"],
|
|
|
|
|
|
|
|
"enabled": config["ConnectOnCreate"],
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if config["ConnectOnCreate"] == True:
|
|
|
|
|
|
|
|
self.addBot(name)
|
|
|
|
|
|
|
|
success("Successfully created bot")
|
|
|
|
|
|
|
|
self.savePool()
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
elif cmd == "del":
|
|
|
|
elif cmd == "del":
|
|
|
|
if length == 2:
|
|
|
|
if length == 2:
|
|
|
|
|
|
|
|
|
|
|
|