frodovdr
/
raspap-webgui
mirror of https://github.com/billz/raspap-webgui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Debug DisplayWPAConfig

This commit is contained in:
Bill Zimmerman 2015-02-27 16:11:56 +01:00
parent 590bb69a57
commit 27bdfcda16
1 changed files with 143 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

221
includes/functions.php
View File

@ -50,31 +50,40 @@ function ConvertToChannel( $freq ) {
} }
/** /**
* * Converts WPA security string to readable format
* @param string $security * @param string $security
* @return string * @return string
*/ */
function ConvertToSecurity( $security ) { function ConvertToSecurity( $security ) {
switch( $security ) { switch( $security ) {
case "[WPA2-PSK-CCMP][ESS]": case "[WPA2-PSK-CCMP][ESS]":
return "WPA2-PSK (AES)"; return "WPA2-PSK (AES)";
break; break;
case "[WPA2-PSK-TKIP][ESS]": case "[WPA2-PSK-TKIP][ESS]":
return "WPA2-PSK (TKIP)"; return "WPA2-PSK (TKIP)";
break; break;
case "[WPA2-PSK-CCMP][WPS][ESS]":
return "WPA/WPA2-PSK (TKIP/AES)";
break;
case "[WPA2-PSK-TKIP+CCMP][WPS][ESS]":
return "WPA2-PSK (TKIP/AES) with WPS";
break;
case "[WPA-PSK-TKIP+CCMP][WPS][ESS]": case "[WPA-PSK-TKIP+CCMP][WPS][ESS]":
return "WPA-PSK (TKIP/AES) with WPS"; return "WPA-PSK (TKIP/AES) with WPS";
break; break;
case "[WPA-PSK-TKIP][WPA2-PSK-CCMP][WPS][ESS]":
return "WPA/WPA2-PSK (TKIP/AES)";
break;
case "[WPA-PSK-TKIP+CCMP][WPA2-PSK-TKIP+CCMP][ESS]": case "[WPA-PSK-TKIP+CCMP][WPA2-PSK-TKIP+CCMP][ESS]":
return "WPA/WPA2-PSK (TKIP/AES)"; return "WPA/WPA2-PSK (TKIP/AES)";
break; break;
case "[WPA-PSK-TKIP][ESS]": case "[WPA-PSK-TKIP][ESS]":
return "WPA-PSK (TKIP)"; return "WPA-PSK (TKIP)";
break; break;
case "[WEP][ESS]": case "[WEP][ESS]":
return "WEP"; return "WEP";
break; break;
} }
} }
@ -121,10 +130,14 @@ function DisplayDashboard(){
$strFrequency = $result[1]; $strFrequency = $result[1];
if(strpos( $strWlan0, "UP" ) !== false && strpos( $strWlan0, "RUNNING" ) !== false ) { if(strpos( $strWlan0, "UP" ) !== false && strpos( $strWlan0, "RUNNING" ) !== false ) {
$strStatus = '<span style="color:green">Interface is <strong>up</strong></span>'; $status = '<div class="alert alert-success alert-dismissable">Interface is up
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
$wlan0up = true;
} else { } else {
$strStatus = '<span style="color:red">Interface is <strong>down</strong></span>'; $status = '<div class="alert alert-warning alert-dismissable">Interface is down
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
} }
if( isset($_POST['ifdown_wlan0']) ) { if( isset($_POST['ifdown_wlan0']) ) {
exec( 'ifconfig wlan0 | grep -i running | wc -l',$test ); exec( 'ifconfig wlan0 | grep -i running | wc -l',$test );
if($test[0] == 1) { if($test[0] == 1) {
@ -146,6 +159,7 @@ function DisplayDashboard(){
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"><i class="fa fa-dashboard fa-fw"></i> Dashboard </div> <div class="panel-heading"><i class="fa fa-dashboard fa-fw"></i> Dashboard </div>
<div class="panel-body"> <div class="panel-body">
<p><?php echo $status; ?></p>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="panel panel-default"> <div class="panel panel-default">
@ -153,7 +167,6 @@ function DisplayDashboard(){
<h4>Interface Information</h4> <h4>Interface Information</h4>
Interface Name : wlan0<br /> Interface Name : wlan0<br />
Interface Status : <?php echo $strStatus ?><br />
IP Address : <?php echo $strIPAddress ?><br /> IP Address : <?php echo $strIPAddress ?><br />
Subnet Mask : <?php echo $strNetMask ?><br /> Subnet Mask : <?php echo $strNetMask ?><br />
Mac Address : <?php echo $strHWAddress ?><br /> Mac Address : <?php echo $strHWAddress ?><br />
@ -197,9 +210,13 @@ function DisplayDashboard(){
<div class="col-lg-12"> <div class="col-lg-12">
<div class="row"> <div class="row">
<form action="/?page=wlan0_info" method="POST"> <form action="?page=wlan0_info" method="POST">
<input type="submit" class="btn btn-success" value="Start wlan0" name="ifup_wlan0" /> <?php if ( !$wlan0up ) {
<input type="submit" class="btn btn-warning" value="Stop wlan0" name="ifdown_wlan0" /> echo '<input type="submit" class="btn btn-success" value="Start wlan0" name="ifup_wlan0" />';
} else {
echo '<input type="submit" class="btn btn-warning" value="Stop wlan0" name="ifdown_wlan0" />';
}
?>
<input type="button" class="btn btn-outline btn-primary" value="Refresh" onclick="document.location.reload(true)" /> <input type="button" class="btn btn-outline btn-primary" value="Refresh" onclick="document.location.reload(true)" />
</form> </form>
</div> </div>
@ -218,76 +235,124 @@ function DisplayDashboard(){
* *
*/ */
function DisplayWPAConfig(){ function DisplayWPAConfig(){
exec('sudo cat ' . RASPI_WPA_SUPPLICANT_CONFIG, $return);
$ssid = array();
$psk = array();
foreach($return as $a) { ?>
if(preg_match('/SSID/i',$a)) { <div class="row">
$arrssid = explode("=",$a); <div class="col-lg-12">
$ssid[] = str_replace('"','',$arrssid[1]); <div class="panel panel-primary">
} <div class="panel-heading"><i class="fa fa-signal fa-fw"></i> Configure client
if(preg_match('/\#psk/i',$a)) { </div>
$arrpsk = explode("=",$a); <!-- /.panel-heading -->
$psk[] = str_replace('"','',$arrpsk[1]); <div class="panel-body">
} <?php echo $status; ?>
} <h4>Client settings</h4>
<div class="row">
<div class="col-lg-12">
$numSSIDs = count($ssid); <?php
$output = '<form method="POST" action="/?page=wpa_conf" id="wpa_conf_form"><input type="hidden" id="Networks" name="Networks" /><div class="network" id="networkbox">'; // save WPA settings
for($ssids = 0; $ssids < $numSSIDs; $ssids++) { if( isset($_POST['SaveWPAPSKSettings']) ) {
$output .= '<div id="Networkbox'.$ssids.'" class="NetworkBoxes">Network '.$ssids.' <input type="button" value="Delete" onClick="DeleteNetwork('.$ssids.')" /></span><br />
<span class="tableft" id="lssid0">SSID :</span><input type="text" id="ssid0" name="ssid'.$ssids.'" value="'.$ssid[$ssids].'" onkeyup="CheckSSID(this)" /><br />
<span class="tableft" id="lpsk0">PSK :</span><input type="password" id="psk0" name="psk'.$ssids.'" value="'.$psk[$ssids].'" onkeyup="CheckPSK(this)" /></div>';
}
$output .= '</div><input type="submit" class="btn btn-primary" value="Scan for Networks" name="Scan" /> <input type="button" class="btn btn-primary" value="Add Network" onClick="AddNetwork();" /> <input type="submit" class="btn btn-primary" value="Save" name="SaveWPAPSKSettings" onmouseover="UpdateNetworks(this)" id="Save" disabled />
</form>';
echo $output; $config = 'ctrl_interface=DIR='. RASPI_WPA_CTRL_INTERFACE .' GROUP=netdev
echo '<script type="text/Javascript">UpdateNetworks()</script>'; update_config=1
';
$networks = $_POST['Networks'];
for( $x = 0; $x < $networks; $x++ ) {
$network = '';
$ssid = escapeshellarg( $_POST['ssid'.$x] );
$psk = escapeshellarg( $_POST['psk'.$x] );
if( isset($_POST['SaveWPAPSKSettings']) ) { if ( strlen($psk) >2 ) {
$config = 'ctrl_interface=DIR='. RASPI_WPA_CTRL_INTERFACE .' GROUP=netdev update_config=1'; exec( 'wpa_passphrase '.$ssid. ' ' . $psk,$network );
$networks = $_POST['Networks']; foreach($network as $b) {
for( $x = 0; $x < $networks; $x++ ) {
$network = '';
$ssid = escapeshellarg( $_POST['ssid'.$x] );
$psk = escapeshellarg( $_POST['psk'.$x] );
exec( 'wpa_passphrase '.$ssid. ' ' . $psk,$network );
foreach( $network as $b ) {
$config .= "$b $config .= "$b
"; ";
} }
} }
}
var_dump($config);
exec( "echo '$config' > /tmp/wifidata", $return ); exec( "echo '$config' > /tmp/wifidata", $return );
system( 'sudo cp /tmp/wifidata ' . RASPI_WPA_SUPPLICANT_CONFIG, $returnval ); system( 'sudo cp /tmp/wifidata ' . RASPI_WPA_SUPPLICANT_CONFIG, $returnval );
if( $returnval == 0 ) { if( $returnval == 0 ) {
echo "Wifi settings updated successfully"; echo '<div class="alert alert-success alert-dismissable">Wifi settings updated successfully
} else { <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
echo "Wifi settings failed to be updated"; } else {
} echo '<div class="alert alert-danger alert-dismissable">Wifi settings failed to be updated
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
}
} elseif( isset($_POST['Scan']) ) { // scan networks
$return = ''; } elseif( isset($_POST['Scan']) ) {
exec( 'sudo wpa_cli scan',$return ); $return = '';
sleep(5); exec( 'sudo wpa_cli scan',$return );
exec( 'sudo wpa_cli scan_results',$return ); sleep(3);
for( $shift = 0; $shift < 4; $shift++ ) { exec( 'sudo wpa_cli scan_results',$return );
array_shift($return); for( $shift = 0; $shift < 4; $shift++ ) {
} array_shift($return);
echo "Networks found : <br />"; }
foreach( $return as $network ) { // display output
$arrNetwork = preg_split("/[\t]+/",$network); echo '<form method="POST" action="?page=wpa_conf" id="wpa_conf_form"><input type="hidden" id="Networks" name="Networks" /><div class="network" id="networkbox"></div>';
$bssid = $arrNetwork[0]; echo '<div class="row"><div class="col-lg-6"><input type="submit" class="btn btn-primary" value="Scan for networks" name="Scan" /> <input type="button" class="btn btn-primary" value="Add network" onClick="AddNetwork();" /> <input type="submit" class="btn btn-primary" value="Save" name="SaveWPAPSKSettings" onmouseover="UpdateNetworks(this)" id="Save" disabled /></div></div>';
$channel = ConvertToChannel($arrNetwork[1]); echo '<h4>Networks found</h4><div class="table-responsive"><table class="table table-hover">';
$signal = $arrNetwork[2] . " dBm"; echo '<thead><tr><th></th><th>SSID</th><th>Channel</th><th>Signal</th><th>Security</th></tr></thead><tbody>';
$security = $arrNetwork[3]; foreach( $return as $network ) {
$ssid = $arrNetwork[4]; $arrNetwork = preg_split("/[\t]+/",$network);
echo '<input type="button" value="Connect to This network" onClick="AddScanned(\''.$ssid.'\')" />' . $ssid . " on channel " . $channel . " with " . $signal . "(".ConvertToSecurity($security)." Security)<br />"; $bssid = $arrNetwork[0];
$channel = ConvertToChannel($arrNetwork[1]);
$signal = $arrNetwork[2] . " dBm";
$security = $arrNetwork[3];
$ssid = $arrNetwork[4];
echo '<tr><td><input type="button" class="btn btn-outline btn-primary" value="Connect" onClick="AddScanned(\''.$ssid.'\')" /></td> <td><strong>' . $ssid . "</strong></td> <td>" . $channel . "</td><td>" . $signal . "</td><td>". ConvertToSecurity($security) ."</td></tr>";
}
echo '</tbody></table>';
} } else {
}
// default action, output configured network(s)
exec(' sudo cat ' . RASPI_WPA_SUPPLICANT_CONFIG, $return);
$ssid = array();
$psk = array();
foreach($return as $a) {
if(preg_match('/SSID/i',$a)) {
$arrssid = explode("=",$a);
$ssid[] = str_replace('"','',$arrssid[1]);
}
if(preg_match('/psk/i',$a)) {
$arrpsk = explode("=",$a);
$psk[] = str_replace('"','',$arrpsk[1]);
}
}
$numSSIDs = count($ssid);
$output = '<form method="POST" action="?page=wpa_conf" id="wpa_conf_form"><input type="hidden" id="Networks" name="Networks" /><div class="network" id="networkbox">';
if ( $numSSIDs > 0 ) {
for( $ssids = 0; $ssids < $numSSIDs; $ssids++ ) {
$output .= '<div id="Networkbox'.$ssids.'" class="NetworkBoxes">
<div class="row"><div class="form-group col-md-4"><label for="code">Network '.$ssids.'</label></div></div>
<div class="row"><div class="form-group col-md-4"><label for="code" id="lssid0">SSID</label><input type="text" class="form-control" id="ssid0" name="ssid'.$ssids.'" value="'.$ssid[$ssids].'" onkeyup="CheckSSID(this)" /></div></div>
<div class="row"><div class="form-group col-md-4"><label for="code" id="lpsk0">PSK</label><input type="password" class="form-control" id="psk0" name="psk'.$ssids.'" value="'.$psk[$ssids].'" onkeyup="CheckPSK(this)" /></div></div>
<div class="row"><div class="form-group col-md-4"><input type="button" class="btn btn-outline btn-primary" value="Delete" onClick="DeleteNetwork('.$ssids.')" /></div></div>';
}
$output .= '</div><!-- /#Networkbox -->';
} else {
$status = '<div class="alert alert-warning alert-dismissable">Not connected
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
}
$output .= '<div class="row"><div class="col-lg-6"><input type="submit" class="btn btn-primary" value="Scan for networks" name="Scan" /> <input type="button" class="btn btn-primary" value="Add network" onClick="AddNetwork();" /> <input type="submit" class="btn btn-primary" value="Save" name="SaveWPAPSKSettings" onmouseover="UpdateNetworks(this)" id="Save" disabled />';
$output .= '</form>';
echo $output;
}
?>
<script type="text/Javascript">UpdateNetworks(this)</script>
</form>
</div><!-- ./ Panel body -->
</div><!-- /.panel-primary -->
</div><!-- /.col-lg-12 -->
</div><!-- /.row -->
<?
} }
/** /**
@ -702,7 +767,7 @@ function DisplayOpenVPNConfig() {
<div class="tab-pane fade in active" id="openvpnclient"> <div class="tab-pane fade in active" id="openvpnclient">
<h4>Client settings</h4> <h4>Client settings</h4>
<form role="form" action="/?page=save_hostapd_conf" method="POST"> <form role="form" action="?page=save_hostapd_conf" method="POST">
<div class="row"> <div class="row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
@ -825,7 +890,7 @@ function DisplayTorProxyConfig(){
<div class="tab-pane fade in active" id="basic"> <div class="tab-pane fade in active" id="basic">
<h4>Basic settings</h4> <h4>Basic settings</h4>
<form role="form" action="/?page=save_hostapd_conf" method="POST"> <form role="form" action="?page=save_hostapd_conf" method="POST">
<div class="row"> <div class="row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="code">VirtualAddrNetwork</label> <label for="code">VirtualAddrNetwork</label>