Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-15 07:20:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Corrected handling of group updates

Browse Source 
Removed old openfire package from requirements
This commit is contained in:
Adarnof 2015-12-22 22:39:38 +00:00
parent 23c8d48fbe
commit 9b2934ae7a
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -5,7 +5,6 @@ evelink
dnspython dnspython
passlib passlib
xmpppy==0.5.0rc1 xmpppy==0.5.0rc1
python-openfire==0.2.3-beta
requests requests
# Django Stuff # # Django Stuff #

24
services/managers/openfire_manager.py
View File

@ -5,14 +5,8 @@ import xmpp
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.auth.models import Group from django.contrib.auth.models import Group
from django.conf import settings from django.conf import settings
from openfire import exception
from openfire import UserService
from authentication.managers import AuthServicesInfoManager
import threading import threading
from ofrestapi.users import Users as ofUsers
import ofrestapi
class OpenfireManager: class OpenfireManager:
@ -46,7 +40,7 @@ class OpenfireManager:
try: try:
sanatized_username = OpenfireManager.__santatize_username(username) sanatized_username = OpenfireManager.__santatize_username(username)
password = OpenfireManager.__generate_random_pass() password = OpenfireManager.__generate_random_pass()
api = ofrestapi.users(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY) api = ofUsers(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY)
api.add_user(sanatized_username, password) api.add_user(sanatized_username, password)
except exception.UserAlreadyExistsException: except exception.UserAlreadyExistsException:
@ -58,7 +52,7 @@ class OpenfireManager:
@staticmethod @staticmethod
def delete_user(username): def delete_user(username):
try: try:
api = ofrestapi.users(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY) api = ofUsers(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY)
api.delete_user(username) api.delete_user(username)
return True return True
except exception.UserNotFoundException: except exception.UserNotFoundException:
@ -66,19 +60,19 @@ class OpenfireManager:
@staticmethod @staticmethod
def lock_user(username): def lock_user(username):
api = ofrestapi.users(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY) api = ofUsers(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY)
api.lock_user(username) api.lock_user(username)
@staticmethod @staticmethod
def unlock_user(username): def unlock_user(username):
api = ofrestapi.users(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY) api = ofUsers(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY)
api.unlock_user(username) api.unlock_user(username)
@staticmethod @staticmethod
def update_user_pass(username): def update_user_pass(username):
try: try:
password = OpenfireManager.__generate_random_pass() password = OpenfireManager.__generate_random_pass()
api = ofrestapi.users(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY) api = ofUsers(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY)
api.update_user(username, password=password) api.update_user(username, password=password)
return password return password
except exception.UserNotFoundException: except exception.UserNotFoundException:
@ -87,8 +81,8 @@ class OpenfireManager:
@staticmethod @staticmethod
def update_user_groups(username, password, groups): def update_user_groups(username, password, groups):
try: try:
api = ofrestapi.users(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY) api = ofUsers(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY)
remote_groups = api.get_user_groups(username) remote_groups = api.get_user_groups(username)['groupname']
add_groups = [] add_groups = []
del_groups = [] del_groups = []
for g in groups: for g in groups:
@ -107,7 +101,7 @@ class OpenfireManager:
@staticmethod @staticmethod
def delete_user_groups(username, groups): def delete_user_groups(username, groups):
api = ofrestapi.users(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY) api = ofUsers(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY)
api.delete_user_groups(username, groups) api.delete_user_groups(username, groups)
@staticmethod @staticmethod