From 7e5814e9d5bbeff2ad988592ca37c9ed529bf899 Mon Sep 17 00:00:00 2001
From: "Carlos.Martin" <carlos.martin@mettle.co.uk>
Date: Sat, 28 Aug 2021 18:16:24 +0100
Subject: [PATCH] sentry files

---
 build_lists/sensitive_files.yaml | 27 +++++++++++++++++++++++++++
 linPEAS/builder/linpeas_base.sh  | 12 ++++++------
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/build_lists/sensitive_files.yaml b/build_lists/sensitive_files.yaml
index e1c43ea..08ef228 100644
--- a/build_lists/sensitive_files.yaml
+++ b/build_lists/sensitive_files.yaml
@@ -2152,6 +2152,33 @@ search:
                 search_in: 
                   - common
 
+  - name: Sentry
+    value:
+        config:
+          auto_check: True
+
+        files:
+          - name: "sentry"
+            value: 
+                files:
+                  - name: "config.yml"
+                    value:
+                        bad_regex: "*key*"
+                        remove_empty_lines: True
+                        remove_regex: '^#'
+                type: d
+                search_in: 
+                  - common
+          
+          - name: "sentry.conf.py"
+            value: 
+                bad_regex: "[pP][aA][sS][sS].*|[uU][sS][eE][rR].*"
+                remove_empty_lines: True
+                remove_regex: '^#'
+                type: f
+                search_in: 
+                  - common
+
   - name: Cacti
     value:
         config:
diff --git a/linPEAS/builder/linpeas_base.sh b/linPEAS/builder/linpeas_base.sh
index d8db9ec..7aeb726 100755
--- a/linPEAS/builder/linpeas_base.sh
+++ b/linPEAS/builder/linpeas_base.sh
@@ -1846,11 +1846,11 @@ if echo $CHECKS | grep -q Net; then
   if [ "$MACOS" ]; then
     print_2title "Any MacOS Sharing Service Enabled?"
     rmMgmt=$(netstat -na | grep LISTEN | grep tcp46 | grep "*.3283" | wc -l);
-    scrShrng=$(netstat -na | grep LISTEN | egrep 'tcp4|tcp6' | grep "*.5900" | wc -l);
-    flShrng=$(netstat -na | grep LISTEN | egrep 'tcp4|tcp6' | egrep "\*.88|\*.445|\*.548" | wc -l);
-    rLgn=$(netstat -na | grep LISTEN | egrep 'tcp4|tcp6' | grep "*.22" | wc -l);
-    rAE=$(netstat -na | grep LISTEN | egrep 'tcp4|tcp6' | grep "*.3031" | wc -l);
-    bmM=$(netstat -na | grep LISTEN | egrep 'tcp4|tcp6' | grep "*.4488" | wc -l);
+    scrShrng=$(netstat -na | grep LISTEN | grep -E 'tcp4|tcp6' | grep "*.5900" | wc -l);
+    flShrng=$(netstat -na | grep LISTEN | grep -E 'tcp4|tcp6' | grep -E "\*.88|\*.445|\*.548" | wc -l);
+    rLgn=$(netstat -na | grep LISTEN | grep -E 'tcp4|tcp6' | grep "*.22" | wc -l);
+    rAE=$(netstat -na | grep LISTEN | grep -E 'tcp4|tcp6' | grep "*.3031" | wc -l);
+    bmM=$(netstat -na | grep LISTEN | grep -E 'tcp4|tcp6' | grep "*.4488" | wc -l);
     printf "\nThe following services are OFF if '0', or ON otherwise:\nScreen Sharing: %s\nFile Sharing: %s\nRemote Login: %s\nRemote Mgmt: %s\nRemote Apple Events: %s\nBack to My Mac: %s\n\n" "$scrShrng" "$flShrng" "$rLgn" "$rmMgmt" "$rAE" "$bmM";
     echo ""
     print_2title "VPN Creds"
@@ -3204,7 +3204,7 @@ if echo $CHECKS | grep -q IntFiles; then
 
   ##-- IF) Passwords files in home
   print_2title "Finding *password* or *credential* files in home (limit 70)"
-  (printf "%s\n" "$PSTORAGE_PASSWORD_FILES" | awk -F/ '{line_init=$0; if (!cont){ cont=0 }; $NF=""; act=$0; if (cont < 3){ print line_init; } if (cont == "3"){print "  #)There are more creds/passwds files in the previous parent folder\n"}; if (act == pre){(cont += 1)} else {cont=0}; pre=act }' | head -n 70 | sed -${E} "s,password|credential,${SED_RED}," | sed "s,There are more creds/passwds files in the previous parent folder,${C}[3m&${C}[0m,") || echo_not_found
+  (printf "%s\n" "$PSTORAGE_PASSWORD_FILES" | grep -v "/snap/" | awk -F/ '{line_init=$0; if (!cont){ cont=0 }; $NF=""; act=$0; if (cont < 3){ print line_init; } if (cont == "3"){print "  #)There are more creds/passwds files in the previous parent folder\n"}; if (act == pre){(cont += 1)} else {cont=0}; pre=act }' | head -n 70 | sed -${E} "s,password|credential,${SED_RED}," | sed "s,There are more creds/passwds files in the previous parent folder,${C}[3m&${C}[0m,") || echo_not_found
   echo ""
 
   if ! [ "$SUPERFAST" ] && [ "$TIMEOUT" ]; then