Grant service access by permissions (#692)

* 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

services/modules/market/auth_hooks.py

@@ -20,6 +20,7 @@ class MarketService(ServicesHook):
         self.name = 'market'
         self.urlpatterns = urlpatterns
         self.service_url = settings.MARKET_URL
+        self.access_perm = 'market.access_market'
 
     @property
     def title(self):
@@ -31,14 +32,11 @@ class MarketService(ServicesHook):
 
     def validate_user(self, user):
         logger.debug('Validating user %s %s account' % (user, self.name))
-        if MarketTasks.has_account(user) and self.service_active_for_user(user):
+        if MarketTasks.has_account(user) and not self.service_active_for_user(user):
             self.delete_user(user)
 
-    def service_enabled_members(self):
-        return settings.ENABLE_AUTH_MARKET or False
-
-    def service_enabled_blues(self):
-        return settings.ENABLE_BLUE_MARKET or False
+    def service_active_for_user(self, user):
+        return user.has_perm(self.access_perm)
 
     def render_services_ctrl(self, request):
         urls = self.Urls()

services/modules/market/migrations/0002_service_permissions.py

@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-02 05:59
+from __future__ import unicode_literals
+
+from django.db import migrations
+from django.conf import settings
+from django.core.exceptions import ObjectDoesNotExist
+from django.contrib.auth.management import create_permissions
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+def migrate_service_enabled(apps, schema_editor):
+    for app_config in apps.get_app_configs():
+        app_config.models_module = True
+        create_permissions(app_config, apps=apps, verbosity=0)
+        app_config.models_module = None
+        
+    Group = apps.get_model("auth", "Group")
+    Permission = apps.get_model("auth", "Permission")
+    MarketUser = apps.get_model("market", "MarketUser")
+
+    perm = Permission.objects.get(codename='access_market')
+
+    member_group_name = getattr(settings, str('DEFAULT_AUTH_GROUP'), 'Member')
+    blue_group_name = getattr(settings, str('DEFAULT_BLUE_GROUP'), 'Blue')
+
+    # Migrate members
+    if MarketUser.objects.filter(user__groups__name=member_group_name).exists() or \
+            getattr(settings, str('ENABLE_AUTH_MARKET'), False):
+        try:
+            group = Group.objects.get(name=member_group_name)
+            group.permissions.add(perm)
+        except ObjectDoesNotExist:
+            logger.warning('Failed to migrate ENABLE_AUTH_MARKET setting')
+
+    # Migrate blues
+    if MarketUser.objects.filter(user__groups__name=blue_group_name).exists() or \
+            getattr(settings, str('ENABLE_BLUE_MARKET'), False):
+        try:
+            group = Group.objects.get(name=blue_group_name)
+            group.permissions.add(perm)
+        except ObjectDoesNotExist:
+            logger.warning('Failed to migrate ENABLE_BLUE_MARKET setting')
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('market', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='marketuser',
+            options={'permissions': (('access_market', 'Can access the Evernus Market service'),)},
+        ),
+        migrations.RunPython(migrate_service_enabled),
+    ]

services/modules/market/models.py

@@ -14,3 +14,8 @@ class MarketUser(models.Model):
 
     def __str__(self):
         return self.username
+
+    class Meta:
+        permissions = (
+            ("access_market", u"Can access the Evernus Market service"),
+        )

services/modules/market/tasks.py

@@ -37,8 +37,4 @@ class MarketTasks:
 
     @staticmethod
     def disable():
-        if settings.ENABLE_AUTH_MARKET:
-            logger.warn("ENABLE_AUTH_MARKET still True, after disabling users will still be able to activate Market accounts")
-        if settings.ENABLE_BLUE_MARKET:
-            logger.warn("ENABLE_BLUE_MARKET still True, after disabling blues will still be able to activate Market accounts")
         MarketUser.objects.all().delete()

services/modules/market/tests.py

@@ -10,7 +10,7 @@ except ImportError:
 from django.test import TestCase, RequestFactory
 from django.conf import settings
 from django import urls
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Group, Permission
 from django.core.exceptions import ObjectDoesNotExist
 
 from alliance_auth.tests.auth_utils import AuthUtils
@@ -22,6 +22,13 @@ from .tasks import MarketTasks
 MODULE_PATH = 'services.modules.market'
 
 
