For AWS It could be done adding a botocore.config.Config obj as parameter during the call of boto3.session.Session.client. As stated in the docs, with Config object of botocore module the SDK can be managed at low level, setting user agent and Region too.
The present code:

ScoutSuite/ScoutSuite/providers/aws/facade/utils.py

Lines 81 to 98 in e5dd01d

    
               def get_client(service: str, session: boto3.session.Session, region: str = None): 
        
                   """ 
        
                   Instantiates an AWS API client 
        
                   :param service: Service targeted, e.g. ec2 
        
                   :param session: The aws session 
        
                   :param region:  Region desired, e.g. us-east-2 
        
                   :return: 
        
                   """ 
        
                   try: 
        
                       return AWSFacadeUtils._clients.setdefault( 
        
                           (service, region), 
        
                           session.client(service, region_name=region) if region else session.client(service)) 
        
                   except Exception as e: 
        
                       print_exception('Failed to create client for the {} service: {}'.format(service, e)) 
        
                       return None

could be modified like this.

def get_client(service: str, session: boto3.session.Session, region: str = None):
         if region:
             user_agent_config = Config(region_name=region,
                                        user_agent="ScoutSuite/5.9 (https://github.com/nccgroup/ScoutSuite)")
         else:
             user_agent_config = Config(user_agent="ScoutSuite/5.9 (https://github.com/nccgroup/ScoutSuite)")
         try:
             return AWSFacadeUtils._clients.setdefault(
                 (service, region), session.client(service, config=user_agent_config))
         except Exception as e:
             print_exception('Failed to create client for the {} service: {}'.format(service, e))
             return None

I hope it works, unluckly i can't test it now.
I didn't find a maintinable way to do this with others providers that don't have a low level sdk like boto3. Is there a way edit sdk settings at http level?

	def get_client(service: str, session: boto3.session.Session, region: str = None):
	"""
	Instantiates an AWS API client

	:param service: Service targeted, e.g. ec2
	:param session: The aws session
	:param region: Region desired, e.g. us-east-2

	:return:
	"""

	try:
	return AWSFacadeUtils._clients.setdefault(
	(service, region),
	session.client(service, region_name=region) if region else session.client(service))
	except Exception as e:
	print_exception('Failed to create client for the {} service: {}'.format(service, e))
	return None

Add ScoutSuite user agent #817

Description

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions