Merge branch 'master' into master

.build.sh

@@ -0,0 +1,12 @@
+
+#!/usr/bin/env bash
+set -ex
+# SET THE FOLLOWING VARIABLES
+# docker hub username
+USERNAME=simplysecurity
+# image name
+IMAGE=simplyemail
+# version
+VERSION="$(cat VERSION)"
+
+docker build -t $USERNAME/$IMAGE:latest .

.coverage.rc

@@ -3,3 +3,4 @@ omit =
     */python?.?/*
     */site-packages/nose/*
     *__init__*
+    */SE/*

.env

@@ -0,0 +1 @@
+source SE/bin/activate

.landscape.yml

@@ -4,3 +4,4 @@ max-line-length: 120
 autodetect: yes
 python-targets:
     - 2
+

.release.sh

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+set -ex
+# Requires the following packages: git, hub, docker
+# SET THE FOLLOWING VARIABLES
+USERNAME=simplysecurity
+IMAGE=simplyemail
+VERSION="$(cat VERSION)"
+
+# UPDATE THE SOURCE CODE
+git pull
+
+# bump version
+docker run --rm -v "$PWD":/app treeder/bump patch
+VERSION=`cat VERSION`
+echo "version: $VERSION"
+
+
+# TAF, PULL, MERGE DEV
+git checkout -b "Version-$VERSION"
+git add --all
+git commit -m "SimplyEmail $VERSION Release"
+#git tag -a "$VERSION" -m "SimplyEmail $VERSION Release"
+git push origin "Version-$VERSION"
+#git push origin "Version-$VERSION" --tags
+git checkout master
+git merge "Version-$VERSION"
+git push
+hub release create Version-$VERSION -m "SimplyEmail $VERSION Release"
+# DEL BRANCH
+#git branch -d "dev"
+#git branch -D "dev"
+
+# ALERT VERSION
+echo "Building Version: $VERSION"
+
+# START BUILD
+./.build.sh
+
+# DOCKER TAG/VERSIONING
+docker tag $USERNAME/$IMAGE:latest $USERNAME/$IMAGE:$VERSION
+
+# PUSH TO DOCKER HUB
+docker push $USERNAME/$IMAGE:latest
+echo "Docker image pushed: $USERNAME/$IMAGE:latest"
+docker push $USERNAME/$IMAGE:$VERSION
+echo "Docker image pushed: $USERNAME/$IMAGE:$VERSION"
+
+# GENERATE CHANGELOG FOR TAG AND PUSH
+github_changelog_generator
+git add --all
+git commit -m "Update CHANGLOG.md from version bump"
+git push 
+

.travis.yml

@@ -5,22 +5,12 @@ install:
   - pip install coveralls
   - pip install coverage
   - pip install nose
-  - pip install python-magic
-  - pip install useragent fake_useragent
-  - pip install beautifulsoup4
-  - pip install mechanize
-  - pip install docx2txt
-  - pip install BeautifulSoup
-  - pip install --upgrade requests
-  - pip install xlsx2csv --upgrade
-  - pip install configparser 
-  - pip install BeautifulSoup --upgrade
-  - pip install pdfminer --upgrade
-  - pip install python-docx
-  - pip install python-pptx
-  - pip install dnspython --upgrade
 script:
-  - "sudo sh setup/Setup.sh"
+  - "git clone --branch master https://github.com/killswitch-GUI/SimplyEmail.git"
+  - "sudo sh setup/setup.sh"
+  - "cd SimplyEmail"
+  - "./setup/setup.sh"
+  - "source SE/bin/activate"
   - "sudo ./SimplyEmail.py -l"
   - "sudo ./SimplyEmail.py -h"
   - "sudo ./SimplyEmail.py -n"

CHANGELOG.md

@@ -0,0 +1,141 @@
+# Change Log
+
+## [Version-1.4.9](https://github.com/SimplySecurity/SimplyEmail/tree/Version-1.4.9) (2017-12-22)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/Version-1.4.8...Version-1.4.9)
+
+## [Version-1.4.8](https://github.com/SimplySecurity/SimplyEmail/tree/Version-1.4.8) (2017-12-22)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/Version-1.4.7...Version-1.4.8)
+
+## [Version-1.4.7](https://github.com/SimplySecurity/SimplyEmail/tree/Version-1.4.7) (2017-12-21)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/Version-1.4.6...Version-1.4.7)
+
+## [Version-1.4.6](https://github.com/SimplySecurity/SimplyEmail/tree/Version-1.4.6) (2017-12-21)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/Version-1.4.5...Version-1.4.6)
+
+## [Version-1.4.5](https://github.com/SimplySecurity/SimplyEmail/tree/Version-1.4.5) (2017-12-21)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/V1.4.1...Version-1.4.5)
+
+**Implemented enhancements:**
+
+- Module sort [\#17](https://github.com/SimplySecurity/SimplyEmail/issues/17)
+
+**Fixed bugs:**
+
+- AttributeError: 'module' object has no attribute '\_base' [\#29](https://github.com/SimplySecurity/SimplyEmail/issues/29)
+- Installation script brakes Kali  [\#24](https://github.com/SimplySecurity/SimplyEmail/issues/24)
+- Execution Error [\#14](https://github.com/SimplySecurity/SimplyEmail/issues/14)
+
+**Closed issues:**
+
+- Magic not working on KALI latest [\#35](https://github.com/SimplySecurity/SimplyEmail/issues/35)
+- canar.io [\#31](https://github.com/SimplySecurity/SimplyEmail/issues/31)
+- Easier automation [\#15](https://github.com/SimplySecurity/SimplyEmail/issues/15)
+
+**Merged pull requests:**
+
+- test [\#43](https://github.com/SimplySecurity/SimplyEmail/pull/43) ([killswitch-GUI](https://github.com/killswitch-GUI))
+- Requirements file has double requirements [\#42](https://github.com/SimplySecurity/SimplyEmail/pull/42) ([Pysint](https://github.com/Pysint))
+- Create CODE\_OF\_CONDUCT.md [\#39](https://github.com/SimplySecurity/SimplyEmail/pull/39) ([killswitch-GUI](https://github.com/killswitch-GUI))
+- Create LICENSE [\#38](https://github.com/SimplySecurity/SimplyEmail/pull/38) ([killswitch-GUI](https://github.com/killswitch-GUI))
+- Update requirments.txt [\#37](https://github.com/SimplySecurity/SimplyEmail/pull/37) ([killswitch-GUI](https://github.com/killswitch-GUI))
+- Dev [\#36](https://github.com/SimplySecurity/SimplyEmail/pull/36) ([killswitch-GUI](https://github.com/killswitch-GUI))
+- Add `--upgrade` flag [\#30](https://github.com/SimplySecurity/SimplyEmail/pull/30) ([bcoles](https://github.com/bcoles))
+- OS system check for Setup.sh [\#27](https://github.com/SimplySecurity/SimplyEmail/pull/27) ([y4utj4](https://github.com/y4utj4))
+- Fix wrong bracket [\#26](https://github.com/SimplySecurity/SimplyEmail/pull/26) ([DPeltier](https://github.com/DPeltier))
+- Fix wget errors [\#25](https://github.com/SimplySecurity/SimplyEmail/pull/25) ([DPeltier](https://github.com/DPeltier))
+- Fixed chmod trying to mod file at wrong location [\#23](https://github.com/SimplySecurity/SimplyEmail/pull/23) ([ChrisTruncer](https://github.com/ChrisTruncer))
+- Dev sleep/jitter [\#22](https://github.com/SimplySecurity/SimplyEmail/pull/22) ([killswitch-GUI](https://github.com/killswitch-GUI))
+- Dev json [\#20](https://github.com/SimplySecurity/SimplyEmail/pull/20) ([killswitch-GUI](https://github.com/killswitch-GUI))
+- Add ordered list [\#19](https://github.com/SimplySecurity/SimplyEmail/pull/19) ([killswitch-GUI](https://github.com/killswitch-GUI))
+
+## [V1.4.1](https://github.com/SimplySecurity/SimplyEmail/tree/V1.4.1) (2016-06-20)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/v1.3...V1.4.1)
+
+**Implemented enhancements:**
+
+- Please use the API [\#9](https://github.com/SimplySecurity/SimplyEmail/issues/9)
+- A bunch of spellcheck/pep8 stuff, and some small improvements [\#13](https://github.com/SimplySecurity/SimplyEmail/pull/13) ([rvazarkar](https://github.com/rvazarkar))
+
+**Fixed bugs:**
+
+- Error in File Location:  [\#16](https://github.com/SimplySecurity/SimplyEmail/issues/16)
+- Error, Kali 2016 Rolling Release [\#11](https://github.com/SimplySecurity/SimplyEmail/issues/11)
+- Please use the API [\#9](https://github.com/SimplySecurity/SimplyEmail/issues/9)
+
+**Merged pull requests:**
+
+- Dev domain [\#18](https://github.com/SimplySecurity/SimplyEmail/pull/18) ([killswitch-GUI](https://github.com/killswitch-GUI))
+- Version 1.4 [\#12](https://github.com/SimplySecurity/SimplyEmail/pull/12) ([killswitch-GUI](https://github.com/killswitch-GUI))
+
+## [v1.3](https://github.com/SimplySecurity/SimplyEmail/tree/v1.3) (2016-04-10)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/1.2...v1.3)
+
+## [1.2](https://github.com/SimplySecurity/SimplyEmail/tree/1.2) (2016-02-20)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/1.0...1.2)
+
+## [1.0](https://github.com/SimplySecurity/SimplyEmail/tree/1.0) (2016-02-06)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/v0.9...1.0)
+
+**Implemented enhancements:**
+
+- fixing some errors and Add Exalead Searches [\#8](https://github.com/SimplySecurity/SimplyEmail/pull/8) ([th3gundy](https://github.com/th3gundy))
+
+## [v0.9](https://github.com/SimplySecurity/SimplyEmail/tree/v0.9) (2016-02-01)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/0.8...v0.9)
+
+**Implemented enhancements:**
+
+- Some fixing and add PasteBinSearch [\#7](https://github.com/SimplySecurity/SimplyEmail/pull/7) ([th3gundy](https://github.com/th3gundy))
+
+## [0.8](https://github.com/SimplySecurity/SimplyEmail/tree/0.8) (2016-01-14)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/v0.7...0.8)
+
+## [v0.7](https://github.com/SimplySecurity/SimplyEmail/tree/v0.7) (2015-12-22)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/0.6...v0.7)
+
+## [0.6](https://github.com/SimplySecurity/SimplyEmail/tree/0.6) (2015-12-07)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/0.5...0.6)
+
+## [0.5](https://github.com/SimplySecurity/SimplyEmail/tree/0.5) (2015-11-21)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/0.4...0.5)
+
+**Merged pull requests:**
+
+- Fixed a couple of typos. [\#6](https://github.com/SimplySecurity/SimplyEmail/pull/6) ([marios-zindilis](https://github.com/marios-zindilis))
+
+## [0.4](https://github.com/SimplySecurity/SimplyEmail/tree/0.4) (2015-11-11)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/0.3...0.4)
+
+**Merged pull requests:**
+
+- Merge v0.4 [\#5](https://github.com/SimplySecurity/SimplyEmail/pull/5) ([killswitch-GUI](https://github.com/killswitch-GUI))
+- Update Setup.sh [\#4](https://github.com/SimplySecurity/SimplyEmail/pull/4) ([trustedsec](https://github.com/trustedsec))
+
+## [0.3](https://github.com/SimplySecurity/SimplyEmail/tree/0.3) (2015-11-10)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/0.2...0.3)
+
+**Merged pull requests:**
+
+- Version 0.3 [\#3](https://github.com/SimplySecurity/SimplyEmail/pull/3) ([killswitch-GUI](https://github.com/killswitch-GUI))
+
+## [0.2](https://github.com/SimplySecurity/SimplyEmail/tree/0.2) (2015-11-10)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/0.0...0.2)
+
+**Merged pull requests:**
+
+- Version 0.2 Merge [\#2](https://github.com/SimplySecurity/SimplyEmail/pull/2) ([killswitch-GUI](https://github.com/killswitch-GUI))
+
+## [0.0](https://github.com/SimplySecurity/SimplyEmail/tree/0.0) (2015-11-09)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/v0.1...0.0)
+
+## [v0.1](https://github.com/SimplySecurity/SimplyEmail/tree/v0.1) (2015-11-09)
+[Full Changelog](https://github.com/SimplySecurity/SimplyEmail/compare/0.1...v0.1)
+
+**Implemented enhancements:**
+
+- Fix bootstrap domain-emails columns [\#1](https://github.com/SimplySecurity/SimplyEmail/pull/1) ([th3gundy](https://github.com/th3gundy))
+
+## [0.1](https://github.com/SimplySecurity/SimplyEmail/tree/0.1) (2015-10-30)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Common/SimplyEmail.ini

@@ -2,7 +2,7 @@
 UserAgent: Mozilla/5.0 (Windows; U; Windows NT 6.0;en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6
 SaveFile: Email_List.txt
 HtmlFile: Email_List.html
-Version: v1.4.3
+Version: v1.5.0
 VersionRepoCheck: Yes
 VersionRepoCheckLocation: https://raw.githubusercontent.com/killswitch-GUI/SimplyEmail/master/setup/License/LICENSE-Version
 

Common/SimplyEmailAggressive.ini

@@ -2,7 +2,7 @@
 UserAgent: (Mozilla/5.0 (Windows; U; Windows NT 6.0;en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6
 SaveFile: Email_List.txt
 HtmlFile: Email_List.html
-Version: v1.2
+Version: v1.5.0
 VersionRepoCheck: Yes
 VersionRepoCheckLocation: https://raw.githubusercontent.com/killswitch-GUI/SimplyEmail/master/License/LICENSE-Version
 

Common/SimplyEmailTest.ini

@@ -2,7 +2,7 @@
 UserAgent: (Mozilla/5.0 (Windows; U; Windows NT 6.0;en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6
 SaveFile: Email_List.txt
 HtmlFile: Email_List.html
-Version: v1.4.3
+Version: v1.5.0
 VersionRepoCheck: Yes
 VersionRepoCheckLocation: https://raw.githubusercontent.com/killswitch-GUI/SimplyEmail/master/License/LICENSE-Version
 

Common/TaskController.py

@@ -955,7 +955,7 @@ def CompletedScreen(self, FinalCount, EmailsBuilt, domain):
                 domain) + "-" + str(self.TimeDate) + "/" + HtmlSaveFile
             # gnome-open cisco.doc
             subprocess.Popen(
-                ("gnome-open", HtmlSaveFile), stdout=subprocess.PIPE)
+                ("firefox", HtmlSaveFile), stdout=subprocess.PIPE)
 
     def VerifyScreen(self):
         # Ask user to open report on CLI

Dockerfile

@@ -0,0 +1,34 @@
+# image base
+FROM ubuntu:16.04
+
+# extra metadata
+LABEL maintainer="SimplySecurity"
+LABEL description="Dockerfile base for SimplyEmail."
+
+# env setup
+ENV DEBIAN_FRONTEND=noninteractive
+
+# set the def shell for ENV
+SHELL ["/bin/bash", "-c"]
+
+# install basic build items
+RUN apt-get update && apt-get install -qy \
+    wget \
+    curl \
+    git \
+    sudo \
+    apt-utils \
+    lsb-core \
+    python2.7
+
+# cleanup image
+RUN apt-get -qy clean \
+    autoremove
+
+
+RUN git clone -b master https://github.com/SimplySecurity/SimplyEmail.git  /opt/SimplyEmail && \
+	cd /opt/SimplyEmail/ && \
+	./setup/setup.sh 
+
+WORKDIR "/opt/SimplyEmail"
+ENTRYPOINT ["./SimplyEmail.py"]