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

Merge pull request from GHSA-q5vh-6whw-x745

Browse Source 
* verify aad tenants, primarily needed in multi-tenant deployments

* add logging and fix trailing slash for issuer

* handle call_if* not supporting additional argument callbacks

* add logging

* include new datatype in webhook docs

* fix pytypes unit tests

Co-authored-by: Brian Caswell <bmc@shmoo.com>
This commit is contained in:
bmc-msft
2021-08-13 14:50:54 -04:00
committed by GitHub
parent ba3a6eab04
commit 2fcb499888
12 changed files with 193 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/deployment/set_admins.py
View File

@ -20,6 +20,21 @@ def create_if_missing(table_service: TableService) -> None:
table_service.create_table(TABLE_NAME)
def update_allowed_aad_tenants(
table_service: TableService, resource_group: str, tenants: List[UUID]
) -> None:
create_if_missing(table_service)
as_str = [str(x) for x in tenants]
table_service.insert_or_merge_entity(
TABLE_NAME,
{
"PartitionKey": resource_group,
"RowKey": resource_group,
"allowed_aad_tenants": json.dumps(as_str),
},
)
def update_admins(
table_service: TableService, resource_group: str, admins: List[UUID]
) -> None:
@ -43,7 +58,8 @@ def main() -> None:
parser = argparse.ArgumentParser(formatter_class=formatter)
parser.add_argument("resource_group")
parser.add_argument("storage_account")
parser.add_argument("admins", type=UUID, nargs="*")
parser.add_argument("--admins", type=UUID, nargs="*")
parser.add_argument("--allowed_aad_tenants", type=UUID, nargs="*")
args = parser.parse_args()
client = get_client_from_cli_profile(StorageManagementClient)
@ -53,7 +69,12 @@ def main() -> None:
table_service = TableService(
account_name=args.storage_account, account_key=storage_keys.keys[0].value
)
update_admins(table_service, args.resource_group, args.admins)
if args.admins:
update_admins(table_service, args.resource_group, args.admins)
if args.allowed_aad_tenants:
update_allowed_aad_tenants(
table_service, args.resource_group, args.allowed_aad_tenants
)
if __name__ == "__main__":