Refactor Plugin Config

api_app/analyzers_manager/serializers.py

@@ -2,9 +2,8 @@
 # See the file 'LICENSE' for copying permission.
 from rest_framework import serializers as rfs
 
-from ..models import PluginConfig, PythonModule
+from ..models import PythonModule
 from ..serializers.plugin import (
-    PluginConfigSerializer,
     PythonConfigSerializer,
     PythonConfigSerializerForMigration,
 )
@@ -27,9 +26,6 @@ class Meta:
 
 
 class AnalyzerConfigSerializer(PythonConfigSerializer):
-    plugin_config = rfs.ListField(
-        child=rfs.DictField(), write_only=True, required=False
-    )
     python_module = rfs.SlugRelatedField(
         queryset=PythonModule.objects.all(), slug_field="module"
     )
@@ -39,38 +35,6 @@ class Meta:
         exclude = PythonConfigSerializer.Meta.exclude
         list_serializer_class = PythonConfigSerializer.Meta.list_serializer_class
 
-    def create(self, validated_data):
-        plugin_config = validated_data.pop("plugin_config", {})
-        pc = super().create(validated_data)
-
-        # create plugin config
-        for config in plugin_config:
-            plugin_config_serializer = PluginConfigSerializer(
-                data=config, context={"request": self.context["request"]}
-            )
-            plugin_config_serializer.is_valid(raise_exception=True)
-            plugin_config_serializer.save()
-        return pc
-
-    def update(self, instance, validated_data):
-        plugin_config = validated_data.pop("plugin_config", [])
-        pc = super().update(instance, validated_data)
-
-        # update plugin config
-        for config in plugin_config:
-            plugin_config_serializer = PluginConfigSerializer(
-                data=config, context={"request": self.context["request"]}
-            )
-            plugin_config_serializer.is_valid(raise_exception=True)
-            PluginConfig.objects.filter(
-                owner=self.context["request"].user,
-                analyzer_config=plugin_config_serializer.validated_data[
-                    "analyzer_config"
-                ],
-                parameter=plugin_config_serializer.validated_data["parameter"],
-            ).update_or_create(plugin_config_serializer.validated_data)
-        return pc
-
 
 class AnalyzerConfigSerializerForMigration(PythonConfigSerializerForMigration):
     class Meta:

api_app/analyzers_manager/urls.py

@@ -4,7 +4,11 @@
 from django.urls import include, path
 from rest_framework import routers
 
-from .views import AnalyzerActionViewSet, AnalyzerConfigViewSet
+from .views import (
+    AnalyzerActionViewSet,
+    AnalyzerConfigViewSet,
+    AnalyzerPluginConfigViewSet,
+)
 
 # Routers provide an easy way of automatically determining the URL conf.
 router = routers.DefaultRouter(trailing_slash=False)
@@ -14,6 +18,11 @@
     basename="analyzerreport",
 )
 router.register(r"analyzer", AnalyzerConfigViewSet, basename="analyzer")
+router.register(
+    r"analyzer/(?P<name>\w+)",
+    AnalyzerPluginConfigViewSet,
+    basename="plugin-config-analyzer",
+)
 
 
 urlpatterns = [

api_app/analyzers_manager/views.py

@@ -5,7 +5,7 @@
 from rest_framework import mixins
 
 from ..permissions import isPluginActionsPermission
-from ..views import PythonConfigViewSet, PythonReportActionViewSet
+from ..views import PluginConfigViewSet, PythonConfigViewSet, PythonReportActionViewSet
 from .filters import AnalyzerConfigFilter
 from .models import AnalyzerConfig, AnalyzerReport
 from .serializers import AnalyzerConfigSerializer
@@ -41,3 +41,7 @@ class AnalyzerActionViewSet(PythonReportActionViewSet):
     @property
     def report_model(cls):
         return AnalyzerReport
+
+
+class AnalyzerPluginConfigViewSet(PluginConfigViewSet):
+    queryset = AnalyzerConfig.objects.all()

api_app/connectors_manager/urls.py

@@ -4,7 +4,11 @@
 from django.urls import include, path
 from rest_framework import routers
 
-from .views import ConnectorActionViewSet, ConnectorConfigViewSet
+from .views import (
+    ConnectorActionViewSet,
+    ConnectorConfigViewSet,
+    ConnectorPluginConfigViewSet,
+)
 
 # Routers provide an easy way of automatically determining the URL conf.
 router = routers.DefaultRouter(trailing_slash=False)
@@ -14,6 +18,11 @@
     basename="connectorreport",
 )
 router.register(r"connector", ConnectorConfigViewSet, basename="connector")
