Skip to content

W
White Rabbit Switch - Software
Commit 0f86913e authored by José Luis Gutiérrez's avatar José Luis Gutiérrez Committed by Alessandro Rubini
Browse files
Options

www: /etc folder fix 

Previous changes on /etc files were not saved after reboot.
Fixed --> /usr/etc
parent da5aaf89
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 39 deletions
userspace/rootfs_override/var/www/change_passwd.php
View file @ 0f86913e
......@@ -43,7 +43,7 @@
echo '<br><br><br><p align=center>Please fill fields.<br></p>';
}else{
$saved_hash = shell_exec("cat /etc/phpusers | grep ".$_POST["user"]." | awk '{print $2}'");
$saved_hash = shell_exec("cat ".$GLOBALS['phpusersfile']." | grep ".$_POST["user"]." | awk '{print $2}'");
$saved_hash = str_replace("\n","",$saved_hash);
$username = $_POST["user"];
......@@ -72,7 +72,7 @@
$old_value=$username." ".$saved_hash;
$new_value=$username." ".$hash_md5_double;
$output = shell_exec('cat /etc/phpusers | sed -i "s/'.$old_value.'/'.$new_value.'/g" /etc/phpusers'); //replace password for the user
$output = shell_exec('cat '.$GLOBALS['phpusersfile'].' | sed -i "s/'.$old_value.'/'.$new_value.'/g" '.$GLOBALS['phpusersfile']); //replace password for the user
//$file = fopen("/etc/phpusers","w+");
//fwrite($file,$output);
......
userspace/rootfs_override/var/www/firmware.php
View file @ 0f86913e
......@@ -27,15 +27,35 @@
<th ><INPUT type=file name="file" ></th>
<th><INPUT type=submit value="Flash Firmware" class="btn" ><INPUT type=hidden name=MAX_FILE_SIZE VALUE=<?php echo wrs_php_filesize();?>000></th>
</FORM>
</tr><tr></tr><tr></tr><tr>
</tr>
<!--
<tr></tr><tr></tr><tr>
<FORM method="POST" ENCTYPE="multipart/form-data" >
<th align=center>Download a backup of the entire Switch</th>
<th><INPUT type=submit value="Backup Firmware" class="btn"><input type="hidden" name="cmd" value="backup-wrs"></th>
</FORM>
</tr>
-->
<?php
//Include downloading and flashing from OHWR if file wr-switch-sw-v4.0-rc1-20140710_binaries.tar is available
//$ohwrlink="http://www.ohwr.org/attachments/download/3095/wr-switch-sw-v4.0-rc1-20140710_binaries.tar";
//echo '<tr></tr><tr></tr><tr><tr></tr><tr></tr><tr><tr></tr><tr></tr><tr>';
//echo ' <tr>
//<th >Download binaries from OHWR <FORM method="POST" onsubmit="return confirm("Are you sure you want to upload and flash a new firmware?");"></th>
//<th ><INPUT type=hidden name="cmd" value="remoteflash" >
//<INPUT type=submit value="Download&Flash Firmware from OHWR" class="btn" ></th>
//</FORM>
//</tr>';
?>
</table>
<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
<hr>
<p align=center ><font color="red">NOTE: Flashing the switch with a wrong binary file might damage your device. <br>Please visit the
<A HREF="http://www.ohwr.org/projects/wr-switch-sw/files" TARGET="_new">OHR website</A> for more details.</font>
</p>
<hr>
<?php
wrs_change_wrfs("rw");
wrs_management();
......
userspace/rootfs_override/var/www/functions.php
View file @ 0f86913e
<?php
//Global Variables
$etcdir="/wr/etc/"; //configuration file folder for WRS
$etcdir="/usr/wr/etc/"; //configuration file folder for WRS
$snmpconf="snmpd.conf";
$ppsiconf="ppsi.conf";
$wrswhalconf="wrsw_hal.conf";
......@@ -9,6 +9,10 @@ $sfpdatabaseconf="sfp_database.conf";
$wrdateconf="wr_date.conf";
$vlancolor = array("#27DE2A", "#B642A8", "#6E42B6", "#425DB6" , "#428DB6", "#4686B6", "#43B88B", "#42B65F", "#82B642", "#B6AE42", "#B67E42");
$MAX_PHP_FILESIZE = 40;
$phpusersfile="/usr/etc/phpusers";
$profilefile="/usr/etc/profile";
$phpinifile="/etc/php.ini";
$interfacesfile = "/usr/etc/network/interfaces";
/*
* Displays the current status of each enpoint.
......@@ -104,7 +108,14 @@ function wrs_main_info(){
//Changing php filesize in case it is necessary
if(wrs_php_filesize()<$GLOBALS['MAX_PHP_FILESIZE']){php_file_transfer_size($GLOBALS['MAX_PHP_FILESIZE']);}
if(empty($_SESSION["utc"])) $_SESSION["utc"]="UTC";
if(empty($_SESSION["utc"])){
$utc_exists = shell_exec("cat ".$GLOBALS['profilefile']." | grep -c TZ");
if($utc_exists){
$_SESSION["utc"]=shell_exec("cat ".$GLOBALS['profilefile']." | grep TZ | awk '{print $2}' | sed 's/TZ=//g'");
}else{
$_SESSION["utc"]="UTC";
}
}
echo "<table border='1' align='center' class='altrowstabledash' id='alternatecolor'>";
echo '<tr class="sub"><td> <b><center>Switch Info </center></b></td></tr>';
......@@ -127,12 +138,12 @@ function wrs_main_info(){
echo '<tr><th align=center> <b><font color="darkblue">PCB Version</font></b> </th><th><center>'; $str = shell_exec("/wr/bin/shw_ver -p"); echo $str; echo '</center></th></tr>';
echo '<tr><th align=center> <b><font color="darkblue">FPGA</font></b> </th><th><center>'; $str = shell_exec("/wr/bin/shw_ver -f"); echo $str; echo '</center></th></tr>';
echo '<tr><th align=center> <b><font color="darkblue">Compiling Date</font></b> </th><th><center>'; $str = shell_exec("/wr/bin/shw_ver -c"); echo $str; echo '</center></th></tr>';
echo '<tr><th align=center> <b><font color="darkblue">White-Rabbit Date</font></b></th><th><center>'; $str = shell_exec("TZ=".$_SESSION['utc']." /wr/bin/wr_date -n get"); echo $str; echo '</center></th></tr>';
echo '<tr><th align=center> <b><font color="darkblue">White-Rabbit Date</font></b></th><th><center>'; $str = shell_exec("export TZ=".$_SESSION['utc']." /wr/bin/wr_date -n get"); echo $str; echo '</center></th></tr>';
echo '<tr><th align=center> <b><font color="darkblue">PPSi</font></b> </th><th><center>'; echo wrs_check_ptp_status() ? '[<A HREF="ptp.php">on</A>]' : '[<A HREF="ptp.php">off</A>]'; echo '</center></th></tr>';
echo '<tr><th align=center> <b><font color="darkblue">Net-SNMP Server</font></b> </th><th><center>'; echo check_snmp_status() ? '[on] ' : '[off] '; echo '&nbsp;&nbsp;ver. '; echo shell_exec("snmpd -v | grep version | awk '{print $3}'");
echo '( port '; $str = shell_exec("cat ".$GLOBALS['etcdir']."snmpd.conf | grep agent | cut -d: -f3 | awk '{print $1}'"); echo $str; echo ')'; echo " <a href='help.php?help_id=snmp' onClick='showPopup(this.href);return(false);'> [OIDs]</a></center></th></tr>";
echo '<tr><th align=center> <b><font color="darkblue">NTP Server</font></b> </th><th><center> <A HREF="management.php">'; $str = check_ntp_server(); echo $str; echo '</A> ['.$_SESSION['utc'].']</center></th></tr>';
echo '<tr><th align=center> <b><font color="darkblue">Max. Filesize Upload</font> </b></th><th><center>'; echo shell_exec("cat /etc/php.ini | grep upload_max_filesize | awk '{print $3}'"); echo '</center></th></tr>';
echo '<tr><th align=center> <b><font color="darkblue">Max. Filesize Upload</font> </b></th><th><center>'; echo shell_exec("cat ".$GLOBALS['phpinifile']." | grep upload_max_filesize | awk '{print $3}'"); echo '</center></th></tr>';
echo '</table>';
......@@ -161,7 +172,7 @@ function check_snmp_status(){
function wrs_interface_setup(){
$interfaces = shell_exec('cat /etc/network/interfaces | grep dhcp');
$interfaces = shell_exec('cat '.$GLOBALS['interfacesfile'].' | grep dhcp');
return (strcmp($interfaces[0],"#")) ? "dhcp" : "static";
}
......@@ -231,18 +242,20 @@ function php_file_transfer_size($size){
wrs_change_wrfs("rw");
// We modify fist upload_max_filesize in php.ini
$prev_size = shell_exec("cat /etc/php.ini | grep upload_max_filesize | awk '{print $3}'");
$prev_size = shell_exec("cat ".$GLOBALS['phpinifile']." | grep upload_max_filesize | awk '{print $3}'");
$prev_size=trim($prev_size);
$cmd = "sed -i 's/upload_max_filesize = ".$prev_size."/upload_max_filesize = ".$size."M/g' /etc/php.ini";
$cmd = "sed -i 's/upload_max_filesize = ".$prev_size."/upload_max_filesize = ".$size."M/g' ".$GLOBALS['phpinifile'];
shell_exec($cmd);
// We modify post_max_size in php.ini
$prev_size = shell_exec("cat /etc/php.ini | grep post_max_size | awk '{print $3}'");
$prev_size = shell_exec("cat ".$GLOBALS['phpinifile']." | grep post_max_size | awk '{print $3}'");
$prev_size=trim($prev_size);
$cmd ="sed -i 's/post_max_size = ".$prev_size."/post_max_size = ".$size."M/g' /etc/php.ini";
$cmd ="sed -i 's/post_max_size = ".$prev_size."/post_max_size = ".$size."M/g' ".$GLOBALS['phpinifile'];
shell_exec($cmd);
shell_exec("cat ".$GLOBALS['phpinifile']." >/usr/etc/php.ini"); //We store it in /usr/etc/php.ini copy. Just in case
wrs_change_wrfs("ro");
//echo '<p align=center>File upload size changed to '.$size.'</p>';
}
......@@ -436,7 +449,7 @@ function wr_show_endpoint_rt_show(){
*/
function wrs_php_filesize(){
$size=shell_exec("cat /etc/php.ini | grep upload_max_filesize | awk '{print $3}'");
$size=shell_exec("cat ".$GLOBALS['phpinifile']." | grep upload_max_filesize | awk '{print $3}'");
$size=substr($size, 0, -2);
return $size;
......@@ -563,14 +576,29 @@ function wrs_management(){
$uploaddir = '/tmp/';
$uploadfile = $uploaddir . basename($_FILES['file']['name']);
echo '<pre>';
if (/*(!strcmp(extension($_FILES['file']['name']), "bin")) &&*/ move_uploaded_file($_FILES['file']['tmp_name'], $uploadfile)) {
echo "<center>File is valid, and was successfully uploaded to tmp folder\n";
if (move_uploaded_file($_FILES['file']['tmp_name'], $uploadfile)) {
echo '<p align=center ><font color="red"><br>Upgrade procedure will take place after reboot.<br>Please do not switch off the device during flashing procedure.</font></p>';
rename($uploadfile, "/update/".($_FILES['file']['name']));
//Reboot switch
shell_exec("reboot");
} else {
echo "<center>File is not valid, please upload a .bin file</center>\n";
echo "<center>Something went wrong. File was not uploaded.</center>\n";
}
echo "</pre>";
} else if (!strcmp($cmd, "remoteflash")){
echo '<p align=center>Downloading '.$ohwrlink.'</p>';
$filename="/tmp/wr-switch-sw-v4.0-rc1-20140710_binaries.tar";
$firmware="/update/wrs-firmware.tar";
$ohwrlink="http://www.ohwr.org/attachments/download/3095/wr-switch-sw-v4.0-rc1-20140710_binaries.tar";
file_put_contents($filename, file_get_contents($ohwrlink));
rename($filename, $firmware);
echo '<p align=center>File successfully downloaded. Rebooting.</p>';
shell_exec("reboot");
} else if (!empty($_FILES['ppsi_conf']['name'])){
$uploaddir = $GLOBALS['etcdir'];
......@@ -686,9 +714,24 @@ function wrs_management(){
//Set UTC
$UTC=htmlspecialchars($_POST["utc"]);
$_SESSION['utc']=$UTC;
$_SESSION['utc']=$UTC;
//Export to /etc/profile --> when /etc/profile remains saved...
$utc_exists = shell_exec("cat ".$GLOBALS['profilefile']." | grep -c TZ");
$utc_prev = shell_exec("cat ".$GLOBALS['profilefile']." | grep TZ");
$utc_prev=trim($utc_prev);
if($utc_exists>0){
$sed_cmd = 'sed -i "s/'.$utc_prev.'/export TZ='.$_SESSION['utc'].'/g" '.$GLOBALS['profilefile'];
shell_exec ($sed_cmd);
}else{ // Add TZ to profile file
shell_exec ('echo "export TZ='.$_SESSION['utc'].'" >>'.$GLOBALS['profilefile']);
}
echo '<br><p align=center>Rebooting...</p>';
//Reboot the switch
shell_exec("reboot");
header('Location: management.php');
} else if (!strcmp($cmd, "backup-wrs")){
......@@ -1056,8 +1099,7 @@ function wrs_display_help($help_id, $name){
} else if (!strcmp($help_id, "firmware")){
$message = "<p>Firmware features: <br>
- <b>Flash firmware</b>: It moves a binary file into the /tmp folder<br>
- <b>Backup firmware</b>: It downloads a copy of the entire WRS to your PC<br>
- <b>Flash firmware</b>: It flashes a new firmware to the switch. Do it under your own risk.<br>
</p>";
}
......
userspace/rootfs_override/var/www/login.php
View file @ 0f86913e
......@@ -25,7 +25,7 @@
if(count($_POST)>0) {
//If /etc/phpusers does not exist we create the file and "admin" "" user&pass
if (!file_exists("/etc/phpusers")) {
if (!file_exists($GLOBALS['phpusersfile'])) {
$username = "admin";
$password = "";
$salt="wrs4.0salt";
......@@ -35,7 +35,7 @@
$hash_md5_double = md5(sha1($salt.$pass)); // md5 hash with salt & sha1 #3
$output= $username." ".$hash_md5_double."\n";
wrs_change_wrfs("rw");
$file = fopen("/etc/phpusers","w+");
$file = fopen($GLOBALS['phpusersfile'],"w+");
fwrite($file,$output);
fclose($file);
wrs_change_wrfs("ro");
......@@ -43,9 +43,9 @@
$username = $_POST["login"];
$password = $_POST["password"];
$saved_hash = shell_exec("cat /etc/phpusers | grep ".$username." | awk '{print $2}'");
$saved_hash = shell_exec("cat ".$GLOBALS['phpusersfile']." | grep ".$username." | awk '{print $2}'");
$saved_hash = str_replace("\n","",$saved_hash);
$user_exists = shell_exec("cat /etc/phpusers | grep -c ".$username);
$user_exists = shell_exec("cat ".$GLOBALS['phpusersfile']." | grep -c ".$username);
$salt="wrs4.0salt";
......
userspace/rootfs_override/var/www/network.php
View file @ 0f86913e
......@@ -61,9 +61,9 @@
}
if ((!empty($_POST["networkgroup"])) && (!strcmp(htmlspecialchars($_POST["networkgroup"]),"DHCP"))){
$interface_file = "/etc/network/interfaces";
$interface_file = $GLOBALS['interfacesfile'];
$tmpfile="/tmp/interfaces";
shell_exec('rm /etc/network/interfaces');
shell_exec('rm '.$interface_file);
$output="# Configure Loopback\nauto lo\niface lo inet loopback\n\n#Force eth0 to be configured by DHCP\nauto eth0\niface eth0 inet dhcp\n\n# Uncomment this example for static configuration\n";
$output.="#iface eth0 inet static\n";
......@@ -77,17 +77,17 @@
fwrite($file,$output);
fclose($file);
//We move the file to /wr/etc/
//We move the file to /usr/etc/network
copy($tmpfile, $interface_file);
echo '<center>DHCP is now set for eth0<br>Restarting network</center>';
//Let's up eth0
shell_exec('/etc/init.d/S40network restart');
echo '<center>DHCP is now set for eth0<br>Rebooting switch</center>';
//Let's reboot
shell_exec('reboot');
}
if ((!empty($_POST["networkgroup"])) && (!strcmp(htmlspecialchars($_POST["networkgroup"]),"Static"))){
//shell_exec('sed -i "s/iface eth0 inet dhcp/#iface eth0 inet dhcp/g" /etc/network/interfaces');
echo '<FORM method="POST">
<table border="0" align="center" class="altrowstable" id="alternatecolor">
<tr>
......@@ -117,9 +117,9 @@
}
if ((!empty($_POST["ip"])) && (!empty($_POST["netmask"])) && (!empty($_POST["network"])) && (!empty($_POST["broadcast"])) && (!empty($_POST["gateway"]))){
$interface_file = "/etc/network/interfaces";
$interface_file = $GLOBALS['interfacesfile'];
$tmpfile="/tmp/interfaces";
shell_exec('rm /etc/network/interfaces');
shell_exec('rm '.$interface_file);
$output="# Configure Loopback\nauto lo\niface lo inet loopback\n\n#Force eth0 to be configured by DHCP\n#auto eth0\n#iface eth0 inet dhcp\n\n# Uncomment this example for static configuration\n";
$output.="iface eth0 inet static\n";
......@@ -133,13 +133,13 @@
fwrite($file,$output);
fclose($file);
//We move the file to /wr/etc/
//We move the file to /usr/etc/network
copy($tmpfile, $interface_file);
echo '<center>New static configuration saved for eth0<br>Changes will take place after reboot.</center>';
//Let's up eth0
shell_exec('/etc/init.d/S40network restart');
//Let's reboot
shell_exec('reboot');
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment