From bfa8a78d3c08a45fa530330fe692042c60bc92ee Mon Sep 17 00:00:00 2001 From: "claude[bot]" <209825114+claude[bot]@users.noreply.github.com> Date: Fri, 19 Dec 2025 00:37:42 +0000 Subject: [PATCH 1/2] Update ABAC docs to reflect Channel Details access via System Console MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add new access path for ABAC rules via Channel Details in System Console (v11.1.1+) - Update abac-system-wide-policies.rst to include both User Management > Channels and Channel Details options - Update abac-channel-access-rules.rst to mention System Console alternative for System Admins - Maintain single-sourcing by cross-referencing between documents Addresses issue #8593 🤖 Generated with [Claude Code](https://claude.ai/code) Co-authored-by: Combs7th --- .../manage/admin/abac-channel-access-rules.rst | 6 ++++++ .../manage/admin/abac-system-wide-policies.rst | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/source/administration-guide/manage/admin/abac-channel-access-rules.rst b/source/administration-guide/manage/admin/abac-channel-access-rules.rst index 3bd6adf38e6..88f987a2b34 100644 --- a/source/administration-guide/manage/admin/abac-channel-access-rules.rst +++ b/source/administration-guide/manage/admin/abac-channel-access-rules.rst @@ -23,10 +23,16 @@ Prerequisites Access Channel Settings ~~~~~~~~~~~~~~~~~~~~~~~~ +**Primary method (for Channel and Team Admins):** + 1. In a private channel where you have Channel Admin permissions, select the channel name at the top of the center pane. 2. Select **Channel Settings** from the dropdown menu. 3. Navigate to the **Access Control** tab. +**Alternative method (for System Admins in Mattermost v11.1.1+):** + +System Admins can also access and edit ABAC rules directly from a channel's details page in the System Console. This provides convenient access to channel-specific rules alongside system-wide ABAC policies. See :doc:`System-wide attribute-based access policies ` for more details on System Console access. + .. note:: The **Access Control** tab is only visible for private channels when you have the appropriate permissions and ABAC is enabled system-wide. diff --git a/source/administration-guide/manage/admin/abac-system-wide-policies.rst b/source/administration-guide/manage/admin/abac-system-wide-policies.rst index 5b33f371974..2083aecfd9f 100644 --- a/source/administration-guide/manage/admin/abac-system-wide-policies.rst +++ b/source/administration-guide/manage/admin/abac-system-wide-policies.rst @@ -91,10 +91,18 @@ Define access controls per channel You can assign an existing access control policy to a private channels for more granular control over channel membership. This is useful when you need to apply different rules for different channels. +**Option 1: Via User Management > Channels** + 1. In the System Console, go to **User Management > Channels** to select the private channel you want to configure, and select **Edit**. 2. In the **Channel Management** section, enable the **Enable attribute-based channel access** option. 3. Under **Access policy**, select **Link to a policy** to select an existing policy. +**Option 2: Via Channel Details (Mattermost v11.1.1+)** + +1. From a channel's details page in the System Console, navigate to the **Access Control** section. +2. Enable the **Enable attribute-based channel access** option. +3. Under **Access policy**, select **Link to a policy** to select an existing policy. + Remove channel policies ~~~~~~~~~~~~~~~~~~~~~~~ From 4cca37a8b5807e3d9b92985416851909f4198686 Mon Sep 17 00:00:00 2001 From: "Carrie Warner (Mattermost)" <74422101+cwarnermm@users.noreply.github.com> Date: Fri, 19 Dec 2025 14:40:18 -0500 Subject: [PATCH 2/2] Editorial reviews --- .../manage/admin/abac-channel-access-rules.rst | 12 +++--------- .../manage/admin/abac-system-wide-policies.rst | 8 ++------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/source/administration-guide/manage/admin/abac-channel-access-rules.rst b/source/administration-guide/manage/admin/abac-channel-access-rules.rst index 88f987a2b34..29fac5333a9 100644 --- a/source/administration-guide/manage/admin/abac-channel-access-rules.rst +++ b/source/administration-guide/manage/admin/abac-channel-access-rules.rst @@ -23,19 +23,13 @@ Prerequisites Access Channel Settings ~~~~~~~~~~~~~~~~~~~~~~~~ -**Primary method (for Channel and Team Admins):** - 1. In a private channel where you have Channel Admin permissions, select the channel name at the top of the center pane. 2. Select **Channel Settings** from the dropdown menu. -3. Navigate to the **Access Control** tab. - -**Alternative method (for System Admins in Mattermost v11.1.1+):** +3. Navigate to the **Access Control** tab. This tab is only visible for private channels when you have the appropriate permissions and ABAC is enabled system-wide. -System Admins can also access and edit ABAC rules directly from a channel's details page in the System Console. This provides convenient access to channel-specific rules alongside system-wide ABAC policies. See :doc:`System-wide attribute-based access policies ` for more details on System Console access. - -.. note:: +.. tip:: - The **Access Control** tab is only visible for private channels when you have the appropriate permissions and ABAC is enabled system-wide. + You can also assign ABAC rules to a channel directly from a channel's details page in the System Console under **Channel Management** by enabling the **Enable attribute-based channel access** option. Under **Access policy**, select **Link to a policy** to select an existing policy. Configure access rules ---------------------- diff --git a/source/administration-guide/manage/admin/abac-system-wide-policies.rst b/source/administration-guide/manage/admin/abac-system-wide-policies.rst index 2083aecfd9f..bd7aa811b5a 100644 --- a/source/administration-guide/manage/admin/abac-system-wide-policies.rst +++ b/source/administration-guide/manage/admin/abac-system-wide-policies.rst @@ -91,17 +91,13 @@ Define access controls per channel You can assign an existing access control policy to a private channels for more granular control over channel membership. This is useful when you need to apply different rules for different channels. -**Option 1: Via User Management > Channels** - 1. In the System Console, go to **User Management > Channels** to select the private channel you want to configure, and select **Edit**. 2. In the **Channel Management** section, enable the **Enable attribute-based channel access** option. 3. Under **Access policy**, select **Link to a policy** to select an existing policy. -**Option 2: Via Channel Details (Mattermost v11.1.1+)** +.. tip:: -1. From a channel's details page in the System Console, navigate to the **Access Control** section. -2. Enable the **Enable attribute-based channel access** option. -3. Under **Access policy**, select **Link to a policy** to select an existing policy. + You can also assign ABAC rules to a channel directly from a channel's details page in the System Console under **Channel Management** by enabling the **Enable attribute-based channel access** option. Under **Access policy**, select **Link to a policy** to select an existing policy. Remove channel policies ~~~~~~~~~~~~~~~~~~~~~~~