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
This commit is contained in:
Marc
2019-08-21 21:15:53 +01:00
committed by GitHub
parent 2ba1732389
commit e676793328
88 changed files with 309 additions and 465 deletions

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");