Merge branch 'master' into mq

Dockerfile

@@ -3,9 +3,17 @@ FROM python:3.9-alpine
 LABEL maintainer="Rhino Assessment Team <[email protected]>"
 LABEL pacu.version="1.5.3"
 
+# Install necessary packages
 RUN apk add --no-cache \
-    aws-cli \
-    zip
+    python3 \
+    py3-pip \
+    zip \
+    curl \
+    unzip
+
+# Install AWS CLI using pip
+RUN pip3 install --upgrade pip \
+    && pip3 install awscli
 
 # Install Pacu
 WORKDIR /usr/src/pacu/
@@ -15,3 +23,4 @@ RUN pip install .
 RUN echo 'AWS_EC2_METADATA_DISABLED=true' >> /etc/profile
 
 ENTRYPOINT ["pacu"]
+

pacu/modules/ec2__enum/main.py

@@ -270,7 +270,7 @@ def main(args, pacu_main):
                 with save(p, 'w+') as f:    
                     for public in public_ips:
                         f.write('{}\n'.format(public))
-                print('  {} publics IP address(es) found and added to text file located at: ~/.local/share/pacu/{}/downloads/{}'.format(len(public_ips),session.name,p))                
+                print('  {} public IP address(es) found and added to text file located at: ~/.local/share/pacu/{}/downloads/{}'.format(len(public_ips),session.name,p))                
             all_public_ips += public_ips
 
         # VPN Customer Gateways

pacu/modules/ecr__enum/main.py

@@ -108,7 +108,7 @@ def main(args, pacu_main):
                         )
                     )
 
-                # Adding repositories to region for extraction ater on
+                # Adding repositories to region for extraction later on
                 summary_data['ecr']['regions'][region] = {}
                 summary_data['ecr']['regions'][region]['num_repos_found'] = num_repos_found
                 summary_data['ecr']['regions'][region]['repositories'] = region_repositories

pacu/modules/iam__decode_accesskey_id/main.py

@@ -5,7 +5,7 @@
 module_info = {
     'name': 'iam__decode_accesskey_id',
     'author': 'Rhino Security Labs',
-    'category': 'enum',
+    'category': 'ENUM',
     'one_liner': 'This module decodes an access key ID to get the AWS account ID. Based on: https://medium.com/@TalBeerySec/a-short-note-on-aws-key-id-f88cc4317489',
     'description': 'This module decodes an access key ID to get the AWS account ID without making and AWS API calls. Based on: https://medium.com/@TalBeerySec/a-short-note-on-aws-key-id-f88cc4317489',
     'services': ['IAM'],

pacu/modules/enum__secrets/main.py → pacu/modules/secrets__enum/main.py

@@ -7,7 +7,7 @@
 from pacu import Main
 
 module_info = {
-    'name': 'enum__secrets',
+    'name': 'secrets__enum',
     'author': 'Nick Spagnola From RSL',
     'category': 'ENUM',
     'one_liner': 'Enumerates and dumps secrets from AWS Secrets Manager and AWS parameter store',