← All changes | classes/Visualizer/Source/Query.php +36 -10 3.10.13 → 4.0.8 View file →

		@@ -59,14 +59,31 @@
59	59	* @param int $chart_id The chart id.
60	60	* @param array $params Any additional parameters (e.g. for connecting to a remote db).
61	61	*/
62	62	public function __construct( $query = null, $chart_id = null, $params = null ) {
63		- $this->_query = $query;
	63	+ $this->_query = $this->strip_sql_comments( $query );
64	64	$this->_chart_id = $chart_id;
65	65	$this->_params = $params;
66	66	}
67	67
68	68	/**
	69	+ * Strips SQL comments from the query.
	70	+ *
	71	+ * @param string $query The query.
	72	+ *
	73	+ * @return string
	74	+ */
	75	+ private function strip_sql_comments( $query = '' ) {
	76	+ if ( empty( $query ) ) {
	77	+ return $query;
	78	+ }
	79	+
	80	+ // Regex https://regex101.com/r/xd5Vrg/1
	81	+ $sql_comments_regex = '@(--[^\r\n]*)|(\#[^\r\n]*)|(/\*[\w\W]*?(?=\*/)\*/)@ms';
	82	+ return trim( preg_replace( $sql_comments_regex, '', $query ) );
	83	+ }
	84	+
	85	+ /**
69	86	* Fetches information from source, parses it and builds series and data arrays.
70	87	*
71	88	* @param bool $as_html Should the result be fetched as an HTML table or as an object.
72	89	* @param bool $results_as_numeric_array Should the result be fetched as ARRAY_N instead of ARRAY_A.
		@@ -78,10 +95,10 @@
78	95	if ( empty( $this->_query ) ) {
79	96	return false;
80	97	}
81	98
82		- // only select queries allowed.
83		- if ( ! preg_match( '/\s*(\bselect\b)\s/i', $this->_query ) ) {
	99	+ // only select queries allowed. must start with SELECT keyword.
	100	+ if ( ! preg_match( '/^(\bselect\b)\s/i', $this->_query ) ) {
84	101	$this->_error = __( 'Only SELECT queries are allowed', 'visualizer' );
85	102	return false;
86	103	}
87	104
		@@ -86,16 +103,19 @@
86	103	}
87	104
88	105	// if previous check passed, check for disallowed query parts to prevent subqueries and other harmful queries.
89	106	$disallow_query_parts = array(
	107	+ 'CREATE',
	108	+ 'ALTER',
	109	+ 'TRUNCATE',
	110	+ 'DROP',
	111	+
90	112	'INSERT',
	113	+ 'DELETE',
91	114	'UPDATE',
92		- 'DELETE',
	115	+ 'REPLACE',
	116	+
93	117	'RENAME',
94		- 'DROP',
95		- 'CREATE',
96		- 'TRUNCATE',
97		- 'ALTER',
98	118	'COMMIT',
99	119	'ROLLBACK',
100	120	'MERGE',
101	121	'CALL',
		@@ -131,9 +151,10 @@
131	151	$results = array();
132	152	$headers = array();
133	153
134	154	// short circuit results for remote dbs.
135		- if ( false !== ( $remote_results = apply_filters( 'visualizer_db_query_execute', false, $this->_query, $as_html, $results_as_numeric_array, $raw_results, $this->_chart_id, $this->_params ) ) ) {
	155	+ $remote_results = apply_filters( 'visualizer_db_query_execute', false, $this->_query, $as_html, $results_as_numeric_array, $raw_results, $this->_chart_id, $this->_params );
	156	+ if ( false !== $remote_results ) {
136	157	$error = $remote_results['error'];
137	158	if ( empty( $error ) ) {
138	159	$results = $remote_results['results'];
139	160	$headers = $remote_results['headers'];
		@@ -157,8 +178,13 @@
157	178	if ( $raw_results ) {
158	179	return $rows;
159	180	}
160	181
	182	+ if ( $wpdb->last_error ) {
	183	+ $this->_error = $wpdb->last_error;
	184	+ return array();
	185	+ }
	186	+
161	187	if ( $rows ) {
162	188	$results = array();
163	189	$headers = array();
164	190	if ( $rows ) {
		@@ -172,9 +198,9 @@
172	198	$headers[] = array( 'type' => $this->get_col_type( $col_num++ ), 'label' => $k );
173	199	}
174	200	}
175	201	$results[] = $result;
176		- $row_num++;
	202	+ ++$row_num;
177	203	}
178	204	}
179	205
180	206	$this->_error = $wpdb->last_error;