Skip to content

Fix(gcp): update cloudsql api and edge case configurations #1522

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

Merged
merged 4 commits into from
Jun 5, 2023
Merged

Fix(gcp): update cloudsql api and edge case configurations #1522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b75d315
fix(gcp): sql-component api is deprecated
saez0pub Apr 5, 2023
6cd1de5
fix(gcp): gke cluster subnetwork can be cross project
saez0pub Apr 5, 2023
6584afb
fix(gcp): False positive on pubsup only cloud functions
saez0pub Apr 5, 2023
b1d9602
fix(gcp): None as cloudfunctions environment_variables
saez0pub Apr 5, 2023
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
2 changes: 1 addition & 1 deletion ScoutSuite/providers/gcp/facade/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ async def is_api_enabled(self, project_id, service):
elif service == 'CloudStorage':
endpoint = 'storage-component'
elif service == 'CloudSQL':
endpoint = 'sql-component'
endpoint = 'sqladmin'
elif service == 'ComputeEngine':
endpoint = 'compute'
elif service == 'Functions':
Expand Down
8 changes: 7 additions & 1 deletion ScoutSuite/providers/gcp/facade/gke.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ async def get_clusters(self, project_id):
async def _get_and_set_private_google_access_enabled(self, cluster, project_id):
try:
region = self._get_cluster_region(cluster)
subnetwork = await self._gce_facade.get_subnetwork(project_id, region, cluster['subnetwork'])
subnetwork_project_id = self._get_cluster_subnetwork_project(cluster)
subnetwork = await self._gce_facade.get_subnetwork(subnetwork_project_id, region, cluster['subnetwork'])
if subnetwork:
cluster['privateIpGoogleAccess'] = subnetwork.get('privateIpGoogleAccess')
else:
Expand All @@ -42,3 +43,8 @@ def _get_cluster_region(self, cluster):
region_regex = re.compile("^([\\w]+-[\\w]+)")
result = region_regex.search(cluster['location'])
return result.group(1)

# Subnetwork can be in different project
# networkConfig.subnetwork is like projects/{project}/regions/{region}/subnetworks/{subnetworkname}
def _get_cluster_subnetwork_project(self, cluster):
return cluster['networkConfig']['subnetwork'].split('/')[1]
4 changes: 2 additions & 2 deletions ScoutSuite/providers/gcp/resources/functions/functions_v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ def _parse_function(self, raw_function):
function_dict['max_instances'] = raw_function['maxInstances']
function_dict['docker_registry'] = raw_function['dockerRegistry']
function_dict['url'] = raw_function.get('httpsTrigger', {}).get('url')
function_dict['security_level'] = raw_function.get('httpsTrigger', {}).get('securityLevel')
function_dict['security_level'] = 'SECURE_ALWAYS' if function_dict['url'] is None else raw_function.get('httpsTrigger', {}).get('securityLevel')
Copy link
Contributor

@liyun-li liyun-li May 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is SECURE_ALWAYS?

Copy link
Contributor

@liyun-li liyun-li May 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@saez0pub ^

Copy link
Contributor

@liyun-li liyun-li Jun 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolved: https://cloud.google.com/logging/docs/reference/audit/appengine/rest/Shared.Types/SecurityLevel

function_dict['ingress_settings'] = raw_function['ingressSettings']

function_dict['bindings'] = raw_function['bindings']

function_dict['environment_variables'] = raw_function['environmentVariables']
function_dict['environment_variables'] = raw_function.get('environmentVariables', {})
function_dict['environment_variables_secrets'] = get_environment_secrets(function_dict['environment_variables'])

function_dict['labels'] = raw_function['labels']
Expand Down
2 changes: 1 addition & 1 deletion ScoutSuite/providers/gcp/resources/functions/functions_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def _parse_function(self, raw_function):
function_dict['service_account'] = raw_function.get('serviceConfig', {}).get('serviceAccountEmail')
function_dict['bindings'] = raw_function['bindings']

function_dict['environment_variables'] = raw_function.get('serviceConfig', {}).get('environmentVariables')
function_dict['environment_variables'] = raw_function.get('serviceConfig', {}).get('environmentVariables', {})
function_dict['environment_variables_secrets'] = get_environment_secrets(function_dict['environment_variables'])

function_dict['labels'] = raw_function['labels']
Expand Down