david/jcl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

'edit-admin' ad-hoc command implementation

Browse Source 
darcs-hash:20070904191118-86b55-cfe426468d12728578af12c535eafa69e38b381b.gz
This commit is contained in:
David Rousselie
2007-09-04 21:11:18 +02:00
parent 32ffc1ed89
commit a70979f569
5 changed files with 183 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
conf/jcl.conf
View File

@@ -18,5 +18,6 @@ db_url: %(type)s://%(host)s%(name)s
[component] [component]
pid_file: /var/run/jabber/jcl.pid pid_file: /var/run/jabber/jcl.pid
#motd: "Message of the day" #motd: "Message of the day"
welcome_message: "Welcome to JCL"
admins: admin1@domain.com, admin2@domain.com

29
src/jcl/jabber/command.py
View File

@@ -228,7 +228,7 @@ class JCLCommandManager(CommandManager):
def __init__(self, component=None, account_manager=None): def __init__(self, component=None, account_manager=None):
""" """
JCLCommandManager constructor JCLCommandManager constructor
Not implemented commands: commands not implemented:
'http://jabber.org/protocol/admin#user-stats', 'http://jabber.org/protocol/admin#user-stats',
'http://jabber.org/protocol/admin#edit-blacklist', 'http://jabber.org/protocol/admin#edit-blacklist',
'http://jabber.org/protocol/admin#add-to-blacklist-in', 'http://jabber.org/protocol/admin#add-to-blacklist-in',
@@ -867,8 +867,31 @@ class JCLCommandManager(CommandManager):
command_node.setProp("status", STATUS_COMPLETED) command_node.setProp("status", STATUS_COMPLETED)
return (None, []) return (None, [])
def execute_edit_admin(self, info_query): def execute_edit_admin_1(self, info_query, session_context,
return [] command_node, lang_class):
self.add_actions(command_node, [ACTION_NEXT])
result_form = Form(xmlnode_or_type="result",
title="TODO",
instructions="TODO")
result_form.add_field(field_type="hidden",
name="FORM_TYPE",
value="http://jabber.org/protocol/admin")
admins = self.component.get_admins()
result_form.add_field(name="adminjids",
field_type="jid-multi",
label="TODO",
values=admins,
required=True)
result_form.as_xml(command_node)
return (result_form, [])
def execute_edit_admin_2(self, info_query, session_context,
command_node, lang_class):
self.__logger.debug("Executing command 'edit admin' step 2")
admins = session_context["adminjids"]
self.component.set_admins(admins)
command_node.setProp("status", STATUS_COMPLETED)
return (None, [])
def execute_restart(self, info_query): def execute_restart(self, info_query):
return [] return []

13
src/jcl/jabber/component.py
View File

@@ -34,6 +34,7 @@ import logging
import signal import signal
import re import re
import traceback import traceback
import string
from Queue import Queue from Queue import Queue
@@ -589,6 +590,18 @@ class JCLComponent(Component, object):
def del_motd(self): def del_motd(self):
self.del_config_parameter("component", "motd") self.del_config_parameter("component", "motd")
def get_admins(self):
admins_str = self.get_config_parameter("component",
"admins")
if admins_str is not None:
return map(string.strip,
admins_str.split(','))
else:
return None
def set_admins(self, admins):
self.set_config_parameter("component", "admins", ",".join(admins))
def get_welcome_message(self): def get_welcome_message(self):
return self.get_config_parameter("component", "welcome_message") return self.get_config_parameter("component", "welcome_message")

98
src/jcl/jabber/tests/command.py
View File

