hak5/nano-tetra-modules
1
0
Fork 0
mirror of https://github.com/hak5/nano-tetra-modules.git synced 2025-10-29 16:58:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

OpenVPNConnect 1.3 Update - RCE Bug Fix and Dependency Handling Bug Fix (#77)

Browse Source
This commit is contained in:
Casey Erdmann
2019-09-27 15:53:17 -04:00
committed by Marc
parent b45e52ccf1
commit d89ddc8f18
4 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenVPNConnect/api/module.php
View File

@@ -27,7 +27,7 @@ class OpenVPNConnect extends Module{
$this->initializeModule(); $this->initializeModule();
break; break;
case 'handleDependencies': case 'handleDependencies':
$this->handleDependencies(); $this->handleDependencies(false);
break; break;
case 'handleDependenciesSDCard': case 'handleDependenciesSDCard':
$this->handleDependenciesSDCard(); $this->handleDependenciesSDCard();
@@ -103,7 +103,6 @@ class OpenVPNConnect extends Module{
// Handles dependency installation and removal // Handles dependency installation and removal
private function handleDependencies($sd){ private function handleDependencies($sd){
if($this->checkDependency('openvpn')){ if($this->checkDependency('openvpn')){
$this->execBackground('opkg remove openvpn-openssl'); $this->execBackground('opkg remove openvpn-openssl');
@@ -158,7 +157,7 @@ class OpenVPNConnect extends Module{
$open_vpn_cmd = "openvpn --log /pineapple/modules/OpenVPNConnect/log/vpn.log --status /pineapple/modules/OpenVPNConnect/log/status.log --config "; $open_vpn_cmd = "openvpn --log /pineapple/modules/OpenVPNConnect/log/vpn.log --status /pineapple/modules/OpenVPNConnect/log/status.log --config ";
if($inputData[0] != ''){ if($inputData[0] != ''){
$config_name = $inputData[0]; $config_name = escapeshellcmd($inputData[0]);
$open_vpn_cmd .= "/root/vpn_config/" . $config_name . " "; $open_vpn_cmd .= "/root/vpn_config/" . $config_name . " ";
}else{ }else{
$this->response = array("success" => false, $this->response = array("success" => false,
@@ -189,7 +188,7 @@ class OpenVPNConnect extends Module{
if($inputData[3] != ''){ if($inputData[3] != ''){
$openvpn_flags = $inputData[3]; $openvpn_flags = escapeshellcmd($inputData[3]);
$open_vpn_cmd .= $openvpn_flags; $open_vpn_cmd .= $openvpn_flags;
} }

4
OpenVPNConnect/js/module.js
View File

@@ -43,7 +43,7 @@ registerController('openVPNConnectController', ['$api', '$scope', '$timeout', '$
$timeout(function() {$window.location.reload();}, 5000); $timeout(function() {$window.location.reload();}, 5000);
} }
//console.log(response) //Log the response to the console, this is useful for debugging. //console.log(response) //Log the response to the console, this is useful for debugging.
}); });
} }
@@ -266,4 +266,4 @@ registerController('openVPNConnectController', ['$api', '$scope', '$timeout', '$
}; };
}]); }]);

16
OpenVPNConnect/module.html
View File

@@ -141,15 +141,23 @@
</div> </div>
<div id="collapseChangelog" class="panel-collapse collapse"> <div id="collapseChangelog" class="panel-collapse collapse">
<div class="panel-body"> <div class="panel-body">
<ul> <ul>
<li> <li>
<b>1.0.2 </b> <b>1.3 </b>
</li>
<ul>
<li class="text-muted">Now with no RCEs :D...Fixed a major RCE caused by not sanitizing user input when passing in certain OpenVPN parameters.</li>
<li class="text-muted">Added stability improvements for package management for those with fresh upgrades to 2.6.X WiFi Pineapple firmware.</li>
<li class="text-muted">Lastly, revised the revision numbers to fall in line with the formal releases.</li>
</ul>
<li>
<b>1.2 </b>
</li> </li>
<ul> <ul>
<li class="text-muted">Added in current status when revisiting page, logging, and ability to install dependencies to SD card or local storage. Also squashed some bugs :)</li> <li class="text-muted">Added in current status when revisiting page, logging, and ability to install dependencies to SD card or local storage. Also squashed some bugs :)</li>
</ul> </ul>
<li> <li>
<b>1.0.1 </b> <b>1.1 </b>
</li> </li>
<ul> <ul>
<li class="text-muted">Minor Revisions: Added better iptables management with dynamic gateway and the ability to use auth-user-pass. Unofficial Release (Github Only)</li> <li class="text-muted">Minor Revisions: Added better iptables management with dynamic gateway and the ability to use auth-user-pass. Unofficial Release (Github Only)</li>
@@ -166,4 +174,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>

2
OpenVPNConnect/module.info
View File

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