Updates to nmap and urlsnarf (#79)

* nmap: Check internal space available to avoid confusion with large depends.

* arpspoof: fix accidental recursion.
This commit is contained in:
Marc
2019-10-02 18:33:32 +01:00
committed by GitHub
parent e85ef10b35
commit dd7a5d3ab2
6 changed files with 337 additions and 244 deletions

View File

@@ -49,7 +49,7 @@ class urlsnarf extends Module
}
}
protected function checkDependency($dependencyName)
protected function checkDep($dependencyName)
{
return ($this->checkDependency($dependencyName) && ($this->uciGet("urlsnarf.module.installed")));
}
@@ -67,7 +67,7 @@ class urlsnarf extends Module
private function handleDependencies()
{
if (!$this->checkDependency("urlsnarf")) {
if (!$this->checkDep("urlsnarf")) {
$this->execBackground("/pineapple/modules/urlsnarf/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {
@@ -119,7 +119,7 @@ class urlsnarf extends Module
private function refreshStatus()
{
if (!file_exists('/tmp/urlsnarf.progress')) {
if (!$this->checkDependency("urlsnarf")) {
if (!$this->checkDep("urlsnarf")) {
$installed = false;
$install = "Not installed";
$installLabel = "danger";
@@ -173,7 +173,7 @@ class urlsnarf extends Module
private function refreshOutput()
{
if ($this->checkDependency("urlsnarf")) {
if ($this->checkDep("urlsnarf")) {
if ($this->checkRunning("urlsnarf")) {
$path = "/pineapple/modules/urlsnarf/log";