+router.register(
+    r"connector/(?P<name>\w+)",
+    ConnectorPluginConfigViewSet,
+    basename="plugin-config-connector",
+)
 
 urlpatterns = [
     path(r"", include(router.urls)),

api_app/connectors_manager/views.py

@@ -3,8 +3,8 @@
 
 import logging
 
-from ..views import PythonConfigViewSet, PythonReportActionViewSet
-from .models import ConnectorReport
+from ..views import PluginConfigViewSet, PythonConfigViewSet, PythonReportActionViewSet
+from .models import ConnectorConfig, ConnectorReport
 from .serializers import ConnectorConfigSerializer
 
 logger = logging.getLogger(__name__)
@@ -25,3 +25,7 @@ class ConnectorActionViewSet(PythonReportActionViewSet):
     @property
     def report_model(cls):
         return ConnectorReport
+
+
+class ConnectorPluginConfigViewSet(PluginConfigViewSet):
+    queryset = ConnectorConfig.objects.all()

api_app/ingestors_manager/urls.py

@@ -5,10 +5,18 @@
 from rest_framework import routers
 
 # Routers provide an easy way of automatically determining the URL conf.
-from api_app.ingestors_manager.views import IngestorConfigViewSet
+from api_app.ingestors_manager.views import (
+    IngestorConfigViewSet,
+    IngestorPluginConfigViewSet,
+)
 
 router = routers.DefaultRouter(trailing_slash=False)
 router.register(r"ingestor", IngestorConfigViewSet, basename="ingestor")
+router.register(
+    r"ingestor/(?P<name>\w+)",
+    IngestorPluginConfigViewSet,
+    basename="plugin-config-ingestor",
+)
 
 urlpatterns = [
     # Viewsets

api_app/ingestors_manager/views.py

@@ -6,8 +6,9 @@
 from rest_framework import status
 from rest_framework.response import Response
 
+from api_app.ingestors_manager.models import IngestorConfig
 from api_app.ingestors_manager.serializers import IngestorConfigSerializer
-from api_app.views import PythonConfigViewSet
+from api_app.views import PluginConfigViewSet, PythonConfigViewSet
 
 logger = logging.getLogger(__name__)
 
@@ -20,3 +21,7 @@ def disable_in_org(self, request, pk=None):
 
     def enable_in_org(self, request, pk=None):
         return Response(status=status.HTTP_404_NOT_FOUND)
+
+
+class IngestorPluginConfigViewSet(PluginConfigViewSet):
+    queryset = IngestorConfig.objects.all()

api_app/models.py

@@ -1025,18 +1025,6 @@ def plugin_name(self):
         """Returns the name of the plugin associated with this configuration."""
         return self.config.name
 
-    @property
-    def type(self):
-        """Returns the type of the plugin associated with this configuration."""
-        # TODO retrocompatibility
-        return self.config.plugin_type
-
-    @property
-    def config_type(self):
-        """Returns the type of the configuration (1 or 2)."""
-        # TODO retrocompatibility
-        return "2" if self.is_secret() else "1"
-
 
 class OrganizationPluginConfiguration(models.Model):
     """

api_app/pivots_manager/serializers.py

@@ -3,11 +3,10 @@
 
 from api_app.analyzers_manager.models import AnalyzerConfig
 from api_app.connectors_manager.models import ConnectorConfig
-from api_app.models import Job, PluginConfig, PythonModule
+from api_app.models import Job, PythonModule
 from api_app.pivots_manager.models import PivotConfig, PivotMap, PivotReport
 from api_app.playbooks_manager.models import PlaybookConfig
 from api_app.serializers.plugin import (
-    PluginConfigSerializer,
     PythonConfigSerializer,
     PythonConfigSerializerForMigration,
 )
@@ -77,9 +76,6 @@ class PivotConfigSerializer(PythonConfigSerializer):
     python_module = rfs.SlugRelatedField(
         queryset=PythonModule.objects.all(), slug_field="module"
     )
-    plugin_config = rfs.ListField(
-        child=rfs.DictField(), write_only=True, required=False
-    )
 
     class Meta:
         model = PivotConfig
@@ -99,38 +95,6 @@ def validate(self, attrs):
             )
         return attrs
 
-    def create(self, validated_data):
-        plugin_config = validated_data.pop("plugin_config", {})
-        pc = super().create(validated_data)
-
-        # create plugin config
-        for config in plugin_config:
-            plugin_config_serializer = PluginConfigSerializer(
-                data=config, context={"request": self.context["request"]}
-            )
-            plugin_config_serializer.is_valid(raise_exception=True)
-            plugin_config_serializer.save()
-        return pc
-
-    def update(self, instance, validated_data):
-        plugin_config = validated_data.pop("plugin_config", [])
-        pc = super().update(instance, validated_data)
-
-        # update plugin config
-        for config in plugin_config:
-            plugin_config_serializer = PluginConfigSerializer(
-                data=config, context={"request": self.context["request"]}
-            )
-            plugin_config_serializer.is_valid(raise_exception=True)
-            PluginConfig.objects.filter(
-                owner=self.context["request"].user,
-                analyzer_config=plugin_config_serializer.validated_data[
-                    "analyzer_config"
-                ],
-                parameter=plugin_config_serializer.validated_data["parameter"],
-            ).update_or_create(plugin_config_serializer.validated_data)
-        return pc
-
 
 class PivotConfigSerializerForMigration(PythonConfigSerializerForMigration):
     related_analyzer_configs = rfs.SlugRelatedField(

api_app/pivots_manager/urls.py

@@ -5,11 +5,18 @@
 from rest_framework import routers
 
 # Routers provide an easy way of automatically determining the URL conf.
-from api_app.pivots_manager.views import PivotConfigViewSet, PivotMapViewSet
+from api_app.pivots_manager.views import (
+    PivotConfigViewSet,
+    PivotMapViewSet,
+    PivotPluginConfigViewSet,
+)
 
 router = routers.DefaultRouter(trailing_slash=False)
 router.register(r"pivot", PivotConfigViewSet, basename="pivot")
 router.register(r"pivot_map", PivotMapViewSet, basename="pivot_map")
+router.register(
+    r"pivot/(?P<name>\w+)", PivotPluginConfigViewSet, basename="plugin-config-pivot"
+)
 
 urlpatterns = [
     path(r"", include(router.urls)),

api_app/pivots_manager/views.py

@@ -7,7 +7,11 @@
     PivotOwnerPermission,
 )
 from api_app.pivots_manager.serializers import PivotConfigSerializer, PivotMapSerializer
-from api_app.views import PythonConfigViewSet, PythonReportActionViewSet
+from api_app.views import (
+    PluginConfigViewSet,
+    PythonConfigViewSet,
+    PythonReportActionViewSet,
+)
 
 
 class PivotConfigViewSet(
@@ -55,3 +59,7 @@ class PivotMapViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = PivotMapSerializer
     lookup_field = "pk"
     queryset = PivotMap.objects.all()
+
+
+class PivotPluginConfigViewSet(PluginConfigViewSet):
+    queryset = PivotConfig.objects.all()