This is an automated email from the ASF dual-hosted git repository. tomsun28 pushed a commit to branch 2.0.0 in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 20a81fbbf87cff13773f1aa2a973cb31c6073550 Author: tomsun28 <[email protected]> AuthorDate: Fri Oct 9 13:42:32 2026 +0800 fix(startup): dedupe sureness ACL rules and keep the mute POST scope from master The merge union left path===method duplicates across the per-resource list and master's #4270 hardening block. Most were identical, but /api/config/mute===post conflicted: the bare [admin] line shadowed master's deliberate [admin,user,guest] rule (the mute toggle lives in the notification widget every signed-in user sees), and sureness logged "match same resource config" at startup. Keep the commented master entries; drop the bare copies. --- hertzbeat-manager/src/test/resources/sureness.yml | 3 --- hertzbeat-startup/src/main/resources/sureness.yml | 9 --------- 2 files changed, 12 deletions(-) diff --git a/hertzbeat-manager/src/test/resources/sureness.yml b/hertzbeat-manager/src/test/resources/sureness.yml index fb130adc24..45d2d4d022 100644 --- a/hertzbeat-manager/src/test/resources/sureness.yml +++ b/hertzbeat-manager/src/test/resources/sureness.yml @@ -68,7 +68,6 @@ resourceRole: - /api/monitors/**===delete===[admin] - /api/alert/define/preview/**===get===[admin,user] - /api/alert/**===get===[admin,user,guest] - - /api/alert/sse/**===get===[admin,user,guest] - /api/alert/**===post===[admin,user] - /api/alert/**===put===[admin,user] - /api/alert/**===delete===[admin] @@ -145,13 +144,11 @@ resourceRole: - /api/ingestion/otlp/**===get===[admin,user,guest] - /api/ingestion/otlp/metrics/console===get===[admin,user,guest] - /api/otlp/**===post===[admin,user] - - /api/logs/otlp/**===post===[admin,user] - /api/logs/**===get===[admin,user,guest] - /api/logs/analysis/compare===post===[admin,user,guest] - /api/logs/sse/**===get===[admin,user,guest] - /api/traces/**===get===[admin,user,guest] - /api/manager/import-tasks/**===get===[admin,user] - - /api/manager/sse/**===get===[admin,user,guest] - /api/bulletin/**===get===[admin,user,guest] - /api/bulletin/**===post===[admin,user] - /api/bulletin/**===put===[admin,user] diff --git a/hertzbeat-startup/src/main/resources/sureness.yml b/hertzbeat-startup/src/main/resources/sureness.yml index 36fdab051a..83e9a6d93e 100644 --- a/hertzbeat-startup/src/main/resources/sureness.yml +++ b/hertzbeat-startup/src/main/resources/sureness.yml @@ -30,8 +30,6 @@ resourceRole: - /api/plugin===post===[admin] - /api/plugin===put===[admin] - /api/plugin===delete===[admin] - - /api/plugin/**===get===[admin] - - /api/plugin/**===post===[admin] - /api/apps/**===get===[admin,user,guest] # the define yml routes persist the global collection templates # post can only add a new type, put overwrites an existing one and immediately @@ -76,13 +74,11 @@ resourceRole: - /api/alert/defines/**===get===[admin,user] - /api/alert/defines/**===post===[admin] - /api/alert/**===get===[admin,user,guest] - - /api/alert/sse/**===get===[admin,user,guest] - /api/alert/**===post===[admin,user] - /api/alert/**===put===[admin,user] - /api/alert/**===delete===[admin] - /api/alerts/**===get===[admin,user,guest] - /api/alerts/**===post===[admin,user] - - /api/v2/alerts===post===[admin,user] - /api/alerts/**===put===[admin,user] - /api/alerts/**===delete===[admin] - /api/notice/**===get===[admin,user,guest] @@ -108,12 +104,9 @@ resourceRole: - /api/config/oss===get===[admin,user,guest] - /api/config/oss===post===[admin] - /api/config/mute===get===[admin,user,guest] - - /api/config/mute===post===[admin] - /api/config/template===get===[admin,user,guest] - /api/config/template===post===[admin] - /api/config/template/*===put===[admin] - - /api/config/secret===get===[admin] - - /api/config/secret===post===[admin] - /api/config/provider===get===[admin] - /api/config/provider===post===[admin] - /api/label===get===[admin,user,guest] @@ -179,13 +172,11 @@ resourceRole: - /api/ingestion/otlp/**===get===[admin,user,guest] - /api/ingestion/otlp/metrics/console===get===[admin,user,guest] - /api/otlp/**===post===[admin,user] - - /api/logs/otlp/**===post===[admin,user] - /api/logs/**===get===[admin,user,guest] - /api/logs/analysis/compare===post===[admin,user,guest] - /api/logs/sse/**===get===[admin,user,guest] - /api/traces/**===get===[admin,user,guest] - /api/manager/import-tasks/**===get===[admin,user] - - /api/manager/sse/**===get===[admin,user,guest] - /api/signal/saved-view/**===get===[admin,user,guest] - /api/signal/saved-view===put===[admin,user] - /api/signal/saved-view/**===delete===[admin,user] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
