From b2ddd2d5e994c8cdf15ea4c5181350add5d866ed Mon Sep 17 00:00:00 2001
From: fbu <fbuedenhoelzer@it-sec.de>
Date: Fri, 24 Sep 2021 17:03:28 +0200
Subject: [PATCH 1/2] Fixing subnet confusion

---
 payloads/library/recon/Sample-Nmap-Payload/payload.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/payloads/library/recon/Sample-Nmap-Payload/payload.sh b/payloads/library/recon/Sample-Nmap-Payload/payload.sh
index f3c49ba..eaef146 100644
--- a/payloads/library/recon/Sample-Nmap-Payload/payload.sh
+++ b/payloads/library/recon/Sample-Nmap-Payload/payload.sh
@@ -27,7 +27,7 @@ COUNT=$(($(ls -l $LOOT_DIR/*.txt | wc -l)+1))
 NETMODE DHCP_CLIENT
 SERIAL_WRITE [*] Waiting for IP from DHCP
 while [ -z "$SUBNET" ]; do
-  sleep 1 && SUBNET=$(ip addr | grep -i eth0 | grep -i inet | grep -E -o "([0-9]{1,3}[\.]){3}[0-9]{1,3}[\/]{1}[0-9]{1,2}" | sed 's/\.[0-9]*\//\.0\//')
+  sleep 1 && SUBNET=$(ip addr | grep -i eth0 | grep -i inet | grep -E -o "([0-9]{1,3}[\.]){3}[0-9]{1,3}[\/]{1}[0-9]{1,2}")
 done
 echo "Recieved IP address from DHCP" >> /tmp/payload-debug.log
 

From b3b171224e9d02783d556c4e43f8ef44111dfe89 Mon Sep 17 00:00:00 2001
From: flux <mail@cyb3rwr3ck.net>
Date: Fri, 22 Oct 2021 22:13:41 +0200
Subject: [PATCH 2/2] Added online shark, fixed typo

---
 .gitignore   |  2 ++
 sharkjack.sh | 28 +++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..73be223
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+shark-upgrade.bin
diff --git a/sharkjack.sh b/sharkjack.sh
index 8cf4155..8530643 100755
--- a/sharkjack.sh
+++ b/sharkjack.sh
@@ -314,11 +314,34 @@ function setup_shark(){
   if [[ -z $SSHKEYPATH ]]; then
     ssh-copy-id -i root@172.16.24.1
   else
-    ssh-copy-id -i $SSHKEYPATH "root@172.16.42.1"
+    ssh-copy-id -i $SSHKEYPATH "root@172.16.24.1"
   fi
   exitscript 0
 }
 
+function online_shark() {
+    locate_shark
+    echo -e "\nConfiguring host and shark for internet access\n"
+    IFIP=$(ip ad show $IFACE | grep inet | awk '{print $2}' | grep -E -o "([0-9]{1,3}[\.]){3}[0-9]{1,3}")
+    
+    # configuring shark
+    ssh root@172.16.24.1 "ip route add default via $IFIP dev eth0 && echo 'nameserver 9.9.9.9' > /etc/resolv.conf"
+    echo -e "\nAdded Quad9 (9.9.9.9) as DNS-Resolver, modify in sharks' /etc/resolv.conf if needed"
+
+    # configuring host
+    UPLINK=$(ip route show default | awk '{print $5}' | grep -v $IFACE)
+    echo -e "\nUsing interface $UPLINK for uplink"
+    iptables -A FORWARD -o $UPLINK -i $IFACE -s 172.16.24.0/24 -m conntrack --ctstate NEW -j ACCEPT
+    iptables -A FORWARD -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
+    iptables -t nat -F POSTROUTING
+    iptables -t nat -A POSTROUTING -o $UPLINK -j MASQUERADE
+    echo 1 > /proc/sys/net/ipv4/ip_forward
+    # making sure the os does not try to route through the shark 
+    ip route del default via 172.16.24.1 &>/dev/null
+    
+    exitscript 0
+}
+
 function main_menu() {
    banner
    if [[ $OS -eq 1 ]]; then
@@ -332,6 +355,7 @@ function main_menu() {
    [$(tput bold)G$(tput sgr0)]et loot saved on Shark Jack\n\n\
    [$(tput bold)R$(tput sgr0)]eset known_hosts keys for the Shark Jack on this system\n\
    [$(tput bold)S$(tput sgr0)]etup ssh keys for easy access\n\
+   [$(tput bold)O$(tput sgr0)]nline mode for downloading packages etc.\n\
    [$(tput bold)Q$(tput sgr0)]uit\n\n"
 
    read -r -sn1 key
@@ -342,11 +366,13 @@ function main_menu() {
           [gG]) get_loot;;
           [rR]) reset_key;;
           [sS]) setup_shark;;
+          [oO]) online_shark;;
           [qQ]) exitscript 0;;
           *) main_menu;;
    esac
 }
 
+
 # Validate priv / iptables
 root_check
 os_check