Manual merge

CONTRIBUTING.md

@@ -0,0 +1,42 @@
+# Contributing
+
+Are you interested in contributing to Legion? We love contributors! We ask that you follow the guidelines below when making contributions to the project. We ask that you also follow our contributor [**Code of Conduct**](#code-of-conduct). We look forward to working with you - get started in one of the sections below.
+
+
+
+#### Did you find a bug?
+
+* Awesome. First, ensure that your bug isn't a duplicate by checking the [Issues](https://github.com/GoVanguard/legion/issues). **If the issue already exists**, go ahead and comment on the issue with your bug report information, following the guidelines below as if you were reporting a new issue - just don't make a new issue.
+* **If you can't find the issue**, its time to [open a new issue](https://github.com/GoVanguard/legion/issues/new). Fill in the issue with a clear title and description. Where possible, include steps to reproduce the bug, code samples, and screenshots. Tag the issue if it fits into one of our existing categories.
+
+
+
+#### Did you patch a bug?
+
+* Excellent - your first steps are to open a new [Pull Request](https://github.com/GoVanguard/legion/pulls) with your patch. Be prepared to answer questions or receive feedback from the team.
+* Ensure the PR has a description that clearly details the problem and your solution. Be sure to include issue numbers if possible.
+* Follow our coding practices and standards for whatever files you're working on.
+
+
+
+#### Do you want to add a feature?
+
+* We love new features! Please [make an issue](https://github.com/GoVanguard/legion/issues/new) for discussion, with a clear title and description of the proposed feature. Add the Proposal tag, and use the comments to follow up with the team.
+* Wait for a response and approval to your proposal before working on your patch and submitting a PR. This way, if we find any problems with the proposal, and discuss remediation before work gets wasted.
+* Once your feature is complete, all you need to do is [submit a PR](https://github.com/GoVanguard/legion/pulls). 
+
+
+
+#### Do you have a general question?
+
+* If you have any questions not related to legion's code, features, or bugs use support@gvit.com
+
+
+
+#### Code of Conduct
+
+We like to keep the rules simple. 
+
+* Behavior meant to malign, disrespect, denigrate, harass, or attack any person will not be tolerated.
+* Use respectful language and foster a community of collaboration.
+

deps/installDeps.sh

@@ -9,4 +9,4 @@ source ./deps/apt.sh
 apt-get update -m
 
 echo "Installing deps..."
-DEBIAN_FRONTEND="noninteractive" apt-get -yqqq --allow-unauthenticated --force-yes -o DPkg::Options::="--force-overwrite" -o DPkg::Options::="--force-confdef" install nmap finger hydra nikto whatweb nbtscan nfs-common rpcbind smbclient sra-toolkit ldap-utils sslscan rwho medusa x11-apps cutycapt leafpad xvfb imagemagick eog hping3 sqlmap wapiti libqt5core5a python-pip python-impacket ruby perl dnsmap git
+DEBIAN_FRONTEND="noninteractive" apt-get -yqqq --allow-unauthenticated --force-yes -o DPkg::Options::="--force-overwrite" -o DPkg::Options::="--force-confdef" install nmap finger hydra nikto whatweb nbtscan nfs-common rpcbind smbclient sra-toolkit ldap-utils sslscan rwho medusa x11-apps cutycapt leafpad xvfb imagemagick eog hping3 sqlmap wapiti libqt5core5a python-pip python-impacket ruby perl dnsmap urlscan git

legion.conf

@@ -276,6 +276,8 @@ vnc-info.nse=vnc-info.nse, "nmap -Pn [IP] -p [PORT] --script=vnc-info.nse --scri
 webslayer=Launch webslayer, webslayer, "http,https,ssl,soap,http-proxy,http-alt"
 whatweb=Run whatweb, "whatweb [IP]:[PORT] --color=never --log-brief=[OUTPUT].txt", "http,https,ssl,soap,http-proxy,http-alt"
 x11screen=Run x11screenshot, bash ./scripts/x11screenshot.sh [IP] 0 [OUTPUT], X11
+dnsmap=Run dnsmap, "dnsmap [IP] -w ./wordlists/gvit_subdomain_wordlist.txt -r [OUTPUT]", dnsmap
+cloudfail=Run cloudfail, "python3.7 scripts/CloudFail/cloudfail.py --target [IP] --tor", cloudfail
 
 [PortTerminalActions]
 firefox=Open with firefox, firefox [IP]:[PORT], 

requirements.txt

@@ -13,3 +13,4 @@ requests==2.20.1
 pyfiglet
 colorama
 termcolor
+win_inet_pton

ui/view.py

@@ -1466,7 +1466,7 @@ def callHydra(self, bWidget):
                     return
                 else:
                     log.info('Adding host to scope here!!')
-                    self.controller.addHosts(str(bWidget.ipTextinput.text()).replace(';',' '), False, False)
+                    self.controller.addHosts(str(bWidget.ipTextinput.text()).replace(';',' '), False, False, "unset", "unset")
 
             bWidget.validationLabel.hide()
             bWidget.toggleRunButton()