Skip to content

[App Service] Prevent access restriction updates from dropping site config #34050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danielw5 wants to merge 2 commits into
base: dev
Choose a base branch
from
+19 −12
Open

[App Service] Prevent access restriction updates from dropping site config #34050

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2ae844
Prevent access restriction updates from dropping site config
danielw5 Sep 9, 2026
6056b4f
guard against missing access restrictions
danielw5 Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions src/azure-cli/azure/cli/command_modules/appservice/access_restrictions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
ALLOWED_HTTP_HEADER_NAMES = ['x-forwarded-host', 'x-forwarded-for', 'x-azure-fdid', 'x-fd-healthprobe']


def _update_webapp_access_restrictions(cmd, resource_group_name, name, slot, properties):
config = {'properties': properties}
return _generic_site_operation(
cmd.cli_ctx, resource_group_name, name, 'update_configuration', slot, config)
Comment on lines +24 to +27


def show_webapp_access_restrictions(cmd, resource_group_name, name, slot=None):
configs = get_site_configs(cmd, resource_group_name, name, slot)
access_restrictions = [r.as_dict() for r in (configs.ip_security_restrictions or [])]
Expand Down Expand Up @@ -100,8 +106,9 @@ def add_webapp_access_restriction(
logger.info(http_headers)
rule_instance.headers = _parse_http_headers(http_headers=http_headers)

result = _generic_site_operation(
cmd.cli_ctx, resource_group_name, name, 'update_configuration', slot, configs)
property_name = 'scmIpSecurityRestrictions' if scm_site else 'ipSecurityRestrictions'
result = _update_webapp_access_restrictions(
cmd, resource_group_name, name, slot, {property_name: access_rules})
return result.scm_ip_security_restrictions if scm_site else result.ip_security_restrictions


Expand All @@ -120,7 +127,7 @@ def remove_webapp_access_restriction(cmd, resource_group_name, name, rule_name=N
rule_instance = None
# get rules list
access_rules = configs.scm_ip_security_restrictions if scm_site else configs.ip_security_restrictions
for rule in list(access_rules):
for rule in (list(access_rules) if access_rules is not None else []):
if rule_name and input_rule_types == 0:
if rule.name and rule.name.lower() == rule_name.lower() and rule.action == action:
rule_instance = rule
Expand Down Expand Up @@ -154,25 +161,25 @@ def remove_webapp_access_restriction(cmd, resource_group_name, name, rule_name=N

access_rules.remove(rule_instance)

result = _generic_site_operation(
cmd.cli_ctx, resource_group_name, name, 'update_configuration', slot, configs)
property_name = 'scmIpSecurityRestrictions' if scm_site else 'ipSecurityRestrictions'
result = _update_webapp_access_restrictions(
cmd, resource_group_name, name, slot, {property_name: access_rules})
Comment thread
danielw5 marked this conversation as resolved.
return result.scm_ip_security_restrictions if scm_site else result.ip_security_restrictions


def set_webapp_access_restriction(cmd, resource_group_name, name, use_same_restrictions_for_scm_site=None,
default_action=None, scm_default_action=None, slot=None):
configs = get_site_configs(cmd, resource_group_name, name, slot)
properties = {}

if use_same_restrictions_for_scm_site is not None:
setattr(configs, 'scm_ip_security_restrictions_use_main', bool(use_same_restrictions_for_scm_site))
properties['scmIpSecurityRestrictionsUseMain'] = bool(use_same_restrictions_for_scm_site)
if default_action is not None:
setattr(configs, 'ip_security_restrictions_default_action', default_action)
properties['ipSecurityRestrictionsDefaultAction'] = default_action
if scm_default_action is not None:
setattr(configs, 'scm_ip_security_restrictions_default_action', scm_default_action)
properties['scmIpSecurityRestrictionsDefaultAction'] = scm_default_action

app_config = _generic_site_operation(
cmd.cli_ctx, resource_group_name, name, 'update_configuration',
slot, configs)
app_config = _update_webapp_access_restrictions(
cmd, resource_group_name, name, slot, properties)
Comment on lines +172 to +182
app_use_main = app_config.scm_ip_security_restrictions_use_main
app_default_action = app_config.ip_security_restrictions_default_action
app_scm_default_action = app_config.scm_ip_security_restrictions_default_action
Expand Down
Loading