| ' + + ' | ' + + ' | |
| ' + + ' | ' + ' |
';
retHtml += '
';
return retHtml;
diff --git a/xCAT-UI/js/srv_xcatauth.js b/xCAT-UI/js/srv_xcatauth.js
index a22fc56ad..e9c4ef89c 100644
--- a/xCAT-UI/js/srv_xcatauth.js
+++ b/xCAT-UI/js/srv_xcatauth.js
@@ -24,8 +24,8 @@ $(document).ready(function() {
}).button();
if (document.location.protocol == 'http:') {
- $('#login_status').html('You are using an unencrypted session!');
- $('#login_status').css('color', 'red');
+ $('#login-status').html('You are using an unencrypted session!');
+ $('#login-status').css('color', 'red');
}
if (!$("#login input[name='username']").val()) {
@@ -62,7 +62,7 @@ function onlogin(data, txtStatus) {
var usrName = $("#login input[name='username']").val();
$("#login input[name='password']").val('');
if (data.authenticated == 'yes') {
- $('#login_status').text('Login successful');
+ $('#login-status').text('Login successful');
window.location = 'service.php';
// Set user name cookie
@@ -70,8 +70,8 @@ function onlogin(data, txtStatus) {
exDate.setTime(exDate.getTime() + (240 * 60 * 1000));
$.cookie('xcat_username', usrName, { expires: exDate });
} else {
- $('#login_status').text('Authentication failure');
- $('#login_status').css('color', '#FF0000');
+ $('#login-status').text('Authentication failure');
+ $('#login-status').css('color', '#FF0000');
}
}
@@ -79,8 +79,8 @@ function onlogin(data, txtStatus) {
* Authenticate user for new session
*/
function authenticate() {
- $('#login_status').css('color', '#000000');
- $('#login_status').html('Authenticating...');
+ $('#login-status').css('color', '#000000');
+ $('#login-status').html('Authenticating...');
var passwd = $("#login input[name='password']").val();
$.post('lib/srv_log.php', {
diff --git a/xCAT-UI/js/xcatauth.js b/xCAT-UI/js/xcatauth.js
index 9d615b349..22fb185fc 100644
--- a/xCAT-UI/js/xcatauth.js
+++ b/xCAT-UI/js/xcatauth.js
@@ -26,8 +26,8 @@ $(document).ready(function() {
$('#login button').button();
if (document.location.protocol == "http:") {
- $("#login_status").html("You are using an unencrypted session!");
- $("#login_status").css("color", "#ff0000");
+ $("#login-status").html("You are using an unencrypted session!");
+ $("#login-status").css("color", "#ff0000");
}
if ($("#login input[name='username']").val() == "") {
@@ -64,7 +64,7 @@ function onlogin(data, txtStatus) {
// Clear password field regardless of what happens
$("#login input[name='password']").val("");
if (data.authenticated == "yes") {
- $("#login_status").text("Login successful");
+ $("#login-status").text("Login successful");
// Not the first time to log
if ($.cookie('logonflag')){
@@ -87,7 +87,7 @@ function onlogin(data, txtStatus) {
});
} else {
- $("#login_status").text("Authentication failure").css("color", "#FF0000");
+ $("#login-status").text("Authentication failure").css("color", "#FF0000");
}
}
@@ -97,8 +97,8 @@ function onlogin(data, txtStatus) {
* @return Nothing
*/
function authenticate() {
- $("#login_status").css("color", "#000000");
- $("#login_status").html('Authenticating...');
+ $("#login-status").css("color", "#000000");
+ $("#login-status").html('Authenticating...');
var passwd = $("#login input[name='password']").val();
$.post("lib/log.php", {
username : $("#login input[name='username']").val(),
diff --git a/xCAT-UI/lib/cmd.php b/xCAT-UI/lib/cmd.php
index d040fe499..d272b9d79 100644
--- a/xCAT-UI/lib/cmd.php
+++ b/xCAT-UI/lib/cmd.php
@@ -6,26 +6,26 @@ require_once "$TOPDIR/lib/jsonwrapper.php";
/**
* Issue a xCAT command, e.g. rinv gpok123 all
- * This will handle most commands. If not, you can create your
- * own .php. Look at zCmd.php for an example.
+ * This will handle most commands. If not, you can create your own .php.
+ * Look at zCmd.php for an example.
*
- * @param $cmd The xCAT command
- * @param $tgt The target node or group
- * @param $args The xCAT command arguments, separated by semicolons
- * @param $opts The xCAT command options, separated by semicolons
- * @return The xCAT response. Replies are in the form of JSON
+ * @param $cmd The xCAT command
+ * @param $tgt The target node or group
+ * @param $args The xCAT command arguments, separated by semicolons
+ * @param $opts The xCAT command options, separated by semicolons
+ * @return The xCAT response. Replies are in the form of JSON
*/
if (isset($_GET["cmd"])) {
// HTTP GET requests
$cmd = $_GET["cmd"];
$tgt = $_GET["tgt"];
$args = $_GET["args"];
-
+
// File contents in case of file write
if (isset($_GET["cont"])) {
$cont = $_GET["cont"];
}
-
+
// Special messages put here
// This gets sent back to the AJAX request as is.
$msg = $_GET["msg"];
@@ -34,7 +34,7 @@ if (isset($_GET["cmd"])) {
if (!$tgt) {
$tgt = NULL;
}
-
+
// If no $msg is given, set $msg to NULL
if (!$msg) {
$msg = NULL;
@@ -52,12 +52,12 @@ if (isset($_GET["cmd"])) {
$args_array = array($args);
}
}
-
+
// If no $opts are given, set $opts_array to NULL
$opts_array = array();
if (isset($_GET["opts"])) {
$opts = $_GET["opts"];
-
+
// If $args contains multiple arguments, split it into an array
if (strpos($opts,";")) {
// Split the arguments into an array
@@ -74,7 +74,7 @@ if (isset($_GET["cmd"])) {
if (in_array("flush", $opts_array)) {
return;
}
-
+
$rsp = array();
// webrun pping and gangliastatus output needs special handling
@@ -90,7 +90,7 @@ if (isset($_GET["cmd"])) {
// This command gets the nodes and groups
else if(strncasecmp($cmd, "extnoderange", 12) == 0) {
$rsp = extractExtnoderange($xml);
- }
+ }
// Write contents to file
else if(strncasecmp($cmd, "write", 4) == 0) {
// Directory should be /var/opt/xcat/profiles
@@ -99,7 +99,7 @@ if (isset($_GET["cmd"])) {
$handle = fopen($file, 'w') or die("Cannot open $file");
fwrite($handle, $cont);
fclose($handle);
-
+
$rsp = "Directory entry written to $file";
}
// Handle the typical output
@@ -108,20 +108,20 @@ if (isset($_GET["cmd"])) {
foreach ($child->children() as $data) {
if($data->name) {
$node = $data->name;
-
+
if ($data->data->contents) {
$cont = $data->data->contents;
} else {
$cont = $data->data;
}
-
+
if ($data->data->desc) {
$cont = $data->data->desc . ": " . $cont;
}
-
+
$cont = str_replace(":|:", "\n", $cont);
array_push($rsp, "$node: $cont");
- } else if(strlen("$data") > 2) {
+ } else if (strlen("$data") > 2) {
$data = str_replace(":|:", "\n", $data);
array_push($rsp, "$data");
}
@@ -137,8 +137,8 @@ if (isset($_GET["cmd"])) {
/**
* Extract the output for a webrun command
*
- * @param $xml The XML output from docmd()
- * @return An array containing the output
+ * @param $xml The XML output from docmd()
+ * @return An array containing the output
*/
function extractWebrun($xml) {
$rsp = array();
@@ -149,7 +149,7 @@ function extractWebrun($xml) {
foreach($nodes->children() as $node){
// Get the node name
$name = $node->name;
-
+
// Get the content
$status = $node->data;
$status = str_replace(":|:", "\n", $status);
@@ -166,8 +166,8 @@ function extractWebrun($xml) {
/**
* Extract the output for a nodels command
*
- * @param $xml The XML output from docmd()
- * @return An array containing the output
+ * @param $xml The XML output from docmd()
+ * @return An array containing the output
*/
function extractNodels($xml) {
$rsp = array();
@@ -195,8 +195,8 @@ function extractNodels($xml) {
/**
* Extract the output for a extnoderange command
*
- * @param $xml The XML output from docmd()
- * @return The nodes and groups
+ * @param $xml The XML output from docmd()
+ * @return The nodes and groups
*/
function extractExtnoderange($xml) {
$rsp = array();
diff --git a/xCAT-UI/lib/functions.php b/xCAT-UI/lib/functions.php
index c1e23b5eb..52935d368 100644
--- a/xCAT-UI/lib/functions.php
+++ b/xCAT-UI/lib/functions.php
@@ -5,22 +5,21 @@
// Retain session variables across page requests
session_start();
-session_write_close(); // Do not block HTTP requests
+session_write_close(); // Do not block other HTTP requests
-// The settings below display error on the screen,
-// instead of giving blank pages.
+// The settings below display error on the screen, instead of giving blank pages.
error_reporting(E_ALL);
ini_set('display_errors', true);
/**
* Run a command using the xCAT client/server protocol
*
- * @param $cmd The xCAT command
- * @param $nr Node range or group
- * @param $args_array Command arguments
- * @param $opts_array Command options
- * @return A tree of SimpleXML objects.
- * See perl-xCAT/xCAT/Client.pm for the format
+ * @param $cmd The xCAT command
+ * @param $nr Node range or group
+ * @param $args_array Command arguments
+ * @param $opts_array Command options
+ * @return A tree of SimpleXML objects.
+ * See perl-xCAT/xCAT/Client.pm for the format
*/
function docmd($cmd, $nr, $args_array, $opts_array){
// If we are not logged in,
@@ -34,7 +33,9 @@ function docmd($cmd, $nr, $args_array, $opts_array){
// Add command, node range, and arguments to request
$request = simplexml_load_string('xCAT submit request socket error: $errno - $errstr
"; } - + // Flush (send) the output buffer and turn off output buffering ob_end_flush(); // Close syslog closelog(); - + if(! $cleanexit) { if (preg_match('/^\s*(Error) xCAT response ended prematurely: ", htmlentities($response), "
"; $rsp = FALSE; } @@ -170,10 +169,6 @@ function submit_request($req, $skipVerify, $opts_array){ /** * Enable password storage to split between cookie and session variable - * - * @param $data - * @param $key - * @return */ function xorcrypt($data, $key) { $datalen = strlen($data); @@ -187,9 +182,6 @@ function xorcrypt($data, $key) { /** * Get password - * - * @param Nothing - * @return */ function getpassword() { if (isset($GLOBALS['xcatauthsecret'])) { @@ -204,13 +196,11 @@ function getpassword() { } /** - * Get the password splitting knowledge between server - * and client side persistant storage. Caller should regenerate - * session ID when contemplating a new user/password, to preclude - * session fixation, though fixation is limited without the secret. + * Get the password splitting knowledge between server and client side persistant storage. + * Caller should regenerate session ID when contemplating a new user/password, + * to preclude session fixation, though fixation is limited without the secret. * - * @param $password Password - * @return Nothing + * @param $password Password */ function setpassword($password) { $randlen = strlen($password); @@ -227,8 +217,8 @@ function setpassword($password) { /** * Get RAND characters * - * @param $length Length of characters - * @return RAND characters + * @param $length Length of characters + * @return RAND characters */ function getrandchars($length) { $charset = '0123456789abcdefghijklmnopqrstuvwxyz!@#$%^&*'; @@ -246,9 +236,7 @@ function getrandchars($length) { /** * Determine if a user/password session exists * - * @param Nothing - * @return True If user has a session. - * False Otherwise + * @return True if user has a session, false otherwise */ function is_logged() { if (isset($_SESSION["username"]) and !is_bool(getpassword())) { @@ -260,10 +248,8 @@ function is_logged() { /** * Determine if a user is currently logged in successfully - * - * @param Nothing - * @return True If the user is currently logged in successfully - * False Otherwise + * + * @return True if the user is currently logged in successfully, false otherwise */ function isAuthenticated() { if (is_logged()) { @@ -290,12 +276,10 @@ function isAuthenticated() { } /** -* Determine if a user has root access -* -* @param Nothing -* @return True If the user has root access -* False Otherwise -*/ + * Determine if a user has root access + * + * @return True if the user has root access, false otherwise + */ function isRootAcess() { if (is_logged() && $_SESSION["xcatpassvalid"]) { $testacc = docmd('tabdump', '', array('policy', '-w', "name==" . $_SESSION["username"]), array()); @@ -304,7 +288,7 @@ function isRootAcess() { $result = str_replace('"', '', $result); $args = array(); $args = explode(",", $result); - + // Get the comments which contains the privilege $comments = $args[8]; $args = explode(";", $comments); @@ -319,13 +303,13 @@ function isRootAcess() { $privilege = 'root'; $_SESSION["xcatpassvalid"] = 1; } - + break; - } + } } } } - + if (strcmp($_SESSION["username"], 'root') == 0) { $_SESSION["xcatpassvalid"] = 1; } @@ -338,10 +322,7 @@ function isRootAcess() { } /** - * Log out of the current user session - * - * @param Nothing - * @return Nothing + * Log out of current user session */ function logout() { // Clear the secret cookie from browser @@ -360,12 +341,9 @@ function logout() { /** * Format a given string and echo it back to the browser - * - * @param $str String - * @return Nothing */ function format_TBD($str) { - // Format a given string however you want it + // Format a given string however you want it echo $tmp . ''; flush(); } diff --git a/xCAT-UI/lib/rcons.php b/xCAT-UI/lib/rcons.php index 5ddc2825a..d27960aa2 100644 --- a/xCAT-UI/lib/rcons.php +++ b/xCAT-UI/lib/rcons.php @@ -77,14 +77,14 @@ function rconsSynchronise($parameter) { if (0 == strlen($line)) { continue; } - + if ('<' == substr($line, 0, 1)) { $flag = true; $return .= $line; break; } } - + if ($flag) { while (!feof($fp)) { $return .= fgets($fp, 1024); diff --git a/xCAT-UI/lib/srv_cmd.php b/xCAT-UI/lib/srv_cmd.php index 3798fab27..ae3b4878b 100644 --- a/xCAT-UI/lib/srv_cmd.php +++ b/xCAT-UI/lib/srv_cmd.php @@ -5,22 +5,21 @@ require_once "$TOPDIR/lib/srv_functions.php"; require_once "$TOPDIR/lib/jsonwrapper.php"; /** - * Issue a xCAT command, e.g. rinv gpok123 all - * This will handle most commands. If not, you can create your - * own .php. Look at zCmd.php for an example. + * Issue a xCAT command, e.g. rinv gpok123 all. This will handle most commands. + * If not, you can create your own .php. Look at zCmd.php for an example. * - * @param $cmd The xCAT command - * @param $tgt The target node or group - * @param $args The xCAT command arguments, separated by semicolons - * @param $opts The xCAT command options, separated by semicolons - * @return The xCAT response. Replies are in the form of JSON + * @param $cmd The xCAT command + * @param $tgt The target node or group + * @param $args The xCAT command arguments, separated by semicolons + * @param $opts The xCAT command options, separated by semicolons + * @return The xCAT response. Replies are in the form of JSON */ if (isset($_GET["cmd"])) { // HTTP GET requests $cmd = $_GET["cmd"]; $tgt = $_GET["tgt"]; $args = $_GET["args"]; - + // Special messages put here // This gets sent back to the AJAX request as is. $msg = $_GET["msg"]; @@ -29,7 +28,7 @@ if (isset($_GET["cmd"])) { if (!$tgt) { $tgt = NULL; } - + // If no $msg is given, set $msg to NULL if (!$msg) { $msg = NULL; @@ -47,12 +46,12 @@ if (isset($_GET["cmd"])) { $args_array = array($args); } } - + // If no $opts are given, set $opts_array to NULL $opts_array = array(); if (isset($_GET["opts"])) { $opts = $_GET["opts"]; - + // If $args contains multiple arguments, split it into an array if (strpos($opts,";")) { // Split the arguments into an array @@ -69,7 +68,7 @@ if (isset($_GET["cmd"])) { if (in_array("flush", $opts_array)) { return; } - + $rsp = array(); // webrun pping and gangliastatus output needs special handling @@ -92,17 +91,16 @@ if (isset($_GET["cmd"])) { foreach ($child->children() as $data) { if($data->name) { $node = $data->name; - + if($data->data->contents){ $cont = $data->data->contents; - } - else{ + } else { $cont = $data->data; } - + $cont = str_replace(":|:", "\n", $cont); array_push($rsp, "$node: $cont"); - } else if(strlen("$data") > 2) { + } else if (strlen("$data") > 2) { $data = str_replace(":|:", "\n", $data); array_push($rsp, "$data"); } @@ -118,8 +116,8 @@ if (isset($_GET["cmd"])) { /** * Extract the output for a webrun command * - * @param $xml The XML output from docmd() - * @return An array containing the output + * @param $xml The XML output from docmd() + * @return An array containing the output */ function extractWebrun($xml) { $rsp = array(); @@ -130,7 +128,7 @@ function extractWebrun($xml) { foreach($nodes->children() as $node){ // Get the node name $name = $node->name; - + // Get the content $status = $node->data; $status = str_replace(":|:", "\n", $status); @@ -147,8 +145,8 @@ function extractWebrun($xml) { /** * Extract the output for a nodels command * - * @param $xml The XML output from docmd() - * @return An array containing the output + * @param $xml The XML output from docmd() + * @return An array containing the output */ function extractNodels($xml) { $rsp = array(); @@ -176,8 +174,8 @@ function extractNodels($xml) { /** * Extract the output for a extnoderange command * - * @param $xml The XML output from docmd() - * @return The nodes and groups + * @param $xml The XML output from docmd() + * @return The nodes and groups */ function extractExtnoderange($xml) { $rsp = array(); diff --git a/xCAT-UI/lib/srv_functions.php b/xCAT-UI/lib/srv_functions.php index 624db7687..c18a336fb 100644 --- a/xCAT-UI/lib/srv_functions.php +++ b/xCAT-UI/lib/srv_functions.php @@ -5,7 +5,7 @@ // Retain session variables across page requests session_start(); -session_write_close(); // Do not block HTTP requests +session_write_close(); // Do not block HTTP requests // The settings below display error on the screen, // instead of giving blank pages. @@ -15,310 +15,286 @@ ini_set('display_errors', true); /** * Run a command using the xCAT client/server protocol * - * @param $cmd The xCAT command - * @param $nr Node range or group - * @param $args_array Command arguments - * @param $opts_array Command options - * @return A tree of SimpleXML objects. - * See perl-xCAT/xCAT/Client.pm for the format + * @param $cmd The xCAT command + * @param $nr Node range or group + * @param $args_array Command arguments + * @param $opts_array Command options + * @return A tree of SimpleXML objects. See perl-xCAT/xCAT/Client.pm for the format */ function docmd($cmd, $nr, $args_array, $opts_array){ - // If we are not logged in, - // do not try to communicate with xcatd - if (!is_logged()) { - echo "
You are not logged in! Failed to run command.
"; - return simplexml_load_string('You are not logged in! Failed to run command.
"; + return simplexml_load_string('' . $tmp . ''; - ob_flush(); - flush(); - } - } - } - } - - // Look for serverdone response - $fullpattern = '/
xCAT submit request socket error: $errno - $errstr
"; - } - - // Flush (send) the output buffer and turn off output buffering - ob_end_flush(); + // Open a socket to xcatd + syslog(LOG_INFO, "Opening socket to xcatd..."); + if ($fp = stream_socket_client('ssl://'.$xcathost.':'.$port, $errno, $errstr, 30, STREAM_CLIENT_CONNECT)){ + $reqXML = $req->asXML(); + $nr = $req->noderange; + $cmd = $req->command; + + syslog(LOG_INFO, "Sending request: $cmd $nr"); + stream_set_blocking($fp, 0); // Set as non-blocking + fwrite($fp,$req->asXML()); // Send XML to xcatd + set_time_limit(900); // Set 15 minutes timeout (for long running requests) + // The default is 30 seconds which is too short for some requests + + // Turn on output buffering + ob_start(); + while(!feof($fp)) { // Read until there is no more + // Remove newlines and add it to the response + $str = fread($fp, 8192); + if ($str) { + $response .= preg_replace('/>\n\s*<', $str); + + // Flush output to browser + if ($flush) { + // Strip HTML tags from output + if ($tmp = trim(strip_tags($str))) { + // Format the output based on what was given for $flush_format + if ($flush_format == "TDB") { + format_TBD($tmp); + } else { + // Print out output by default + echo '' . $tmp . ''; + ob_flush(); + flush(); + } + } + } + } + + // Look for serverdone response + $fullpattern = '/
xCAT submit request socket error: $errno - $errstr
"; + } + + // Flush (send) the output buffer and turn off output buffering + ob_end_flush(); - // Close syslog - closelog(); - - if(! $cleanexit) { - if (preg_match('/^\s*(Error) xCAT response ended prematurely: ", htmlentities($response), "
"; - $rsp = FALSE; - } - } - return $rsp; + // Close syslog + closelog(); + + if(! $cleanexit) { + if (preg_match('/^\s*(Error) xCAT response ended prematurely: ", htmlentities($response), "
"; + $rsp = FALSE; + } + } + return $rsp; } /** * Enable password storage to split between cookie and session variable - * - * @param $data - * @param $key - * @return */ function xorcrypt($data, $key) { - $datalen = strlen($data); - $keylen = strlen($key); - for ($i=0;$i<$datalen;$i++) { - $data[$i] = chr(ord($data[$i])^ord($key[$i])); - } + $datalen = strlen($data); + $keylen = strlen($key); + for ($i=0;$i<$datalen;$i++) { + $data[$i] = chr(ord($data[$i])^ord($key[$i])); + } - return $data; + return $data; } /** * Get RAND characters * - * @param $length Length of characters - * @return RAND characters + * @param $length Length of characters + * @return RAND characters */ function getrandchars($length) { - $charset = '0123456789abcdefghijklmnopqrstuvwxyz!@#$%^&*'; - $charsize = strlen($charset); - srand(); - $chars = ''; - for ($i=0;$i<$length;$i++) { - $num=rand()%$charsize; - $chars=$chars.substr($charset,$num,1); - } + $charset = '0123456789abcdefghijklmnopqrstuvwxyz!@#$%^&*'; + $charsize = strlen($charset); + srand(); + $chars = ''; + for ($i=0;$i<$length;$i++) { + $num=rand()%$charsize; + $chars=$chars.substr($charset,$num,1); + } - return $chars; + return $chars; } /** * Format a given string and echo it back to the browser - * - * @param $str String - * @return Nothing */ function format_TBD($str) { - // Format a given string however you want it - echo $tmp . ''; - flush(); + // Format a given string however you want it + echo $tmp . '
'; + flush(); } /** * Get password - * - * @param Nothing - * @return */ function getpassword() { - if (isset($GLOBALS['xcatauthsecret'])) { - $cryptext = $GLOBALS['xcatauthsecret']; - } else if (isset($_COOKIE["xcatauthsecret"])) { - $cryptext = $_COOKIE["xcatauthsecret"]; - } else { - return false; - } + if (isset($GLOBALS['xcatauthsecret'])) { + $cryptext = $GLOBALS['xcatauthsecret']; + } else if (isset($_COOKIE["xcatauthsecret"])) { + $cryptext = $_COOKIE["xcatauthsecret"]; + } else { + return false; + } - return xorcrypt($_SESSION["secretkey"], base64_decode($cryptext)); + return xorcrypt($_SESSION["secretkey"], base64_decode($cryptext)); } /** - * Get the password splitting knowledge between server - * and client side persistant storage. Caller should regenerate - * session ID when contemplating a new user/password, to preclude - * session fixation, though fixation is limited without the secret. + * Get the password splitting knowledge between server and client side persistant storage. + * Caller should regenerate session ID when contemplating a new user/password, + * to preclude session fixation, though fixation is limited without the secret. * - * @param $password Password - * @return Nothing + * @param $password Password */ function setpassword($password) { - $randlen = strlen($password); - $key = getrandchars($randlen); - $cryptext = xorcrypt($password,$key); + $randlen = strlen($password); + $key = getrandchars($randlen); + $cryptext = xorcrypt($password,$key); - // Non-ascii characters, encode it in base64 - $cryptext = base64_encode($cryptext); - setcookie("xcatauthsecret",$cryptext,0,'/'); - $GLOBALS["xcatauthsecret"] = $cryptext; - $_SESSION["secretkey"] = $key; + // Non-ascii characters, encode it in base64 + $cryptext = base64_encode($cryptext); + setcookie("xcatauthsecret",$cryptext,0,'/'); + $GLOBALS["xcatauthsecret"] = $cryptext; + $_SESSION["secretkey"] = $key; } /** * Determine if a user/password session exists * - * @param Nothing - * @return True If user has a session. - * False Otherwise + * @return True if user has a session, false otherwise */ function is_logged() { - if (isset($_SESSION["srv_username"]) and !is_bool(getpassword())) { - return true; - } else { - return false; - } + if (isset($_SESSION["srv_username"]) and !is_bool(getpassword())) { + return true; + } else { + return false; + } } /** * Determine if a user is currently logged in successfully - * - * @param Nothing - * @return True If the user is currently logged in successfully - * False Otherwise + * + * @return True if the user is currently logged in successfully, false otherwise */ function isAuthenticated() { - if (is_logged()) { - if ($_SESSION["srv_xcatpassvalid"] != 1) { - $testcred = docmd("authcheck", "", NULL, NULL); - if (isset($testcred->{'xcatresponse'}->{'data'})) { - $result = "".$testcred->{'xcatresponse'}->{'data'}; - if (is_numeric(strpos("Authenticated",$result))) { - // Logged in successfully - $_SESSION["srv_xcatpassvalid"] = 1; - } else { - // Not logged in - $_SESSION["srv_xcatpassvalid"] = 0; - } - } - } - } + if (is_logged()) { + if ($_SESSION["srv_xcatpassvalid"] != 1) { + $testcred = docmd("authcheck", "", NULL, NULL); + if (isset($testcred->{'xcatresponse'}->{'data'})) { + $result = "".$testcred->{'xcatresponse'}->{'data'}; + if (is_numeric(strpos("Authenticated",$result))) { + // Logged in successfully + $_SESSION["srv_xcatpassvalid"] = 1; + } else { + // Not logged in + $_SESSION["srv_xcatpassvalid"] = 0; + } + } + } + } - if (isset($_SESSION["srv_xcatpassvalid"]) and $_SESSION["srv_xcatpassvalid"]==1) { - return true; - } else { - return false; - } + if (isset($_SESSION["srv_xcatpassvalid"]) and $_SESSION["srv_xcatpassvalid"]==1) { + return true; + } else { + return false; + } } /** * Log out of the current user session - * - * @param Nothing - * @return Nothing */ function logout() { - // Clear the secret cookie from browser - if (isset($_COOKIE["xcatauthsecret"])) { - setcookie("xcatauthsecret",'',time()-86400*7,'/'); - } + // Clear the secret cookie from browser + if (isset($_COOKIE["xcatauthsecret"])) { + setcookie("xcatauthsecret",'',time()-86400*7,'/'); + } - // Expire session cookie - if (isset($_COOKIE[session_name()])) { - setcookie(session_name(),"",time()-86400*7,"/"); - } + // Expire session cookie + if (isset($_COOKIE[session_name()])) { + setcookie(session_name(),"",time()-86400*7,"/"); + } - // Clear server store of data - $_SESSION=array(); + // Clear server store of data + $_SESSION=array(); } ?> diff --git a/xCAT-UI/lib/srv_log.php b/xCAT-UI/lib/srv_log.php index 5a9f3bccc..31106b9aa 100644 --- a/xCAT-UI/lib/srv_log.php +++ b/xCAT-UI/lib/srv_log.php @@ -11,29 +11,29 @@ header("Cache-Control: post-check=0, pre-check=0", false); header("Pragma: no-cache"); if (isset($_REQUEST["password"])) { - // Clear data from session - $_SESSION = array(); + // Clear data from session + $_SESSION = array(); - // Zap existing session entirely - session_regenerate_id(true); - setpassword($_REQUEST["password"]); + // Zap existing session entirely + session_regenerate_id(true); + setpassword($_REQUEST["password"]); - // Invalid password - $_SESSION["srv_xcatpassvalid"] = -1; + // Invalid password + $_SESSION["srv_xcatpassvalid"] = -1; } if (isset($_REQUEST["username"])) { - $_SESSION["srv_username"] = $_REQUEST["username"]; + $_SESSION["srv_username"] = $_REQUEST["username"]; - // Invalid user name - $_SESSION["srv_xcatpassvalid"]=-1; + // Invalid user name + $_SESSION["srv_xcatpassvalid"]=-1; } $jdata = array(); if (isAuthenticated()) { - $jdata["authenticated"]="yes"; + $jdata["authenticated"]="yes"; } else { - $jdata["authenticated"]="no"; + $jdata["authenticated"]="no"; } echo json_encode($jdata); diff --git a/xCAT-UI/lib/systemcmd.php b/xCAT-UI/lib/systemcmd.php index 469551789..7990aa035 100644 --- a/xCAT-UI/lib/systemcmd.php +++ b/xCAT-UI/lib/systemcmd.php @@ -7,30 +7,30 @@ require_once "$TOPDIR/lib/jsonwrapper.php"; /** * This will handle system commands, e.g. rpm -qa xCAT * - * @param $cmd The system command - * @return The system response. Replies are in the form of JSON + * @param $cmd The system command + * @return The system response. Replies are in the form of JSON */ if (!isAuthenticated()) { - echo ("Please login before continuing!"); - exit; + echo ("Please login before continuing!"); + exit; } if (isset($_GET["cmd"])) { - // HTTP GET requests - $cmd = $_GET["cmd"]; - $msg = NULL; - $ret = ""; + // HTTP GET requests + $cmd = $_GET["cmd"]; + $msg = NULL; + $ret = ""; - if (isset($_GET["msg"])) { - $msg = $_GET["msg"]; - } - - if ($cmd == "ostype") { - $ret = strtolower(PHP_OS); - } else { - $ret = shell_exec($cmd); - } + if (isset($_GET["msg"])) { + $msg = $_GET["msg"]; + } + + if ($cmd == "ostype") { + $ret = strtolower(PHP_OS); + } else { + $ret = shell_exec($cmd); + } - echo json_encode(array("rsp"=>$ret, "msg" => $msg)); + echo json_encode(array("rsp"=>$ret, "msg" => $msg)); } ?> \ No newline at end of file diff --git a/xCAT-UI/lib/tabRestore.php b/xCAT-UI/lib/tabRestore.php index 79fafd6b8..4d3e960dc 100644 --- a/xCAT-UI/lib/tabRestore.php +++ b/xCAT-UI/lib/tabRestore.php @@ -7,8 +7,8 @@ require_once "$TOPDIR/lib/jsonwrapper.php"; /** * Replace the contents of an xCAT table * - * @param $tab The xCAT table - * @param $cont The xCAT table contents + * @param $tab The xCAT table + * @param $cont The xCAT table contents * @return The xCAT response. Replies are in the form of JSON */ if (isset($_POST["table"])) { @@ -24,7 +24,7 @@ $request = simplexml_load_string('
- ';
-
- // User name and log out section
- if (isset($_SESSION['username'])){
- echo
- "";
- }
+ // Header menu
+ echo
+ '
+ ';
- // Content
- echo '';
+ echo '
';
+ // Content
+ echo '';
- // End of page
- echo
- '
- ';
+ // End of page
+ echo
+ '
+ 