-
Notifications
You must be signed in to change notification settings - Fork 18
security: SQLi and XSS hardening (main) #319
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -291,10 +291,10 @@ function syslog_statistics() { | |
| $time = date($date_format, strtotime($r['insert_time'])); | ||
|
|
||
| form_alternate_row(); | ||
| echo '<td>' . (get_request_var('host') != '-2' ? $r['host']:'-') . '</td>'; | ||
| echo '<td>' . (get_request_var('host') != '-2' ? htmle($r['host']):'-') . '</td>'; | ||
| echo '<td>' . (get_request_var('facility') != '-2' ? ucfirst($r['facility']):'-') . '</td>'; | ||
| echo '<td>' . (get_request_var('priority') != '-2' ? ucfirst($r['priority']):'-') . '</td>'; | ||
| echo '<td>' . (get_request_var('program') != '-2' ? ucfirst($r['program']):'-') . '</td>'; | ||
| echo '<td>' . (get_request_var('program') != '-2' ? htmle(ucfirst($r['program'])):'-') . '</td>'; | ||
|
Comment on lines
293
to
+297
|
||
| //echo '<td class="right">' . $r['insert_time'] . '</td>'; | ||
| echo '<td class="right">' . $time . '</td>'; | ||
| echo '<td class="right">' . number_format_i18n($r['records'], -1) . '</td>'; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -272,43 +272,56 @@ | |
| $smsalert = ''; | ||
| $th_sql = ''; | ||
|
|
||
| $params = array(); | ||
| if ($alert['type'] == 'facility') { | ||
| $sql = 'SELECT * FROM `' . $syslogdb_default . '`.`syslog_incoming` | ||
| WHERE ' . $syslog_incoming_config['facilityField'] . "='" . $alert['message'] . "' | ||
| AND status=" . $uniqueID; | ||
| WHERE ' . $syslog_incoming_config['facilityField'] . '=? | ||
| AND status=?'; | ||
| $params[] = $alert['message']; | ||
| $params[] = $uniqueID; | ||
| } else if ($alert['type'] == 'messageb') { | ||
| $sql = 'SELECT * FROM `' . $syslogdb_default . '`.`syslog_incoming` | ||
| WHERE ' . $syslog_incoming_config['textField'] . " | ||
| LIKE '" . $alert['message'] . "%' | ||
| AND status=" . $uniqueID; | ||
| WHERE ' . $syslog_incoming_config['textField'] . ' | ||
| LIKE ? | ||
| AND status=?'; | ||
| $params[] = $alert['message'] . '%'; | ||
| $params[] = $uniqueID; | ||
| } else if ($alert['type'] == 'messagec') { | ||
| $sql = 'SELECT * FROM `' . $syslogdb_default . '`.`syslog_incoming` | ||
| WHERE ' . $syslog_incoming_config['textField'] . " | ||
| LIKE '%" . $alert['message'] . "%' | ||
| AND status=" . $uniqueID; | ||
| WHERE ' . $syslog_incoming_config['textField'] . ' | ||
| LIKE ? | ||
| AND status=?'; | ||
| $params[] = '%' . $alert['message'] . '%'; | ||
| $params[] = $uniqueID; | ||
| } else if ($alert['type'] == 'messagee') { | ||
| $sql = 'SELECT * FROM `' . $syslogdb_default . '`.`syslog_incoming` | ||
| WHERE ' . $syslog_incoming_config['textField'] . " | ||
| LIKE '%" . $alert['message'] . "' | ||
| AND status=" . $uniqueID; | ||
| WHERE ' . $syslog_incoming_config['textField'] . ' | ||
| LIKE ? | ||
| AND status=?'; | ||
| $params[] = '%' . $alert['message']; | ||
| $params[] = $uniqueID; | ||
| } else if ($alert['type'] == 'host') { | ||
| $sql = 'SELECT * FROM `' . $syslogdb_default . '`.`syslog_incoming` | ||
| WHERE ' . $syslog_incoming_config['hostField'] . "='" . $alert['message'] . "' | ||
| AND status=" . $uniqueID; | ||
| WHERE ' . $syslog_incoming_config['hostField'] . '=? | ||
| AND status=?'; | ||
| $params[] = $alert['message']; | ||
| $params[] = $uniqueID; | ||
| } else if ($alert['type'] == 'sql') { | ||
| $sql = 'SELECT * FROM `' . $syslogdb_default . '`.`syslog_incoming` | ||
| WHERE (' . $alert['message'] . ') | ||
| AND status=' . $uniqueID; | ||
| WHERE (?) | ||
| AND status=?'; | ||
| $params[] = $alert['message']; | ||
| $params[] = $uniqueID; | ||
| } | ||
|
Comment on lines
309
to
315
|
||
|
|
||
| if ($sql != '') { | ||
| if ($alert['method'] == '1') { | ||
| $th_sql = str_replace('*', 'count(*)', $sql); | ||
| $count = syslog_db_fetch_cell($th_sql); | ||
| $count = syslog_db_fetch_cell_prepared($th_sql, $params); | ||
| } | ||
|
|
||
| if (($alert['method'] == '1' && $count >= $alert['num']) || ($alert['method'] == '0')) { | ||
| $at = syslog_db_fetch_assoc($sql); | ||
| $at = syslog_db_fetch_assoc_prepared($sql, $params); | ||
|
|
||
| /* get a date for the repeat alert */ | ||
| if ($alert['repeat_alert']) { | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new docblock for
syslog_db_fetch_assoc_prepared()says it "return[s] the first column of the first row", but the function name and implementation indicate it returns an associative result set (viadb_fetch_assoc_prepared). Please update the comment/@returns description to match the actual return type/behavior to avoid misleading future callers.