fix(azure): apply access mode to every zone in the same block (#8110)

This commit is contained in:
James R T
2026-05-20 23:06:37 +08:00
committed by GitHub
parent f8dffa7fc2
commit 84faec64c3
2 changed files with 50 additions and 24 deletions

View File

@@ -67,18 +67,17 @@ func parse(c *caddy.Controller) (auth.EnvironmentSettings, map[string][]string,
var fall fall.F
var access string
var resourceGroup string
var zoneName string
for c.Next() {
args := c.RemainingArgs()
var currentZoneKeys []string
for i := range args {
parts := strings.SplitN(args[i], ":", 2)
if len(parts) != 2 {
return env, resourceGroupMapping, accessMap, fall, c.Errf("invalid resource group/zone: %q", args[i])
}
resourceGroup, zoneName = parts[0], parts[1]
resourceGroup, zoneName := parts[0], parts[1]
if resourceGroup == "" || zoneName == "" {
return env, resourceGroupMapping, accessMap, fall, c.Errf("invalid resource group/zone: %q", args[i])
}
@@ -88,6 +87,7 @@ func parse(c *caddy.Controller) (auth.EnvironmentSettings, map[string][]string,
resourceGroupSet[resourceGroup+zoneName] = struct{}{}
accessMap[resourceGroup+zoneName] = "public"
currentZoneKeys = append(currentZoneKeys, resourceGroup+zoneName)
resourceGroupMapping[resourceGroup] = append(resourceGroupMapping[resourceGroup], zoneName)
}
@@ -131,7 +131,9 @@ func parse(c *caddy.Controller) (auth.EnvironmentSettings, map[string][]string,
if access != "public" && access != "private" {
return env, resourceGroupMapping, accessMap, fall, c.Errf("invalid access value: can be public/private, found: %s", access)
}
accessMap[resourceGroup+zoneName] = access
for _, k := range currentZoneKeys {
accessMap[k] = access
}
default:
return env, resourceGroupMapping, accessMap, fall, c.Errf("unknown property: %q", c.Val())
}