Skip to content

Commit

Permalink
[feature] Emit signal in freeradius accounting view #341
Browse files Browse the repository at this point in the history
Closes #341
  • Loading branch information
devkapilbansal authored and codesankalp committed Nov 29, 2021
1 parent db2fbbe commit 855b626
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 7 deletions.
6 changes: 6 additions & 0 deletions openwisp_radius/api/freeradius_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from .. import settings as app_settings
from ..counters.base import BaseCounter
from ..counters.exceptions import MaxQuotaReached, SkipCheck
from ..signals import radius_accounting_success
from ..utils import load_model
from .serializers import (
AuthorizeSerializer,
Expand Down Expand Up @@ -431,12 +432,14 @@ def post(self, request, *args, **kwargs):
acct_data = self._data_to_acct_model(serializer.validated_data.copy())
serializer.create(acct_data)
headers = self.get_success_headers(serializer.data)
self.send_radius_accounting_signal(acct_data)
return Response(None, status=201, headers=headers)
else:
serializer = self.get_serializer(instance, data=data, partial=False)
serializer.is_valid(raise_exception=True)
acct_data = self._data_to_acct_model(serializer.validated_data.copy())
serializer.update(instance, acct_data)
self.send_radius_accounting_signal(acct_data)
return Response(None)

def _data_to_acct_model(self, valid_data):
Expand All @@ -445,6 +448,9 @@ def _data_to_acct_model(self, valid_data):
valid_data['organization'] = acct_org
return valid_data

def send_radius_accounting_signal(self, account_data):
radius_accounting_success.send(sender=self.__class__, account_data=account_data)


accounting = AccountingView.as_view()

Expand Down
3 changes: 3 additions & 0 deletions openwisp_radius/signals.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.dispatch import Signal

radius_accounting_success = Signal(providing_args=['account_data'])
19 changes: 12 additions & 7 deletions openwisp_radius/tests/test_api/test_freeradius_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
from django.utils.timezone import now
from freezegun import freeze_time

from openwisp_utils.tests import capture_any_output
from openwisp_utils.tests import capture_any_output, catch_signal

from ... import registration
from ... import settings as app_settings
from ...api.freeradius_views import logger as freeradius_api_logger
from ...counters.exceptions import MaxQuotaReached, SkipCheck
from ...signals import radius_accounting_success
from ...utils import load_model
from ..mixins import ApiTokenMixin, BaseTestCase

Expand Down Expand Up @@ -681,7 +682,9 @@ def test_accounting_start_200(self):
self.assertEqual(RadiusAccounting.objects.count(), 0)
ra = self._create_radius_accounting(**self._acct_initial_data)
data = self._prep_start_acct_data()
response = self.post_json(data)
with catch_signal(radius_accounting_success) as handler:
response = self.post_json(data)
handler.assert_called_once()
self.assertEqual(response.status_code, 200)
self.assertIsNone(response.data)
self.assertEqual(RadiusAccounting.objects.count(), 1)
Expand All @@ -694,11 +697,13 @@ def test_accounting_start_radius_token_201(self):
data = self._prep_start_acct_data()
data.update(username='tester')
self.assertEqual(RadiusAccounting.objects.count(), 0)
response = self.client.post(
self._acct_url,
data=json.dumps(data),
content_type='application/json',
)
with catch_signal(radius_accounting_success) as handler:
response = self.client.post(
self._acct_url,
data=json.dumps(data),
content_type='application/json',
)
handler.assert_called_once()
self.assertEqual(response.status_code, 201)
self.assertIsNone(response.data)
self.assertEqual(RadiusAccounting.objects.count(), 1)
Expand Down

0 comments on commit 855b626

Please sign in to comment.