ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-15 11:28:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add arg to deploy.py for custom_domain (#2720)

Browse Source
This commit is contained in:
Adam
2023-01-05 10:28:17 -08:00
committed by GitHub
parent b995cc25ad
commit af25752c55
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/deployment/deploy.py
View File

@ -160,6 +160,7 @@ class Client:
auto_create_cli_app: bool, auto_create_cli_app: bool,
host_dotnet_on_windows: bool, host_dotnet_on_windows: bool,
enable_profiler: bool, enable_profiler: bool,
custom_domain: Optional[str],
): ):
self.subscription_id = subscription_id self.subscription_id = subscription_id
self.resource_group = resource_group self.resource_group = resource_group
@ -173,6 +174,7 @@ class Client:
self.third_party = third_party self.third_party = third_party
self.create_registration = create_registration self.create_registration = create_registration
self.multi_tenant_domain = multi_tenant_domain self.multi_tenant_domain = multi_tenant_domain
self.custom_domain = custom_domain
self.upgrade = upgrade self.upgrade = upgrade
self.results: Dict = { self.results: Dict = {
"client_id": client_id, "client_id": client_id,
@ -636,6 +638,21 @@ class Client:
app_func_audiences = [self.get_identifier_url()] app_func_audiences = [self.get_identifier_url()]
app_func_audiences.extend([self.get_instance_url()]) app_func_audiences.extend([self.get_instance_url()])
# Add --custom_domain value to Allowed token audiences setting
if self.custom_domain:
if self.multi_tenant_domain:
root_domain = self.multi_tenant_domain
else:
root_domain = "%s.azurewebsites.net" % self.application_name
custom_domains = [
"api://%s/%s" % (root_domain, self.custom_domain.split(".")[0]),
"https://%s/%s" % (root_domain, self.custom_domain.split(".")[0]),
]
app_func_audiences.extend(custom_domains)
if self.multi_tenant_domain: if self.multi_tenant_domain:
# clear the value in the Issuer Url field: # clear the value in the Issuer Url field:
# https://docs.microsoft.com/en-us/sharepoint/dev/spfx/use-aadhttpclient-enterpriseapi-multitenant # https://docs.microsoft.com/en-us/sharepoint/dev/spfx/use-aadhttpclient-enterpriseapi-multitenant
@ -1302,6 +1319,13 @@ def main() -> None:
action="store_true", action="store_true",
help="Enable CPU and memory profiler in dotnet Azure Function", help="Enable CPU and memory profiler in dotnet Azure Function",
) )
parser.add_argument(
"--custom_domain",
type=str,
help="Use a custom domain name for your Azure Function and CLI endpoint",
)
args = parser.parse_args() args = parser.parse_args()
if shutil.which("func") is None: if shutil.which("func") is None:
@ -1334,6 +1358,7 @@ def main() -> None:
auto_create_cli_app=args.auto_create_cli_app, auto_create_cli_app=args.auto_create_cli_app,
host_dotnet_on_windows=args.host_dotnet_on_windows, host_dotnet_on_windows=args.host_dotnet_on_windows,
enable_profiler=args.enable_profiler, enable_profiler=args.enable_profiler,
custom_domain=args.custom_domain,
) )
if args.verbose: if args.verbose:
level = logging.DEBUG level = logging.DEBUG