@@ -2638,14 +2638,96 @@ class JCLCommandManager_TestCase(JCLTestCase):
"welcome_message")) "welcome_message"))
os.unlink(config_file) os.unlink(config_file)
# def test_execute_edit_admin(self): def test_execute_edit_admin(self):
# #TODO : implement command self.comp.account_manager.account_classes = (ExampleAccount,
# info_query = Iq(stanza_type="set", Example2Account)
# from_jid="user1@test.com", config_file = tempfile.mktemp(".conf", "jcltest", jcl.tests.DB_DIR)
# to_jid="jcl.test.com") self.comp.config_file = config_file
# result = self.command_manager.execute_add_user(info_query) self.comp.config = ConfigParser()
# self.assertNotEquals(result, None) self.comp.set_admins(["admin1@test.com", "admin2@test.com"])
# self.assertEquals(len(result), 1) model.db_connect()
user1 = User(jid="test1@test.com")
account11 = ExampleAccount(user=user1,
name="account11",
jid="account11@jcl.test.com")
account11.status = account.ONLINE
account12 = Example2Account(user=user1,
name="account12",
jid="account12@jcl.test.com")
account12.status = "away"
user2 = User(jid="test2@test.com")
account21 = ExampleAccount(user=user2,
name="account21",
jid="account21@jcl.test.com")
account21.status = account.OFFLINE
account22 = ExampleAccount(user=user2,
name="account11",
jid="account11@jcl.test.com")
account22.status = account.OFFLINE
model.db_disconnect()
info_query = Iq(stanza_type="set",
from_jid="user1@test.com",
to_jid="jcl.test.com")
command_node = info_query.set_new_content(command.COMMAND_NS, "command")
command_node.setProp("node",
"http://jabber.org/protocol/admin#edit-admin")
result = self.command_manager.apply_command_action(\
info_query,
"http://jabber.org/protocol/admin#edit-admin",
"execute")
self.assertNotEquals(result, None)
self.assertEquals(len(result), 1)
xml_command = result[0].xpath_eval("c:command",
{"c": "http://jabber.org/protocol/commands"})[0]
self.assertEquals(xml_command.prop("status"), "executing")
self.assertNotEquals(xml_command.prop("sessionid"), None)
self.__check_actions(result[0], ["next"])
fields = result[0].xpath_eval("c:command/data:x/data:field",
{"c": "http://jabber.org/protocol/commands",
"data": "jabber:x:data"})
self.assertEquals(len(fields), 2)
self.assertEquals(fields[1].prop("var"), "adminjids")
self.assertEquals(fields[1].prop("type"), "jid-multi")
self.assertEquals(fields[1].children.name, "value")
self.assertEquals(fields[1].children.content, "admin1@test.com")
self.assertEquals(fields[1].children.next.name, "value")
self.assertEquals(fields[1].children.next.content, "admin2@test.com")
self.assertEquals(fields[1].children.next.next.name, "required")
# Second step
info_query = Iq(stanza_type="set",
from_jid="user1@test.com",
to_jid="jcl.test.com")
command_node = info_query.set_new_content(command.COMMAND_NS, "command")
command_node.setProp("node",
"http://jabber.org/protocol/admin#edit-admin")
session_id = xml_command.prop("sessionid")
command_node.setProp("sessionid", session_id)
command_node.setProp("action", "next")
submit_form = Form(xmlnode_or_type="submit")
submit_form.add_field(field_type="jid-multi",
name="adminjids",
values=["admin3@test.com", "admin4@test.com"])
submit_form.as_xml(command_node)
result = self.command_manager.apply_command_action(\
info_query,
"http://jabber.org/protocol/admin#edit-admin",
"execute")
self.assertNotEquals(result, None)
self.assertEquals(len(result), 1)
xml_command = result[0].xpath_eval("c:command",
{"c": "http://jabber.org/protocol/commands"})[0]
self.assertEquals(xml_command.prop("status"), "completed")
self.assertEquals(xml_command.prop("sessionid"), session_id)
self.__check_actions(result[0])
context_session = self.command_manager.sessions[session_id][1]
self.assertEquals(context_session["adminjids"],
["admin3@test.com", "admin4@test.com"])
self.comp.config.read(self.comp.config_file)
self.assertTrue(self.comp.config.has_option("component", "admins"))
self.assertEquals(self.comp.config.get("component", "admins"),
"admin3@test.com,admin4@test.com")
os.unlink(config_file)
# def test_execute_restart(self): # def test_execute_restart(self):
# #TODO : implement command # #TODO : implement command

52
src/jcl/jabber/tests/component.py
View File

@@ -2693,6 +2693,58 @@ class JCLComponent_TestCase(JCLTestCase):
"welcome_message")) "welcome_message"))
os.unlink(config_file) os.unlink(config_file)
def test_get_admins(self):
config_file = tempfile.mktemp(".conf", "jcltest", jcl.tests.DB_DIR)
self.comp.config_file = config_file
self.comp.config = ConfigParser()
self.comp.config.read(self.comp.config_file)
self.comp.config.add_section("component")
self.comp.config.set("component", "admins", "admin1@test.com, admin2@test.com")
self.comp.config.write(open(self.comp.config_file, "w"))
admins = self.comp.get_admins()
self.assertEquals(len(admins), 2)
self.assertEquals(admins[0], "admin1@test.com")
self.assertEquals(admins[1], "admin2@test.com")
os.unlink(config_file)
def test_get_no_admins(self):
config_file = tempfile.mktemp(".conf", "jcltest", jcl.tests.DB_DIR)
self.comp.config_file = config_file
self.comp.config = ConfigParser()
self.comp.config.read(self.comp.config_file)
self.comp.config.write(open(self.comp.config_file, "w"))
admins = self.comp.get_admins()
self.assertEquals(admins, None)
os.unlink(config_file)
def test_set_new_admins(self):
config_file = tempfile.mktemp(".conf", "jcltest", jcl.tests.DB_DIR)
self.comp.config_file = config_file
self.comp.config = ConfigParser()
self.comp.set_admins(["admin1@test.com", "admin2@test.com"])
self.comp.config.read(self.comp.config_file)
self.assertTrue(self.comp.config.has_option("component",
"admins"))
self.assertEquals(self.comp.config.get("component", "admins"),
"admin1@test.com,admin2@test.com")
os.unlink(config_file)
def test_set_admins(self):
config_file = tempfile.mktemp(".conf", "jcltest", jcl.tests.DB_DIR)
self.comp.config_file = config_file
self.comp.config = ConfigParser()
self.comp.config.add_section("component")
self.comp.config.set("component", "admins",
"admin1@test.com, admin2@test.com")
self.comp.config.write(open(self.comp.config_file, "w"))
self.comp.set_admins(["admin3@test.com", "admin4@test.com"])
self.comp.config.read(self.comp.config_file)
self.assertTrue(self.comp.config.has_option("component",
"admins"))
self.assertEquals(self.comp.config.get("component", "admins"),
"admin3@test.com,admin4@test.com")
os.unlink(config_file)
########################################################################### ###########################################################################
# 'handle_command' tests # 'handle_command' tests
########################################################################### ###########################################################################