added new Modular Transparent Proxy tranks @xtr4nge sslstrip::mod

CHANGELOG

@@ -1,3 +1,10 @@
+Version 0.7.3
+-------------
+- added new Pump-Logo default
+- added PumpSettings TAB DHCP configure
+- fixed no share internet with plugins sslstrip disabled
+- added new Modular Transparent Proxy tranks @xtr4nge sslstrip::mod
+
 Version 0.7.1
 -------------
 - added update commits from repository

CONTRIBUTING.md

@@ -4,7 +4,7 @@ You can help this project by reporting problems, suggestions, localizing it or c
 
 ### Report a problem or suggestion
 
-Go to our [issue tracker](https://github.com/P0cL4bs/3vilTwinAttacker/issues) and check if your problem/suggestion is already reported. If not, create a new issue with a descriptive title and detail your suggestion or steps to reproduce the problem.
+Go to our [issue tracker](https://github.com/P0cL4bs/WiFi-Pumpkin/issues) and check if your problem/suggestion is already reported. If not, create a new issue with a descriptive title and detail your suggestion or steps to reproduce the problem.
 A good bug report shouldn't leave others needing to chase you up for more
 information. Please try to be as detailed as possible in your report.
 

Core/Utils.py

@@ -154,7 +154,7 @@ def run(self):
         self.makeLogger()
         self.process = Popen(self.cmd,stdout=PIPE,stderr=STDOUT)
         for line in iter(self.process.stdout.readline, b''):
-            #self.log_hostapd.info(line.rstrip())
+            self.log_hostapd.info(line.rstrip())
             if self.objectName() == 'hostapd':
                 if 'AP-STA-DISCONNECTED' in line.rstrip() or 'inactivity (timer DEAUTH/REMOVE)' in line.rstrip():
                     self.statusAP_connected.emit(line.split()[2])
@@ -199,25 +199,14 @@ def __init__(self,cmd,):
 
     def run(self):
         print 'Starting Thread:' + self.name
-        if self.name == 'Airbase-ng':
-            setup_logger('airbase', './Logs/AccessPoint/requestAP.log')
-            log_airbase = logging.getLogger('airbase')
-            self.logger = True
-        elif self.name == 'Dns2Proxy':
+        if self.name == 'Dns2Proxy':
             setup_logger('dns2proxy', './Logs/AccessPoint/dns2proxy.log')
             log_dns2proxy = logging.getLogger('dns2proxy')
             self.logger = True
         self.process = Popen(self.cmd,stdout=PIPE,stderr=STDOUT)
         for line in iter(self.process.stdout.readline, b''):
             if self.logger:
-                if self.name == 'Airbase-ng':
-                    if search('Created tap interface',line):
-                        Popen(['ifconfig',line.split()[4], 'up'])
-                        self.iface = line.split()[4]
-                    log_airbase.info(line.rstrip())
-                elif self.name == 'hostapd':
-                    log_hostapd.info(line.rstrip())
-                elif self.name == 'Dns2Proxy':
+                if self.name == 'Dns2Proxy':
                     log_dns2proxy.info(line.rstrip())
                     self.prompt = False
             if self.prompt:
@@ -553,6 +542,7 @@ def exportHtml():
          'credentials': {'Logs/AccessPoint/credentials.log':[]},
          'requestAP': {'Logs/AccessPoint/requestAP.log':[]},
          'dns2proxy': {'Logs/AccessPoint/dns2proxy.log':[]},
+         'injectionPage': {'Logs/AccessPoint/injectionPage.log':[]},
          'phishing': {'Logs/Phishing/Webclone.log':[]},}
         for i in readFile.keys():
             for j in readFile[i]:

Core/config/Settings.py

@@ -48,7 +48,7 @@ def center(self):
         frameGm.moveCenter(centerPoint)
         self.move(frameGm.topLeft())
 
-    def xmlSettings(self,id,data,bool,show):
+    def xmlSettings(self,id,data,bool,show=False):
         xmldoc = minidom.parse('Core/config/Settings.xml')
         country = xmldoc.getElementsByTagName(id)
         firstchild = country[0]
@@ -186,7 +186,7 @@ def Qui(self):
         self.btn_save = QPushButton('Save')
         self.btn_save.clicked.connect(self.save_settings)
         self.btn_save.setFixedWidth(80)
-        self.btn_save.setIcon(QIcon('rsc/Save.png'))
+        self.btn_save.setIcon(QIcon('Icons/Save.png'))
 
         self.GruPag0=QButtonGroup()
         self.GruPag1=QButtonGroup()
@@ -218,7 +218,6 @@ def Qui(self):
         self.interface = QLineEdit(self)
         self.Apname =  QLineEdit(self)
         self.channel = QSpinBox(self)
-        self.rangeIP = QLineEdit(self)
         self.redirectport = QLineEdit(self)
         self.InterfaceNetCreds = QLineEdit(self)
 
@@ -317,7 +316,6 @@ def Qui(self):
         self.interface.setText(self.xmlSettings('interface', 'monitor_mode', None, False))
         self.Apname.setText(self.xmlSettings('AP', 'name', None, False))
         self.channel.setValue(int(self.xmlSettings('channel', 'mchannel', None, False)))
-        self.rangeIP.setText(self.xmlSettings('Iprange', 'range', None, False))
         self.redirectport.setText(self.xmlSettings('redirect', 'port', None, False))
         self.InterfaceNetCreds.setText(self.xmlSettings('netcreds', 'interface', None, False))
         #add tab Advanced
@@ -327,7 +325,6 @@ def Qui(self):
         self.page_2.addRow('Interface Monitor:',self.interface)
         self.page_2.addRow('AP Name:',self.Apname)
         self.page_2.addRow('Channel:',self.channel)
-        self.page_2.addRow('DHCP Range:',self.rangeIP)
         self.page_2.addRow('Port sslstrip:',self.redirectport)
         self.page_2.addRow('NetCreds Interface:',self.InterfaceNetCreds)
         self.page_2.addRow(QLabel('mdk3 Args:'),self.txt_arguments)

Core/config/Settings.xml

@@ -10,12 +10,32 @@
         <themes selected="themes/theme2"/>
     </configure>
 
+    <DHCP>
+        <leasetimeDef value="600"/>
+        <leasetimeMax value="7200"/>
+        <subnet value="10.0.0.0"/>
+        <router value="10.0.0.1"/>
+        <netmask value="255.255.255.0"/>
+        <broadcast value="10.0.0.255"/>
+        <range value="10.0.0.20 10.0.0.50"/>
+    </DHCP>
+
+
+    <DHCPDefault>
+        <D-leasetimeDef value="600"/>
+        <D-leasetimeMax value="7200"/>
+        <D-subnet value="10.0.0.0"/>
+        <D-router value="10.0.0.1"/>
+        <D-netmask value="255.255.255.0"/>
+        <D-broadcast value="10.0.0.255"/>
+        <D-range value="10.0.0.20 10.0.0.50"/>
+    </DHCPDefault>
+
     <configure>
         <advanced Function_scan="Ping"/>
         <interface monitor_mode="wlan1"/>
         <channel mchannel="11"/>
         <AP name="PumpAP"/>
-        <Iprange range="10.0.0.20 10.0.0.50"/>
         <redirect port="10000"/>
         <netcreds interface="wlan3"/>
     </configure>

Core/config/commits/Lcommits.cfg

@@ -1,11 +1,8 @@
 master:
 [
-  {	Version: '0.7.1'}
-  { changelog : 'added update commits from repository' },
-  { changelog : 'added QTableWidget filter (mac,ip,hostname) clients connected on AP' },
-  { changelog : 'added count of clients connected no AP' },
-  { changelog : 'changed name Tool Wifi-Pumpkin' },
-  { changelog : 'locked dnsmasq support  temporarily' },
-  { changelog : 'added new modules Phishing Manager' },
-  { changelog : 'some improvements in modules' },
+  {	Version: '0.7.3'}
+  { changelog : 'added new Pump-Logo default' },
+  { changelog : 'added PumpSettings TAB DHCP configure' },
+  { changelog : 'fixed no share internet with plugins sslstrip disabled' },
+  { changelog : 'added new Modular Transparent Proxy tranks @xtr4nge sslstrip::mod' },
 ]

Core/helpers/update.py

@@ -54,8 +54,8 @@ def GUI(self):
         self.btnUpdate.setDisabled(True)
 
         # icons
-        self.btnCheck.setIcon(QIcon('rsc/Checklist_update.png'))
-        self.btnUpdate.setIcon(QIcon('rsc/updates_.png'))
+        self.btnCheck.setIcon(QIcon('Icons/Checklist_update.png'))
+        self.btnUpdate.setIcon(QIcon('Icons/updates_.png'))
         #connects
         self.btnCheck.clicked.connect(self.checkUpdate)
         self.btnUpdate.clicked.connect(self.startUpdate)
@@ -113,7 +113,7 @@ def RcheckCommits(self,commits):
         if 'no changes into' in commits:
             item = QListWidgetItem()
             item.setText(commits)
-            item.setIcon(QIcon('rsc/checked_update.png'))
+            item.setIcon(QIcon('Icons/checked_update.png'))
             item.setSizeHint(QSize(20,20))
             self.LCommits.addItem(item)
             return self.btnCheck.setEnabled(True)
@@ -127,7 +127,7 @@ def RcheckCommits(self,commits):
         elif 'commit:' in commits:
             item = QListWidgetItem()
             item.setText(commits)
-            item.setIcon(QIcon('rsc/check_update.png'))
+            item.setIcon(QIcon('Icons/check_update.png'))
             item.setSizeHint(QSize(20,20))
             self.LCommits.addItem(item)
             self.btnCheck.setEnabled(True)

Core/loaders/Stealth/PackagesUI.py

@@ -9,7 +9,7 @@ class PumpkinModule(QWidget):
     ''' this is Qwidget Module base '''
     def __init__(self,parent=None,*args):
         super(PumpkinModule, self).__init__(parent)
-        self.setWindowIcon(QIcon('rsc/icon.ico'))
+        self.setWindowIcon(QIcon('Icons/icon.ico'))
         self.module_network = Refactor
         self.configure      = frm_Settings()
         self.Ftemplates     = frm_PhishingManager()

Core/themes/theme1.qss

@@ -156,7 +156,7 @@ QComboBox::drop-down
 
 QComboBox::down-arrow
 {
-     image: url(rsc/down_arrow.png);
+     image: url(Icons/down_arrow.png);
 }
 
 QGroupBox:focus
@@ -452,7 +452,7 @@ QRadioButton::indicator:hover, QCheckBox::indicator:hover
 
 QCheckBox::indicator:checked
 {
-    image:url(rsc/check.png);
+    image:url(Icons/check.png);
 }
 
 QCheckBox::indicator:disabled, QRadioButton::indicator:disabled