diff --git a/requirements.txt b/requirements.txt index 40bb260..e563466 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,20 +5,20 @@ Flask==2.2.5 requests~=2.31.0 msal~=1.20.0 responses~=0.23.1 -pytest~=7.2.2 +pytest~=8.1.1 pytest-cov~=3.0.0 pytest-xdist~=2.5.0 -prance~=0.22.11.4.0 +prance~=23.6.21.0 openapi~=1.1.0 openapi-spec-validator~=0.5.6 jsf~=0.7.1 -pillow~=10.0.0 +pillow>=10.3.0 scandir~=1.10.0 backports.shutil-get-terminal-size~=1.0.0 browsepy~=0.5.6 -art +art~=6.1 flake8~=4.0.1 -black~=22.3.0 +black~=24.4.0 types-requests==2.31.0.1 bandit~=1.7.2 mypy~=1.3.0 diff --git a/setup.cfg b/setup.cfg index ccabb59..05a279d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] name = powerpwn -author = Michael Bargury -version = 2.1.4 +author = Michael Bargury, Lana Salameh and Avishai Efrat +version = 2.1.5 [options] install_requires = @@ -12,16 +12,16 @@ install_requires = requests >=2.31.0 msal >=1.20.0 responses >=0.23.1 - pytest >=7.2.2 - prance >=0.22.11.4.0 + pytest >=8.1.1 + prance >=23.6.21.0 openapi >=1.1.0 openapi-spec-validator >=0.5.6 jsf >=0.7.1 - pillow >=10.0.0 + pillow >=10.3.0 scandir >=1.10.0 backports.shutil-get-terminal-size >=1.0.0 browsepy >=0.5.6 - art + art >= 6.1 typing_extensions<4.6.0 pyjwt >=2.6.0 diff --git a/src/powerpwn/main.py b/src/powerpwn/main.py index 532dfa1..1e89d58 100644 --- a/src/powerpwn/main.py +++ b/src/powerpwn/main.py @@ -19,6 +19,7 @@ def main(): print("\n\n------------------------------------------------------------") tprint("powerpwn") + print("t2`24 edition\n\n") print("------------------------------------------------------------\n\n") args = parse_arguments() diff --git a/src/powerpwn/powerdump/collect/data_collectors/connections_data_collectors/connectors/shared_sql.py b/src/powerpwn/powerdump/collect/data_collectors/connections_data_collectors/connectors/shared_sql.py index 5aa3b26..cbc7e0f 100644 --- a/src/powerpwn/powerdump/collect/data_collectors/connections_data_collectors/connectors/shared_sql.py +++ b/src/powerpwn/powerdump/collect/data_collectors/connections_data_collectors/connectors/shared_sql.py @@ -32,9 +32,11 @@ def _ping(self, connection_parameters: dict) -> List[DataStore]: tenant=None, account="temp", scope=None, - host=f'https://{connection_parameters["server"]}.database.windows.net' - if is_windows - else f'https://{connection_parameters["values"]["server"]["value"]}', + host=( + f'https://{connection_parameters["server"]}.database.windows.net' + if is_windows + else f'https://{connection_parameters["values"]["server"]["value"]}' + ), name=connection_parameters["server"] if is_windows else connection_parameters["values"]["server"]["value"], extra={}, ) diff --git a/src/powerpwn/powerdump/collect/data_collectors/idata_collector.py b/src/powerpwn/powerdump/collect/data_collectors/idata_collector.py index 2c73942..ec521a8 100644 --- a/src/powerpwn/powerdump/collect/data_collectors/idata_collector.py +++ b/src/powerpwn/powerdump/collect/data_collectors/idata_collector.py @@ -5,5 +5,4 @@ class IDataCollector(ABC): @abstractmethod - def collect(self, session: requests.Session, env_id: str, output_dir: str) -> None: - ... + def collect(self, session: requests.Session, env_id: str, output_dir: str) -> None: ... # noqa diff --git a/src/powerpwn/powerdump/collect/resources_collectors/iresource_collector.py b/src/powerpwn/powerdump/collect/resources_collectors/iresource_collector.py index 47833dd..9e7cc91 100644 --- a/src/powerpwn/powerdump/collect/resources_collectors/iresource_collector.py +++ b/src/powerpwn/powerdump/collect/resources_collectors/iresource_collector.py @@ -21,5 +21,4 @@ def collect(self, session: requests.Session, env_id: str) -> Generator[ResourceE ... @abstractmethod - def resource_type(self) -> ResourceType: - ... + def resource_type(self) -> ResourceType: ... # noqa diff --git a/src/powerpwn/powerdump/utils/model_loaders.py b/src/powerpwn/powerdump/utils/model_loaders.py index 7d208de..40edd7a 100644 --- a/src/powerpwn/powerdump/utils/model_loaders.py +++ b/src/powerpwn/powerdump/utils/model_loaders.py @@ -123,8 +123,8 @@ def map_connector_id_and_env_id_to_connection_ids(connections: Generator[Connect for connection in connections: if connection.environment_id.startswith("default"): connection.environment_id = connection.environment_id.replace("default", "Default") - connector_id_and_env_id_to_connection_ids[ - (connection.connector_id, connection.environment_id) - ] = connector_id_and_env_id_to_connection_ids.get((connection.connector_id, connection.environment_id), []) + [connection.connection_id] + connector_id_and_env_id_to_connection_ids[(connection.connector_id, connection.environment_id)] = ( + connector_id_and_env_id_to_connection_ids.get((connection.connector_id, connection.environment_id), []) + [connection.connection_id] + ) return connector_id_and_env_id_to_connection_ids