Merge pull request #97 from 101t/3.0.3

3.0.3

Author: 101t

config/settings/com.py

@@ -166,15 +166,15 @@
 # REST API Settings
 REST_FRAMEWORK = {
     'DEFAULT_AUTHENTICATION_CLASSES': (
+        'rest_framework.authentication.SessionAuthentication',
         'rest_framework.authentication.BasicAuthentication',
     ),
     'DEFAULT_PERMISSION_CLASSES': (
         'rest_framework.permissions.IsAuthenticated',
     ),
     'DEFAULT_RENDERER_CLASSES': (
-        'rest_framework.renderers.BrowsableAPIRenderer',
         'rest_framework.renderers.JSONRenderer',
-        'rest_framework.renderers.CoreJSONRenderer',
+        'rest_framework.renderers.BrowsableAPIRenderer',
     ),
 }
 

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   jasmin-web:
-    image: tarekaec/jasmin_web_panel:1.4.2
+    image: tarekaec/jasmin_web_panel:1.4.4
     ports:
       - "${JASMIN_WEB_PORT:-8999}:8000"
     deploy:
@@ -26,7 +26,7 @@ services:
     restart: unless-stopped
 
   jasmin-celery:
-    image: tarekaec/jasmin_web_panel:1.4.2
+    image: tarekaec/jasmin_web_panel:1.4.4
     entrypoint: bash ./docker-entrypoint-celery.sh
     deploy:
       replicas: 1

main/api/urls.py

@@ -6,11 +6,51 @@
 app_name = 'api'
 
 urlpatterns = format_suffix_patterns([
+    # API Root
+    path('', view=views.api_root, name='api_root'),
+    # Groups
     path('groups/', include(arg=[
         path('<str:gid>/enable/', view=views.groups_enable, name='groups_enable'),
         path('<str:gid>/disable/', view=views.groups_disable, name='groups_disable'),
         path('<str:gid>/', view=views.groups_detail, name='groups_detail'),
         path('', view=views.groups_list, name='groups_list'),
     ])),
+    # Users
+    path('users/', include(arg=[
+        path('<str:uid>/enable/', view=views.users_enable, name='users_enable'),
+        path('<str:uid>/disable/', view=views.users_disable, name='users_disable'),
+        path('<str:uid>/', view=views.users_detail, name='users_detail'),
+        path('', view=views.users_list, name='users_list'),
+    ])),
+    # Filters
+    path('filters/', include(arg=[
+        path('<str:fid>/', view=views.filters_detail, name='filters_detail'),
+        path('', view=views.filters_list, name='filters_list'),
+    ])),
+    # HTTP Client Connectors
+    path('httpccm/', include(arg=[
+        path('<str:cid>/', view=views.httpccm_detail, name='httpccm_detail'),
+        path('', view=views.httpccm_list, name='httpccm_list'),
+    ])),
+    # SMPP Client Connectors
+    path('smppccm/', include(arg=[
+        path('<str:cid>/start/', view=views.smppccm_start, name='smppccm_start'),
+        path('<str:cid>/stop/', view=views.smppccm_stop, name='smppccm_stop'),
+        path('<str:cid>/', view=views.smppccm_detail, name='smppccm_detail'),
+        path('', view=views.smppccm_list, name='smppccm_list'),
+    ])),
+    # MO Routers
+    path('morouter/', include(arg=[
+        path('flush/', view=views.morouter_flush, name='morouter_flush'),
+        path('<str:order>/', view=views.morouter_detail, name='morouter_detail'),
+        path('', view=views.morouter_list, name='morouter_list'),
+    ])),
+    # MT Routers
+    path('mtrouter/', include(arg=[
+        path('flush/', view=views.mtrouter_flush, name='mtrouter_flush'),
+        path('<str:order>/', view=views.mtrouter_detail, name='mtrouter_detail'),
+        path('', view=views.mtrouter_list, name='mtrouter_list'),
+    ])),
+    # Health Check
     path('health_check', view=views.health_check, name="health_check")
 ])

main/api/views/__init__.py

@@ -1,7 +1,66 @@
+from .root import api_root
 from .groups import (
     groups_list,
     groups_detail,
     groups_enable,
     groups_disable,
 )
-from .health_check import health_check
+from .users import (
+    users_list,
+    users_detail,
+    users_enable,
+    users_disable,
+)
+from .filters import (
+    filters_list,
+    filters_detail,
+)
+from .httpccm import (
+    httpccm_list,
+    httpccm_detail,
+)
+from .smppccm import (
+    smppccm_list,
+    smppccm_detail,
+    smppccm_start,
+    smppccm_stop,
+)
+from .morouter import (
+    morouter_list,
+    morouter_detail,
+    morouter_flush,
+)
+from .mtrouter import (
+    mtrouter_list,
+    mtrouter_detail,
+    mtrouter_flush,
+)
+from .health_check import health_check
+
+
+__all__ = [
+    'api_root',
+    'groups_list',
+    'groups_detail',
+    'groups_enable',
+    'groups_disable',
+    'users_list',
+    'users_detail',
+    'users_enable',
+    'users_disable',
+    'filters_list',
+    'filters_detail',
+    'httpccm_list',
+    'httpccm_detail',
+    'smppccm_list',
+    'smppccm_detail',
+    'smppccm_start',
+    'smppccm_stop',
+    'morouter_list',
+    'morouter_detail',
+    'morouter_flush',
+    'mtrouter_list',
+    'mtrouter_detail',
+    'mtrouter_flush',
+    'health_check',
+]

