upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Filter cloud-restricted descendants by ancestor path prefix, not exact match

Browse source 
The cloud filtering for config diffs now matches descendant and indexed
paths (e.g. SqlSettings.ReplicaLagSettings[0].DataSource) under tagged
ancestor fields, not just exact path equality.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Wayne Wollesen 2026-03-22 10:44:27 -07:00
parent 4563d7fc3f
commit dfe73b14c6
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
server/public/model/config.go
View file

@ -5198,7 +5198,23 @@ func CloudRestrictedPaths() map[string]bool {
return collectTaggedPaths(reflect.TypeFor[Config](), ConfigAccessTagType, ConfigAccessTagCloudRestrictable, "")
}
// FilterCloudRestrictedChanges removes changes whose paths match cloud-restrictable config fields.
// isCloudRestricted checks whether a change path matches or is a descendant
// of any cloud-restrictable config field path (e.g. "SqlSettings.ReplicaLagSettings"
// also matches "SqlSettings.ReplicaLagSettings[0].DataSource").
func isCloudRestricted(path string, restricted map[string]bool) bool {
if restricted[path] {
return true
}
for rp := range restricted {
if strings.HasPrefix(path, rp+".") || strings.HasPrefix(path, rp+"[") {
return true
}
}
return false
}
// FilterCloudRestrictedChanges removes changes whose paths match or descend from
// cloud-restrictable config fields.
func FilterCloudRestrictedChanges(items []*ConfigListItem) {
restricted := CloudRestrictedPaths()
for _, item := range items {
@ -5207,7 +5223,7 @@ func FilterCloudRestrictedChanges(items []*ConfigListItem) {
}
filtered := make([]ConfigChange, 0, len(item.Changes))
for _, ch := range item.Changes {
if !restricted[ch.Path] {
if !isCloudRestricted(ch.Path, restricted) {
filtered = append(filtered, ch)
}
}