Support for global config access, iptables rules backup & recovery

#2 Open
Repository
sskaje
Branch
default
Repository
IntrepidusGroup
Branch
default

Bitbucket cannot automatically merge this request.

The commits that make up this pull request have been removed.

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update 
hg pull -r default https://bitbucket.org/sskaje/mallory
Author
  1. sskaje
Reviewers
Description

1 Add global config class MalloryConfig and MalloryConfigVars, MalloryConfigObject

2 Pass global config use Debugger/RPC as a JSON string from mallory cli to gui

3 Move mallory rpc uri settings to MalloryConfig

4 Change Gui constructor parameters, make dbname accessed from MalloryConfig

5 Make mallory listen port(--listen) readable by Gui to make iptables working for a non-default port (using MalloryConfig)

6 Add --datadir/-D option, make '../db/' configurable. Database name, path are accessed from MalloryConfig instead of the hardcoded relative path

7 Add iptables backup & restore scripts

8 Backup iptables rules before applying MiTM hijack and restore on GUI exit(MalloryGui.closeEvent()), backup files locates at ${datadir}/mallory_iptables_backup

9 Sleep 5 sec if there connection problems occurs 5 times in MalloryGui.check_for_de(), this helps when ctrl+c to a running mallory.py for GUI terminal

10 iptables won't be execute if either outbound interface or mitm interface is empty

11 Trying to fix Issue #15, non-tcp protocols still have problems

12 Upgrade Pyro to Pyro4, make pickle as default serializer, might be insecure

13 Move RPC related config (host, port, name, etc) into MalloryConfig

14 Support unixsocket for RPC

15 Fix shebang for mallory.py and launchgui.py

16 Replace deprecated Sets with built-in set

17 Fix SETUP file for Ubuntu 13.10, including apt-get, easy_install ...

18 Remove built-in dnspython package, do easy_install dnspython instead

19 Fix M2Crypto.X509.* import in protocol.sslproto, then comment this import line

20 Fix symlink in mallory_install.sh

21 Fix apt-get package dependencies, python package dependencies in mallory_install.sh

22 Fix PIL.ImageChops in image_invert.py

  • Issues #15: Mallory GUI not intercepting traffic open

Comments (0)