Maintenance for a few modules (#42)

This commit is contained in:
WM
2018-08-27 02:32:32 +02:00
committed by Sebastian Kinne
parent 13b3c40d76
commit a5d7d19cd5
161 changed files with 16954 additions and 10056 deletions

View File

@@ -1,16 +1,17 @@
<?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
{
public function route()
public function route()
{
switch ($this->request->action) {
case 'refreshInfo':
$this->refreshInfo();
break;
case 'refreshOutput':
case 'refreshInfo':
$this->refreshInfo();
break;
case 'refreshOutput':
$this->refreshOutput();
break;
case 'refreshStatus':
@@ -34,311 +35,266 @@ class SSLsplit extends Module
case 'deleteHistory':
$this->deleteHistory();
break;
case 'downloadHistory':
$this->downloadHistory();
break;
case 'toggleSSLsplitOnBoot':
$this->toggleSSLsplitOnBoot();
break;
case 'handleCertificate':
$this->handleCertificate();
break;
case 'handleCertificateStatus':
$this->handleCertificateStatus();
break;
case 'saveConfigurationData':
$this->saveConfigurationData();
break;
case 'getConfigurationData':
$this->getConfigurationData();
break;
case 'downloadHistory':
$this->downloadHistory();
break;
case 'toggleSSLsplitOnBoot':
$this->toggleSSLsplitOnBoot();
break;
case 'handleCertificate':
$this->handleCertificate();
break;
case 'handleCertificateStatus':
$this->handleCertificateStatus();
break;
case 'saveConfigurationData':
$this->saveConfigurationData();
break;
case 'getConfigurationData':
$this->getConfigurationData();
break;
}
}
protected function checkDependency($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("sslsplit.module.installed")));
}
protected function checkDependency($dependencyName)
{
return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("sslsplit.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()
{
$moduleInfo = @json_decode(file_get_contents("/pineapple/modules/SSLsplit/module.info"));
$this->response = array('title' => $moduleInfo->title, 'version' => $moduleInfo->version);
}
protected function refreshInfo()
{
$moduleInfo = @json_decode(file_get_contents("/pineapple/modules/SSLsplit/module.info"));
$this->response = array('title' => $moduleInfo->title, 'version' => $moduleInfo->version);
}
private function handleCertificate()
{
if(!file_exists("/pineapple/modules/SSLsplit/cert/certificate.crt"))
{
$this->execBackground("/pineapple/modules/SSLsplit/scripts/generate_certificate.sh");
$this->response = array('success' => true);
}
else
{
exec("rm -rf /pineapple/modules/SSLsplit/cert/certificate.*");
$this->response = array('success' => true);
}
}
if (!file_exists("/pineapple/modules/SSLsplit/cert/certificate.crt")) {
$this->execBackground("/pineapple/modules/SSLsplit/scripts/generate_certificate.sh");
$this->response = array('success' => true);
} else {
exec("rm -rf /pineapple/modules/SSLsplit/cert/certificate.*");
$this->response = array('success' => true);
}
}
private function handleCertificateStatus()
{
if (!file_exists('/tmp/SSLsplit_certificate.progress'))
{
if (!file_exists('/tmp/SSLsplit_certificate.progress')) {
$this->response = array('success' => true);
}
else
{
} else {
$this->response = array('success' => false);
}
}
}
private function handleDependencies()
{
if(!$this->checkDependency("sslsplit"))
{
$this->execBackground("/pineapple/modules/SSLsplit/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
}
else
{
$this->execBackground("/pineapple/modules/SSLsplit/scripts/dependencies.sh remove");
$this->response = array('success' => true);
}
}
if (!$this->checkDependency("sslsplit")) {
$this->execBackground("/pineapple/modules/SSLsplit/scripts/dependencies.sh install ".$this->request->destination);
$this->response = array('success' => true);
} else {
$this->execBackground("/pineapple/modules/SSLsplit/scripts/dependencies.sh remove");
$this->response = array('success' => true);
}
}
private function handleDependenciesStatus()
{
if (!file_exists('/tmp/SSLsplit.progress'))
{
if (!file_exists('/tmp/SSLsplit.progress')) {
$this->response = array('success' => true);
}
else
{
} else {
$this->response = array('success' => false);
}
}
private function toggleSSLsplitOnBoot()
{
if(exec("cat /etc/rc.local | grep SSLsplit/scripts/autostart_sslsplit.sh") == "")
{
exec("sed -i '/exit 0/d' /etc/rc.local");
exec("echo /pineapple/modules/SSLsplit/scripts/autostart_sslsplit.sh >> /etc/rc.local");
exec("echo exit 0 >> /etc/rc.local");
}
else
{
exec("sed -i '/SSLsplit\/scripts\/autostart_sslsplit.sh/d' /etc/rc.local");
}
}
if (exec("cat /etc/rc.local | grep SSLsplit/scripts/autostart_sslsplit.sh") == "") {
exec("sed -i '/exit 0/d' /etc/rc.local");
exec("echo /pineapple/modules/SSLsplit/scripts/autostart_sslsplit.sh >> /etc/rc.local");
exec("echo exit 0 >> /etc/rc.local");
} else {
exec("sed -i '/SSLsplit\/scripts\/autostart_sslsplit.sh/d' /etc/rc.local");
}
}
private function toggleSSLsplit()
{
if(!$this->checkRunning("sslsplit"))
{
$this->execBackground("/pineapple/modules/SSLsplit/scripts/sslsplit.sh start");
}
else
{
$this->execBackground("/pineapple/modules/SSLsplit/scripts/sslsplit.sh stop");
}
}
if (!$this->checkRunning("sslsplit")) {
$this->execBackground("/pineapple/modules/SSLsplit/scripts/sslsplit.sh start");
} else {
$this->execBackground("/pineapple/modules/SSLsplit/scripts/sslsplit.sh stop");
}
}
private function refreshStatus()
{
if (!file_exists('/tmp/SSLsplit.progress'))
{
if(!$this->checkDependency("sslsplit"))
{
$installed = false;
$install = "Not installed";
$installLabel = "danger";
$processing = false;
if (!file_exists('/tmp/SSLsplit.progress')) {
if (!$this->checkDependency("sslsplit")) {
$installed = false;
$install = "Not installed";
$installLabel = "danger";
$processing = false;
$status = "Start";
$statusLabel = "success";
$status = "Start";
$statusLabel = "success";
$bootLabelON = "default";
$bootLabelOFF = "danger";
}
else
{
$installed = true;
$install = "Installed";
$installLabel = "success";
$processing = false;
$bootLabelON = "default";
$bootLabelOFF = "danger";
} else {
$installed = true;
$install = "Installed";
$installLabel = "success";
$processing = false;
if ($this->checkRunning("sslsplit"))
{
$status = "Stop";
$statusLabel = "danger";
}
else
{
$status = "Start";
$statusLabel = "success";
}
if ($this->checkRunning("sslsplit")) {
$status = "Stop";
$statusLabel = "danger";
} else {
$status = "Start";
$statusLabel = "success";
}
if(exec("cat /etc/rc.local | grep SSLsplit/scripts/autostart_sslsplit.sh") == "")
{
$bootLabelON = "default";
$bootLabelOFF = "danger";
}
else
{
$bootLabelON = "success";
$bootLabelOFF = "default";
}
}
if (exec("cat /etc/rc.local | grep SSLsplit/scripts/autostart_sslsplit.sh") == "") {
$bootLabelON = "default";
$bootLabelOFF = "danger";
} else {
$bootLabelON = "success";
$bootLabelOFF = "default";
}
}
if (!file_exists('/tmp/SSLsplit_certificate.progress'))
{
if(!file_exists("/pineapple/modules/SSLsplit/cert/certificate.crt"))
{
$certificate = "Not generated";
$certificateLabel = "danger";
$generated = false;
$generating = false;
}
else
{
$certificate = "Generated";
$certificateLabel = "success";
$generated = true;
$generating = false;
}
}
else
{
$certificate = "Generating...";
$certificateLabel = "warning";
$generated = false;
$generating = true;
}
}
else
{
$installed = false;
$install = "Installing...";
$installLabel = "warning";
$processing = true;
if (!file_exists('/tmp/SSLsplit_certificate.progress')) {
if (!file_exists("/pineapple/modules/SSLsplit/cert/certificate.crt")) {
$certificate = "Not generated";
$certificateLabel = "danger";
$generated = false;
$generating = false;
} else {
$certificate = "Generated";
$certificateLabel = "success";
$generated = true;
$generating = false;
}
} else {
$certificate = "Generating...";
$certificateLabel = "warning";
$generated = false;
$generating = true;
}
} else {
$installed = false;
$install = "Installing...";
$installLabel = "warning";
$processing = true;
$status = "Start";
$statusLabel = "success";
$status = "Start";
$statusLabel = "success";
$bootLabelON = "default";
$bootLabelOFF = "danger";
$bootLabelON = "default";
$bootLabelOFF = "danger";
$certificate = "Not generated";
$certificateLabel = "danger";
$generating = false;
$certificate = "Not generated";
$certificateLabel = "danger";
$generating = false;
}
$device = $this->getDevice();
$sdAvailable = $this->isSDAvailable();
$device = $this->getDevice();
$sdAvailable = $this->isSDAvailable();
$this->response = array("device" => $device, "sdAvailable" => $sdAvailable, "status" => $status, "statusLabel" => $statusLabel, "installed" => $installed,
"certificate" => $certificate, "certificateLabel" => $certificateLabel, "generating" => $generating, "generated" => $generated,
"install" => $install, "installLabel" => $installLabel,
"bootLabelON" => $bootLabelON, "bootLabelOFF" => $bootLabelOFF, "processing" => $processing);
}
$this->response = array("device" => $device, "sdAvailable" => $sdAvailable, "status" => $status, "statusLabel" => $statusLabel, "installed" => $installed,
"certificate" => $certificate, "certificateLabel" => $certificateLabel, "generating" => $generating, "generated" => $generated,
"install" => $install, "installLabel" => $installLabel,
"bootLabelON" => $bootLabelON, "bootLabelOFF" => $bootLabelOFF, "processing" => $processing);
}
private function refreshOutput()
{
if($this->checkDependency("sslsplit"))
{
if ($this->checkRunning("sslsplit"))
{
if(file_exists("/pineapple/modules/SSLsplit/connections.log"))
{
if ($this->request->filter != "")
{
$filter = $this->request->filter;
if ($this->checkDependency("sslsplit")) {
if ($this->checkRunning("sslsplit")) {
if (file_exists("/pineapple/modules/SSLsplit/connections.log")) {
if ($this->request->filter != "") {
$filter = $this->request->filter;
$cmd = "cat /pineapple/modules/SSLsplit/connections.log"." | ".$filter;
}
else
{
$cmd = "cat /pineapple/modules/SSLsplit/connections.log";
}
$cmd = "cat /pineapple/modules/SSLsplit/connections.log"." | ".$filter;
} else {
$cmd = "cat /pineapple/modules/SSLsplit/connections.log";
}
exec ($cmd, $output);
if(!empty($output))
$this->response = implode("\n", array_reverse($output));
else
$this->response = "Empty connections log...";
}
else
{
$this->response = "No connections log...";
}
}
else
{
$this->response = "SSLsplit is not running...";
}
}
else
{
$this->response = "SSLsplit is not installed...";
}
exec($cmd, $output);
if (!empty($output)) {
$this->response = implode("\n", array_reverse($output));
} else {
$this->response = "Empty connections log...";
}
} else {
$this->response = "No connections log...";
}
} else {
$this->response = "SSLsplit is not running...";
}
} else {
$this->response = "SSLsplit is not installed...";
}
}
private function refreshHistory()
{
$this->streamFunction = function () {
$log_list = array_reverse(glob("/pineapple/modules/SSLsplit/log/*"));
private function refreshHistory()
{
$this->streamFunction = function () {
$log_list = array_reverse(glob("/pineapple/modules/SSLsplit/log/*"));
echo '[';
for($i=0;$i<count($log_list);$i++)
{
$info = explode("_", basename($log_list[$i]));
$entryDate = gmdate('Y-m-d H-i-s', $info[1]);
$entryName = basename($log_list[$i]);
echo '[';
for ($i=0;$i<count($log_list);$i++) {
$info = explode("_", basename($log_list[$i]));
$entryDate = gmdate('Y-m-d H-i-s', $info[1]);
$entryName = basename($log_list[$i]);
echo json_encode(array($entryDate, $entryName));
echo json_encode(array($entryDate, $entryName));
if($i!=count($log_list)-1) echo ',';
}
echo ']';
};
}
if ($i!=count($log_list)-1) {
echo ',';
}
}
echo ']';
};
}
private function viewHistory()
{
$log_date = gmdate("F d Y H:i:s", filemtime("/pineapple/modules/SSLsplit/log/".$this->request->file));
exec ("cat /pineapple/modules/SSLsplit/log/".$this->request->file, $output);
private function viewHistory()
{
$log_date = gmdate("F d Y H:i:s", filemtime("/pineapple/modules/SSLsplit/log/".$this->request->file));
exec("cat /pineapple/modules/SSLsplit/log/".$this->request->file, $output);
if(!empty($output))
$this->response = array("output" => implode("\n", $output), "date" => $log_date);
else
$this->response = array("output" => "Empty log...", "date" => $log_date);
}
if (!empty($output)) {
$this->response = array("output" => implode("\n", $output), "date" => $log_date);
} else {
$this->response = array("output" => "Empty log...", "date" => $log_date);
}
}
private function deleteHistory()
{
exec("rm -rf /pineapple/modules/SSLsplit/log/".$this->request->file);
}
private function deleteHistory()
{
exec("rm -rf /pineapple/modules/SSLsplit/log/".$this->request->file);
}
private function downloadHistory()
{
$this->response = array("download" => $this->downloadFile("/pineapple/modules/SSLsplit/log/".$this->request->file));
}
private function downloadHistory()
{
$this->response = array("download" => $this->downloadFile("/pineapple/modules/SSLsplit/log/".$this->request->file));
}
private function saveConfigurationData()
{
$filename = '/pineapple/modules/SSLsplit/rules/iptables';
file_put_contents($filename, $this->request->configurationData);
}
private function saveConfigurationData()
{
$filename = '/pineapple/modules/SSLsplit/rules/iptables';
file_put_contents($filename, $this->request->configurationData);
}
private function getConfigurationData()
{
$configurationData = file_get_contents('/pineapple/modules/SSLsplit/rules/iptables');
$this->response = array("configurationData" => $configurationData);
}
private function getConfigurationData()
{
$configurationData = file_get_contents('/pineapple/modules/SSLsplit/rules/iptables');
$this->response = array("configurationData" => $configurationData);
}
}

