mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-09 20:40:17 +02:00
a33c8c14ee
* Add service access permissions and migration `ENABLE_AUTH_<servicename> = True` will have the new permission applied to the settings configured `DEFAULT_AUTH_GROUP` group or `Member` if none is configured. `ENABLE_BLUE_<servicename> = True` will have the new permission applied to the settings configured `DEFAULT_BLUE_GROUP` group or `Blue` if none is configured. * Move views and hooks to permissions based access * Remove access restriction to services view Hypothetically non-member/blues could be granted permission to access services manually as desired now. A user that has no permissions to access any services will see a blank services list. * Remove obsolete service settings * Remove references to obsolete settings * Adjusted tests to support permissions based access * Fix incorrectly named permissions * Add simple get_services generator function * Added signals for user and groups perm changes * Update validate_services to support permissions deactivate_services removed as its surplus to requirements. * Removed state parameter from validate_services calls * Update tests to support signals changes * Fix incorrect call to validate_services task * Fix validate_services and test * Add validate_user to changed user groups signal * Added tests for new signals * Remove unnecessary post_add signals * Added documentation for service permissions * Added detection for members with service active If there are any service users in the Member or Blue groups active, then the permission will be added to the respective Member or Blue group. This means its no longer necessary to maintain the service enablesettings to migrate to permissions based service. Remove obsolete state based status checking
51 lines
1.4 KiB
Python
51 lines
1.4 KiB
Python
from __future__ import unicode_literals
|
|
|
|
import logging
|
|
|
|
from alliance_auth.celeryapp import app
|
|
|
|
from services.hooks import ServicesHook
|
|
import redis
|
|
|
|
REDIS_CLIENT = redis.Redis()
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
# http://loose-bits.com/2010/10/distributed-task-locking-in-celery.html
|
|
def only_one(function=None, key="", timeout=None):
|
|
"""Enforce only one celery task at a time."""
|
|
|
|
def _dec(run_func):
|
|
"""Decorator."""
|
|
|
|
def _caller(*args, **kwargs):
|
|
"""Caller."""
|
|
ret_value = None
|
|
have_lock = False
|
|
lock = REDIS_CLIENT.lock(key, timeout=timeout)
|
|
try:
|
|
have_lock = lock.acquire(blocking=False)
|
|
if have_lock:
|
|
ret_value = run_func(*args, **kwargs)
|
|
finally:
|
|
if have_lock:
|
|
lock.release()
|
|
|
|
return ret_value
|
|
|
|
return _caller
|
|
|
|
return _dec(function) if function is not None else _dec
|
|
|
|
|
|
@app.task(bind=True)
|
|
def validate_services(self, user):
|
|
logger.debug('Ensuring user %s has permissions for active services'.format(user))
|
|
# Iterate through services hooks and have them check the validity of the user
|
|
for svc in ServicesHook.get_services():
|
|
try:
|
|
svc.validate_user(user)
|
|
except:
|
|
logger.exception('Exception running validate_user for services module %s on user %s' % (svc, user))
|