hak5
/
nano-tetra-modules
mirror of https://github.com/hak5/nano-tetra-modules.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63 from joebertj/master 

Correctly display interface device names even if it changes
pull/67/head
Marc 2019-06-19 17:18:09 +00:00 committed by GitHub
parent 83e9b935e7 c97b87078e
commit afa6bc6053
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ConnectedClients/api/module.php
View File

@ -49,10 +49,11 @@ class ConnectedClients extends Module
} }
private function getConnectedClients() { private function getConnectedClients() {
exec("iw dev wlan0 station dump | grep Station | awk '{print $2}'", $wlan0clients); exec("iwconfig 2>/dev/null | grep IEEE | awk '{print $1}'", $wlandev);
exec("iw dev wlan0-1 station dump | grep Station | awk '{print $2}'", $wlan01clients); exec("iw dev $wlandev[0] station dump | grep Station | awk '{print $2}'", $wlan0clients);
exec("iw dev wlan1 station dump | grep Station | awk '{print $2}'", $wlan1clients); exec("iw dev $wlandev[1] station dump | grep Station | awk '{print $2}'", $wlan01clients);
$this->response = array('wlan0clients' => $wlan0clients, 'wlan01clients' => $wlan01clients, 'wlan1clients' => $wlan1clients); exec("iw dev $wlandev[2] station dump | grep Station | awk '{print $2}'", $wlan1clients);
$this->response = array('wlan0clients' => $wlan0clients, 'wlan01clients' => $wlan01clients, 'wlan1clients' => $wlan1clients, 'wlandev' => $wlandev);
} }
private function removeMacAddress() { private function removeMacAddress() {

2
ConnectedClients/js/module.js
View File

@ -5,6 +5,7 @@ registerController('ConnectedClientsController', ['$api', '$scope', function($ap
$scope.wlan0clients = []; $scope.wlan0clients = [];
$scope.wlan01clients = []; $scope.wlan01clients = [];
$scope.wlan1clients = []; $scope.wlan1clients = [];
$scope.wlandev = [];
$scope.dhcplength = 0; $scope.dhcplength = 0;
$scope.dhcpleases = []; $scope.dhcpleases = [];
$scope.blacklistlength = 0; $scope.blacklistlength = 0;
@ -31,6 +32,7 @@ registerController('ConnectedClientsController', ['$api', '$scope', function($ap
$scope.wlan0clients = response.wlan0clients; $scope.wlan0clients = response.wlan0clients;
$scope.wlan01clients = response.wlan01clients; $scope.wlan01clients = response.wlan01clients;
$scope.wlan1clients = response.wlan1clients; $scope.wlan1clients = response.wlan1clients;
$scope.wlandev = response.wlandev;
}); });
}); });

6
ConnectedClients/module.html
View File

@ -13,17 +13,17 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div id="ClientsContainer" class="panel-collapse collapse in"> <div id="ClientsContainer" class="panel-collapse collapse in">
<h3 class="text-center">wlan0</h3> <h3 class="text-center">{{ wlandev[0] }}</h3>
<table class="table table-striped table-bordered text-center"> <table class="table table-striped table-bordered text-center">
<tr><th class="text-center">Mac Address</th><th class="text-center">Disassociate</th><th class="text-center">Deauthenticate</th><th class="text-center">Blacklist</th></tr> <tr><th class="text-center">Mac Address</th><th class="text-center">Disassociate</th><th class="text-center">Deauthenticate</th><th class="text-center">Blacklist</th></tr>
<tr ng-repeat="wlan0 in wlan0clients"><td>{{ wlan0 }}</td><td><button type="button" class="btn btn-danger" ng-click="disassociateMac(wlan0)">Disassociate</button></td><td><button type="button" class="btn btn-danger" ng-click="deauthenticateMac(wlan0)">Deauthenticate</button></td><td><button type="button" class="btn btn-danger" ng-click="addMacAddress(wlan0)">Blacklist</button></td></tr> <tr ng-repeat="wlan0 in wlan0clients"><td>{{ wlan0 }}</td><td><button type="button" class="btn btn-danger" ng-click="disassociateMac(wlan0)">Disassociate</button></td><td><button type="button" class="btn btn-danger" ng-click="deauthenticateMac(wlan0)">Deauthenticate</button></td><td><button type="button" class="btn btn-danger" ng-click="addMacAddress(wlan0)">Blacklist</button></td></tr>
</table> </table>
<h3 class="text-center">wlan0-1</h3> <h3 class="text-center">{{ wlandev[1] }}</h3>
<table class="table table-striped table-bordered text-center"> <table class="table table-striped table-bordered text-center">
<tr><th class="text-center">Mac Address</th><th class="text-center">Disassociate</th><th class="text-center">Deauthenticate</th><th class="text-center">Blacklist</th></tr> <tr><th class="text-center">Mac Address</th><th class="text-center">Disassociate</th><th class="text-center">Deauthenticate</th><th class="text-center">Blacklist</th></tr>
<tr ng-repeat="wlan01 in wlan01clients"><td>{{ wlan01 }}</td><td><button type="button" class="btn btn-danger" ng-click="disassociateMac(wlan01)">Disassociate</button></td><td><button type="button" class="btn btn-danger" ng-click="deauthenticateMac(wlan01)">Deauthenticate</button></td><td><button type="button" class="btn btn-danger" ng-click="addMacAddress(wlan01)">Blacklist</button></td></tr> <tr ng-repeat="wlan01 in wlan01clients"><td>{{ wlan01 }}</td><td><button type="button" class="btn btn-danger" ng-click="disassociateMac(wlan01)">Disassociate</button></td><td><button type="button" class="btn btn-danger" ng-click="deauthenticateMac(wlan01)">Deauthenticate</button></td><td><button type="button" class="btn btn-danger" ng-click="addMacAddress(wlan01)">Blacklist</button></td></tr>
</table> </table>
<h3 class="text-center">wlan1</h3> <h3 class="text-center">{{ wlandev[2] }}</h3>
<table class="table table-striped table-bordered text-center"> <table class="table table-striped table-bordered text-center">
<tr><th class="text-center">Mac Address</th><th class="text-center">Disassociate</th><th class="text-center">Deauthenticate</th><th class="text-center">Blacklist</th></tr> <tr><th class="text-center">Mac Address</th><th class="text-center">Disassociate</th><th class="text-center">Deauthenticate</th><th class="text-center">Blacklist</th></tr>
<tr ng-repeat="wlan1 in wlan1clients"><td>{{ wlan1 }}</td><td><button type="button" class="btn btn-danger" ng-click="disassociateMac(wlan1)">Disassociate</button></td><td><button type="button" class="btn btn-danger" ng-click="deauthenticateMac(wlan1)">Deauthenticate</button></td><td><button type="button" class="btn btn-danger" ng-click="addMacAddress(wlan1)">Blacklist</button></td></tr> <tr ng-repeat="wlan1 in wlan1clients"><td>{{ wlan1 }}</td><td><button type="button" class="btn btn-danger" ng-click="disassociateMac(wlan1)">Disassociate</button></td><td><button type="button" class="btn btn-danger" ng-click="deauthenticateMac(wlan1)">Deauthenticate</button></td><td><button type="button" class="btn btn-danger" ng-click="addMacAddress(wlan1)">Blacklist</button></td></tr>