gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Retrieve parameters from $_POST in server_status_processes.php

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
This commit is contained in:
Maurício Meneghini Fauth 2018-11-03 00:52:04 -03:00 committed by Isaac Bennetch
parent d9ac1bc150
commit 5ca6129f81
4 changed files with 44 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/server_status_processes.js
View File

@ -47,10 +47,12 @@ var processList = {
*/
killProcessHandler: function (event) {
event.preventDefault();
var url = $(this).attr('href');
var argSep = PMA_commonParams.get('arg_separator');
var params = $(this).getPostData();
params += argSep + 'ajax_request=1' + argSep + 'server=' + PMA_commonParams.get('server');
// Get row element of the process to be killed.
var $tr = $(this).closest('tr');
$.getJSON(url, function (data) {
$.post($(this).attr('href'), params, function (data) {
// Check if process was killed or not.
if (data.hasOwnProperty('success') && data.success) {
// remove the row of killed process.
@ -66,7 +68,7 @@ var processList = {
// Show process error message
PMA_ajaxShowMessage(data.error, false);
}
});
}, 'json');
},
/**
@ -86,7 +88,7 @@ var processList = {
if (processList.autoRefresh) {
var interval = parseInt(processList.refreshInterval, 10) * 1000;
var urlParams = processList.getUrlParams();
processList.refreshRequest = $.get(processList.refreshUrl,
processList.refreshRequest = $.post(processList.refreshUrl,
urlParams,
function (data) {
if (data.hasOwnProperty('success') && data.success) {

53
libraries/classes/Server/Status/Processes.php
View File

@ -58,7 +58,7 @@ class Processes
{
$url_params = array();
$show_full_sql = ! empty($_REQUEST['full']);
$show_full_sql = ! empty($_POST['full']);
if ($show_full_sql) {
$url_params['full'] = 1;
$full_text_link = 'server_status_processes.php' . Url::getCommon(
@ -115,19 +115,19 @@ class Processes
$sql_query = $show_full_sql
? 'SHOW FULL PROCESSLIST'
: 'SHOW PROCESSLIST';
if ((! empty($_REQUEST['order_by_field'])
&& ! empty($_REQUEST['sort_order']))
|| (! empty($_REQUEST['showExecuting']))
if ((! empty($_POST['order_by_field'])
&& ! empty($_POST['sort_order']))
|| (! empty($_POST['showExecuting']))
) {
$sql_query = 'SELECT * FROM `INFORMATION_SCHEMA`.`PROCESSLIST` ';
}
if (! empty($_REQUEST['showExecuting'])) {
if (! empty($_POST['showExecuting'])) {
$sql_query .= ' WHERE state != "" ';
}
if (!empty($_REQUEST['order_by_field']) && !empty($_REQUEST['sort_order'])) {
if (!empty($_POST['order_by_field']) && !empty($_POST['sort_order'])) {
$sql_query .= ' ORDER BY '
. Util::backquote($_REQUEST['order_by_field'])
. ' ' . $_REQUEST['sort_order'];
. Util::backquote($_POST['order_by_field'])
. ' ' . $_POST['sort_order'];
}
$result = $GLOBALS['dbi']->query($sql_query);
@ -140,15 +140,15 @@ class Processes
$retval .= '<th>' . __('Processes') . '</th>';
foreach ($sortable_columns as $column) {
$is_sorted = ! empty($_REQUEST['order_by_field'])
&& ! empty($_REQUEST['sort_order'])
&& ($_REQUEST['order_by_field'] == $column['order_by_field']);
$is_sorted = ! empty($_POST['order_by_field'])
&& ! empty($_POST['sort_order'])
&& ($_POST['order_by_field'] == $column['order_by_field']);
$column['sort_order'] = 'ASC';
if ($is_sorted && $_REQUEST['sort_order'] === 'ASC') {
if ($is_sorted && $_POST['sort_order'] === 'ASC') {
$column['sort_order'] = 'DESC';
}
if (isset($_REQUEST['showExecuting'])) {
if (isset($_POST['showExecuting'])) {
$column['showExecuting'] = 'on';
}
@ -161,7 +161,7 @@ class Processes
if ($is_sorted) {
$asc_display_style = 'inline';
$desc_display_style = 'none';
if ($_REQUEST['sort_order'] === 'DESC') {
if ($_POST['sort_order'] === 'DESC') {
$desc_display_style = 'inline';
$asc_display_style = 'none';
}
@ -214,23 +214,23 @@ class Processes
public static function getHtmlForProcessListFilter()
{
$showExecuting = '';
if (! empty($_REQUEST['showExecuting'])) {
if (! empty($_POST['showExecuting'])) {
$showExecuting = ' checked="checked"';
}
$url_params = array(
'ajax_request' => true,
'full' => (isset($_REQUEST['full']) ? $_REQUEST['full'] : ''),
'column_name' => (isset($_REQUEST['column_name']) ? $_REQUEST['column_name'] : ''),
'full' => (isset($_POST['full']) ? $_POST['full'] : ''),
'column_name' => (isset($_POST['column_name']) ? $_POST['column_name'] : ''),
'order_by_field'
=> (isset($_REQUEST['order_by_field']) ? $_REQUEST['order_by_field'] : ''),
'sort_order' => (isset($_REQUEST['sort_order']) ? $_REQUEST['sort_order'] : ''),
=> (isset($_POST['order_by_field']) ? $_POST['order_by_field'] : ''),
'sort_order' => (isset($_POST['sort_order']) ? $_POST['sort_order'] : ''),
);
$retval = '';
$retval .= '<fieldset id="tableFilter">';
$retval .= '<legend>' . __('Filters') . '</legend>';
$retval .= '<form action="server_status_processes.php">';
$retval .= '<form action="server_status_processes.php" method="post">';
$retval .= Url::getHiddenInputs($url_params);
$retval .= '<input type="submit" value="' . __('Refresh') . '" />';
$retval .= '<div class="formelement">';
@ -258,8 +258,8 @@ class Processes
{
// Array keys need to modify due to the way it has used
// to display column values
if ((! empty($_REQUEST['order_by_field']) && ! empty($_REQUEST['sort_order']))
|| (! empty($_REQUEST['showExecuting']))
if ((! empty($_POST['order_by_field']) && ! empty($_POST['sort_order']))
|| (! empty($_POST['showExecuting']))
) {
foreach (array_keys($process) as $key) {
$new_key = ucfirst(mb_strtolower($key));
@ -270,14 +270,9 @@ class Processes
}
}
$url_params = array(
'kill' => $process['Id'],
'ajax_request' => true
);
$kill_process = 'server_status_processes.php' . Url::getCommon($url_params);
$retval = '<tr>';
$retval .= '<td><a class="ajax kill_process" href="' . $kill_process . '">'
$retval .= '<td><a class="ajax kill_process" href="server_status_processes.php"'
. ' data-post="' . Url::getCommon(['kill' => $process['Id']], '') . '">'
. __('Kill') . '</a></td>';
$retval .= '<td class="value">' . $process['Id'] . '</td>';
$retval .= '<td>' . htmlspecialchars($process['User']) . '</td>';

6
server_status_processes.php
View File

@ -25,8 +25,8 @@ $response = Response::getInstance();
* Kills a selected process
* on ajax request
*/
if ($response->isAjax() && !empty($_REQUEST['kill'])) {
$kill = intval($_REQUEST['kill']);
if ($response->isAjax() && !empty($_POST['kill'])) {
$kill = intval($_POST['kill']);
$query = $GLOBALS['dbi']->getKillQuery($kill);
if ($GLOBALS['dbi']->tryQuery($query)) {
$message = PhpMyAdmin\Message::success(
@ -44,7 +44,7 @@ if ($response->isAjax() && !empty($_REQUEST['kill'])) {
}
$message->addParam($kill);
$response->addJSON('message', $message);
} elseif ($response->isAjax() && !empty($_REQUEST['refresh'])) {
} elseif ($response->isAjax() && !empty($_POST['refresh'])) {
// Only sends the process list table
$response->addHTML(Processes::getHtmlForServerProcesslist());
} else {

26
test/classes/Server/Status/ProcessesTest.php
View File

@ -133,10 +133,10 @@ class ProcessesTest extends TestCase
$html
);
$_REQUEST['full'] = true;
$_REQUEST['sort_order'] = 'ASC';
$_REQUEST['order_by_field'] = 'db';
$_REQUEST['column_name'] = 'Database';
$_POST['full'] = true;
$_POST['sort_order'] = 'ASC';
$_POST['order_by_field'] = 'db';
$_POST['column_name'] = 'Database';
$html = Processes::getHtmlForServerProcesslist();
$this->assertContains(
@ -152,9 +152,9 @@ class ProcessesTest extends TestCase
$html
);
$_REQUEST['sort_order'] = 'DESC';
$_REQUEST['order_by_field'] = 'Host';
$_REQUEST['column_name'] = 'Host';
$_POST['sort_order'] = 'DESC';
$_POST['order_by_field'] = 'Host';
$_POST['column_name'] = 'Host';
$html = Processes::getHtmlForServerProcesslist();
$this->assertContains(
@ -187,20 +187,16 @@ class ProcessesTest extends TestCase
);
$show_full_sql = true;
$_REQUEST['sort_order'] = "desc";
$_REQUEST['order_by_field'] = "process";
$_POST['sort_order'] = "desc";
$_POST['order_by_field'] = "process";
$GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 12;
//Call the test function
$html = Processes::getHtmlForServerProcessItem($process, $show_full_sql);
//validate 1: $kill_process
$url_params = array(
'kill' => $process['id'],
'ajax_request' => true
);
$kill_process = 'server_status_processes.php'
. Url::getCommon($url_params);
$kill_process = 'href="server_status_processes.php" data-post="'
. Url::getCommon(['kill' => $process['id']], '') . '"';
$this->assertContains(
$kill_process,
$html