diff --git a/services/modules/teamspeak3/forms.py b/services/modules/teamspeak3/forms.py index 4377ebcc..ec4366b7 100644 --- a/services/modules/teamspeak3/forms.py +++ b/services/modules/teamspeak3/forms.py @@ -10,6 +10,7 @@ class TeamspeakJoinForm(forms.Form): username = forms.CharField(widget=forms.HiddenInput()) def clean(self): - if Teamspeak3Manager._get_userid(self.cleaned_data['username']): - return self.cleaned_data + with Teamspeak3Manager() as ts3man: + if ts3man._get_userid(self.cleaned_data['username']): + return self.cleaned_data raise forms.ValidationError(_("Unable to locate user %s on server") % self.cleaned_data['username']) diff --git a/services/modules/teamspeak3/manager.py b/services/modules/teamspeak3/manager.py index 5661b62f..85cfdd2a 100755 --- a/services/modules/teamspeak3/manager.py +++ b/services/modules/teamspeak3/manager.py @@ -12,7 +12,31 @@ logger = logging.getLogger(__name__) class Teamspeak3Manager: def __init__(self): - pass + self._server = None + + @property + def server(self): + if self._server is not None and self._server._connected: + return self._server + else: + raise ValueError("Teamspeak not connected") + + def connect(self): + self._server = self.__get_created_server() + return self + + def disconnect(self): + self._server.disconnect() + self._server = None + + def __enter__(self): + logger.debug("Entering with statement, connecting") + self.connect() + return self + + def __exit__(self, _type, value, traceback): + logger.debug("Exiting with statement, cleaning up") + self.disconnect() @staticmethod def __get_created_server(): @@ -38,12 +62,10 @@ class Teamspeak3Manager: sanatized = "[BLUE][" + corp_ticker + "]" + username return sanatized[:30] - @staticmethod - def _get_userid(uid): + def _get_userid(self, uid): logger.debug("Looking for uid %s on TS3 server." % uid) - server = Teamspeak3Manager.__get_created_server() try: - ret = server.send_command('customsearch', {'ident': 'sso_uid', 'pattern': uid}) + ret = self.server.send_command('customsearch', {'ident': 'sso_uid', 'pattern': uid}) if ret and 'keys' in ret and 'cldbid' in ret['keys']: logger.debug("Got userid %s for uid %s" % (ret['keys']['cldbid'], uid)) return ret['keys']['cldbid'] @@ -52,11 +74,9 @@ class Teamspeak3Manager: raise e return None - @staticmethod - def _group_id_by_name(groupname): - server = Teamspeak3Manager.__get_created_server() + def _group_id_by_name(self, groupname): logger.debug("Looking for group %s on TS3 server." % groupname) - group_cache = server.send_command('servergrouplist') + group_cache = self.server.send_command('servergrouplist') logger.debug("Received group cache from server: %s" % group_cache) for group in group_cache: logger.debug("Checking group %s" % group) @@ -66,34 +86,30 @@ class Teamspeak3Manager: logger.debug("Group %s not found on server." % groupname) return None - @staticmethod - def _create_group(groupname): + def _create_group(self, groupname): logger.debug("Creating group %s on TS3 server." % groupname) - server = Teamspeak3Manager.__get_created_server() - sgid = Teamspeak3Manager._group_id_by_name(groupname) + sgid = self._group_id_by_name(groupname) if not sgid: logger.debug("Group does not yet exist. Proceeding with creation.") - ret = server.send_command('servergroupadd', {'name': groupname}) - Teamspeak3Manager.__group_cache = None + ret = self.server.send_command('servergroupadd', {'name': groupname}) + self.__group_cache = None sgid = ret['keys']['sgid'] - server.send_command('servergroupaddperm', - {'sgid': sgid, 'permsid': 'i_group_needed_modify_power', 'permvalue': 75, - 'permnegated': 0, 'permskip': 0}) - server.send_command('servergroupaddperm', - {'sgid': sgid, 'permsid': 'i_group_needed_member_add_power', 'permvalue': 100, - 'permnegated': 0, 'permskip': 0}) - server.send_command('servergroupaddperm', - {'sgid': sgid, 'permsid': 'i_group_needed_member_remove_power', 'permvalue': 100, - 'permnegated': 0, 'permskip': 0}) + self.server.send_command('servergroupaddperm', + {'sgid': sgid, 'permsid': 'i_group_needed_modify_power', 'permvalue': 75, + 'permnegated': 0, 'permskip': 0}) + self.server.send_command('servergroupaddperm', + {'sgid': sgid, 'permsid': 'i_group_needed_member_add_power', 'permvalue': 100, + 'permnegated': 0, 'permskip': 0}) + self.server.send_command('servergroupaddperm', + {'sgid': sgid, 'permsid': 'i_group_needed_member_remove_power', 'permvalue': 100, + 'permnegated': 0, 'permskip': 0}) logger.info("Created group on TS3 server with name %s and id %s" % (groupname, sgid)) return sgid - @staticmethod - def _user_group_list(cldbid): + def _user_group_list(self, cldbid): logger.debug("Retrieving group list for user with id %s" % cldbid) - server = Teamspeak3Manager.__get_created_server() try: - groups = server.send_command('servergroupsbyclientid', {'cldbid': cldbid}) + groups = self.server.send_command('servergroupsbyclientid', {'cldbid': cldbid}) except TeamspeakError as e: if e.code == '1281': # no groups groups = [] @@ -112,11 +128,9 @@ class Teamspeak3Manager: logger.debug("Returning name/id pairing: %s" % outlist) return outlist - @staticmethod - def _group_list(): + def _group_list(self): logger.debug("Retrieving group list on TS3 server.") - server = Teamspeak3Manager.__get_created_server() - group_cache = server.send_command('servergrouplist') + group_cache = self.server.send_command('servergrouplist') logger.debug("Received group cache from server: %s" % group_cache) outlist = {} if group_cache: @@ -128,35 +142,30 @@ class Teamspeak3Manager: logger.debug("Returning name/id pairing: %s" % outlist) return outlist - @staticmethod - def _add_user_to_group(uid, groupid): + def _add_user_to_group(self, uid, groupid): logger.debug("Adding group id %s to TS3 user id %s" % (groupid, uid)) - server = Teamspeak3Manager.__get_created_server() - user_groups = Teamspeak3Manager._user_group_list(uid) + user_groups = self._user_group_list(uid) if groupid not in user_groups.values(): logger.debug("User does not have group already. Issuing command to add.") - server.send_command('servergroupaddclient', - {'sgid': str(groupid), 'cldbid': uid}) + self.server.send_command('servergroupaddclient', + {'sgid': str(groupid), 'cldbid': uid}) logger.info("Added user id %s to group id %s on TS3 server." % (uid, groupid)) - @staticmethod - def _remove_user_from_group(uid, groupid): + def _remove_user_from_group(self, uid, groupid): logger.debug("Removing group id %s from TS3 user id %s" % (groupid, uid)) - server = Teamspeak3Manager.__get_created_server() - user_groups = Teamspeak3Manager._user_group_list(uid) + user_groups = self._user_group_list(uid) if str(groupid) in user_groups.values(): logger.debug("User is in group. Issuing command to remove.") - server.send_command('servergroupdelclient', - {'sgid': str(groupid), 'cldbid': uid}) + self.server.send_command('servergroupdelclient', + {'sgid': str(groupid), 'cldbid': uid}) logger.info("Removed user id %s from group id %s on TS3 server." % (uid, groupid)) - @staticmethod - def _sync_ts_group_db(): + def _sync_ts_group_db(self): logger.debug("_sync_ts_group_db function called.") try: - remote_groups = Teamspeak3Manager._group_list() + remote_groups = self._group_list() local_groups = TSgroup.objects.all() logger.debug("Comparing remote groups to TSgroup objects: %s" % local_groups) for key in remote_groups: @@ -181,23 +190,20 @@ class Teamspeak3Manager: except: logger.exception("An unhandled exception has occured while syncing TS groups.") - @staticmethod - def add_user(username, corp_ticker): - username_clean = Teamspeak3Manager.__santatize_username(Teamspeak3Manager.__generate_username(username, - corp_ticker)) - server = Teamspeak3Manager.__get_created_server() + def add_user(self, username, corp_ticker): + username_clean = self.__santatize_username(self.__generate_username(username, corp_ticker)) logger.debug("Adding user to TS3 server with cleaned username %s" % username_clean) - server_groups = Teamspeak3Manager._group_list() + server_groups = self._group_list() if settings.DEFAULT_AUTH_GROUP not in server_groups: - Teamspeak3Manager._create_group(settings.DEFAULT_AUTH_GROUP) + self._create_group(settings.DEFAULT_AUTH_GROUP) - alliance_group_id = Teamspeak3Manager._group_id_by_name(settings.DEFAULT_AUTH_GROUP) + alliance_group_id = self._group_id_by_name(settings.DEFAULT_AUTH_GROUP) try: - ret = server.send_command('tokenadd', {'tokentype': 0, 'tokenid1': alliance_group_id, 'tokenid2': 0, - 'tokendescription': username_clean, - 'tokencustomset': "ident=sso_uid value=%s" % username_clean}) + ret = self.server.send_command('tokenadd', {'tokentype': 0, 'tokenid1': alliance_group_id, 'tokenid2': 0, + 'tokendescription': username_clean, + 'tokencustomset': "ident=sso_uid value=%s" % username_clean}) except TeamspeakError as e: logger.error("Failed to add teamspeak user %s: %s" % (username, str(e))) return "","" @@ -210,22 +216,19 @@ class Teamspeak3Manager: logger.exception("Failed to add teamspeak user %s - received response: %s" % (username_clean, ret)) return "", "" - @staticmethod - def add_blue_user(username, corp_ticker): - username_clean = Teamspeak3Manager.__santatize_username(Teamspeak3Manager.__generate_username_blue(username, - corp_ticker)) - server = Teamspeak3Manager.__get_created_server() + def add_blue_user(self, username, corp_ticker): + username_clean = self.__santatize_username(self.__generate_username_blue(username, corp_ticker)) logger.debug("Adding user to TS3 server with cleaned username %s" % username_clean) - server_groups = Teamspeak3Manager._group_list() + server_groups = self._group_list() if settings.DEFAULT_BLUE_GROUP not in server_groups: - Teamspeak3Manager._create_group(settings.DEFAULT_BLUE_GROUP) + self._create_group(settings.DEFAULT_BLUE_GROUP) - blue_group_id = Teamspeak3Manager._group_id_by_name(settings.DEFAULT_BLUE_GROUP) + blue_group_id = self._group_id_by_name(settings.DEFAULT_BLUE_GROUP) try: - ret = server.send_command('tokenadd', {'tokentype': 0, 'tokenid1': blue_group_id, 'tokenid2': 0, - 'tokendescription': username_clean, - 'tokencustomset': "ident=sso_uid value=%s" % username_clean}) + ret = self.server.send_command('tokenadd', {'tokentype': 0, 'tokenid1': blue_group_id, 'tokenid2': 0, + 'tokendescription': username_clean, + 'tokencustomset': "ident=sso_uid value=%s" % username_clean}) except TeamspeakError as e: logger.error("Failed to add blue teamspeak user %s: %s" % (username, str(e))) return "","" @@ -238,24 +241,22 @@ class Teamspeak3Manager: logger.exception("Failed to add blue teamspeak user %s - received response: %s" % (username_clean, ret)) return "", "" - @staticmethod - def delete_user(uid): - server = Teamspeak3Manager.__get_created_server() - user = Teamspeak3Manager._get_userid(uid) + def delete_user(self, uid): + user = self._get_userid(uid) logger.debug("Deleting user %s with id %s from TS3 server." % (user, uid)) if user: - clients = server.send_command('clientlist') + clients = self.server.send_command('clientlist') for client in clients: try: if client['keys']['client_database_id'] == user: logger.debug("Found user %s on TS3 server - issuing deletion command." % user) - server.send_command('clientkick', {'clid': client['keys']['clid'], 'reasonid': 5, - 'reasonmsg': 'Auth service deleted'}) + self.server.send_command('clientkick', {'clid': client['keys']['clid'], 'reasonid': 5, + 'reasonmsg': 'Auth service deleted'}) except: logger.exception("Failed to delete user id %s from TS3 - received response %s" % (uid, client)) return False try: - ret = server.send_command('clientdbdelete', {'cldbid': user}) + ret = self.server.send_command('clientdbdelete', {'cldbid': user}) except TeamspeakError as e: logger.error("Failed to delete teamspeak user %s: %s" % (uid, str(e))) return False @@ -269,33 +270,29 @@ class Teamspeak3Manager: logger.warn("User with id %s not found on TS3 server. Assuming succesful deletion." % uid) return True - @staticmethod - def check_user_exists(uid): - if Teamspeak3Manager._get_userid(uid): + def check_user_exists(self, uid): + if self._get_userid(uid): return True return False - @staticmethod - def generate_new_permissionkey(uid, username, corpticker): + def generate_new_permissionkey(self, uid, username, corpticker): logger.debug("Re-issuing permission key for user id %s" % uid) - Teamspeak3Manager.delete_user(uid) - return Teamspeak3Manager.add_user(username, corpticker) + self.delete_user(uid) + return self.add_user(username, corpticker) - @staticmethod - def generate_new_blue_permissionkey(uid, username, corpticker): + def generate_new_blue_permissionkey(self, uid, username, corpticker): logger.debug("Re-issuing blue permission key for user id %s" % uid) - Teamspeak3Manager.delete_user(uid) - return Teamspeak3Manager.add_blue_user(username, corpticker) + self.delete_user(uid) + return self.add_blue_user(username, corpticker) - @staticmethod - def update_groups(uid, ts_groups): + def update_groups(self, uid, ts_groups): logger.debug("Updating uid %s TS3 groups %s" % (uid, ts_groups)) - userid = Teamspeak3Manager._get_userid(uid) + userid = self._get_userid(uid) addgroups = [] remgroups = [] if userid is not None: - user_ts_groups = Teamspeak3Manager._user_group_list(userid) + user_ts_groups = self._user_group_list(userid) logger.debug("User has groups on TS3 server: %s" % user_ts_groups) for key in user_ts_groups: user_ts_groups[key] = int(user_ts_groups[key]) @@ -309,8 +306,8 @@ class Teamspeak3Manager: for g in addgroups: logger.info("Adding Teamspeak user %s into group %s" % (userid, g)) - Teamspeak3Manager._add_user_to_group(userid, g) + self._add_user_to_group(userid, g) for g in remgroups: logger.info("Removing Teamspeak user %s from group %s" % (userid, g)) - Teamspeak3Manager._remove_user_from_group(userid, g) + self._remove_user_from_group(userid, g) diff --git a/services/modules/teamspeak3/tasks.py b/services/modules/teamspeak3/tasks.py index 4643449f..39d3f87a 100644 --- a/services/modules/teamspeak3/tasks.py +++ b/services/modules/teamspeak3/tasks.py @@ -25,11 +25,12 @@ class Teamspeak3Tasks: def delete_user(cls, user, notify_user=False): if cls.has_account(user): logger.debug("User %s has TS3 account %s. Deleting." % (user, user.teamspeak3.uid)) - if Teamspeak3Manager.delete_user(user.teamspeak3.uid): - user.teamspeak3.delete() - if notify_user: - notify(user, 'TeamSpeak3 Account Disabled', level='danger') - return True + with Teamspeak3Manager() as ts3man: + if ts3man.delete_user(user.teamspeak3.uid): + user.teamspeak3.delete() + if notify_user: + notify(user, 'TeamSpeak3 Account Disabled', level='danger') + return True return False @staticmethod @@ -43,7 +44,8 @@ class Teamspeak3Tasks: @app.task() def run_ts3_group_update(): logger.debug("TS3 installed. Syncing local group objects.") - Teamspeak3Manager._sync_ts_group_db() + with Teamspeak3Manager() as ts3man: + ts3man._sync_ts_group_db() @staticmethod def disable(): @@ -73,7 +75,8 @@ class Teamspeak3Tasks: groups[ts_group.ts_group_name] = ts_group.ts_group_id logger.debug("Updating user %s teamspeak3 groups to %s" % (user, groups)) try: - Teamspeak3Manager.update_groups(user.teamspeak3.uid, groups) + with Teamspeak3Manager() as ts3man: + ts3man.update_groups(user.teamspeak3.uid, groups) logger.debug("Updated user %s teamspeak3 groups." % user) except TeamspeakError as e: logger.error("Error occured while syncing TS groups for %s: %s" % (user, str(e))) diff --git a/services/modules/teamspeak3/tests.py b/services/modules/teamspeak3/tests.py index bb190e2d..b0426f0b 100644 --- a/services/modules/teamspeak3/tests.py +++ b/services/modules/teamspeak3/tests.py @@ -75,20 +75,22 @@ class Teamspeak3HooksTestCase(TestCase): @mock.patch(MODULE_PATH + '.tasks.Teamspeak3Manager') def test_update_all_groups(self, manager): + instance = manager.return_value.__enter__.return_value service = self.service() service.update_all_groups() # Check member and blue user have groups updated - self.assertTrue(manager.update_groups.called) - self.assertEqual(manager.update_groups.call_count, 2) + self.assertTrue(instance.update_groups.called) + self.assertEqual(instance.update_groups.call_count, 2) def test_update_groups(self): # Check member has Member group updated with mock.patch(MODULE_PATH + '.tasks.Teamspeak3Manager') as manager: + instance = manager.return_value.__enter__.return_value service = self.service() member = User.objects.get(username=self.member) service.update_groups(member) - self.assertTrue(manager.update_groups.called) - args, kwargs = manager.update_groups.call_args + self.assertTrue(instance.update_groups.called) + args, kwargs = instance.update_groups.call_args # update_groups(user.teamspeak3.uid, groups) self.assertEqual({'Member': 1}, args[1]) # Check groups self.assertEqual(self.member, args[0]) # Check uid @@ -98,7 +100,7 @@ class Teamspeak3HooksTestCase(TestCase): service = self.service() none_user = User.objects.get(username=self.none_user) service.update_groups(none_user) - self.assertFalse(manager.update_user_groups.called) + self.assertFalse(manager.return_value.__enter__.return_value.update_user_groups.called) @mock.patch(MODULE_PATH + '.tasks.Teamspeak3Manager') def test_validate_user(self, manager): @@ -112,7 +114,7 @@ class Teamspeak3HooksTestCase(TestCase): none_user = User.objects.get(username=self.none_user) Teamspeak3User.objects.create(user=none_user, uid='abc123', perm_key='132ACB') service.validate_user(none_user) - self.assertTrue(manager.delete_user.called) + self.assertTrue(manager.return_value.__enter__.return_value.delete_user.called) with self.assertRaises(ObjectDoesNotExist): none_teamspeak3 = User.objects.get(username=self.none_user).teamspeak3 @@ -124,7 +126,7 @@ class Teamspeak3HooksTestCase(TestCase): result = service.delete_user(member) self.assertTrue(result) - self.assertTrue(manager.delete_user.called) + self.assertTrue(manager.return_value.__enter__.return_value.delete_user.called) with self.assertRaises(ObjectDoesNotExist): teamspeak3_user = User.objects.get(username=self.member).teamspeak3 @@ -182,11 +184,12 @@ class Teamspeak3ViewsTestCase(TestCase): def test_activate(self, manager, forms_manager): self.login() expected_username = 'auth_member' - manager.add_user.return_value = (expected_username, 'abc123') + instance = manager.return_value.__enter__.return_value + instance.add_user.return_value = (expected_username, 'abc123') response = self.client.get(urls.reverse('auth_activate_teamspeak3')) - self.assertTrue(manager.add_user.called) + self.assertTrue(instance.add_user.called) teamspeak3_user = Teamspeak3User.objects.get(user=self.member) self.assertTrue(teamspeak3_user.uid) self.assertTrue(teamspeak3_user.perm_key) @@ -197,11 +200,12 @@ class Teamspeak3ViewsTestCase(TestCase): def test_activate_blue(self, manager, forms_manager): self.login(self.blue_user) expected_username = 'auth_blue' - manager.add_blue_user.return_value = (expected_username, 'abc123') + instance = manager.return_value.__enter__.return_value + instance.add_blue_user.return_value = (expected_username, 'abc123') response = self.client.get(urls.reverse('auth_activate_teamspeak3')) - self.assertTrue(manager.add_blue_user.called) + self.assertTrue(instance.add_blue_user.called) teamspeak3_user = Teamspeak3User.objects.get(user=self.blue_user) self.assertTrue(teamspeak3_user.uid) self.assertTrue(teamspeak3_user.perm_key) @@ -213,15 +217,16 @@ class Teamspeak3ViewsTestCase(TestCase): self.login() expected_username = 'auth_member' - forms_manager._get_userid.return_value = '1234' + forms_instance = manager.return_value.__enter__.return_value + forms_instance._get_userid.return_value = '1234' Teamspeak3User.objects.update_or_create(user=self.member, defaults={'uid': '1234', 'perm_key': '5678'}) data = {'username': 'auth_member'} response = self.client.post(urls.reverse('auth_verify_teamspeak3'), data) - self.assertTrue(manager.update_groups.called) self.assertRedirects(response, urls.reverse('auth_services'), target_status_code=200) + self.assertTrue(manager.return_value.__enter__.return_value.update_groups.called) @mock.patch(MODULE_PATH + '.tasks.Teamspeak3Manager') def test_deactivate(self, manager): @@ -230,7 +235,7 @@ class Teamspeak3ViewsTestCase(TestCase): response = self.client.get(urls.reverse('auth_deactivate_teamspeak3')) - self.assertTrue(manager.delete_user.called) + self.assertTrue(manager.return_value.__enter__.return_value.delete_user.called) self.assertRedirects(response, expected_url=urls.reverse('auth_services'), target_status_code=200) with self.assertRaises(ObjectDoesNotExist): teamspeak3_user = User.objects.get(pk=self.member.pk).teamspeak3 @@ -241,7 +246,7 @@ class Teamspeak3ViewsTestCase(TestCase): self.login() Teamspeak3User.objects.create(user=self.member, uid='some member') - manager.generate_new_permissionkey.return_value = "valid_member", "123abc" + manager.return_value.__enter__.return_value.generate_new_permissionkey.return_value = "valid_member", "123abc" response = self.client.get(urls.reverse('auth_reset_teamspeak3_perm')) @@ -249,7 +254,7 @@ class Teamspeak3ViewsTestCase(TestCase): ts3_user = Teamspeak3User.objects.get(uid='valid_member') self.assertEqual(ts3_user.uid, 'valid_member') self.assertEqual(ts3_user.perm_key, '123abc') - self.assertTrue(tasks_manager.update_groups.called) + self.assertTrue(tasks_manager.return_value.__enter__.return_value.update_groups.called) @mock.patch(MODULE_PATH + '.tasks.Teamspeak3Manager') @mock.patch(MODULE_PATH + '.views.Teamspeak3Manager') @@ -257,7 +262,8 @@ class Teamspeak3ViewsTestCase(TestCase): self.login(self.blue_user) Teamspeak3User.objects.create(user=self.blue_user, uid='some member') - manager.generate_new_blue_permissionkey.return_value = "valid_blue", "123abc" + manager.return_value.__enter__.return_value.generate_new_blue_permissionkey.return_value = ("valid_blue", + "123abc") response = self.client.get(urls.reverse('auth_reset_teamspeak3_perm')) @@ -265,7 +271,7 @@ class Teamspeak3ViewsTestCase(TestCase): ts3_user = Teamspeak3User.objects.get(uid='valid_blue') self.assertEqual(ts3_user.uid, 'valid_blue') self.assertEqual(ts3_user.perm_key, '123abc') - self.assertTrue(tasks_manager.update_groups.called) + self.assertTrue(tasks_manager.return_value.__enter__.return_value.update_groups.called) class Teamspeak3SignalsTestCase(TestCase): diff --git a/services/modules/teamspeak3/util/ts3.py b/services/modules/teamspeak3/util/ts3.py index d36acfef..901dcc93 100755 --- a/services/modules/teamspeak3/util/ts3.py +++ b/services/modules/teamspeak3/util/ts3.py @@ -50,13 +50,24 @@ class TS3Proto: return True def disconnect(self): - self.send_command("quit") - self._conn.close() - self._connected = False - self._log.info('Disconnected') + if self._connected: + try: + self.send("quit") + self._conn.close() + except: + self._log.exception('Error while disconnecting') + self._connected = False + self._log.info('Disconnected') + else: + self._log.info("Not connected") def send_command(self, command, keys=None, opts=None): cmd = self.construct_command(command, keys=keys, opts=opts) + + # Clear read buffer of any stray bytes + self._conn.read_very_eager() + + # Send command self.send('%s\n' % cmd) data = [] diff --git a/services/modules/teamspeak3/views.py b/services/modules/teamspeak3/views.py index 4eee0799..d667cbdb 100644 --- a/services/modules/teamspeak3/views.py +++ b/services/modules/teamspeak3/views.py @@ -28,17 +28,17 @@ def activate_teamspeak3(request): authinfo = AuthServicesInfo.objects.get(user=request.user) character = EveManager.get_main_character(request.user) ticker = character.corporation_ticker - - if authinfo.state == BLUE_STATE: - logger.debug("Adding TS3 user for blue user %s with main character %s" % (request.user, character)) - # Blue members should have alliance ticker (if in alliance) - if EveAllianceInfo.objects.filter(alliance_id=character.alliance_id).exists(): - alliance = EveAllianceInfo.objects.filter(alliance_id=character.alliance_id)[0] - ticker = alliance.alliance_ticker - result = Teamspeak3Manager.add_blue_user(character.character_name, ticker) - else: - logger.debug("Adding TS3 user for user %s with main character %s" % (request.user, character)) - result = Teamspeak3Manager.add_user(character.character_name, ticker) + with Teamspeak3Manager() as ts3man: + if authinfo.state == BLUE_STATE: + logger.debug("Adding TS3 user for blue user %s with main character %s" % (request.user, character)) + # Blue members should have alliance ticker (if in alliance) + if EveAllianceInfo.objects.filter(alliance_id=character.alliance_id).exists(): + alliance = EveAllianceInfo.objects.filter(alliance_id=character.alliance_id)[0] + ticker = alliance.alliance_ticker + result = ts3man.add_blue_user(character.character_name, ticker) + else: + logger.debug("Adding TS3 user for user %s with main character %s" % (request.user, character)) + result = ts3man.add_user(character.character_name, ticker) # if its empty we failed if result[0] is not "": @@ -82,8 +82,9 @@ def deactivate_teamspeak3(request): if Teamspeak3Tasks.has_account(request.user) and Teamspeak3Tasks.delete_user(request.user): logger.info("Successfully deactivated TS3 for user %s" % request.user) messages.success(request, 'Deactivated TeamSpeak3 account.') - logger.error("Unsuccessful attempt to deactivate TS3 for user %s" % request.user) - messages.error(request, 'An error occurred while processing your TeamSpeak3 account.') + else: + logger.error("Unsuccessful attempt to deactivate TS3 for user %s" % request.user) + messages.error(request, 'An error occurred while processing your TeamSpeak3 account.') return redirect("auth_services") @@ -96,18 +97,19 @@ def reset_teamspeak3_perm(request): authinfo = AuthServicesInfo.objects.get(user=request.user) character = EveManager.get_main_character(request.user) logger.debug("Deleting TS3 user for user %s" % request.user) - Teamspeak3Manager.delete_user(request.user.teamspeak3.uid) + with Teamspeak3Manager() as ts3man: + ts3man.delete_user(request.user.teamspeak3.uid) - if authinfo.state == BLUE_STATE: - logger.debug( - "Generating new permission key for blue user %s with main character %s" % (request.user, character)) - result = Teamspeak3Manager.generate_new_blue_permissionkey(request.user.teamspeak3.uid, - character.character_name, - character.corporation_ticker) - else: - logger.debug("Generating new permission key for user %s with main character %s" % (request.user, character)) - result = Teamspeak3Manager.generate_new_permissionkey(request.user.teamspeak3.uid, character.character_name, - character.corporation_ticker) + if authinfo.state == BLUE_STATE: + logger.debug( + "Generating new permission key for blue user %s with main character %s" % (request.user, character)) + result = ts3man.generate_new_blue_permissionkey(request.user.teamspeak3.uid, + character.character_name, + character.corporation_ticker) + else: + logger.debug("Generating new permission key for user %s with main character %s" % (request.user, character)) + result = ts3man.generate_new_permissionkey(request.user.teamspeak3.uid, character.character_name, + character.corporation_ticker) # if blank we failed if result[0] != "":