Update Modules for 2.6.0+ (Wave 1) (#71)

* Misc: Ignore JetBrains IDE files

* Modules: Update Modules for 2.6.0 (1)

* SiteSurvey: Actually install mdk3 dependency.

* Modules: Bump version numbers for updated modules
pull/76/head
Marc 2019-08-21 21:15:53 +01:00 committed by GitHub
parent 2ba1732389
commit e676793328
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
88 changed files with 309 additions and 465 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.idea/

View File

@ -1,8 +1,5 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class DNSMasqSpoof extends Module
{
public function route()
@ -44,9 +41,9 @@ class DNSMasqSpoof extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDep($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("dnsmasqspoof.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("dnsmasqspoof.module.installed")));
}
protected function getDevice()
@ -67,7 +64,7 @@ class DNSMasqSpoof extends Module
private function handleDependencies()
{
if (!$this->checkDependency("dnsmasq")) {
if (!$this->checkDep("dnsmasq")) {
$this->execBackground("/pineapple/modules/DNSMasqSpoof/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "DNSMasq Spoof",
"version": "1.1"
"version": "1.2"
}

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
if grep addn-hosts /etc/dnsmasq.conf &> /dev/null; then
/etc/init.d/dnsmasq stop && /etc/init.d/dnsmasq start
else

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/DNSMasqSpoof.progress ]] && {
exit 0
}

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
if [ "$1" = "start" ]; then
echo "no-dhcp-interface=" >> /etc/dnsmasq.conf
echo "server=8.8.8.8" >> /etc/dnsmasq.conf

View File

@ -1,8 +1,5 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class DNSspoof extends Module
{
public function route()
@ -62,9 +59,9 @@ class DNSspoof extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDep($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("dnsspoof.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("dnsspoof.module.installed")));
}
protected function getDevice()
@ -80,7 +77,7 @@ class DNSspoof extends Module
private function handleDependencies()
{
if (!$this->checkDependency("dnsspoof")) {
if (!$this->checkDep("dnsspoof")) {
$this->execBackground("/pineapple/modules/DNSspoof/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "DNSspoof",
"version": "1.4"
"version": "1.5"
}

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
MYINTERFACE=`uci get dnsspoof.autostart.interface`
HOSTSFILE="/etc/pineapple/spoofhost"

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
logger "== DNSSpoof Dependencies Installer"
[[ -f /tmp/DNSspoof.progress ]] && {
exit 0

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
MYINTERFACE=`uci get dnsspoof.run.interface`
HOSTSFILE="/etc/pineapple/spoofhost"

View File

@ -1,7 +1,7 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
//putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
//putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class Deauth extends Module
{
@ -53,9 +53,9 @@ class Deauth extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDep($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("deauth.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("deauth.module.installed")));
}
protected function getDevice()
@ -71,7 +71,7 @@ class Deauth extends Module
private function handleDependencies()
{
if (!$this->checkDependency("mdk3")) {
if (!$this->checkDep("mdk3")) {
$this->execBackground("/pineapple/modules/Deauth/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {
@ -116,7 +116,7 @@ class Deauth extends Module
private function refreshStatus()
{
if (!file_exists('/tmp/Deauth.progress')) {
if (!$this->checkDependency("mdk3")) {
if (!$this->checkDep("mdk3")) {
$installed = false;
$install = "Not installed";
$installLabel = "danger";

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "Deauth",
"version": "1.6"
"version": "1.7"
}

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
LOG=/tmp/deauth.log
MYPATH='/pineapple/modules/Deauth/'

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
LOG=/tmp/deauth.log
MYPATH='/pineapple/modules/Deauth/'

View File

@ -1,8 +1,8 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
#export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/Deauth.progress ]] && {
exit 0

View File

@ -1,6 +1,4 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class KeyManager extends Module
{
@ -55,9 +53,9 @@ class KeyManager extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDep($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("keymanager.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("keymanager.module.installed")));
}
protected function getDevice()
@ -73,13 +71,10 @@ class KeyManager extends Module
private function handleKey()
{
if(!file_exists("/root/.ssh/id_rsa"))
{
if (!file_exists("/root/.ssh/id_rsa")) {
$this->execBackground("/pineapple/modules/KeyManager/scripts/generate_key.sh");
$this->response = array('success' => true);
}
else
{
} else {
exec("rm -rf /root/.ssh/id_rsa*");
$this->response = array('success' => true);
}
@ -87,25 +82,19 @@ class KeyManager extends Module
private function handleKeyStatus()
{
if (!file_exists('/tmp/KeyManager_key.progress'))
{
if (!file_exists('/tmp/KeyManager_key.progress')) {
$this->response = array('success' => true);
}
else
{
} else {
$this->response = array('success' => false);
}
}
private function handleDependencies()
{
if(!$this->checkDependency("ssh-keyscan"))
{
$this->execBackground("/pineapple/modules/KeyManager/scripts/dependencies.sh install ".$this->request->destination);
if (!$this->checkDep("ssh-keyscan")) {
$this->execBackground("/pineapple/modules/KeyManager/scripts/dependencies.sh install " . $this->request->destination);
$this->response = array('success' => true);
}
else
{
} else {
$this->execBackground("/pineapple/modules/KeyManager/scripts/dependencies.sh remove");
$this->response = array('success' => true);
}
@ -113,62 +102,47 @@ class KeyManager extends Module
private function handleDependenciesStatus()
{
if (!file_exists('/tmp/KeyManager.progress'))
{
if (!file_exists('/tmp/KeyManager.progress')) {
$this->response = array('success' => true);
}
else
{
} else {
$this->response = array('success' => false);
}
}
private function refreshStatus()
{
if (!file_exists('/tmp/KeyManager.progress'))
{
if(!$this->checkDependency("ssh-keyscan"))
{
if (!file_exists('/tmp/KeyManager.progress')) {
if (!$this->checkDep("ssh-keyscan")) {
$installed = false;
$install = "Not installed";
$installLabel = "danger";
$processing = false;
}
else
{
} else {
$installed = true;
$install = "Installed";
$installLabel = "success";
$processing = false;
}
if (!file_exists('/tmp/KeyManager_key.progress'))
{
if(!file_exists("/root/.ssh/id_rsa"))
{
if (!file_exists('/tmp/KeyManager_key.progress')) {
if (!file_exists("/root/.ssh/id_rsa")) {
$key = "Not generated";
$keyLabel = "danger";
$generated = false;
$generating = false;
}
else
{
} else {
$key = "Generated";
$keyLabel = "success";
$generated = true;
$generating = false;
}
}
else
{
} else {
$key = "Generating...";
$keyLabel = "warning";
$generated = false;
$generating = true;
}
}
else
{
} else {
$installed = false;
$install = "Installing...";
$installLabel = "warning";
@ -187,16 +161,13 @@ class KeyManager extends Module
private function refreshOutput()
{
if (file_exists("/tmp/keymanager.log"))
{
if (file_exists("/tmp/keymanager.log")) {
$output = file_get_contents("/tmp/keymanager.log");
if(!empty($output))
if (!empty($output))
$this->response = $output;
else
$this->response = " ";
}
else
{
} else {
$this->response = " ";
}
}
@ -220,12 +191,9 @@ class KeyManager extends Module
private function addToKnownHostsStatus()
{
if (!file_exists('/tmp/KeyManager.progress'))
{
if (!file_exists('/tmp/KeyManager.progress')) {
$this->response = array('success' => true);
}
else
{
} else {
$this->response = array('success' => false);
}
}
@ -241,12 +209,9 @@ class KeyManager extends Module
private function copyToRemoteHostStatus()
{
if (!file_exists('/tmp/KeyManager.progress'))
{
if (!file_exists('/tmp/KeyManager.progress')) {
$this->response = array('success' => true);
}
else
{
} else {
$this->response = array('success' => false);
}
}
@ -257,7 +222,7 @@ class KeyManager extends Module
$this->uciSet("keymanager.settings.port", $this->request->port);
$this->uciSet("keymanager.settings.user", $this->request->user);
$this->execBackground("/pineapple/modules/KeyManager/scripts/copy_key.sh ".$this->request->password);
$this->execBackground("/pineapple/modules/KeyManager/scripts/copy_key.sh " . $this->request->password);
$this->response = array('success' => true);
}

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "Key Manager",
"version": "1.0"
"version": "1.1"
}

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/KeyManager.progress ]] && {
exit 0

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/KeyManager.progress ]] && {
exit 0

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
logger "== KeyManager Install Script"
[[ -f /tmp/KeyManager.progress ]] && {
exit 0

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/KeyManager_key.progress ]] && {
exit 0

View File

@ -1,7 +1,6 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class LogManager extends Module
{

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "Log Manager",
"version": "1.3"
"version": "1.4"
}

View File

@ -1,8 +1,5 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class Occupineapple extends Module
{
public function route()
@ -56,9 +53,9 @@ class Occupineapple extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDeps($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("occupineapple.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("occupineapple.module.installed")));
}
protected function getDevice()
@ -74,7 +71,7 @@ class Occupineapple extends Module
private function handleDependencies()
{
if (!$this->checkDependency("mdk3")) {
if (!$this->checkDeps("mdk3")) {
$this->execBackground("/pineapple/modules/Occupineapple/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {
@ -121,7 +118,7 @@ class Occupineapple extends Module
private function refreshStatus()
{
if (!file_exists('/tmp/Occupineapple.progress')) {
if (!$this->checkDependency("mdk3")) {
if (!$this->checkDeps("mdk3")) {
$installed = false;
$install = "Not installed";
$installLabel = "danger";
@ -175,7 +172,7 @@ class Occupineapple extends Module
private function refreshOutput()
{
if ($this->checkDependency("mdk3")) {
if ($this->checkDeps("mdk3")) {
if ($this->checkRunning("mdk3")) {
exec("cat /tmp/occupineapple.log", $output);
if (!empty($output)) {

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "Occupineapple",
"version": "1.6"
"version": "1.7"
}

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
LOG=/tmp/occupineapple.log
MYPATH='/pineapple/modules/Occupineapple/'

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/Occupineapple.progress ]] && {
exit 0
}

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
LOG=/tmp/occupineapple.log
MYPATH='/pineapple/modules/Occupineapple/'

View File

@ -1,6 +1,4 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class OnlineHashCrack extends Module
{
@ -49,9 +47,9 @@ class OnlineHashCrack extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDeps($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("onlinehashcrack.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("onlinehashcrack.module.installed")));
}
protected function getDevice()
@ -67,7 +65,7 @@ class OnlineHashCrack extends Module
private function handleDependencies()
{
if(!$this->checkDependency("curl"))
if(!$this->checkDeps("curl"))
{
$this->execBackground("/pineapple/modules/OnlineHashCrack/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
@ -95,7 +93,7 @@ class OnlineHashCrack extends Module
{
if (!file_exists('/tmp/OnlineHashCrack.progress'))
{
if(!$this->checkDependency("curl"))
if(!$this->checkDeps("curl"))
{
$installed = false;
$install = "Not installed";

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "Online Hash Crack",
"version": "1.4"
"version": "1.5"
}

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/OnlineHashCrack.progress ]] && {
exit 0
}

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/OnlineHashCrack.progress ]] && {
exit 0
}

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/OnlineHashCrack.progress ]] && {
exit 0
}

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "OpenVPNConnect",
"version": "1.1"
"version": "1.2"
}

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "Papers",
"version": "1.6"
"version": "1.7"
}

View File

@ -1,8 +1,5 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class Responder extends Module
{
public function route()
@ -56,9 +53,9 @@ class Responder extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDeps($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("responder.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("responder.module.installed")));
}
protected function checkRunning($processName)
@ -79,7 +76,7 @@ class Responder extends Module
private function handleDependencies()
{
if (!$this->checkDependency("python")) {
if (!$this->checkDeps("python")) {
$this->execBackground("/pineapple/modules/Responder/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {
@ -131,7 +128,7 @@ class Responder extends Module
private function refreshStatus()
{
if (!file_exists('/tmp/Responder.progress')) {
if (!$this->checkDependency("python")) {
if (!$this->checkDeps("python")) {
$installed = false;
$install = "Not installed";
$installLabel = "danger";
@ -186,7 +183,7 @@ class Responder extends Module
private function refreshOutput()
{
if ($this->checkDependency("python")) {
if ($this->checkDeps("python")) {
if ($this->checkRunning("Responder.py")) {
if (file_exists("/pineapple/modules/Responder/dep/responder/logs/Responder-Session.log")) {
if ($this->request->filter != "") {

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "Responder",
"version": "1.1"
"version": "1.2"
}

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
MYINTERFACE=`uci get responder.autostart.interface`

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/Responder.progress ]] && {
exit 0
}

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
MYINTERFACE=`uci get responder.run.interface`

View File

@ -1,7 +1,6 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class SSLsplit extends Module
{
@ -56,9 +55,9 @@ class SSLsplit extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDeps($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("sslsplit.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("sslsplit.module.installed")));
}
protected function getDevice()
@ -94,7 +93,7 @@ class SSLsplit extends Module
private function handleDependencies()
{
if (!$this->checkDependency("sslsplit")) {
if (!$this->checkDeps("sslsplit")) {
$this->execBackground("/pineapple/modules/SSLsplit/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {
@ -135,7 +134,7 @@ class SSLsplit extends Module
private function refreshStatus()
{
if (!file_exists('/tmp/SSLsplit.progress')) {
if (!$this->checkDependency("sslsplit")) {
if (!$this->checkDeps("sslsplit")) {
$installed = false;
$install = "Not installed";
$installLabel = "danger";
@ -215,7 +214,7 @@ class SSLsplit extends Module
private function refreshOutput()
{
if ($this->checkDependency("sslsplit")) {
if ($this->checkDeps("sslsplit")) {
if ($this->checkRunning("sslsplit")) {
if (file_exists("/pineapple/modules/SSLsplit/connections.log")) {
if ($this->request->filter != "") {

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "SSLsplit",
"version": "1.3"
"version": "1.4"
}

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/SSLsplit.progress ]] && {
exit 0

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/SSLsplit_certificate.progress ]] && {
exit 0

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`

View File

@ -1,8 +1,5 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
require_once('/pineapple/modules/SiteSurvey/api/iwlist_parser.php');
class SiteSurvey extends Module
@ -70,9 +67,9 @@ class SiteSurvey extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDeps($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("sitesurvey.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("sitesurvey.module.installed")));
}
protected function getDevice()
@ -93,7 +90,7 @@ class SiteSurvey extends Module
private function handleDependencies()
{
if (!$this->checkDependency("mdk3")) {
if (!$this->checkDeps("mdk3")) {
$this->execBackground("/pineapple/modules/SiteSurvey/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {
@ -114,7 +111,7 @@ class SiteSurvey extends Module
private function refreshStatus()
{
if (!file_exists('/tmp/SiteSurvey.progress')) {
if (!$this->checkDependency("iwlist")) {
if (!$this->checkDeps("iwlist")) {
$installed = false;
$install = "Not installed";
$installLabel = "danger";

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "Site Survey",
"version": "1.5"
"version": "1.6"
}

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
LOG=/tmp/SiteSurvey.log
LOCK=/tmp/SiteSurvey_capture.lock

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
LOG=/tmp/SiteSurvey.log
LOCK=/tmp/SiteSurvey_deauth.lock

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
logger "== SITESURVEY INSTALL SCRIPT"
[[ -f /tmp/SiteSurvey.progress ]] && {
exit 0
@ -13,8 +12,10 @@ touch /tmp/SiteSurvey.progress
if [ "$1" = "install" ]; then
if [ "$2" = "internal" ]; then
opkg update
opkg install mdk3
elif [ "$2" = "sd" ]; then
opkg update
opkg install mdk3 --dest=sd
fi
touch /etc/config/sitesurvey

View File

@ -1,7 +1,6 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class Status extends Module
{

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "Status",
"version": "1.4"
"version": "1.5"
}

View File

@ -1,8 +1,5 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class dump1090 extends Module
{
public function route()
@ -53,9 +50,9 @@ class dump1090 extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDep($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("dump1090.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("dump1090.module.installed")));
}
protected function getDevice()
@ -71,7 +68,7 @@ class dump1090 extends Module
private function handleDependencies()
{
if (!$this->checkDependency("dump1090")) {
if (!$this->checkDep("dump1090")) {
$this->execBackground("/pineapple/modules/dump1090/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "dump1090",
"version": "1.1"
"version": "1.2"
}

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
logger "== DUMP1090 INSTALL SCRIPT"
[[ -f /tmp/dump1090.progress ]] && {
exit 0

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
OPTIONS=''

View File

@ -1,7 +1,6 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class ettercap extends Module
{
@ -64,7 +63,7 @@ class ettercap extends Module
protected function checkDependency($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("ettercap.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("ettercap.module.installed")));
}
protected function getDevice()

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/ettercap.progress ]] && {
exit 0

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
MYCMD=`cat /tmp/ettercap.run`

View File

@ -1,8 +1,5 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class ngrep extends Module
{
public function route()
@ -56,9 +53,9 @@ class ngrep extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDeps($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("ngrep.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("ngrep.module.installed")));
}
protected function getDevice()
@ -74,7 +71,7 @@ class ngrep extends Module
private function handleDependencies()
{
if (!$this->checkDependency("ngrep")) {
if (!$this->checkDeps("ngrep")) {
$this->execBackground("/pineapple/modules/ngrep/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {
@ -107,7 +104,7 @@ class ngrep extends Module
private function refreshStatus()
{
if (!file_exists('/tmp/ngrep.progress')) {
if (!$this->checkDependency("ngrep")) {
if (!$this->checkDeps("ngrep")) {
$installed = false;
$install = "Not installed";
$installLabel = "danger";
@ -147,7 +144,7 @@ class ngrep extends Module
private function refreshOutput()
{
if ($this->checkDependency("ngrep")) {
if ($this->checkDeps("ngrep")) {
if ($this->checkRunning("ngrep")) {
$path = "/pineapple/modules/ngrep/log";

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "ngrep",
"version": "1.6"
"version": "1.7"
}

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
logger "== Ngrep Install Script"
[[ -f /tmp/ngrep.progress ]] && {
exit 0
@ -19,10 +18,6 @@ if [ "$1" = "install" ]; then
opkg install ngrep --dest sd
fi
if [ ! -f /usr/lib/libpcap.so ] && [ -f /usr/lib/libpcap.so.1.3 ]; then
ln -s /usr/lib/libpcap.so /usr/lib/libpcap.so.1.3
fi
touch /etc/config/ngrep
echo "config ngrep 'module'" > /etc/config/ngrep

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
MYCMD=`cat /tmp/ngrep.run`

View File

@ -1,7 +1,7 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
//putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
//putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class nmap extends Module
{
@ -44,15 +44,15 @@ class nmap extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDep($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("nmap.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("nmap.module.installed")));
}
protected function getDevice()
{
return trim(exec("cat /proc/cpuinfo | grep machine | awk -F: '{print $2}'"));
}
// protected function getDevice()
// {
// return trim(exec("cat /proc/cpuinfo | grep machine | awk -F: '{print $2}'"));
// }
protected function refreshInfo()
{
@ -62,6 +62,7 @@ class nmap extends Module
private function handleDependencies()
{
error_log("handleDependencies()");
if (!$this->checkDependency("nmap")) {
$this->execBackground("/pineapple/modules/nmap/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
@ -92,9 +93,11 @@ class nmap extends Module
private function togglenmap()
{
if (!$this->checkRunning("nmap")) {
error_log("nmap not running");
$full_cmd = $this->request->command . " -oN /tmp/nmap.scan 2>&1";
shell_exec("echo -e \"{$full_cmd}\" > /tmp/nmap.run");
error_log("calling run script");
$this->execBackground("/pineapple/modules/nmap/scripts/nmap.sh start");
} else {
$this->execBackground("/pineapple/modules/nmap/scripts/nmap.sh stop");

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "nmap",
"version": "1.7"
"version": "1.8"
}

View File

@ -1,8 +1,10 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
#export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
logger "== RUNNING NMAP INSTALL SCRIPT"
[[ -f /tmp/nmap.progress ]] && {
exit 0
@ -19,9 +21,9 @@ if [ "$1" = "install" ]; then
opkg install nmap --dest sd
fi
if [ ! -f /usr/lib/libpcap.so ] && [ -f /usr/lib/libpcap.so.1.3 ]; then
ln -s /usr/lib/libpcap.so /usr/lib/libpcap.so.1.3
fi
# if [ ! -f /usr/lib/libpcap.so ] && [ -f /usr/lib/libpcap.so.1.3 ]; then
# ln -s /usr/lib/libpcap.so /usr/lib/libpcap.so.1.3
# fi
touch /etc/config/nmap
echo "config nmap 'module'" > /etc/config/nmap

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
logger "== STARTING NMAP SCRIPT"
MYTIME=`date +%s`
MYCMD=`cat /tmp/nmap.run`

View File

@ -1,8 +1,5 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class p0f extends Module
{
public function route()
@ -50,9 +47,9 @@ class p0f extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDeps($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("p0f.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("p0f.module.installed")));
}
protected function getDevice()
@ -68,7 +65,7 @@ class p0f extends Module
private function handleDependencies()
{
if (!$this->checkDependency("p0f")) {
if (!$this->checkDeps("p0f")) {
$this->execBackground("/pineapple/modules/p0f/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {
@ -120,7 +117,7 @@ class p0f extends Module
private function refreshStatus()
{
if (!file_exists('/tmp/p0f.progress')) {
if (!$this->checkDependency("p0f")) {
if (!$this->checkDeps("p0f")) {
$installed = false;
$install = "Not installed";
$installLabel = "danger";
@ -175,7 +172,7 @@ class p0f extends Module
private function refreshOutput()
{
if ($this->checkDependency("p0f")) {
if ($this->checkDeps("p0f")) {
if ($this->checkRunning("p0f")) {
$path = "/pineapple/modules/p0f/log";

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "p0f",
"version": "1.2"
"version": "1.3"
}

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
MYINTERFACE=`uci get p0f.autostart.interface`

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/p0f.progress ]] && {
exit 0
}

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
MYINTERFACE=`uci get p0f.run.interface`

View File

@ -1,7 +1,6 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class tcpdump extends Module
{
@ -47,9 +46,9 @@ class tcpdump extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDeps($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("tcpdump.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("tcpdump.module.installed")));
}
protected function getDevice()
@ -65,7 +64,7 @@ class tcpdump extends Module
private function handleDependencies()
{
if (!$this->checkDependency("tcpdump")) {
if (!$this->checkDeps("tcpdump")) {
$this->execBackground("/pineapple/modules/tcpdump/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {
@ -98,7 +97,7 @@ class tcpdump extends Module
private function refreshStatus()
{
if (!file_exists('/tmp/tcpdump.progress')) {
if (!$this->checkDependency("tcpdump")) {
if (!$this->checkDeps("tcpdump")) {
$installed = false;
$install = "Not installed";
$installLabel = "danger";
@ -138,7 +137,7 @@ class tcpdump extends Module
private function refreshOutput()
{
if ($this->checkDependency("tcpdump")) {
if ($this->checkDeps("tcpdump")) {
if (file_exists("/tmp/tcpdump_capture.log")) {
$output = file_get_contents("/tmp/tcpdump_capture.log");
if (!empty($output)) {

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "tcpdump",
"version": "1.7"
"version": "1.8"
}

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/tcpdump.progress ]] && {
exit 0

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
MYCMD=`cat /tmp/tcpdump.run`

View File

@ -2,8 +2,7 @@
# author: catatonicprime
# date: March 2018
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
touch /tmp/tor.progress

View File

@ -1,7 +1,6 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
class urlsnarf extends Module
{
@ -52,7 +51,7 @@ class urlsnarf extends Module
protected function checkDependency($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("urlsnarf.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("urlsnarf.module.installed")));
}
protected function getDevice()

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "urlsnarf",
"version": "1.5"
"version": "1.6"
}

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
MYINTERFACE=`uci get urlsnarf.autostart.interface`

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/urlsnarf.progress ]] && {
exit 0

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
MYINTERFACE=`uci get urlsnarf.run.interface`

View File

@ -1,8 +1,5 @@
<?php namespace pineapple;
putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
require_once('/pineapple/modules/wps/api/iwlist_parser.php');
class wps extends Module
@ -70,9 +67,9 @@ class wps extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDeps($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("wps.module.installed")));
return ($this->checkDependency($dependencyName) && ($this->uciGet("wps.module.installed")));
}
protected function getDevice()
@ -93,7 +90,7 @@ class wps extends Module
private function handleDependencies()
{
if (!$this->checkDependency("reaver")) {
if (!$this->checkDeps("reaver")) {
$this->execBackground("/pineapple/modules/wps/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {
@ -114,7 +111,7 @@ class wps extends Module
private function refreshStatus()
{
if (!file_exists('/tmp/wps.progress')) {
if (!$this->checkDependency("iwlist")) {
if (!$this->checkDeps("iwlist")) {
$installed = false;
$install = "Not installed";
$installLabel = "danger";
@ -166,7 +163,7 @@ class wps extends Module
private function refreshOutput()
{
if ($this->checkDependency("reaver") && $this->checkDependency("bully")) {
if ($this->checkDeps("reaver") && $this->checkDeps("bully")) {
if ($this->checkRunning("reaver") || $this->checkRunning("bully")) {
$path = "/pineapple/modules/wps/log";

View File

@ -6,5 +6,5 @@
"tetra"
],
"title": "wps",
"version": "1.6"
"version": "1.7"
}

View File

@ -1,9 +1,6 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
[[ -f /tmp/wps.progress ]] && {
exit 0
}

View File

@ -1,8 +1,7 @@
#!/bin/sh
#2015 - Whistle Master
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
MYTIME=`date +%s`
MYCMD=`cat /tmp/wps.run`