+def add_permissions():
+    permission = Permission.objects.get(codename='access_market')
+    members = Group.objects.get(name=settings.DEFAULT_AUTH_GROUP)
+    blues = Group.objects.get(name=settings.DEFAULT_BLUE_GROUP)
+    AuthUtils.add_permissions_to_groups([permission], [members, blues])
+
+
 class MarketHooksTestCase(TestCase):
     def setUp(self):
         self.member = 'member_user'
@@ -33,6 +40,7 @@ class MarketHooksTestCase(TestCase):
         self.none_user = 'none_user'
         none_user = AuthUtils.create_user(self.none_user)
         self.service = MarketService
+        add_permissions()
 
     def test_has_account(self):
         member = User.objects.get(username=self.member)
@@ -47,11 +55,9 @@ class MarketHooksTestCase(TestCase):
         member = User.objects.get(username=self.member)
         blue = User.objects.get(username=self.blue)
         none_user = User.objects.get(username=self.none_user)
-        self.assertTrue(service.service_enabled_members())
-        self.assertTrue(service.service_enabled_blues())
 
-        self.assertEqual(service.service_active_for_user(member), settings.ENABLE_AUTH_MARKET)
-        self.assertEqual(service.service_active_for_user(blue), settings.ENABLE_BLUE_MARKET)
+        self.assertTrue(service.service_active_for_user(member))
+        self.assertTrue(service.service_active_for_user(blue))
         self.assertFalse(service.service_active_for_user(none_user))
 
     @mock.patch(MODULE_PATH + '.tasks.MarketManager')
@@ -66,6 +72,22 @@ class MarketHooksTestCase(TestCase):
         with self.assertRaises(ObjectDoesNotExist):
             market_user = User.objects.get(username=self.member).market
 
+    @mock.patch(MODULE_PATH + '.tasks.MarketManager')
+    def test_validate_user(self, manager):
+        service = self.service()
+        # Test member is not deleted
+        member = User.objects.get(username=self.member)
+        service.validate_user(member)
+        self.assertTrue(User.objects.get(username=self.member).market)
+
+        # Test none user is deleted
+        none_user = User.objects.get(username=self.none_user)
+        MarketUser.objects.create(user=none_user, username='abc123')
+        service.validate_user(none_user)
+        self.assertTrue(manager.disable_user.called)
+        with self.assertRaises(ObjectDoesNotExist):
+            none_svc = User.objects.get(username=self.none_user).market
+
     def test_render_services_ctrl(self):
         service = self.service()
         member = User.objects.get(username=self.member)
@@ -93,6 +115,7 @@ class MarketViewsTestCase(TestCase):
         self.member.email = 'auth_member@example.com'
         self.member.save()
         AuthUtils.add_main_character(self.member, 'auth_member', '12345', corp_id='111', corp_name='Test Corporation')
+        add_permissions()
 
     def login(self):
         self.client.login(username=self.member.username, password='password')

services/modules/market/views.py

@@ -1,10 +1,9 @@
 from __future__ import unicode_literals
 
 from django.contrib import messages
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import login_required, permission_required
 from django.shortcuts import render, redirect
 
-from authentication.decorators import members_and_blues
 from services.forms import ServicePasswordForm
 from eveonline.managers import EveManager
 
@@ -16,9 +15,11 @@ import logging
 
 logger = logging.getLogger(__name__)
 
+ACCESS_PERM = 'market.access_market'
+
 
 @login_required
-@members_and_blues()
+@permission_required(ACCESS_PERM)
 def activate_market(request):
     logger.debug("activate_market called by user %s" % request.user)
     character = EveManager.get_main_character(request.user)
@@ -44,7 +45,7 @@ def activate_market(request):
 
 
 @login_required
-@members_and_blues()
+@permission_required(ACCESS_PERM)
 def deactivate_market(request):
     logger.debug("deactivate_market called by user %s" % request.user)
     # false we failed
@@ -58,7 +59,7 @@ def deactivate_market(request):
 
 
 @login_required
-@members_and_blues()
+@permission_required(ACCESS_PERM)
 def reset_market_password(request):
     logger.debug("reset_market_password called by user %s" % request.user)
     if MarketTasks.has_account(request.user):
@@ -80,7 +81,7 @@ def reset_market_password(request):
 
 
 @login_required
-@members_and_blues()
+@permission_required(ACCESS_PERM)
 def set_market_password(request):
     logger.debug("set_market_password called by user %s" % request.user)
     if request.method == 'POST':