Return 404 when content rules are not activated (PLIP 4119) (#2067)

* Return 404 when content rules are not activated (PLIP 4119)

Assisted-by: Claude Sonnet 5.5, Claude Opus 5.5

* Tests: run fieldset test on rules layer, strengthen inactive-profile 404 tests

Assisted-by: Claude Sonnet 5.5, Claude Opus 5.5

---------

Co-authored-by: David Glick <david@glicksoftware.com>

Author: jensens

news/+controlpanel404.bugfix

@@ -0,0 +1,2 @@
+``POST``, ``PATCH`` and ``DELETE`` on ``@controlpanels`` with an unknown control panel name return 404 instead of 500.
+@jensens

news/+plip4119.feature

@@ -0,0 +1,3 @@
+Content rules endpoints return 404 when content rules are not activated in the site, instead of failing with an error.
+Preparation for PLIP https://github.com/plone/Products.CMFPlone/issues/4119.
+@jensens

setup.py

@@ -21,6 +21,7 @@
 TEST_REQUIRES = [
     "collective.MockMailHost",
     "plone.app.caching",
+    "plone.app.contentrules",
     "plone.app.contenttypes[test]",
     "plone.app.iterate",
     "plone.app.discussion[test]",

src/plone/restapi/controlpanels/rules.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from plone.contentrules.engine.interfaces import IRuleStorage
 from plone.restapi.controlpanels import RegistryConfigletPanel
 from plone.restapi.controlpanels.interfaces import IContentRulesControlpanel
 from plone.restapi.deserializer import json_body
@@ -15,6 +16,7 @@
 from zExceptions import NotFound
 from zope.component import adapter
 from zope.component import queryMultiAdapter
+from zope.component import queryUtility
 from zope.interface import alsoProvides
 from zope.interface import implementer
 from zope.interface import Interface
@@ -342,3 +344,15 @@ def _delete_rule(self, rule_id: str) -> None:
         # calls authorize directly, so we need to override that here
         cpanel.authorize = lambda: True
         cpanel.delete_rule()
+
+
+@adapter(Interface, IControlpanelLayer)
+@implementer(IContentRulesControlpanel)
+def content_rules_controlpanel(context, request):
+    """Return the content rules control panel, or None when content rules
+    are not activated (no storage or no add-on browser layer)."""
+    if queryUtility(IRuleStorage) is None:
+        return None
+    if queryMultiAdapter((context, request), name="rules-controlpanel") is None:
+        return None
+    return ContentRulesControlpanel(context, request)

src/plone/restapi/services/controlpanels/add.py

@@ -2,6 +2,7 @@
 from plone.restapi.interfaces import IControlpanelLayer
 from plone.restapi.services import Service
 from zExceptions import BadRequest
+from zExceptions import NotFound
 from zope.component import getAdapters
 from zope.interface import alsoProvides
 from zope.interface import implementer
@@ -35,6 +36,8 @@ def reply(self):
             raise BadRequest("Missing parameter controlpanelname")
 
         panel = self.panel_by_name(self.params[0])
+        if panel is None:
+            raise NotFound(self.context, self.params[0], self.request)
         res = panel.add(self.params[1:])
 
         self.request.response.setStatus(201)

src/plone/restapi/services/controlpanels/configure.zcml

@@ -57,7 +57,7 @@
 
   <!-- Rules Controlpanel -->
   <adapter
-      factory="plone.restapi.controlpanels.rules.ContentRulesControlpanel"
+      factory="plone.restapi.controlpanels.rules.content_rules_controlpanel"
       provides="plone.restapi.controlpanels.interfaces.IContentRulesControlpanel"
       name="content-rules"
       zcml:condition="installed plone.app.contentrules"

src/plone/restapi/services/controlpanels/delete.py

@@ -2,6 +2,7 @@
 from plone.restapi.interfaces import IControlpanelLayer
 from plone.restapi.services import Service
 from zExceptions import BadRequest
+from zExceptions import NotFound
 from zope.component import getAdapters
 from zope.interface import alsoProvides
 from zope.interface import implementer
@@ -35,6 +36,8 @@ def reply(self):
             raise BadRequest("Can't delete Control Panel: %s" % self.params)
 
         panel = self.panel_by_name(self.params[0])
+        if panel is None:
+            raise NotFound(self.context, self.params[0], self.request)
         panel.delete(self.params[1:])
 
         return self.reply_no_content()

src/plone/restapi/services/controlpanels/update.py

@@ -3,6 +3,7 @@
 from plone.restapi.interfaces import IDeserializeFromJson
 from plone.restapi.services import Service
 from zExceptions import BadRequest
+from zExceptions import NotFound
 from zope.component import getAdapters
 from zope.interface import alsoProvides
 from zope.interface import implementer
@@ -36,6 +37,8 @@ def reply(self):
             raise BadRequest("Missing parameter controlpanelname")
 
         panel = self.panel_by_name(self.params[0])
+        if panel is None:
+            raise NotFound(self.context, self.params[0], self.request)
         if len(self.params) > 1:
             # Update panel child
             panel.update(self.params[1:])

src/plone/restapi/services/rules/__init__.py

@@ -0,0 +1,16 @@
+from plone.contentrules.engine.interfaces import IRuleStorage
+from zExceptions import NotFound
+from zope.component import queryMultiAdapter
+from zope.component import queryUtility
+
+
+def ensure_rules_activated(context, request):
+    """Raise NotFound unless content rules are activated in this site.
+
+    Activated means: the rule storage exists and the management view is
+    available for this request (the add-on browser layer is active).
+    """
+    if queryUtility(IRuleStorage) is None:
+        raise NotFound("Content rules are not activated in this site.")
+    if queryMultiAdapter((context, request), name="manage-content-rules") is None:
+        raise NotFound("Content rules are not activated in this site.")

src/plone/restapi/services/rules/add.py

@@ -1,4 +1,5 @@
 from plone.restapi.services import Service
+from plone.restapi.services.rules import ensure_rules_activated
 from zExceptions import BadRequest
 from zope.component import queryMultiAdapter
 from zope.interface import alsoProvides
@@ -22,6 +23,7 @@ def publishTraverse(self, request, name):
         return self
 
     def reply(self):
+        ensure_rules_activated(self.context, self.request)
 
         if not self.params:
             raise BadRequest("Missing parameter rule_id")