From bb8ee46b82c259c93c32f0a58337c925d97cd450 Mon Sep 17 00:00:00 2001
From: byt3bl33d3r <byt3bl33d3r@gmail.com>
Date: Mon, 15 Jun 2015 00:18:55 +0200
Subject: [PATCH] added kali setup script and updated readme

---
 README.md         | 13 ++++++++-----
 kali_setup.sh     |  6 ++++++
 other_setup.sh    |  3 +++
 plugins/Inject.py |  1 +
 setup.sh          |  3 ---
 5 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100755 kali_setup.sh
 create mode 100644 other_setup.sh
 delete mode 100755 setup.sh

diff --git a/README.md b/README.md
index a87832e..67a9a9a 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ Contact me at:
 - IRC on Freenode: #MITMf
 - Email: byt3bl33d3r@gmail.com
 
+**Update: Installation steps have changed! Please read the new [instructions](#installation)** 
 **Before submitting issues, please read the [FAQ](#faq) and the appropriate [section](#submitting-issues).**
 
 Available plugins
@@ -81,12 +82,14 @@ How to install on Kali
 
 Installation
 ============
-If MITMf is not in your distro's repo or you just want the latest version:
-- Run the command ```git clone https://github.com/byt3bl33d3r/MITMf.git``` to clone this directory
-- Run the ```setup.sh``` script
-- Run the command ```pip install --upgrade -r requirements.txt``` to install all Python dependencies
+If you're rocking Kali and want the latest version:
+- Clone this repository
+- Run the ```kali_setup.sh``` script
 
-On Kali Linux, if you get an error while installing the ```pypcap``` package or when starting MITMf you see: ```ImportError: no module named pcap```, run ```apt-get install python-pypcap``` to fix it
+If you're rocking any other Linux distro:
+- Clone this repository
+- Run the ```other_setup.sh``` script
+- Run the command ```pip install --upgrade -r requirements.txt``` to install all Python dependencies
 
 Submitting Issues
 =================
diff --git a/kali_setup.sh b/kali_setup.sh
new file mode 100755
index 0000000..d90d0b5
--- /dev/null
+++ b/kali_setup.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+git submodule init && git submodule update --recursive
+apt-get install -y python-capstone python-twisted python-requests python-scapy python-dnspython python-cryptography python-crypto
+apt-get install -y python-msgpack python-configobj python-pefile python-ipy python-openssl python-pypcap
+pip install Pillow mitmflib
diff --git a/other_setup.sh b/other_setup.sh
new file mode 100644
index 0000000..3c8052a
--- /dev/null
+++ b/other_setup.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+git submodule init && git submodule update --recursive
\ No newline at end of file
diff --git a/plugins/Inject.py b/plugins/Inject.py
index d86b5ef..b832ce4 100644
--- a/plugins/Inject.py
+++ b/plugins/Inject.py
@@ -170,6 +170,7 @@ class Inject(CacheKill, Plugin):
         options.add_argument("--js-url", type=str, help="Location of your (presumably) malicious Javascript.")
         options.add_argument("--html-url", type=str, help="Location of your (presumably) malicious HTML. Injected via hidden iframe.")
         options.add_argument("--html-payload", type=str, default='', help="String you would like to inject.")
+        options.add_argument("--html-file", type=argparse.FileType('r'), help='File containg HTML you would like to inject')
         options.add_argument("--match-str", type=str, default=None, help="String you would like to match and place your payload before. (</body> by default)")
         options.add_argument("--preserve-cache", action="store_true", help="Don't kill the server/client caching.")
         group = options.add_mutually_exclusive_group(required=False)
diff --git a/setup.sh b/setup.sh
deleted file mode 100755
index 282b969..0000000
--- a/setup.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-git submodule init && git submodule update --recursive