View File

@@ -2,17 +2,17 @@ registerController('SSLsplit_Controller', ['$api', '$scope', '$rootScope', '$int
$scope.title = "Loading...";
$scope.version = "Loading...";
$scope.refreshInfo = (function() {
$scope.refreshInfo = (function() {
$api.request({
module: 'SSLsplit',
action: "refreshInfo"
}, function(response) {
$scope.title = response.title;
$scope.version = "v"+response.version;
})
});
module: 'SSLsplit',
action: "refreshInfo"
}, function(response) {
$scope.title = response.title;
$scope.version = "v" + response.version;
})
});
$scope.refreshInfo();
$scope.refreshInfo();
}]);
@@ -37,70 +37,70 @@ registerController('SSLsplit_ControlsController', ['$api', '$scope', '$rootScope
$scope.sdAvailable = false;
$rootScope.status = {
installed : false,
generated : false,
refreshOutput : false,
refreshHistory : false
installed: false,
generated: false,
refreshOutput: false,
refreshHistory: false
};
$scope.refreshStatus = (function() {
$scope.refreshStatus = (function() {
$api.request({
module: "SSLsplit",
action: "refreshStatus"
}, function(response) {
$scope.status = response.status;
module: "SSLsplit",
action: "refreshStatus"
}, function(response) {
$scope.status = response.status;
$scope.statusLabel = response.statusLabel;
$scope.verbose = response.verbose;
$rootScope.status.installed = response.installed;
$scope.device = response.device;
$scope.sdAvailable = response.sdAvailable;
if(response.processing) $scope.processing = true;
if (response.processing) $scope.processing = true;
$scope.install = response.install;
$scope.installLabel = response.installLabel;
$rootScope.status.generated = response.generated;
$scope.certificate = response.certificate;
if(response.generating) $scope.generating = true;
if (response.generating) $scope.generating = true;
$scope.certificateLabel = response.certificateLabel;
$scope.bootLabelON = response.bootLabelON;
$scope.bootLabelOFF = response.bootLabelOFF;
})
});
})
});
$scope.handleCertificate = (function() {
if($scope.certificate != "Generated")
$scope.handleCertificate = (function() {
if ($scope.certificate != "Generated")
$scope.certificate = "Generating...";
else
$scope.certificate = "Removing...";
$api.request({
module: 'SSLsplit',
action: 'handleCertificate'
}, function(response){
if (response.success === true) {
module: 'SSLsplit',
action: 'handleCertificate'
}, function(response) {
if (response.success === true) {
$scope.certificateLabel = "warning";
$scope.generating = true;
$scope.handleCertificateInterval = $interval(function(){
$api.request({
module: 'SSLsplit',
action: 'handleCertificateStatus'
}, function(response) {
if (response.success === true){
$scope.generating = false;
$interval.cancel($scope.handleCertificateInterval);
$scope.refreshStatus();
}
});
}, 5000);
}
});
});
$scope.handleCertificateInterval = $interval(function() {
$api.request({
module: 'SSLsplit',
action: 'handleCertificateStatus'
}, function(response) {
if (response.success === true) {
$scope.generating = false;
$interval.cancel($scope.handleCertificateInterval);
$scope.refreshStatus();
}
});
}, 5000);
}
});
});
$scope.toggleSSLsplit = (function() {
if($scope.status != "Stop")
$scope.toggleSSLsplit = (function() {
if ($scope.status != "Stop")
$scope.status = "Starting...";
else
$scope.status = "Stopping...";
@@ -112,123 +112,117 @@ registerController('SSLsplit_ControlsController', ['$api', '$scope', '$rootScope
$rootScope.status.refreshHistory = false;
$api.request({
module: 'SSLsplit',
action: 'toggleSSLsplit',
module: 'SSLsplit',
action: 'toggleSSLsplit',
verbose: $scope.verbose
}, function(response) {
$timeout(function(){
$rootScope.status.refreshOutput = true;
$rootScope.status.refreshHistory = true;
}, function(response) {
$timeout(function() {
$rootScope.status.refreshOutput = true;
$rootScope.status.refreshHistory = true;
$scope.starting = false;
$scope.starting = false;
$scope.refreshStatus();
}, 2000);
})
});
}, 2000);
})
});
$scope.toggleSSLsplitOnBoot = (function() {
if($scope.bootLabelON == "default")
{
$scope.toggleSSLsplitOnBoot = (function() {
if ($scope.bootLabelON == "default") {
$scope.bootLabelON = "success";
$scope.bootLabelOFF = "default";
}
else
{
} else {
$scope.bootLabelON = "default";
$scope.bootLabelOFF = "danger";
}
$api.request({
module: 'SSLsplit',
action: 'toggleSSLsplitOnBoot',
}, function(response) {
module: 'SSLsplit',
action: 'toggleSSLsplitOnBoot',
}, function(response) {
$scope.refreshStatus();
})
});
})
});
$scope.handleDependencies = (function(param) {
if(!$rootScope.status.installed)
$scope.handleDependencies = (function(param) {
if (!$rootScope.status.installed)
$scope.install = "Installing...";
else
$scope.install = "Removing...";
$api.request({
module: 'SSLsplit',
action: 'handleDependencies',
destination: param
}, function(response){
if (response.success === true) {
module: 'SSLsplit',
action: 'handleDependencies',
destination: param
}, function(response) {
if (response.success === true) {
$scope.installLabel = "warning";
$scope.processing = true;
$scope.handleDependenciesInterval = $interval(function(){
$api.request({
module: 'SSLsplit',
action: 'handleDependenciesStatus'
}, function(response) {
if (response.success === true){
$scope.processing = false;
$scope.handleDependenciesInterval = $interval(function() {
$api.request({
module: 'SSLsplit',
action: 'handleDependenciesStatus'
}, function(response) {
if (response.success === true) {
$scope.processing = false;
$scope.refreshStatus();
$interval.cancel($scope.handleDependenciesInterval);
}
});
}, 5000);
}
});
});
$interval.cancel($scope.handleDependenciesInterval);
}
});
}, 5000);
}
});
});
$scope.refreshStatus();
}]);
registerController('SSLsplit_OutputController', ['$api', '$scope', '$rootScope', '$interval', function($api, $scope, $rootScope, $interval) {
$scope.output = 'Loading...';
$scope.output = 'Loading...';
$scope.filter = '';
$scope.refreshLabelON = "default";
$scope.refreshLabelOFF = "danger";
$scope.refreshOutput = (function() {
$scope.refreshOutput = (function() {
$api.request({
module: "SSLsplit",
action: "refreshOutput",
module: "SSLsplit",
action: "refreshOutput",
filter: $scope.filter
}, function(response) {
$scope.output = response;
})
});
}, function(response) {
$scope.output = response;
})
});
$scope.clearFilter = (function() {
$scope.filter = '';
$scope.refreshOutput();
});
$scope.clearFilter = (function() {
$scope.filter = '';
$scope.refreshOutput();
});
$scope.toggleAutoRefresh = (function() {
if($scope.autoRefreshInterval)
{
$scope.toggleAutoRefresh = (function() {
if ($scope.autoRefreshInterval) {
$interval.cancel($scope.autoRefreshInterval);
$scope.autoRefreshInterval = null;
$scope.refreshLabelON = "default";
$scope.refreshLabelOFF = "danger";
}
else
{
} else {
$scope.refreshLabelON = "success";
$scope.refreshLabelOFF = "default";
$scope.autoRefreshInterval = $interval(function(){
$scope.autoRefreshInterval = $interval(function() {
$scope.refreshOutput();
}, 5000);
}, 5000);
}
});
});
$scope.refreshOutput();
$scope.refreshOutput();
$rootScope.$watch('status.refreshOutput', function(param) {
if(param) {
$scope.refreshOutput();
}
});
$rootScope.$watch('status.refreshOutput', function(param) {
if (param) {
$scope.refreshOutput();
}
});
}]);
@@ -237,52 +231,52 @@ registerController('SSLsplit_HistoryController', ['$api', '$scope', '$rootScope'
$scope.historyOutput = 'Loading...';
$scope.historyDate = 'Loading...';
$scope.refreshHistory = (function() {
$api.request({
module: "SSLsplit",
action: "refreshHistory"
}, function(response) {
$scope.history = response;
})
});
$scope.refreshHistory = (function() {
$api.request({
module: "SSLsplit",
action: "refreshHistory"
}, function(response) {
$scope.history = response;
})
});
$scope.viewHistory = (function(param) {
$api.request({
module: "SSLsplit",
action: "viewHistory",
file: param
}, function(response) {
$scope.historyOutput = response.output;
$scope.historyDate = response.date;
})
});
$scope.viewHistory = (function(param) {
$api.request({
module: "SSLsplit",
action: "viewHistory",
file: param
}, function(response) {
$scope.historyOutput = response.output;
$scope.historyDate = response.date;
})
});
$scope.deleteHistory = (function(param) {
$api.request({
module: "SSLsplit",
action: "deleteHistory",
file: param
}, function(response) {
$scope.refreshHistory();
})
});
$scope.deleteHistory = (function(param) {
$api.request({
module: "SSLsplit",
action: "deleteHistory",
file: param
}, function(response) {
$scope.refreshHistory();
})
});
$scope.downloadHistory = (function(param) {
$api.request({
module: 'SSLsplit',
action: 'downloadHistory',
file: param
}, function(response) {
if (response.error === undefined) {
window.location = '/api/?download=' + response.download;
}
});
$api.request({
module: 'SSLsplit',
action: 'downloadHistory',
file: param
}, function(response) {
if (response.error === undefined) {
window.location = '/api/?download=' + response.download;
}
});
});
$scope.refreshHistory();
$rootScope.$watch('status.refreshHistory', function(param) {
if(param) {
if (param) {
$scope.refreshHistory();
}
});
@@ -305,14 +299,14 @@ registerController('SSLsplit_ConfigurationController', ['$api', '$scope', '$time
action: 'saveConfigurationData',
configurationData: $scope.configurationData
}, function(response) {
$scope.saveConfigurationLabel = "success";
$scope.saveConfiguration = "Saved";
$scope.saveConfigurationLabel = "success";
$scope.saveConfiguration = "Saved";
$timeout(function(){
$scope.saveConfigurationLabel = "primary";
$scope.saveConfiguration = "Save";
$scope.saving = false;
}, 2000);
$timeout(function() {
$scope.saveConfigurationLabel = "primary";
$scope.saveConfiguration = "Save";
$scope.saving = false;
}, 2000);
});
});

1
SSLsplit/log/README.txt Normal file
View File

@@ -0,0 +1 @@
Logs will be saved here.

View File

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

View File

@@ -21,8 +21,4 @@ sh /pineapple/modules/SSLsplit/rules/iptables
iptables -t nat -A POSTROUTING -j MASQUERADE
if [ ! -d /pineapple/modules/SSLsplit/log ]; then
mkdir /pineapple/modules/SSLsplit/log
fi
sslsplit -D -l /pineapple/modules/SSLsplit/connections.log -L /pineapple/modules/SSLsplit/log/output_${MYTIME}.log -k /pineapple/modules/SSLsplit/cert/certificate.key -c /pineapple/modules/SSLsplit/cert/certificate.crt ssl 0.0.0.0 8443 tcp 0.0.0.0 8080

View File

@@ -8,10 +8,6 @@ MYTIME=`date +%s`
killall sslsplit
if [ ! -d /pineapple/modules/SSLsplit/log ]; then
mkdir /pineapple/modules/SSLsplit/log
fi
if [ "$1" = "start" ]; then
echo '1' > /proc/sys/net/ipv4/ip_forward