From 69d9f040804f28ab19625e91b6af8bbdb8bbbf1d Mon Sep 17 00:00:00 2001 From: Noah McGregor Harper <74685766+nharper285@users.noreply.github.com> Date: Mon, 25 Oct 2021 15:39:18 -0700 Subject: [PATCH] Update configuration.py to check for 'block all' configuration. (#1394) * Creating InstanceConfig Attributes for NSG Refactor (#1331) * Updating instance_config * Updating attribute names. * Updating list factory. * Updating config attributes. Co-authored-by: nharper285 * NSG deployment on a creation of new debug/repro proxy. (#1340) Co-authored-by: stas * Build fix (#1374) * Bump reqwest from 0.11.4 to 0.11.5 in /src/proxy-manager (#1336) Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.4 to 0.11.5. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.4...v0.11.5) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump reqwest from 0.11.4 to 0.11.5 in /src/agent (#1335) Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.4 to 0.11.5. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.4...v0.11.5) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Work around for newly-upgraded pip breaking pip-licenses (#1346) * Work around for newly upgrdaded pip breaking pip-licenses (can be reverted once https://github.com/raimon49/pip-licenses/issues/113 is fixed) * Update .github/workflows/ci.yml Co-authored-by: Joe Ranweiler Co-authored-by: stas Co-authored-by: Joe Ranweiler * Bump iced-x86 from 1.14.0 to 1.15.0 in /src/agent (#1337) Bumps [iced-x86](https://github.com/icedland/iced) from 1.14.0 to 1.15.0. - [Release notes](https://github.com/icedland/iced/releases) - [Commits](https://github.com/icedland/iced/compare/v1.14.0...v1.15.0) --- updated-dependencies: - dependency-name: iced-x86 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * revert pip breaking pip-licenses workaround (#1348) Co-authored-by: stas * Bump thiserror from 1.0.29 to 1.0.30 in /src/proxy-manager (#1341) Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.29 to 1.0.30. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.29...1.0.30) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump thiserror from 1.0.29 to 1.0.30 in /src/agent (#1342) Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.29 to 1.0.30. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.29...1.0.30) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump strum from 0.21.0 to 0.22.0 in /src/agent (#1343) Bumps [strum](https://github.com/Peternator7/strum) from 0.21.0 to 0.22.0. - [Release notes](https://github.com/Peternator7/strum/releases) - [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md) - [Commits](https://github.com/Peternator7/strum/commits) --- updated-dependencies: - dependency-name: strum dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump azure cli to 2.27.2 (#1355) * Bump azure cli to 2.27.2 * fixing up add-corpus-storage-account script Co-authored-by: stas * Bump azure-identity to 1.6.1 (#1356) Co-authored-by: stas * Bump strum_macros from 0.21.1 to 0.22.0 in /src/agent (#1344) Bumps [strum_macros](https://github.com/Peternator7/strum) from 0.21.1 to 0.22.0. - [Release notes](https://github.com/Peternator7/strum/releases) - [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md) - [Commits](https://github.com/Peternator7/strum/commits) --- updated-dependencies: - dependency-name: strum_macros dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marc Greisen * Bump sysinfo from 0.20.4 to 0.20.5 in /src/agent (#1353) Bumps [sysinfo](https://github.com/GuillaumeGomez/sysinfo) from 0.20.4 to 0.20.5. - [Release notes](https://github.com/GuillaumeGomez/sysinfo/releases) - [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md) - [Commits](https://github.com/GuillaumeGomez/sysinfo/commits) --- updated-dependencies: - dependency-name: sysinfo dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Release 3.2.0 (#1361) * Release 3.2.0 * Added python dependencies * Update CHANGELOG.md Co-authored-by: Cheick Keita * Update CHANGELOG.md Co-authored-by: Joe Ranweiler * Update grammar * Update CHANGELOG.md Co-authored-by: Joe Ranweiler Co-authored-by: Cheick Keita Co-authored-by: Joe Ranweiler * Temporarily ignore non-actionable `cargo audit` errors (#1365) * Azure DevOps notifications not appearing (#1370) Co-authored-by: stas * Bump procfs from 0.10.1 to 0.11.0 in /src/agent (#1360) Bumps [procfs](https://github.com/eminence/procfs) from 0.10.1 to 0.11.0. - [Release notes](https://github.com/eminence/procfs/releases) - [Commits](https://github.com/eminence/procfs/compare/v0.10.1...v0.11.0) --- updated-dependencies: - dependency-name: procfs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marc Greisen * Bump structopt from 0.3.23 to 0.3.25 in /src/agent (#1364) Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.23 to 0.3.25. - [Release notes](https://github.com/TeXitoi/structopt/releases) - [Changelog](https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md) - [Commits](https://github.com/TeXitoi/structopt/compare/v0.3.23...v0.3.25) --- updated-dependencies: - dependency-name: structopt dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump reqwest from 0.11.5 to 0.11.6 in /src/proxy-manager (#1367) Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.5 to 0.11.6. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.5...v0.11.6) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: stas Co-authored-by: Joe Ranweiler Co-authored-by: Marc Greisen Co-authored-by: Cheick Keita Co-authored-by: Joe Ranweiler * Delete NSG if no resources associated with it (#1358) Co-authored-by: stas * Update NSGs after changes to instance config (#1385) * Refactor set_admins into configuration.py and update deployment params with nsg_config * Fixing arguments. * Param takes in network config json * Fixing Client in deploy * removing import * Adding onefuzztypes to reqs.txt * Reverting to single list * Removing imports. * Retriggering build * Setting specific pip version for local testing. * Removing imports? * More imports. * Fixing formatting. * Updating how to parse nsg param. * Removing old logging statements. * Fixing types. * REmoving bad log * Removing local pip version. * Removing comments * fixing * Formatting * Fixing .split() * Adding NSG rule checks and type. * Formatting. * Formatting. * Removing imports. * Fixing formatting. * Testing formatting. * Retrigger? * New InstanceConfigClient class. * Retrigger. * Cherry picked commit. * Reformatting. * Actually fixing formatting. * Fixing table_service call. * Fixing return statement and nsg_rule pass. * Full config. * Removing commented out code. * Fixing logic. * Adding wildcard check. * Code for updating NSGs when instance_config updated. * Updating argument to set_allowed_rules * Updating model to no longer be optional. * Fixing args for set_allowed_rules * trying to fix calls to get_nsg * Updating calls to nsg lib * Fixing imports. * Updating calls to set_allowed and creating constructor for NSGConfig type. * Removing constructor and manually setting default ip * Fixing models. * Hopefully fixing docs. * Fix set_allowed call * Adding error handling for update config. * Changing to error check. * Fixing error call. * Fixing imports. * Adding empty() function on request. * Removing empty function. # Conflicts: # src/pytypes/onefuzztypes/models.py * Fixing files for update. * Fixing nsg.py. * Fixing imports. * removing commented code. Co-authored-by: nharper285 * Aligning feature branch with main (#1389) * Bump reqwest from 0.11.4 to 0.11.5 in /src/proxy-manager (#1336) Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.4 to 0.11.5. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.4...v0.11.5) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump reqwest from 0.11.4 to 0.11.5 in /src/agent (#1335) Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.4 to 0.11.5. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.4...v0.11.5) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Work around for newly-upgraded pip breaking pip-licenses (#1346) * Work around for newly upgrdaded pip breaking pip-licenses (can be reverted once https://github.com/raimon49/pip-licenses/issues/113 is fixed) * Update .github/workflows/ci.yml Co-authored-by: Joe Ranweiler Co-authored-by: stas Co-authored-by: Joe Ranweiler * Bump iced-x86 from 1.14.0 to 1.15.0 in /src/agent (#1337) Bumps [iced-x86](https://github.com/icedland/iced) from 1.14.0 to 1.15.0. - [Release notes](https://github.com/icedland/iced/releases) - [Commits](https://github.com/icedland/iced/compare/v1.14.0...v1.15.0) --- updated-dependencies: - dependency-name: iced-x86 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * revert pip breaking pip-licenses workaround (#1348) Co-authored-by: stas * Bump thiserror from 1.0.29 to 1.0.30 in /src/proxy-manager (#1341) Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.29 to 1.0.30. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.29...1.0.30) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump thiserror from 1.0.29 to 1.0.30 in /src/agent (#1342) Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.29 to 1.0.30. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.29...1.0.30) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump strum from 0.21.0 to 0.22.0 in /src/agent (#1343) Bumps [strum](https://github.com/Peternator7/strum) from 0.21.0 to 0.22.0. - [Release notes](https://github.com/Peternator7/strum/releases) - [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md) - [Commits](https://github.com/Peternator7/strum/commits) --- updated-dependencies: - dependency-name: strum dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump azure cli to 2.27.2 (#1355) * Bump azure cli to 2.27.2 * fixing up add-corpus-storage-account script Co-authored-by: stas * Bump azure-identity to 1.6.1 (#1356) Co-authored-by: stas * Bump strum_macros from 0.21.1 to 0.22.0 in /src/agent (#1344) Bumps [strum_macros](https://github.com/Peternator7/strum) from 0.21.1 to 0.22.0. - [Release notes](https://github.com/Peternator7/strum/releases) - [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md) - [Commits](https://github.com/Peternator7/strum/commits) --- updated-dependencies: - dependency-name: strum_macros dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marc Greisen * Bump sysinfo from 0.20.4 to 0.20.5 in /src/agent (#1353) Bumps [sysinfo](https://github.com/GuillaumeGomez/sysinfo) from 0.20.4 to 0.20.5. - [Release notes](https://github.com/GuillaumeGomez/sysinfo/releases) - [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md) - [Commits](https://github.com/GuillaumeGomez/sysinfo/commits) --- updated-dependencies: - dependency-name: sysinfo dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Release 3.2.0 (#1361) * Release 3.2.0 * Added python dependencies * Update CHANGELOG.md Co-authored-by: Cheick Keita * Update CHANGELOG.md Co-authored-by: Joe Ranweiler * Update grammar * Update CHANGELOG.md Co-authored-by: Joe Ranweiler Co-authored-by: Cheick Keita Co-authored-by: Joe Ranweiler * Temporarily ignore non-actionable `cargo audit` errors (#1365) * Azure DevOps notifications not appearing (#1370) Co-authored-by: stas * Bump procfs from 0.10.1 to 0.11.0 in /src/agent (#1360) Bumps [procfs](https://github.com/eminence/procfs) from 0.10.1 to 0.11.0. - [Release notes](https://github.com/eminence/procfs/releases) - [Commits](https://github.com/eminence/procfs/compare/v0.10.1...v0.11.0) --- updated-dependencies: - dependency-name: procfs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marc Greisen * Bump structopt from 0.3.23 to 0.3.25 in /src/agent (#1364) Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.23 to 0.3.25. - [Release notes](https://github.com/TeXitoi/structopt/releases) - [Changelog](https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md) - [Commits](https://github.com/TeXitoi/structopt/compare/v0.3.23...v0.3.25) --- updated-dependencies: - dependency-name: structopt dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump reqwest from 0.11.5 to 0.11.6 in /src/proxy-manager (#1367) Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.5 to 0.11.6. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.5...v0.11.6) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump reqwest from 0.11.5 to 0.11.6 in /src/agent (#1368) Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.5 to 0.11.6. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.5...v0.11.6) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump crossterm from 0.21.0 to 0.22.1 in /src/agent (#1369) Bumps [crossterm](https://github.com/crossterm-rs/crossterm) from 0.21.0 to 0.22.1. - [Release notes](https://github.com/crossterm-rs/crossterm/releases) - [Changelog](https://github.com/crossterm-rs/crossterm/blob/master/CHANGELOG.md) - [Commits](https://github.com/crossterm-rs/crossterm/commits) --- updated-dependencies: - dependency-name: crossterm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marc Greisen * Fix validation of `target_exe` blob name (#1371) * NSG Updated After CLI Update to Instance_Config (#1375) * Creating InstanceConfig Attributes for NSG Refactor (#1331) * Updating instance_config * Updating attribute names. * Updating list factory. * Updating config attributes. Co-authored-by: nharper285 * NSG deployment on a creation of new debug/repro proxy. (#1340) Co-authored-by: stas * Code for updating NSGs when instance_config updated. * Updating argument to set_allowed_rules * Temporarily ignore non-actionable `cargo audit` errors (#1365) * Updating model to no longer be optional. * Fixing args for set_allowed_rules * trying to fix calls to get_nsg * Updating calls to nsg lib * Fixing imports. * Updating calls to set_allowed and creating constructor for NSGConfig type. * Removing constructor and manually setting default ip * Fixing models. * Hopefully fixing docs. * Fix set_allowed call * Adding error handling for update config. * Changing to error check. * Fixing error call. * Fixing imports. * Updating instanceconfig retrieval. * Fixing imports. * Adding empty() function on request. * Fixing name of function. * Removing empty function. Co-authored-by: nharper285 Co-authored-by: Stas Co-authored-by: stas Co-authored-by: Joe Ranweiler * Revert "NSG Updated After CLI Update to Instance_Config (#1375)" (#1384) This reverts commit 357bc4fcadc0bae9886e53ba1a9a316365e41094. * Bump backtrace from 0.3.61 to 0.3.62 in /src/agent (#1382) Bumps [backtrace](https://github.com/rust-lang/backtrace-rs) from 0.3.61 to 0.3.62. - [Release notes](https://github.com/rust-lang/backtrace-rs/releases) - [Commits](https://github.com/rust-lang/backtrace-rs/compare/0.3.61...0.3.62) --- updated-dependencies: - dependency-name: backtrace dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marc Greisen * Set compiler env vars to effect Win10 SDK downgrade (#1388) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: stas Co-authored-by: Joe Ranweiler Co-authored-by: Marc Greisen Co-authored-by: Cheick Keita Co-authored-by: Joe Ranweiler Co-authored-by: Noah McGregor Harper <74685766+nharper285@users.noreply.github.com> Co-authored-by: nharper285 * Updating configuration.py to check for 'block all' config. * Fixing error message. * associate subnets with NSG (#1393) * associate subnets with NSG change NSG rule protocol to ANY * subnet wait * Improve NSG update logic Co-authored-by: stas Co-authored-by: nharper285 Co-authored-by: Stas Co-authored-by: stas Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joe Ranweiler Co-authored-by: Marc Greisen Co-authored-by: Cheick Keita Co-authored-by: Joe Ranweiler --- src/deployment/configuration.py | 311 ++++++++++++++++---------------- 1 file changed, 157 insertions(+), 154 deletions(-) diff --git a/src/deployment/configuration.py b/src/deployment/configuration.py index 7de25269dc..b3e1b50303 100644 --- a/src/deployment/configuration.py +++ b/src/deployment/configuration.py @@ -1,154 +1,157 @@ -#!/usr/bin/env python -# -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. - -import ipaddress -import json -import logging -from typing import List, Optional -from uuid import UUID - -from azure.cosmosdb.table.tableservice import TableService - -storage_client_logger = logging.getLogger("azure.cosmosdb.table.common.storageclient") -TABLE_NAME = "InstanceConfig" - -logger = logging.getLogger("deploy") - - -class InstanceConfigClient: - - table_service: TableService - resource_group: str - - def __init__(self, table_service: TableService, resource_group: str): - self.resource_group = resource_group - self.table_service = table_service - self.create_if_missing(table_service) - - ## Disable logging from storageclient. This module displays an error message - ## when a resource is not found even if the exception is raised and handled internally. - ## This happen when a table does not exist. An error message is displayed but the exception is - ## handled by the library. - def disable_storage_client_logging(self) -> None: - if storage_client_logger: - storage_client_logger.disabled = True - - def enable_storage_client_logging(self) -> None: - if storage_client_logger: - storage_client_logger.disabled = False - - def create_if_missing(self, table_service: TableService) -> None: - try: - self.disable_storage_client_logging() - - if not table_service.exists(TABLE_NAME): - table_service.create_table(TABLE_NAME) - finally: - self.enable_storage_client_logging() - - -class NsgRule: - - rule: str - is_tag: bool - - def __init__(self, rule: str): - try: - self.is_tag = False - self.check_rule(rule) - self.rule = rule - except Exception: - raise ValueError( - "Invalid rule. Please provide a valid rule or supply the wild card *." - ) - - def check_rule(self, value: str) -> None: - if value is None or len(value.strip()) == 0: - raise ValueError( - "Rule can not be None or empty string. Please provide a valid rule or supply the wild card *." - ) - # Check Wild Card - if value == "*": - return - # Check if IP Address - try: - ipaddress.ip_address(value) - return - except ValueError: - pass - # Check if IP Range - try: - ipaddress.ip_network(value) - return - except ValueError: - pass - - self.is_tag = True - - -def update_allowed_aad_tenants( - config_client: InstanceConfigClient, tenants: List[UUID] -) -> None: - as_str = [str(x) for x in tenants] - config_client.table_service.insert_or_merge_entity( - TABLE_NAME, - { - "PartitionKey": config_client.resource_group, - "RowKey": config_client.resource_group, - "allowed_aad_tenants": json.dumps(as_str), - }, - ) - - -def update_admins(config_client: InstanceConfigClient, admins: List[UUID]) -> None: - admins_as_str: Optional[List[str]] = None - if admins: - admins_as_str = [str(x) for x in admins] - - config_client.table_service.insert_or_merge_entity( - TABLE_NAME, - { - "PartitionKey": config_client.resource_group, - "RowKey": config_client.resource_group, - "admins": json.dumps(admins_as_str), - }, - ) - - -def parse_rules(rules_str: str) -> List[NsgRule]: - rules_list = rules_str.split(",") - - nsg_rules = [] - for rule in rules_list: - try: - nsg_rule = NsgRule(rule) - nsg_rules.append(nsg_rule) - except Exception: - raise ValueError( - "One or more input rules was invalid. Please enter a comma-separted list if valid sources." - ) - return nsg_rules - - -def update_nsg( - config_client: InstanceConfigClient, - allowed_rules: List[NsgRule], -) -> None: - tags_as_str = [x.rule for x in allowed_rules if x.is_tag] - ips_as_str = [x.rule for x in allowed_rules if not x.is_tag] - nsg_config = {"allowed_service_tags": tags_as_str, "allowed_ips": ips_as_str} - # create class initialized by table service/resource group outside function that's checked in deploy.py - config_client.table_service.insert_or_merge_entity( - TABLE_NAME, - { - "PartitionKey": config_client.resource_group, - "RowKey": config_client.resource_group, - "proxy_nsg_config": json.dumps(nsg_config), - }, - ) - - -if __name__ == "__main__": - pass +#!/usr/bin/env python +# +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. + +import ipaddress +import json +import logging +from typing import List, Optional +from uuid import UUID + +from azure.cosmosdb.table.tableservice import TableService + +storage_client_logger = logging.getLogger("azure.cosmosdb.table.common.storageclient") +TABLE_NAME = "InstanceConfig" + +logger = logging.getLogger("deploy") + + +class InstanceConfigClient: + + table_service: TableService + resource_group: str + + def __init__(self, table_service: TableService, resource_group: str): + self.resource_group = resource_group + self.table_service = table_service + self.create_if_missing(table_service) + + ## Disable logging from storageclient. This module displays an error message + ## when a resource is not found even if the exception is raised and handled internally. + ## This happen when a table does not exist. An error message is displayed but the exception is + ## handled by the library. + def disable_storage_client_logging(self) -> None: + if storage_client_logger: + storage_client_logger.disabled = True + + def enable_storage_client_logging(self) -> None: + if storage_client_logger: + storage_client_logger.disabled = False + + def create_if_missing(self, table_service: TableService) -> None: + try: + self.disable_storage_client_logging() + + if not table_service.exists(TABLE_NAME): + table_service.create_table(TABLE_NAME) + finally: + self.enable_storage_client_logging() + + +class NsgRule: + + rule: str + is_tag: bool + + def __init__(self, rule: str): + try: + self.is_tag = False + self.check_rule(rule) + self.rule = rule + except Exception: + raise ValueError( + "Invalid rule. Please provide a valid rule or supply the wild card *." + ) + + def check_rule(self, value: str) -> None: + if value is None: + raise ValueError( + "Please provide a valid rule or supply the empty string '' to block all sources or the wild card * to allow all sources." + ) + # Check block all + if len(value.strip()) == 0: + return + # Check Wild Card + if value == "*": + return + # Check if IP Address + try: + ipaddress.ip_address(value) + return + except ValueError: + pass + # Check if IP Range + try: + ipaddress.ip_network(value) + return + except ValueError: + pass + + self.is_tag = True + + +def update_allowed_aad_tenants( + config_client: InstanceConfigClient, tenants: List[UUID] +) -> None: + as_str = [str(x) for x in tenants] + config_client.table_service.insert_or_merge_entity( + TABLE_NAME, + { + "PartitionKey": config_client.resource_group, + "RowKey": config_client.resource_group, + "allowed_aad_tenants": json.dumps(as_str), + }, + ) + + +def update_admins(config_client: InstanceConfigClient, admins: List[UUID]) -> None: + admins_as_str: Optional[List[str]] = None + if admins: + admins_as_str = [str(x) for x in admins] + + config_client.table_service.insert_or_merge_entity( + TABLE_NAME, + { + "PartitionKey": config_client.resource_group, + "RowKey": config_client.resource_group, + "admins": json.dumps(admins_as_str), + }, + ) + + +def parse_rules(rules_str: str) -> List[NsgRule]: + rules_list = rules_str.split(",") + + nsg_rules = [] + for rule in rules_list: + try: + nsg_rule = NsgRule(rule) + nsg_rules.append(nsg_rule) + except Exception: + raise ValueError( + "One or more input rules was invalid. Please enter a comma-separted list if valid sources." + ) + return nsg_rules + + +def update_nsg( + config_client: InstanceConfigClient, + allowed_rules: List[NsgRule], +) -> None: + tags_as_str = [x.rule for x in allowed_rules if x.is_tag] + ips_as_str = [x.rule for x in allowed_rules if not x.is_tag] + nsg_config = {"allowed_service_tags": tags_as_str, "allowed_ips": ips_as_str} + # create class initialized by table service/resource group outside function that's checked in deploy.py + config_client.table_service.insert_or_merge_entity( + TABLE_NAME, + { + "PartitionKey": config_client.resource_group, + "RowKey": config_client.resource_group, + "proxy_nsg_config": json.dumps(nsg_config), + }, + ) + + +if __name__ == "__main__": + pass