main/api/views/filters.py

@@ -0,0 +1,121 @@
+from rest_framework.viewsets import ViewSet
+from rest_framework.response import Response
+from rest_framework import status as http_status
+
+from main.core.smpp import Filters
+from main.core.exceptions import MissingKeyError, ActionFailed, ObjectNotFoundError
+
+
+class FiltersViewSet(ViewSet):
+    """
+    FiltersViewSet to manage Jasmin message filters.
+    
+    Filters are used in routing rules to match messages based on various criteria.
+    
+    **Filter Types:**
+    - `TransparentFilter` - Matches all messages
+    - `UserFilter` - Matches by user (requires `uid`)
+    - `GroupFilter` - Matches by group (requires `gid`)
+    - `ConnectorFilter` - Matches by connector (requires `cid`)
+    - `SourceAddrFilter` - Matches source address regex (requires `source_addr`)
+    - `DestinationAddrFilter` - Matches destination regex (requires `destination_addr`)
+    - `ShortMessageFilter` - Matches message content regex (requires `short_message`)
+    - `TagFilter` - Matches by tag (requires `tag`)
+    """
+    lookup_field = 'fid'
+
+    def list(self, request):
+        """
+        List all Jasmin filters.
+        
+        **Example Request:**
+        ```bash
+        curl -u admin:password http://localhost:8000/api/filters/
+        ```
+        
+        **Example Response:**
+        ```json
+        {"filters": [{"fid": "filter1", "type": "TransparentFilter"}]}
+        ```
+        """
+        try:
+            filters = Filters()
+            return Response(data=filters.list(), status=http_status.HTTP_200_OK)
+        except Exception as e:
+            return Response(data={"error": str(e)}, status=http_status.HTTP_400_BAD_REQUEST)
+
+    def create(self, request):
+        """
+        Create a new filter.
+        
+        **Required Fields:**
+        - `fid` - Filter identifier
+        - `type` - Filter type (see class docstring for types)
+        
+        **Type-specific fields:**
+        - UserFilter: `uid`
+        - GroupFilter: `gid`
+        - ConnectorFilter: `cid`
+        - SourceAddrFilter: `source_addr` (regex)
+        - DestinationAddrFilter: `destination_addr` (regex)
+        - ShortMessageFilter: `short_message` (regex)
+        - TagFilter: `tag`
+        
+        **Example Request:**
+        ```bash
+        curl -u admin:password -X POST \\
+          -H "Content-Type: application/json" \\
+          -d '{"fid": "myfilter", "type": "TransparentFilter"}' \\
+          http://localhost:8000/api/filters/
+        ```
+        
+        **Example Response:**
+        ```json
+        {"fid": "myfilter"}
+        ```
+        """
+        try:
+            filters = Filters()
+            result = filters.create(data=request.data)
+            return Response(data=result, status=http_status.HTTP_201_CREATED)
+        except MissingKeyError as e:
+            return Response(data={"error": str(e)}, status=http_status.HTTP_400_BAD_REQUEST)
+        except Exception as e:
+            return Response(data={"error": str(e)}, status=http_status.HTTP_400_BAD_REQUEST)
+
+    def retrieve(self, request, fid):
+        """
+        Retrieve details of a single filter.
+        
+        **Example Request:**
+        ```bash
+        curl -u admin:password http://localhost:8000/api/filters/myfilter/
+        ```
+        """
+        try:
+            filters = Filters()
+            return Response(data=filters.retrieve(fid), status=http_status.HTTP_200_OK)
+        except ObjectNotFoundError as e:
+            return Response(data={"error": str(e)}, status=http_status.HTTP_404_NOT_FOUND)
+
+    def destroy(self, request, fid):
+        """
+        Delete a filter.
+        
+        **Example Request:**
+        ```bash
+        curl -u admin:password -X DELETE http://localhost:8000/api/filters/myfilter/
+        ```
+        """
+        try:
+            filters = Filters()
+            result = filters.destroy(fid)
+            return Response(data=result, status=http_status.HTTP_200_OK)
+        except ObjectNotFoundError as e:
+            return Response(data={"error": str(e)}, status=http_status.HTTP_404_NOT_FOUND)
+        except ActionFailed as e:
+            return Response(data={"error": str(e)}, status=http_status.HTTP_400_BAD_REQUEST)
+
+
+filters_list = FiltersViewSet.as_view({'get': 'list', 'post': 'create'})
+filters_detail = FiltersViewSet.as_view({'get': 'retrieve', 'delete': 'destroy'})