Wiki Updates

CHANGELOG.md

@@ -0,0 +1,115 @@
+Changelog
+==============
+
+[v2.4](https://github.com/xtr4nge/FruityWifi/releases/tag/v2.4)
+----------------
+- Utils have been added (replaces `ifconfig -a`)
+- Kali Linux Rolling compatibility issue has been fixed
+
+
+[v2.3](https://github.com/xtr4nge/FruityWifi/releases/tag/v2.3)
+----------------
+- Monitor mode (mon0) has been fixed (new airmon-ng compatibility issue)
+
+
+[v2.2](https://github.com/xtr4nge/FruityWifi/releases/tag/v2.2)
+----------------
+- Wireless service has been replaced by AP module
+- Mobile support has been added
+- Bootstrap support has been added
+- Token auth has been added
+- Minor fix
+
+
+[v2.1](https://github.com/xtr4nge/FruityWifi/releases/tag/v2.1.3)
+----------------
+- Hostapd Mana support has been added
+- Phishing service has been replaced by phishing module
+- Karma service has been replaced by karma module
+- Sudo has been implemented (replacement for danger)
+- Logs path can be changed
+- Squid dependencies have been removed from FruityWifi installer
+- Phishing dependencies have been removed from FruityWifi installer
+- New AP options available: hostapd, hostapd-mana, hostapd-karma, airmon-ng
+- Domain name can be changed from config panel
+- New install options have been added to install-FruityWifi.sh
+- Install/Remove have been updated
+
+
+[v2.0 (alpha)](https://github.com/xtr4nge/FruityWifi/releases/tag/v2.0)
+----------------
+- Web-Interface has been changed (new look and feel, new options).
+- Nginx has replaced Apache2 as default webserver.
+- Installation script has been updated.
+- Config panel has been changed.
+- Network interfaces structure has been changed and renamed.
+- It is possible to use FruityWifi combining multiple networks and setups.
+- Supplicant mode has been added as a module.
+- 3G/4G Broadband Mobile has been added as a module.
+- FruityWifi HTTP webinterface on port 8000
+- FruityWifi HTTPS webinterface on port 8443
+
+
+v1.9
+----------------
+- Service Karma has been replaced by Karma module
+- Service Supplicant has been replaced by nmcli module
+- Config page has been updated
+- Supplicant config has been changed (nmcli module is required)
+- dnspoof host file has been removed from config page (dnsspoof module is required)
+- Logs page has been updated
+- WSDL has been updated
+- Hostapd/Karma has been removed from installer (replaced by Karma module)
+- NetworkManager has been removed from installer (replaced by nmcli module)
+- install-modules.py has been added (install all modules from console)
+
+
+v1.8
+----------------
+- WSDL has been added
+- New status page has been added
+- Logs can follow in realtime using the new status page (wsdl)
+
+
+v1.6
+----------------
+- Dependencies can be installed from module windows
+- Minor fix
+
+
+v1.5
+----------------
+- New functions has been added
+- Source code has been changed (open file function)
+- Minor fix
+
+
+v1.4
+----------------
+- New functions has been added (monitor mode)
+- Config page has been changed
+- Minor fix
+
+
+v1.3
+----------------
+- Directory structure has been changed
+- Minor fix
+
+
+v1.2
+----------------
+- Installation script has been updated
+- SSLstrip fork (@xtr4nge) has been added (Inject + Tamperer options)
+- Minor fix
+
+
+v1.1
+----------------
+- External modules can be installed from modules page
+- Minor fix
+
+
+v1.0
+----------------
+- Init

FruityWifi/conf/hostapd-secure.conf → FruityWiFi/conf/hostapd-secure.conf

@@ -1,4 +1,5 @@
-ctrl_interface=/var/run/hostapd-phy0
+ctrl_interface=/var/run/hostapd
+
 driver=nl80211
 wmm_ac_bk_cwmin=4
 wmm_ac_bk_cwmax=10
@@ -39,9 +40,6 @@ tx_queue_data0_burst=1.5
 hw_mode=g
 channel=6
 
-
-
-
 logger_syslog=127
 logger_syslog_level=2
 logger_stdout=127
@@ -50,11 +48,10 @@ logger_stdout_level=2
 #ht_capab=[HT20][SHORT-GI-20][SHORT-GI-40][RX-STBC1][DSSS_CCK-40]
 
 interface=wlan0
-ctrl_interface=/var/run/hostapd-phy0
 disassoc_low_ack=1
 auth_algs=1
 #wpa=0
-ssid=FruityWifi
+ssid=FruityWiFi
 #bridge=br-lan
 wmm_enabled=1
 bssid=00:00:00:00:00:00
@@ -65,7 +62,7 @@ macaddr_acl=0
 auth_algs=1
 #ignore_broadcast_ssid=0
 wpa=2
-wpa_passphrase=RaspberryWifi
+wpa_passphrase=FruityWiFi
 wpa_key_mgmt=WPA-PSK
 wpa_pairwise=TKIP
 rsn_pairwise=CCMP

FruityWifi/conf/hostapd.conf → FruityWiFi/conf/hostapd.conf

@@ -1,4 +1,5 @@
-ctrl_interface=/var/run/hostapd-phy0
+ctrl_interface=/var/run/hostapd
+
 driver=nl80211
 wmm_ac_bk_cwmin=4
 wmm_ac_bk_cwmax=10
@@ -39,9 +40,6 @@ tx_queue_data0_burst=1.5
 hw_mode=g
 channel=6
 
-
-
-
 logger_syslog=127
 logger_syslog_level=2
 logger_stdout=127
@@ -50,15 +48,11 @@ logger_stdout_level=2
 #ht_capab=[HT20][SHORT-GI-20][SHORT-GI-40][RX-STBC1][DSSS_CCK-40]
 
 interface=wlan0
-ctrl_interface=/var/run/hostapd-phy0
 disassoc_low_ack=1
 auth_algs=1
 wpa=0
-ssid=FruityWifi
+ssid=FruityWiFi
 #bridge=br-lan
 wmm_enabled=1
 bssid=00:00:00:00:00:00
 ignore_broadcast_ssid=0
-
-
-

FruityWiFi/utils/network.py

@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+
+import os, sys
+import getopt
+import netifaces
+
+def usage():
+    print ("\nFruityWiFi utils v1.1 (@xtr4nge)")
+
+    print ("Usage: network.py <options>\n")
+    print ("Options:")
+    print ("-t <type>, --type=<type>                 TYPE")
+    print ("-i <iface>, --iface=<iface>              INTERFACE")
+    print ("")
+    print ("Author: @xtr4nge")
+    print ("")
+
+def parseOptions(argv):
+    TYPE = ""
+    IFACE = ""
+
+    try:
+        opts, args = getopt.getopt(argv, "ht:i:", 
+                                   ["help", "type=", "iface="])
+
+        for opt, arg in opts:
+            if opt in ("-h", "--help"):
+                usage()
+                sys.exit()
+            elif opt in ("-t", "--type"):
+                TYPE = arg
+            elif opt in ("-i", "--iface"):
+                IFACE = arg
+
+        if TYPE == "":
+            usage()
+            print
+            print ("[Required] \n        -t (TYPE: getiface) \n")
+            print
+
+            sys.exit(1)
+
+        return (TYPE, IFACE)
+
+    except getopt.GetoptError:
+        usage()
+        sys.exit(2)
+
+def getIface():
+    for i in netifaces.interfaces():
+        try: MAC = netifaces.ifaddresses(i)[netifaces.AF_LINK][0]["addr"]
+        except: MAC = ""
+        try: IP = netifaces.ifaddresses(i)[netifaces.AF_INET][0]["addr"]
+        except: IP = ""
+        print (str(i)+"|"+str(IP)+"|"+str(MAC))
+
+def getIfaceNAME():
+    for i in netifaces.interfaces():
+        print (i)
+
+def getIfaceIP(iface):
+    try: IP = netifaces.ifaddresses(iface)[netifaces.AF_INET][0]["addr"]
+    except: IP = ""
+    print (IP)
+
+def getIfaceMAC(iface):
+    try: MAC = netifaces.ifaddresses(iface)[netifaces.AF_LINK][0]["addr"]
+    except: MAC = ""
+    print (MAC)
+
+def main(argv):
+    (TYPE, IFACE) = parseOptions(argv)
+
+    if TYPE == "getiface":
+        getIface()
+    if TYPE == "getifacename":
+        getIfaceNAME()
+    if TYPE == "getifaceip" and IFACE != "":
+        getIfaceIP(IFACE)
+    if TYPE == "getifacemac" and IFACE != "":
+        getIfaceMAC(IFACE)
+
+if __name__ == "__main__":
+    main(sys.argv[1:])

FruityWifi/www/config/config.php → FruityWiFi/www/config/config.php

@@ -1,5 +1,5 @@
 <?
-$version="v2.2";
+$version="v2.4";
 $regex=1; // 1 (on) | 0 (off) >> web interface input validation.
 $regex_extra=" _-.[]*"; // extra characters allowed (input validation).
 $log_path="/usr/share/fruitywifi/logs";