Move into nested docroot
This commit is contained in:
Rob Davies
parent
83a0d3a149
commit
c8b70abde9
13405 changed files with 0 additions and 0 deletions
1
web/core/modules/dblog/config/install/dblog.settings.yml
Normal file
1
web/core/modules/dblog/config/install/dblog.settings.yml
Normal file
|
|
@ -0,0 +1 @@
|
|||
row_limit: 1000
|
||||
9
web/core/modules/dblog/config/schema/dblog.schema.yml
Normal file
9
web/core/modules/dblog/config/schema/dblog.schema.yml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
# Schema for the configuration files of the dblog module.
|
||||
|
||||
dblog.settings:
|
||||
type: config_object
|
||||
label: 'Database logging settings'
|
||||
mapping:
|
||||
row_limit:
|
||||
type: integer
|
||||
label: 'Database log messages to keep'
|
||||
13
web/core/modules/dblog/config/schema/dblog.views.schema.yml
Normal file
13
web/core/modules/dblog/config/schema/dblog.views.schema.yml
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
# Schema for the views plugins of the Database Logging module.
|
||||
|
||||
views.field.dblog_message:
|
||||
type: views_field
|
||||
label: 'Log event message'
|
||||
mapping:
|
||||
replace_variables:
|
||||
type: boolean
|
||||
label: 'Replace variables'
|
||||
|
||||
views.field.dblog_operations:
|
||||
type: views_field
|
||||
label: 'Operation link markup'
|
||||
37
web/core/modules/dblog/css/dblog.module.css
Normal file
37
web/core/modules/dblog/css/dblog.module.css
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
/**
|
||||
* @file
|
||||
* Admin styles for the Database Logging module.
|
||||
*/
|
||||
.dblog-filter-form .form-item-type,
|
||||
.dblog-filter-form .form-item-severity {
|
||||
display: inline-block;
|
||||
margin: .1em .9em .1em .1em; /* LTR */
|
||||
max-width: 30%;
|
||||
}
|
||||
[dir="rtl"] .dblog-filter-form .form-item-type,
|
||||
[dir="rtl"] .dblog-filter-form .form-item-severity {
|
||||
margin: .1em .1em .1em .9em;
|
||||
}
|
||||
.dblog-filter-form .form-actions {
|
||||
display: inline-block;
|
||||
padding: 3ex 0 0;
|
||||
vertical-align: top;
|
||||
}
|
||||
.admin-dblog .icon,
|
||||
.admin-dblog .dblog-warning .icon,
|
||||
.admin-dblog .dblog-error .icon,
|
||||
.admin-dblog .dblog-critical .icon,
|
||||
.admin-dblog .dblog-alert .icon,
|
||||
.admin-dblog .dblog-emergency .icon {
|
||||
background: no-repeat center;
|
||||
width: 16px;
|
||||
}
|
||||
.admin-dblog .dblog-warning .icon {
|
||||
background-image: url(../../../misc/icons/e29700/warning.svg);
|
||||
}
|
||||
.admin-dblog .dblog-error .icon,
|
||||
.admin-dblog .dblog-critical .icon,
|
||||
.admin-dblog .dblog-alert .icon,
|
||||
.admin-dblog .dblog-emergency .icon {
|
||||
background-image: url(../../../misc/icons/e32700/error.svg);
|
||||
}
|
||||
43
web/core/modules/dblog/dblog.admin.inc
Normal file
43
web/core/modules/dblog/dblog.admin.inc
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Administrative page callbacks for the Database Logging module.
|
||||
*/
|
||||
|
||||
use Drupal\Core\Logger\RfcLogLevel;
|
||||
|
||||
/**
|
||||
* Creates a list of database log administration filters that can be applied.
|
||||
*
|
||||
* @return array
|
||||
* Associative array of filters. The top-level keys are used as the form
|
||||
* element names for the filters, and the values are arrays with the following
|
||||
* elements:
|
||||
* - title: Title of the filter.
|
||||
* - where: The filter condition.
|
||||
* - options: Array of options for the select list for the filter.
|
||||
*/
|
||||
function dblog_filters() {
|
||||
$filters = array();
|
||||
|
||||
foreach (_dblog_get_message_types() as $type) {
|
||||
$types[$type] = t($type);
|
||||
}
|
||||
|
||||
if (!empty($types)) {
|
||||
$filters['type'] = array(
|
||||
'title' => t('Type'),
|
||||
'where' => "w.type = ?",
|
||||
'options' => $types,
|
||||
);
|
||||
}
|
||||
|
||||
$filters['severity'] = array(
|
||||
'title' => t('Severity'),
|
||||
'where' => 'w.severity = ?',
|
||||
'options' => RfcLogLevel::getLevels(),
|
||||
);
|
||||
|
||||
return $filters;
|
||||
}
|
||||
7
web/core/modules/dblog/dblog.info.yml
Normal file
7
web/core/modules/dblog/dblog.info.yml
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
name: 'Database Logging'
|
||||
type: module
|
||||
description: 'Logs and records system events to the database.'
|
||||
package: Core
|
||||
version: VERSION
|
||||
core: 8.x
|
||||
configure: system.logging_settings
|
||||
92
web/core/modules/dblog/dblog.install
Normal file
92
web/core/modules/dblog/dblog.install
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Install, update and uninstall functions for the dblog module.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Implements hook_schema().
|
||||
*/
|
||||
function dblog_schema() {
|
||||
$schema['watchdog'] = array(
|
||||
'description' => 'Table that contains logs of all system events.',
|
||||
'fields' => array(
|
||||
'wid' => array(
|
||||
'type' => 'serial',
|
||||
'not null' => TRUE,
|
||||
'description' => 'Primary Key: Unique watchdog event ID.',
|
||||
),
|
||||
'uid' => array(
|
||||
'type' => 'int',
|
||||
'unsigned' => TRUE,
|
||||
'not null' => TRUE,
|
||||
'default' => 0,
|
||||
'description' => 'The {users}.uid of the user who triggered the event.',
|
||||
),
|
||||
'type' => array(
|
||||
'type' => 'varchar_ascii',
|
||||
'length' => 64,
|
||||
'not null' => TRUE,
|
||||
'default' => '',
|
||||
'description' => 'Type of log message, for example "user" or "page not found."',
|
||||
),
|
||||
'message' => array(
|
||||
'type' => 'text',
|
||||
'not null' => TRUE,
|
||||
'size' => 'big',
|
||||
'description' => 'Text of log message to be passed into the t() function.',
|
||||
),
|
||||
'variables' => array(
|
||||
'type' => 'blob',
|
||||
'not null' => TRUE,
|
||||
'size' => 'big',
|
||||
'description' => 'Serialized array of variables that match the message string and that is passed into the t() function.',
|
||||
),
|
||||
'severity' => array(
|
||||
'type' => 'int',
|
||||
'unsigned' => TRUE,
|
||||
'not null' => TRUE,
|
||||
'default' => 0,
|
||||
'size' => 'tiny',
|
||||
'description' => 'The severity level of the event; ranges from 0 (Emergency) to 7 (Debug)',
|
||||
),
|
||||
'link' => array(
|
||||
'type' => 'text',
|
||||
'not null' => FALSE,
|
||||
'description' => 'Link to view the result of the event.',
|
||||
),
|
||||
'location' => array(
|
||||
'type' => 'text',
|
||||
'not null' => TRUE,
|
||||
'description' => 'URL of the origin of the event.',
|
||||
),
|
||||
'referer' => array(
|
||||
'type' => 'text',
|
||||
'not null' => FALSE,
|
||||
'description' => 'URL of referring page.',
|
||||
),
|
||||
'hostname' => array(
|
||||
'type' => 'varchar_ascii',
|
||||
'length' => 128,
|
||||
'not null' => TRUE,
|
||||
'default' => '',
|
||||
'description' => 'Hostname of the user who triggered the event.',
|
||||
),
|
||||
'timestamp' => array(
|
||||
'type' => 'int',
|
||||
'not null' => TRUE,
|
||||
'default' => 0,
|
||||
'description' => 'Unix timestamp of when event occurred.',
|
||||
),
|
||||
),
|
||||
'primary key' => array('wid'),
|
||||
'indexes' => array(
|
||||
'type' => array('type'),
|
||||
'uid' => array('uid'),
|
||||
'severity' => array('severity'),
|
||||
),
|
||||
);
|
||||
|
||||
return $schema;
|
||||
}
|
||||
5
web/core/modules/dblog/dblog.libraries.yml
Normal file
5
web/core/modules/dblog/dblog.libraries.yml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
drupal.dblog:
|
||||
version: VERSION
|
||||
css:
|
||||
component:
|
||||
css/dblog.module.css: {}
|
||||
16
web/core/modules/dblog/dblog.links.menu.yml
Normal file
16
web/core/modules/dblog/dblog.links.menu.yml
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
dblog.overview:
|
||||
title: 'Recent log messages'
|
||||
parent: system.admin_reports
|
||||
description: 'View events that have recently been logged.'
|
||||
route_name: dblog.overview
|
||||
weight: -1
|
||||
dblog.page_not_found:
|
||||
title: 'Top ''page not found'' errors'
|
||||
route_name: dblog.page_not_found
|
||||
parent: system.admin_reports
|
||||
description: 'View ''page not found'' errors (404s).'
|
||||
dblog.access_denied:
|
||||
title: 'Top ''access denied'' errors'
|
||||
route_name: dblog.access_denied
|
||||
description: 'View ''access denied'' errors (403s).'
|
||||
parent: system.admin_reports
|
||||
8
web/core/modules/dblog/dblog.links.task.yml
Normal file
8
web/core/modules/dblog/dblog.links.task.yml
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
dblog.view_logs:
|
||||
title: 'View'
|
||||
route_name: dblog.overview
|
||||
base_route: dblog.overview
|
||||
dblog.clear_logs:
|
||||
title: 'Delete'
|
||||
route_name: dblog.confirm
|
||||
base_route: dblog.overview
|
||||
117
web/core/modules/dblog/dblog.module
Normal file
117
web/core/modules/dblog/dblog.module
Normal file
|
|
@ -0,0 +1,117 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* System monitoring and logging for administrators.
|
||||
*
|
||||
* The Database Logging module monitors your site and keeps a list of recorded
|
||||
* events containing usage and performance data, errors, warnings, and similar
|
||||
* operational information.
|
||||
*/
|
||||
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
use Drupal\Core\Routing\RouteMatchInterface;
|
||||
use Drupal\Core\StringTranslation\TranslatableMarkup;
|
||||
|
||||
/**
|
||||
* Implements hook_help().
|
||||
*/
|
||||
function dblog_help($route_name, RouteMatchInterface $route_match) {
|
||||
switch ($route_name) {
|
||||
case 'help.page.dblog':
|
||||
$output = '';
|
||||
$output .= '<h3>' . t('About') . '</h3>';
|
||||
$output .= '<p>' . t('The Database Logging module logs system events in the Drupal database. For more information, see the <a href=":dblog">online documentation for the Database Logging module</a>.', array(':dblog' => 'https://www.drupal.org/documentation/modules/dblog')) . '</p>';
|
||||
$output .= '<h3>' . t('Uses') . '</h3>';
|
||||
$output .= '<dl>';
|
||||
$output .= '<dt>' . t('Monitoring your site') . '</dt>';
|
||||
$output .= '<dd>' . t('The Database Logging module allows you to view an event log on the <a href=":dblog">Recent log messages</a> page. The log is a chronological list of recorded events containing usage data, performance data, errors, warnings and operational information. Administrators should check the log on a regular basis to ensure their site is working properly.', array(':dblog' => \Drupal::url('dblog.overview'))) . '</dd>';
|
||||
$output .= '<dt>' . t('Debugging site problems') . '</dt>';
|
||||
$output .= '<dd>' . t('In case of errors or problems with the site, the <a href=":dblog">Recent log messages</a> page can be useful for debugging, since it shows the sequence of events. The log messages include usage information, warnings, and errors.', array(':dblog' => \Drupal::url('dblog.overview'))) . '</dd>';
|
||||
$output .= '</dl>';
|
||||
return $output;
|
||||
|
||||
case 'dblog.overview':
|
||||
return '<p>' . t('The Database Logging module logs system events in the Drupal database. Monitor your site or debug site problems on this page.') . '</p>';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_menu_links_discovered_alter().
|
||||
*/
|
||||
function dblog_menu_links_discovered_alter(&$links) {
|
||||
if (\Drupal::moduleHandler()->moduleExists('search')) {
|
||||
$links['dblog.search'] = array(
|
||||
'title' => new TranslatableMarkup('Top search phrases'),
|
||||
'route_name' => 'dblog.search',
|
||||
'description' => new TranslatableMarkup('View most popular search phrases.'),
|
||||
'parent' => 'system.admin_reports',
|
||||
);
|
||||
}
|
||||
|
||||
return $links;
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_cron().
|
||||
*
|
||||
* Controls the size of the log table, paring it to 'dblog_row_limit' messages.
|
||||
*/
|
||||
function dblog_cron() {
|
||||
// Cleanup the watchdog table.
|
||||
$row_limit = \Drupal::config('dblog.settings')->get('row_limit');
|
||||
|
||||
// For row limit n, get the wid of the nth row in descending wid order.
|
||||
// Counting the most recent n rows avoids issues with wid number sequences,
|
||||
// e.g. auto_increment value > 1 or rows deleted directly from the table.
|
||||
if ($row_limit > 0) {
|
||||
$min_row = db_select('watchdog', 'w')
|
||||
->fields('w', array('wid'))
|
||||
->orderBy('wid', 'DESC')
|
||||
->range($row_limit - 1, 1)
|
||||
->execute()->fetchField();
|
||||
|
||||
// Delete all table entries older than the nth row, if nth row was found.
|
||||
if ($min_row) {
|
||||
db_delete('watchdog')
|
||||
->condition('wid', $min_row, '<')
|
||||
->execute();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gathers a list of uniquely defined database log message types.
|
||||
*
|
||||
* @return array
|
||||
* List of uniquely defined database log message types.
|
||||
*/
|
||||
function _dblog_get_message_types() {
|
||||
return db_query('SELECT DISTINCT(type) FROM {watchdog} ORDER BY type')
|
||||
->fetchAllKeyed(0, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements hook_form_FORM_ID_alter() for system_logging_settings().
|
||||
*/
|
||||
function dblog_form_system_logging_settings_alter(&$form, FormStateInterface $form_state) {
|
||||
$row_limits = array(100, 1000, 10000, 100000, 1000000);
|
||||
$form['dblog_row_limit'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => t('Database log messages to keep'),
|
||||
'#default_value' => \Drupal::configFactory()->getEditable('dblog.settings')->get('row_limit'),
|
||||
'#options' => array(0 => t('All')) + array_combine($row_limits, $row_limits),
|
||||
'#description' => t('The maximum number of messages to keep in the database log. Requires a <a href=":cron">cron maintenance task</a>.', array(':cron' => \Drupal::url('system.status')))
|
||||
);
|
||||
|
||||
$form['#submit'][] = 'dblog_logging_settings_submit';
|
||||
}
|
||||
|
||||
/**
|
||||
* Form submission handler for system_logging_settings().
|
||||
*
|
||||
* @see dblog_form_system_logging_settings_alter()
|
||||
*/
|
||||
function dblog_logging_settings_submit($form, FormStateInterface $form_state) {
|
||||
\Drupal::configFactory()->getEditable('dblog.settings')->set('row_limit', $form_state->getValue('dblog_row_limit'))->save();
|
||||
}
|
||||
51
web/core/modules/dblog/dblog.routing.yml
Normal file
51
web/core/modules/dblog/dblog.routing.yml
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
dblog.overview:
|
||||
path: '/admin/reports/dblog'
|
||||
defaults:
|
||||
_controller: '\Drupal\dblog\Controller\DbLogController::overview'
|
||||
_title: 'Recent log messages'
|
||||
requirements:
|
||||
_permission: 'access site reports'
|
||||
|
||||
dblog.confirm:
|
||||
path: '/admin/reports/dblog/confirm'
|
||||
defaults:
|
||||
_form: '\Drupal\dblog\Form\DblogClearLogConfirmForm'
|
||||
_title: 'Confirm delete recent log messages'
|
||||
requirements:
|
||||
_permission: 'access site reports'
|
||||
|
||||
dblog.event:
|
||||
path: '/admin/reports/dblog/event/{event_id}'
|
||||
defaults:
|
||||
_controller: '\Drupal\dblog\Controller\DbLogController::eventDetails'
|
||||
_title: 'Details'
|
||||
requirements:
|
||||
_permission: 'access site reports'
|
||||
|
||||
dblog.page_not_found:
|
||||
path: '/admin/reports/page-not-found'
|
||||
defaults:
|
||||
_title: "Top 'page not found' errors"
|
||||
_controller: '\Drupal\dblog\Controller\DbLogController::topLogMessages'
|
||||
type: 'page not found'
|
||||
requirements:
|
||||
_permission: 'access site reports'
|
||||
|
||||
dblog.access_denied:
|
||||
path: '/admin/reports/access-denied'
|
||||
defaults:
|
||||
_title: "Top 'access denied' errors"
|
||||
_controller: '\Drupal\dblog\Controller\DbLogController::topLogMessages'
|
||||
type: 'access denied'
|
||||
requirements:
|
||||
_permission: 'access site reports'
|
||||
|
||||
dblog.search:
|
||||
path: '/admin/reports/search'
|
||||
defaults:
|
||||
_controller: '\Drupal\dblog\Controller\DbLogController::topLogMessages'
|
||||
_title: 'Top search phrases'
|
||||
type: 'search'
|
||||
requirements:
|
||||
_module_dependencies: 'search'
|
||||
_permission: 'access site reports'
|
||||
7
web/core/modules/dblog/dblog.services.yml
Normal file
7
web/core/modules/dblog/dblog.services.yml
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
services:
|
||||
logger.dblog:
|
||||
class: Drupal\dblog\Logger\DbLog
|
||||
arguments: ['@database', '@logger.log_message_parser']
|
||||
tags:
|
||||
- { name: logger }
|
||||
- { name: backend_overridable }
|
||||
216
web/core/modules/dblog/dblog.views.inc
Normal file
216
web/core/modules/dblog/dblog.views.inc
Normal file
|
|
@ -0,0 +1,216 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Provide views data for dblog.module.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Implements hook_views_data().
|
||||
*/
|
||||
function dblog_views_data() {
|
||||
$data = array();
|
||||
|
||||
$data['watchdog']['table']['group'] = t('Watchdog');
|
||||
$data['watchdog']['table']['wizard_id'] = 'watchdog';
|
||||
|
||||
$data['watchdog']['table']['base'] = array(
|
||||
'field' => 'wid',
|
||||
'title' => t('Log entries'),
|
||||
'help' => t('Contains a list of log entries.'),
|
||||
);
|
||||
|
||||
$data['watchdog']['wid'] = array(
|
||||
'title' => t('WID'),
|
||||
'help' => t('Unique watchdog event ID.'),
|
||||
'field' => array(
|
||||
'id' => 'numeric',
|
||||
),
|
||||
'filter' => array(
|
||||
'id' => 'numeric',
|
||||
),
|
||||
'argument' => array(
|
||||
'id' => 'numeric',
|
||||
),
|
||||
'sort' => array(
|
||||
'id' => 'standard',
|
||||
),
|
||||
);
|
||||
|
||||
$data['watchdog']['uid'] = array(
|
||||
'title' => t('UID'),
|
||||
'help' => t('The user ID of the user on which the log entry was written..'),
|
||||
'field' => array(
|
||||
'id' => 'numeric',
|
||||
),
|
||||
'filter' => array(
|
||||
'id' => 'numeric',
|
||||
),
|
||||
'argument' => array(
|
||||
'id' => 'numeric',
|
||||
),
|
||||
'relationship' => array(
|
||||
'title' => t('User'),
|
||||
'help' => t('The user on which the log entry as written.'),
|
||||
'base' => 'users',
|
||||
'base field' => 'uid',
|
||||
'id' => 'standard',
|
||||
),
|
||||
);
|
||||
|
||||
$data['watchdog']['type'] = array(
|
||||
'title' => t('Type'),
|
||||
'help' => t('The type of the log entry, for example "user" or "page not found".'),
|
||||
'field' => array(
|
||||
'id' => 'standard',
|
||||
),
|
||||
'argument' => array(
|
||||
'id' => 'string',
|
||||
),
|
||||
'filter' => array(
|
||||
'id' => 'in_operator',
|
||||
'options callback' => '_dblog_get_message_types',
|
||||
),
|
||||
'sort' => array(
|
||||
'id' => 'standard',
|
||||
),
|
||||
);
|
||||
|
||||
$data['watchdog']['message'] = array(
|
||||
'title' => t('Message'),
|
||||
'help' => t('The actual message of the log entry.'),
|
||||
'field' => array(
|
||||
'id' => 'dblog_message',
|
||||
),
|
||||
'argument' => array(
|
||||
'id' => 'string',
|
||||
),
|
||||
'filter' => array(
|
||||
'id' => 'string',
|
||||
),
|
||||
'sort' => array(
|
||||
'id' => 'standard',
|
||||
),
|
||||
);
|
||||
|
||||
$data['watchdog']['variables'] = array(
|
||||
'title' => t('Variables'),
|
||||
'help' => t('The variables of the log entry in a serialized format.'),
|
||||
'field' => array(
|
||||
'id' => 'serialized',
|
||||
'click sortable' => FALSE,
|
||||
),
|
||||
'argument' => array(
|
||||
'id' => 'string',
|
||||
),
|
||||
'filter' => array(
|
||||
'id' => 'string',
|
||||
),
|
||||
'sort' => array(
|
||||
'id' => 'standard',
|
||||
),
|
||||
);
|
||||
|
||||
$data['watchdog']['severity'] = array(
|
||||
'title' => t('Severity level'),
|
||||
'help' => t('The severity level of the event; ranges from 0 (Emergency) to 7 (Debug).'),
|
||||
'field' => array(
|
||||
'id' => 'machine_name',
|
||||
'options callback' => 'Drupal\dblog\Controller\DbLogController::getLogLevelClassMap',
|
||||
),
|
||||
'filter' => array(
|
||||
'id' => 'in_operator',
|
||||
'options callback' => 'Drupal\dblog\Controller\DbLogController::getLogLevelClassMap',
|
||||
),
|
||||
'sort' => array(
|
||||
'id' => 'standard',
|
||||
),
|
||||
);
|
||||
|
||||
$data['watchdog']['link'] = array(
|
||||
'title' => t('Operations'),
|
||||
'help' => t('Operation links for the event.'),
|
||||
'field' => array(
|
||||
'id' => 'dblog_operations',
|
||||
),
|
||||
'argument' => array(
|
||||
'id' => 'string',
|
||||
),
|
||||
'filter' => array(
|
||||
'id' => 'string',
|
||||
),
|
||||
'sort' => array(
|
||||
'id' => 'standard',
|
||||
),
|
||||
);
|
||||
|
||||
$data['watchdog']['location'] = array(
|
||||
'title' => t('Location'),
|
||||
'help' => t('URL of the origin of the event.'),
|
||||
'field' => array(
|
||||
'id' => 'standard',
|
||||
),
|
||||
'argument' => array(
|
||||
'id' => 'string',
|
||||
),
|
||||
'filter' => array(
|
||||
'id' => 'string',
|
||||
),
|
||||
'sort' => array(
|
||||
'id' => 'standard',
|
||||
),
|
||||
);
|
||||
|
||||
$data['watchdog']['referer'] = array(
|
||||
'title' => t('Referer'),
|
||||
'help' => t('URL of the previous page.'),
|
||||
'field' => array(
|
||||
'id' => 'standard',
|
||||
),
|
||||
'argument' => array(
|
||||
'id' => 'string',
|
||||
),
|
||||
'filter' => array(
|
||||
'id' => 'string',
|
||||
),
|
||||
'sort' => array(
|
||||
'id' => 'standard',
|
||||
),
|
||||
);
|
||||
|
||||
$data['watchdog']['hostname'] = array(
|
||||
'title' => t('Hostname'),
|
||||
'help' => t('Hostname of the user who triggered the event.'),
|
||||
'field' => array(
|
||||
'id' => 'standard',
|
||||
),
|
||||
'argument' => array(
|
||||
'id' => 'string',
|
||||
),
|
||||
'filter' => array(
|
||||
'id' => 'string',
|
||||
),
|
||||
'sort' => array(
|
||||
'id' => 'standard',
|
||||
),
|
||||
);
|
||||
|
||||
$data['watchdog']['timestamp'] = array(
|
||||
'title' => t('Timestamp'),
|
||||
'help' => t('Date when the event occurred.'),
|
||||
'field' => array(
|
||||
'id' => 'date',
|
||||
),
|
||||
'argument' => array(
|
||||
'id' => 'date',
|
||||
),
|
||||
'filter' => array(
|
||||
'id' => 'date',
|
||||
),
|
||||
'sort' => array(
|
||||
'id' => 'date',
|
||||
),
|
||||
);
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
id: d6_dblog_settings
|
||||
label: Database logging configuration
|
||||
migration_tags:
|
||||
- Drupal 6
|
||||
source:
|
||||
plugin: variable
|
||||
variables:
|
||||
- dblog_row_limit
|
||||
process:
|
||||
row_limit: dblog_row_limit
|
||||
destination:
|
||||
plugin: config
|
||||
config_name: dblog.settings
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
id: d7_dblog_settings
|
||||
label: Database logging configuration
|
||||
migration_tags:
|
||||
- Drupal 7
|
||||
source:
|
||||
plugin: variable
|
||||
variables:
|
||||
- dblog_row_limit
|
||||
process:
|
||||
row_limit: dblog_row_limit
|
||||
destination:
|
||||
plugin: config
|
||||
config_name: dblog.settings
|
||||
425
web/core/modules/dblog/src/Controller/DbLogController.php
Normal file
425
web/core/modules/dblog/src/Controller/DbLogController.php
Normal file
|
|
@ -0,0 +1,425 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\dblog\Controller;
|
||||
|
||||
use Drupal\Component\Utility\Html;
|
||||
use Drupal\Component\Utility\Unicode;
|
||||
use Drupal\Component\Utility\Xss;
|
||||
use Drupal\Core\Controller\ControllerBase;
|
||||
use Drupal\Core\Database\Connection;
|
||||
use Drupal\Core\Datetime\DateFormatterInterface;
|
||||
use Drupal\Core\Extension\ModuleHandlerInterface;
|
||||
use Drupal\Core\Form\FormBuilderInterface;
|
||||
use Drupal\Core\Logger\RfcLogLevel;
|
||||
use Drupal\Core\Url;
|
||||
use Drupal\user\Entity\User;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
/**
|
||||
* Returns responses for dblog routes.
|
||||
*/
|
||||
class DbLogController extends ControllerBase {
|
||||
|
||||
/**
|
||||
* The database service.
|
||||
*
|
||||
* @var \Drupal\Core\Database\Connection
|
||||
*/
|
||||
protected $database;
|
||||
|
||||
/**
|
||||
* The module handler service.
|
||||
*
|
||||
* @var \Drupal\Core\Extension\ModuleHandlerInterface
|
||||
*/
|
||||
protected $moduleHandler;
|
||||
|
||||
/**
|
||||
* The date formatter service.
|
||||
*
|
||||
* @var \Drupal\Core\Datetime\DateFormatterInterface
|
||||
*/
|
||||
protected $dateFormatter;
|
||||
|
||||
/**
|
||||
* The form builder service.
|
||||
*
|
||||
* @var \Drupal\Core\Form\FormBuilderInterface
|
||||
*/
|
||||
protected $formBuilder;
|
||||
|
||||
/**
|
||||
* The user storage.
|
||||
*
|
||||
* @var \Drupal\user\UserStorageInterface
|
||||
*/
|
||||
protected $userStorage;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function create(ContainerInterface $container) {
|
||||
return new static(
|
||||
$container->get('database'),
|
||||
$container->get('module_handler'),
|
||||
$container->get('date.formatter'),
|
||||
$container->get('form_builder')
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs a DbLogController object.
|
||||
*
|
||||
* @param \Drupal\Core\Database\Connection $database
|
||||
* A database connection.
|
||||
* @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
|
||||
* A module handler.
|
||||
* @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
|
||||
* The date formatter service.
|
||||
* @param \Drupal\Core\Form\FormBuilderInterface $form_builder
|
||||
* The form builder service.
|
||||
*/
|
||||
public function __construct(Connection $database, ModuleHandlerInterface $module_handler, DateFormatterInterface $date_formatter, FormBuilderInterface $form_builder) {
|
||||
$this->database = $database;
|
||||
$this->moduleHandler = $module_handler;
|
||||
$this->dateFormatter = $date_formatter;
|
||||
$this->formBuilder = $form_builder;
|
||||
$this->userStorage = $this->entityManager()->getStorage('user');
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets an array of log level classes.
|
||||
*
|
||||
* @return array
|
||||
* An array of log level classes.
|
||||
*/
|
||||
public static function getLogLevelClassMap() {
|
||||
return array(
|
||||
RfcLogLevel::DEBUG => 'dblog-debug',
|
||||
RfcLogLevel::INFO => 'dblog-info',
|
||||
RfcLogLevel::NOTICE => 'dblog-notice',
|
||||
RfcLogLevel::WARNING => 'dblog-warning',
|
||||
RfcLogLevel::ERROR => 'dblog-error',
|
||||
RfcLogLevel::CRITICAL => 'dblog-critical',
|
||||
RfcLogLevel::ALERT => 'dblog-alert',
|
||||
RfcLogLevel::EMERGENCY => 'dblog-emergency',
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a listing of database log messages.
|
||||
*
|
||||
* Messages are truncated at 56 chars.
|
||||
* Full-length messages can be viewed on the message details page.
|
||||
*
|
||||
* @return array
|
||||
* A render array as expected by drupal_render().
|
||||
*
|
||||
* @see dblog_clear_log_form()
|
||||
* @see dblog_event()
|
||||
*/
|
||||
public function overview() {
|
||||
|
||||
$filter = $this->buildFilterQuery();
|
||||
$rows = array();
|
||||
|
||||
$classes = static::getLogLevelClassMap();
|
||||
|
||||
$this->moduleHandler->loadInclude('dblog', 'admin.inc');
|
||||
|
||||
$build['dblog_filter_form'] = $this->formBuilder->getForm('Drupal\dblog\Form\DblogFilterForm');
|
||||
|
||||
$header = array(
|
||||
// Icon column.
|
||||
'',
|
||||
array(
|
||||
'data' => $this->t('Type'),
|
||||
'field' => 'w.type',
|
||||
'class' => array(RESPONSIVE_PRIORITY_MEDIUM)),
|
||||
array(
|
||||
'data' => $this->t('Date'),
|
||||
'field' => 'w.wid',
|
||||
'sort' => 'desc',
|
||||
'class' => array(RESPONSIVE_PRIORITY_LOW)),
|
||||
$this->t('Message'),
|
||||
array(
|
||||
'data' => $this->t('User'),
|
||||
'field' => 'ufd.name',
|
||||
'class' => array(RESPONSIVE_PRIORITY_MEDIUM)),
|
||||
array(
|
||||
'data' => $this->t('Operations'),
|
||||
'class' => array(RESPONSIVE_PRIORITY_LOW)),
|
||||
);
|
||||
|
||||
$query = $this->database->select('watchdog', 'w')
|
||||
->extend('\Drupal\Core\Database\Query\PagerSelectExtender')
|
||||
->extend('\Drupal\Core\Database\Query\TableSortExtender');
|
||||
$query->fields('w', array(
|
||||
'wid',
|
||||
'uid',
|
||||
'severity',
|
||||
'type',
|
||||
'timestamp',
|
||||
'message',
|
||||
'variables',
|
||||
'link',
|
||||
));
|
||||
$query->leftJoin('users_field_data', 'ufd', 'w.uid = ufd.uid');
|
||||
|
||||
if (!empty($filter['where'])) {
|
||||
$query->where($filter['where'], $filter['args']);
|
||||
}
|
||||
$result = $query
|
||||
->limit(50)
|
||||
->orderByHeader($header)
|
||||
->execute();
|
||||
|
||||
foreach ($result as $dblog) {
|
||||
$message = $this->formatMessage($dblog);
|
||||
if ($message && isset($dblog->wid)) {
|
||||
$title = Unicode::truncate(Html::decodeEntities(strip_tags($message)), 256, TRUE, TRUE);
|
||||
$log_text = Unicode::truncate($title, 56, TRUE, TRUE);
|
||||
// The link generator will escape any unsafe HTML entities in the final
|
||||
// text.
|
||||
$message = $this->l($log_text, new Url('dblog.event', array('event_id' => $dblog->wid), array(
|
||||
'attributes' => array(
|
||||
// Provide a title for the link for useful hover hints. The
|
||||
// Attribute object will escape any unsafe HTML entities in the
|
||||
// final text.
|
||||
'title' => $title,
|
||||
),
|
||||
)));
|
||||
}
|
||||
$username = array(
|
||||
'#theme' => 'username',
|
||||
'#account' => $this->userStorage->load($dblog->uid),
|
||||
);
|
||||
$rows[] = array(
|
||||
'data' => array(
|
||||
// Cells.
|
||||
array('class' => array('icon')),
|
||||
$this->t($dblog->type),
|
||||
$this->dateFormatter->format($dblog->timestamp, 'short'),
|
||||
$message,
|
||||
array('data' => $username),
|
||||
array('data' => array('#markup' => $dblog->link)),
|
||||
),
|
||||
// Attributes for table row.
|
||||
'class' => array(Html::getClass('dblog-' . $dblog->type), $classes[$dblog->severity]),
|
||||
);
|
||||
}
|
||||
|
||||
$build['dblog_table'] = array(
|
||||
'#type' => 'table',
|
||||
'#header' => $header,
|
||||
'#rows' => $rows,
|
||||
'#attributes' => array('id' => 'admin-dblog', 'class' => array('admin-dblog')),
|
||||
'#empty' => $this->t('No log messages available.'),
|
||||
'#attached' => array(
|
||||
'library' => array('dblog/drupal.dblog'),
|
||||
),
|
||||
);
|
||||
$build['dblog_pager'] = array('#type' => 'pager');
|
||||
|
||||
return $build;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays details about a specific database log message.
|
||||
*
|
||||
* @param int $event_id
|
||||
* Unique ID of the database log message.
|
||||
*
|
||||
* @return array
|
||||
* If the ID is located in the Database Logging table, a build array in the
|
||||
* format expected by drupal_render();
|
||||
*/
|
||||
public function eventDetails($event_id) {
|
||||
$build = array();
|
||||
if ($dblog = $this->database->query('SELECT w.*, u.uid FROM {watchdog} w LEFT JOIN {users} u ON u.uid = w.uid WHERE w.wid = :id', array(':id' => $event_id))->fetchObject()) {
|
||||
$severity = RfcLogLevel::getLevels();
|
||||
$message = $this->formatMessage($dblog);
|
||||
$username = array(
|
||||
'#theme' => 'username',
|
||||
'#account' => $dblog->uid ? $this->userStorage->load($dblog->uid) : User::getAnonymousUser(),
|
||||
);
|
||||
$rows = array(
|
||||
array(
|
||||
array('data' => $this->t('Type'), 'header' => TRUE),
|
||||
$this->t($dblog->type),
|
||||
),
|
||||
array(
|
||||
array('data' => $this->t('Date'), 'header' => TRUE),
|
||||
$this->dateFormatter->format($dblog->timestamp, 'long'),
|
||||
),
|
||||
array(
|
||||
array('data' => $this->t('User'), 'header' => TRUE),
|
||||
array('data' => $username),
|
||||
),
|
||||
array(
|
||||
array('data' => $this->t('Location'), 'header' => TRUE),
|
||||
$this->l($dblog->location, $dblog->location ? Url::fromUri($dblog->location) : Url::fromRoute('<none>')),
|
||||
),
|
||||
array(
|
||||
array('data' => $this->t('Referrer'), 'header' => TRUE),
|
||||
$this->l($dblog->referer, $dblog->referer ? Url::fromUri($dblog->referer) : Url::fromRoute('<none>')),
|
||||
),
|
||||
array(
|
||||
array('data' => $this->t('Message'), 'header' => TRUE),
|
||||
$message,
|
||||
),
|
||||
array(
|
||||
array('data' => $this->t('Severity'), 'header' => TRUE),
|
||||
$severity[$dblog->severity],
|
||||
),
|
||||
array(
|
||||
array('data' => $this->t('Hostname'), 'header' => TRUE),
|
||||
$dblog->hostname,
|
||||
),
|
||||
array(
|
||||
array('data' => $this->t('Operations'), 'header' => TRUE),
|
||||
array('data' => array('#markup' => $dblog->link)),
|
||||
),
|
||||
);
|
||||
$build['dblog_table'] = array(
|
||||
'#type' => 'table',
|
||||
'#rows' => $rows,
|
||||
'#attributes' => array('class' => array('dblog-event')),
|
||||
'#attached' => array(
|
||||
'library' => array('dblog/drupal.dblog'),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
return $build;
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds a query for database log administration filters based on session.
|
||||
*
|
||||
* @return array
|
||||
* An associative array with keys 'where' and 'args'.
|
||||
*/
|
||||
protected function buildFilterQuery() {
|
||||
if (empty($_SESSION['dblog_overview_filter'])) {
|
||||
return;
|
||||
}
|
||||
|
||||
$this->moduleHandler->loadInclude('dblog', 'admin.inc');
|
||||
|
||||
$filters = dblog_filters();
|
||||
|
||||
// Build query.
|
||||
$where = $args = array();
|
||||
foreach ($_SESSION['dblog_overview_filter'] as $key => $filter) {
|
||||
$filter_where = array();
|
||||
foreach ($filter as $value) {
|
||||
$filter_where[] = $filters[$key]['where'];
|
||||
$args[] = $value;
|
||||
}
|
||||
if (!empty($filter_where)) {
|
||||
$where[] = '(' . implode(' OR ', $filter_where) . ')';
|
||||
}
|
||||
}
|
||||
$where = !empty($where) ? implode(' AND ', $where) : '';
|
||||
|
||||
return array(
|
||||
'where' => $where,
|
||||
'args' => $args,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Formats a database log message.
|
||||
*
|
||||
* @param object $row
|
||||
* The record from the watchdog table. The object properties are: wid, uid,
|
||||
* severity, type, timestamp, message, variables, link, name.
|
||||
*
|
||||
* @return string|\Drupal\Core\StringTranslation\TranslatableMarkup|false
|
||||
* The formatted log message or FALSE if the message or variables properties
|
||||
* are not set.
|
||||
*/
|
||||
public function formatMessage($row) {
|
||||
// Check for required properties.
|
||||
if (isset($row->message, $row->variables)) {
|
||||
$variables = @unserialize($row->variables);
|
||||
// Messages without variables or user specified text.
|
||||
if ($variables === NULL) {
|
||||
$message = Xss::filterAdmin($row->message);
|
||||
}
|
||||
elseif (!is_array($variables)) {
|
||||
$message = $this->t('Log data is corrupted and cannot be unserialized: @message', ['@message' => Xss::filterAdmin($row->message)]);
|
||||
}
|
||||
// Message to translate with injected variables.
|
||||
else {
|
||||
$message = $this->t(Xss::filterAdmin($row->message), $variables);
|
||||
}
|
||||
}
|
||||
else {
|
||||
$message = FALSE;
|
||||
}
|
||||
return $message;
|
||||
}
|
||||
|
||||
/**
|
||||
* Shows the most frequent log messages of a given event type.
|
||||
*
|
||||
* Messages are not truncated on this page because events detailed herein do
|
||||
* not have links to a detailed view.
|
||||
*
|
||||
* Use one of the above *Report() methods.
|
||||
*
|
||||
* @param string $type
|
||||
* Type of database log events to display (e.g., 'search').
|
||||
*
|
||||
* @return array
|
||||
* A build array in the format expected by drupal_render().
|
||||
*/
|
||||
public function topLogMessages($type) {
|
||||
$header = array(
|
||||
array('data' => $this->t('Count'), 'field' => 'count', 'sort' => 'desc'),
|
||||
array('data' => $this->t('Message'), 'field' => 'message'),
|
||||
);
|
||||
|
||||
$count_query = $this->database->select('watchdog');
|
||||
$count_query->addExpression('COUNT(DISTINCT(message))');
|
||||
$count_query->condition('type', $type);
|
||||
|
||||
$query = $this->database->select('watchdog', 'w')
|
||||
->extend('\Drupal\Core\Database\Query\PagerSelectExtender')
|
||||
->extend('\Drupal\Core\Database\Query\TableSortExtender');
|
||||
$query->addExpression('COUNT(wid)', 'count');
|
||||
$query = $query
|
||||
->fields('w', array('message', 'variables'))
|
||||
->condition('w.type', $type)
|
||||
->groupBy('message')
|
||||
->groupBy('variables')
|
||||
->limit(30)
|
||||
->orderByHeader($header);
|
||||
$query->setCountQuery($count_query);
|
||||
$result = $query->execute();
|
||||
|
||||
$rows = array();
|
||||
foreach ($result as $dblog) {
|
||||
if ($message = $this->formatMessage($dblog)) {
|
||||
$rows[] = array($dblog->count, $message);
|
||||
}
|
||||
}
|
||||
|
||||
$build['dblog_top_table'] = array(
|
||||
'#type' => 'table',
|
||||
'#header' => $header,
|
||||
'#rows' => $rows,
|
||||
'#empty' => $this->t('No log messages available.'),
|
||||
'#attached' => array(
|
||||
'library' => array('dblog/drupal.dblog'),
|
||||
),
|
||||
);
|
||||
$build['dblog_top_pager'] = array('#type' => 'pager');
|
||||
|
||||
return $build;
|
||||
}
|
||||
|
||||
}
|
||||
73
web/core/modules/dblog/src/Form/DblogClearLogConfirmForm.php
Normal file
73
web/core/modules/dblog/src/Form/DblogClearLogConfirmForm.php
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\dblog\Form;
|
||||
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
use Drupal\Core\Url;
|
||||
use Drupal\Core\Database\Connection;
|
||||
use Drupal\Core\Form\ConfirmFormBase;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
/**
|
||||
* Provides a confirmation form before clearing out the logs.
|
||||
*/
|
||||
class DblogClearLogConfirmForm extends ConfirmFormBase {
|
||||
|
||||
/**
|
||||
* The database connection.
|
||||
*
|
||||
* @var \Drupal\Core\Database\Connection
|
||||
*/
|
||||
protected $connection;
|
||||
|
||||
/**
|
||||
* Constructs a new DblogClearLogConfirmForm.
|
||||
*
|
||||
* @param \Drupal\Core\Database\Connection $connection
|
||||
* The database connection.
|
||||
*/
|
||||
public function __construct(Connection $connection) {
|
||||
$this->connection = $connection;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static function create(ContainerInterface $container) {
|
||||
return new static(
|
||||
$container->get('database')
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getFormId() {
|
||||
return 'dblog_confirm';
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getQuestion() {
|
||||
return $this->t('Are you sure you want to delete the recent logs?');
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getCancelUrl() {
|
||||
return new Url('dblog.overview');
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function submitForm(array &$form, FormStateInterface $form_state) {
|
||||
$_SESSION['dblog_overview_filter'] = array();
|
||||
$this->connection->truncate('watchdog')->execute();
|
||||
drupal_set_message($this->t('Database log cleared.'));
|
||||
$form_state->setRedirectUrl($this->getCancelUrl());
|
||||
}
|
||||
|
||||
}
|
||||
96
web/core/modules/dblog/src/Form/DblogFilterForm.php
Normal file
96
web/core/modules/dblog/src/Form/DblogFilterForm.php
Normal file
|
|
@ -0,0 +1,96 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\dblog\Form;
|
||||
|
||||
use Drupal\Core\Form\FormBase;
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
|
||||
/**
|
||||
* Provides the database logging filter form.
|
||||
*/
|
||||
class DblogFilterForm extends FormBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getFormId() {
|
||||
return 'dblog_filter_form';
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function buildForm(array $form, FormStateInterface $form_state) {
|
||||
$filters = dblog_filters();
|
||||
|
||||
$form['filters'] = array(
|
||||
'#type' => 'details',
|
||||
'#title' => $this->t('Filter log messages'),
|
||||
'#open' => TRUE,
|
||||
);
|
||||
foreach ($filters as $key => $filter) {
|
||||
$form['filters']['status'][$key] = array(
|
||||
'#title' => $filter['title'],
|
||||
'#type' => 'select',
|
||||
'#multiple' => TRUE,
|
||||
'#size' => 8,
|
||||
'#options' => $filter['options'],
|
||||
);
|
||||
if (!empty($_SESSION['dblog_overview_filter'][$key])) {
|
||||
$form['filters']['status'][$key]['#default_value'] = $_SESSION['dblog_overview_filter'][$key];
|
||||
}
|
||||
}
|
||||
|
||||
$form['filters']['actions'] = array(
|
||||
'#type' => 'actions',
|
||||
'#attributes' => array('class' => array('container-inline')),
|
||||
);
|
||||
$form['filters']['actions']['submit'] = array(
|
||||
'#type' => 'submit',
|
||||
'#value' => $this->t('Filter'),
|
||||
);
|
||||
if (!empty($_SESSION['dblog_overview_filter'])) {
|
||||
$form['filters']['actions']['reset'] = array(
|
||||
'#type' => 'submit',
|
||||
'#value' => $this->t('Reset'),
|
||||
'#limit_validation_errors' => array(),
|
||||
'#submit' => array('::resetForm'),
|
||||
);
|
||||
}
|
||||
return $form;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function validateForm(array &$form, FormStateInterface $form_state) {
|
||||
if ($form_state->isValueEmpty('type') && $form_state->isValueEmpty('severity')) {
|
||||
$form_state->setErrorByName('type', $this->t('You must select something to filter by.'));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function submitForm(array &$form, FormStateInterface $form_state) {
|
||||
$filters = dblog_filters();
|
||||
foreach ($filters as $name => $filter) {
|
||||
if ($form_state->hasValue($name)) {
|
||||
$_SESSION['dblog_overview_filter'][$name] = $form_state->getValue($name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Resets the filter form.
|
||||
*
|
||||
* @param array $form
|
||||
* An associative array containing the structure of the form.
|
||||
* @param \Drupal\Core\Form\FormStateInterface $form_state
|
||||
* The current state of the form.
|
||||
*/
|
||||
public function resetForm(array &$form, FormStateInterface $form_state) {
|
||||
$_SESSION['dblog_overview_filter'] = array();
|
||||
}
|
||||
|
||||
}
|
||||
112
web/core/modules/dblog/src/Logger/DbLog.php
Normal file
112
web/core/modules/dblog/src/Logger/DbLog.php
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\dblog\Logger;
|
||||
|
||||
use Drupal\Component\Utility\Unicode;
|
||||
use Drupal\Core\Database\Connection;
|
||||
use Drupal\Core\Database\Database;
|
||||
use Drupal\Core\Database\DatabaseException;
|
||||
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
|
||||
use Drupal\Core\Logger\LogMessageParserInterface;
|
||||
use Drupal\Core\Logger\RfcLoggerTrait;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
/**
|
||||
* Logs events in the watchdog database table.
|
||||
*/
|
||||
class DbLog implements LoggerInterface {
|
||||
use RfcLoggerTrait;
|
||||
use DependencySerializationTrait;
|
||||
|
||||
/**
|
||||
* The dedicated database connection target to use for log entries.
|
||||
*/
|
||||
const DEDICATED_DBLOG_CONNECTION_TARGET = 'dedicated_dblog';
|
||||
|
||||
/**
|
||||
* The database connection object.
|
||||
*
|
||||
* @var \Drupal\Core\Database\Connection
|
||||
*/
|
||||
protected $connection;
|
||||
|
||||
/**
|
||||
* The message's placeholders parser.
|
||||
*
|
||||
* @var \Drupal\Core\Logger\LogMessageParserInterface
|
||||
*/
|
||||
protected $parser;
|
||||
|
||||
/**
|
||||
* Constructs a DbLog object.
|
||||
*
|
||||
* @param \Drupal\Core\Database\Connection $connection
|
||||
* The database connection object.
|
||||
* @param \Drupal\Core\Logger\LogMessageParserInterface $parser
|
||||
* The parser to use when extracting message variables.
|
||||
*/
|
||||
public function __construct(Connection $connection, LogMessageParserInterface $parser) {
|
||||
$this->connection = $connection;
|
||||
$this->parser = $parser;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function log($level, $message, array $context = array()) {
|
||||
// Remove any backtraces since they may contain an unserializable variable.
|
||||
unset($context['backtrace']);
|
||||
|
||||
// Convert PSR3-style messages to SafeMarkup::format() style, so they can be
|
||||
// translated too in runtime.
|
||||
$message_placeholders = $this->parser->parseMessagePlaceholders($message, $context);
|
||||
|
||||
try {
|
||||
$this->connection
|
||||
->insert('watchdog')
|
||||
->fields(array(
|
||||
'uid' => $context['uid'],
|
||||
'type' => Unicode::substr($context['channel'], 0, 64),
|
||||
'message' => $message,
|
||||
'variables' => serialize($message_placeholders),
|
||||
'severity' => $level,
|
||||
'link' => $context['link'],
|
||||
'location' => $context['request_uri'],
|
||||
'referer' => $context['referer'],
|
||||
'hostname' => Unicode::substr($context['ip'], 0, 128),
|
||||
'timestamp' => $context['timestamp'],
|
||||
))
|
||||
->execute();
|
||||
}
|
||||
catch (\Exception $e) {
|
||||
// When running Drupal on MySQL or MariaDB you can run into several errors
|
||||
// that corrupt the database connection. Some examples for these kind of
|
||||
// errors on the database layer are "1100 - Table 'xyz' was not locked
|
||||
// with LOCK TABLES" and "1153 - Got a packet bigger than
|
||||
// 'max_allowed_packet' bytes". If such an error happens, the MySQL server
|
||||
// invalidates the connection and answers all further requests in this
|
||||
// connection with "2006 - MySQL server had gone away". In that case the
|
||||
// insert statement above results in a database exception. To ensure that
|
||||
// the causal error is written to the log we try once to open a dedicated
|
||||
// connection and write again.
|
||||
if (
|
||||
// Only handle database related exceptions.
|
||||
($e instanceof DatabaseException || $e instanceof \PDOException) &&
|
||||
// Avoid an endless loop of re-write attempts.
|
||||
$this->connection->getTarget() != self::DEDICATED_DBLOG_CONNECTION_TARGET
|
||||
) {
|
||||
// Open a dedicated connection for logging.
|
||||
$key = $this->connection->getKey();
|
||||
$info = Database::getConnectionInfo($key);
|
||||
Database::addConnectionInfo($key, self::DEDICATED_DBLOG_CONNECTION_TARGET, $info['default']);
|
||||
$this->connection = Database::getConnection(self::DEDICATED_DBLOG_CONNECTION_TARGET, $key);
|
||||
// Now try once to log the error again.
|
||||
$this->log($level, $message, $context);
|
||||
}
|
||||
else {
|
||||
throw $e;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\dblog\Plugin\rest\resource;
|
||||
|
||||
use Drupal\rest\Plugin\ResourceBase;
|
||||
use Drupal\rest\ResourceResponse;
|
||||
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
|
||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||
|
||||
/**
|
||||
* Provides a resource for database watchdog log entries.
|
||||
*
|
||||
* @RestResource(
|
||||
* id = "dblog",
|
||||
* label = @Translation("Watchdog database log"),
|
||||
* uri_paths = {
|
||||
* "canonical" = "/dblog/{id}"
|
||||
* }
|
||||
* )
|
||||
*/
|
||||
class DBLogResource extends ResourceBase {
|
||||
|
||||
/**
|
||||
* Responds to GET requests.
|
||||
*
|
||||
* Returns a watchdog log entry for the specified ID.
|
||||
*
|
||||
* @param int $id
|
||||
* The ID of the watchdog log entry.
|
||||
*
|
||||
* @return \Drupal\rest\ResourceResponse
|
||||
* The response containing the log entry.
|
||||
*
|
||||
* @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
|
||||
* Thrown when the log entry was not found.
|
||||
* @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
|
||||
* Thrown when no log entry was provided.
|
||||
*/
|
||||
public function get($id = NULL) {
|
||||
if ($id) {
|
||||
$record = db_query("SELECT * FROM {watchdog} WHERE wid = :wid", array(':wid' => $id))
|
||||
->fetchAssoc();
|
||||
if (!empty($record)) {
|
||||
return new ResourceResponse($record);
|
||||
}
|
||||
|
||||
throw new NotFoundHttpException(t('Log entry with ID @id was not found', array('@id' => $id)));
|
||||
}
|
||||
|
||||
throw new BadRequestHttpException(t('No log entry ID was provided'));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,70 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\dblog\Plugin\views\field;
|
||||
|
||||
use Drupal\Component\Utility\SafeMarkup;
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
use Drupal\views\Plugin\views\field\FieldPluginBase;
|
||||
use Drupal\views\ResultRow;
|
||||
use Drupal\views\ViewExecutable;
|
||||
use Drupal\views\Plugin\views\display\DisplayPluginBase;
|
||||
|
||||
/**
|
||||
* Provides a field handler that renders a log event with replaced variables.
|
||||
*
|
||||
* @ingroup views_field_handlers
|
||||
*
|
||||
* @ViewsField("dblog_message")
|
||||
*/
|
||||
class DblogMessage extends FieldPluginBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
|
||||
parent::init($view, $display, $options);
|
||||
|
||||
if ($this->options['replace_variables']) {
|
||||
$this->additional_fields['variables'] = 'variables';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function defineOptions() {
|
||||
$options = parent::defineOptions();
|
||||
$options['replace_variables'] = array('default' => TRUE);
|
||||
|
||||
return $options;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function buildOptionsForm(&$form, FormStateInterface $form_state) {
|
||||
parent::buildOptionsForm($form, $form_state);
|
||||
|
||||
$form['replace_variables'] = array(
|
||||
'#title' => $this->t('Replace variables'),
|
||||
'#type' => 'checkbox',
|
||||
'#default_value' => $this->options['replace_variables'],
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function render(ResultRow $values) {
|
||||
$value = $this->getValue($values);
|
||||
|
||||
if ($this->options['replace_variables']) {
|
||||
$variables = unserialize($this->getvalue($values, 'variables'));
|
||||
return SafeMarkup::format($value, (array) $variables);
|
||||
}
|
||||
else {
|
||||
return $this->sanitizeValue($value);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\dblog\Plugin\views\field;
|
||||
|
||||
use Drupal\views\Plugin\views\field\FieldPluginBase;
|
||||
use Drupal\views\ResultRow;
|
||||
|
||||
/**
|
||||
* Provides a field handler that renders operation link markup.
|
||||
*
|
||||
* @ingroup views_field_handlers
|
||||
*
|
||||
* @ViewsField("dblog_operations")
|
||||
*/
|
||||
class DblogOperations extends FieldPluginBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function clickSortable() {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function render(ResultRow $values) {
|
||||
$value = $this->getValue($values);
|
||||
return $this->sanitizeValue($value, 'xss_admin');
|
||||
}
|
||||
|
||||
}
|
||||
37
web/core/modules/dblog/src/Plugin/views/wizard/Watchdog.php
Normal file
37
web/core/modules/dblog/src/Plugin/views/wizard/Watchdog.php
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\dblog\Plugin\views\wizard;
|
||||
|
||||
use Drupal\views\Plugin\views\wizard\WizardPluginBase;
|
||||
|
||||
/**
|
||||
* Defines a wizard for the watchdog table.
|
||||
*
|
||||
* @ViewsWizard(
|
||||
* id = "watchdog",
|
||||
* module = "dblog",
|
||||
* base_table = "watchdog",
|
||||
* title = @Translation("Log entries")
|
||||
* )
|
||||
*/
|
||||
class Watchdog extends WizardPluginBase {
|
||||
|
||||
/**
|
||||
* Set the created column.
|
||||
*/
|
||||
protected $createdColumn = 'timestamp';
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function defaultDisplayOptions() {
|
||||
$display_options = parent::defaultDisplayOptions();
|
||||
|
||||
// Add permission-based access control.
|
||||
$display_options['access']['type'] = 'perm';
|
||||
$display_options['access']['options']['perm'] = 'access site reports';
|
||||
|
||||
return $display_options;
|
||||
}
|
||||
|
||||
}
|
||||
43
web/core/modules/dblog/src/Tests/ConnectionFailureTest.php
Normal file
43
web/core/modules/dblog/src/Tests/ConnectionFailureTest.php
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\dblog\Tests;
|
||||
|
||||
use Drupal\Core\Database\Database;
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
|
||||
/**
|
||||
* Tests logging of connection failures.
|
||||
*
|
||||
* @group dblog
|
||||
*/
|
||||
class ConnectionFailureTest extends WebTestBase {
|
||||
|
||||
public static $modules = array('dblog');
|
||||
|
||||
/**
|
||||
* Tests logging of connection failures.
|
||||
*/
|
||||
function testConnectionFailureLogging() {
|
||||
$logger = \Drupal::service('logger.factory');
|
||||
|
||||
// MySQL errors like "1153 - Got a packet bigger than 'max_allowed_packet'
|
||||
// bytes" or "1100 - Table 'xyz' was not locked with LOCK TABLES" lead to a
|
||||
// database connection unusable for further requests. All further request
|
||||
// will result in an "2006 - MySQL server had gone away" error. As a
|
||||
// consequence it's impossible to use this connection to log the causing
|
||||
// initial error itself. Using Database::closeConnection() we simulate such
|
||||
// a corrupted connection. In this case dblog has to establish a different
|
||||
// connection by itself to be able to write the log entry.
|
||||
Database::closeConnection();
|
||||
|
||||
// Create a log entry.
|
||||
$logger->get('php')->error('testConnectionFailureLogging');
|
||||
|
||||
// Re-establish the default database connection.
|
||||
Database::getConnection();
|
||||
|
||||
$wid = db_query("SELECT MAX(wid) FROM {watchdog} WHERE message = 'testConnectionFailureLogging'")->fetchField();
|
||||
$this->assertTrue($wid, 'Watchdog entry has been stored in database.');
|
||||
}
|
||||
|
||||
}
|
||||
821
web/core/modules/dblog/src/Tests/DbLogTest.php
Normal file
821
web/core/modules/dblog/src/Tests/DbLogTest.php
Normal file
|
|
@ -0,0 +1,821 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\dblog\Tests;
|
||||
|
||||
use Drupal\Component\Utility\Html;
|
||||
use Drupal\Component\Utility\Unicode;
|
||||
use Drupal\Core\Logger\RfcLogLevel;
|
||||
use Drupal\Core\Url;
|
||||
use Drupal\dblog\Controller\DbLogController;
|
||||
use Drupal\simpletest\WebTestBase;
|
||||
|
||||
/**
|
||||
* Generate events and verify dblog entries; verify user access to log reports
|
||||
* based on permissions.
|
||||
*
|
||||
* @group dblog
|
||||
*/
|
||||
class DbLogTest extends WebTestBase {
|
||||
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = array('dblog', 'node', 'forum', 'help', 'block');
|
||||
|
||||
/**
|
||||
* A user with some relevant administrative permissions.
|
||||
*
|
||||
* @var \Drupal\user\UserInterface
|
||||
*/
|
||||
protected $adminUser;
|
||||
|
||||
/**
|
||||
* A user without any permissions.
|
||||
*
|
||||
* @var \Drupal\user\UserInterface
|
||||
*/
|
||||
protected $webUser;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
$this->drupalPlaceBlock('system_breadcrumb_block');
|
||||
$this->drupalPlaceBlock('page_title_block');
|
||||
|
||||
// Create users with specific permissions.
|
||||
$this->adminUser = $this->drupalCreateUser(array('administer site configuration', 'access administration pages', 'access site reports', 'administer users'));
|
||||
$this->webUser = $this->drupalCreateUser(array());
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests Database Logging module functionality through interfaces.
|
||||
*
|
||||
* First logs in users, then creates database log events, and finally tests
|
||||
* Database Logging module functionality through both the admin and user
|
||||
* interfaces.
|
||||
*/
|
||||
function testDbLog() {
|
||||
// Log in the admin user.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
|
||||
$row_limit = 100;
|
||||
$this->verifyRowLimit($row_limit);
|
||||
$this->verifyCron($row_limit);
|
||||
$this->verifyEvents();
|
||||
$this->verifyReports();
|
||||
$this->verifyBreadcrumbs();
|
||||
$this->verifyLinkEscaping();
|
||||
// Verify the overview table sorting.
|
||||
$orders = array('Date', 'Type', 'User');
|
||||
$sorts = array('asc', 'desc');
|
||||
foreach ($orders as $order) {
|
||||
foreach ($sorts as $sort) {
|
||||
$this->verifySort($sort, $order);
|
||||
}
|
||||
}
|
||||
|
||||
// Log in the regular user.
|
||||
$this->drupalLogin($this->webUser);
|
||||
$this->verifyReports(403);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test individual log event page.
|
||||
*/
|
||||
public function testLogEventPage() {
|
||||
// Login the admin user.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
|
||||
// Since referrer and location links vary by how the tests are run, inject
|
||||
// fake log data to test these.
|
||||
$context = [
|
||||
'request_uri' => 'http://example.com?dblog=1',
|
||||
'referer' => 'http://example.org?dblog=2',
|
||||
'uid' => 0,
|
||||
'channel' => 'testing',
|
||||
'link' => 'foo/bar',
|
||||
'ip' => '0.0.1.0',
|
||||
'timestamp' => REQUEST_TIME,
|
||||
];
|
||||
\Drupal::service('logger.dblog')->log(RfcLogLevel::NOTICE, 'Test message', $context);
|
||||
$wid = db_query('SELECT MAX(wid) FROM {watchdog}')->fetchField();
|
||||
|
||||
// Verify the links appear correctly.
|
||||
$this->drupalGet('admin/reports/dblog/event/' . $wid);
|
||||
$this->assertLinkByHref($context['request_uri']);
|
||||
$this->assertLinkByHref($context['referer']);
|
||||
|
||||
// Verify hostname.
|
||||
$this->assertRaw($context['ip'], 'Found hostname on the detail page.');
|
||||
|
||||
// Verify severity.
|
||||
$this->assertText('Notice', 'The severity was properly displayed on the detail page.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Verifies setting of the database log row limit.
|
||||
*
|
||||
* @param int $row_limit
|
||||
* The row limit.
|
||||
*/
|
||||
private function verifyRowLimit($row_limit) {
|
||||
// Change the database log row limit.
|
||||
$edit = array();
|
||||
$edit['dblog_row_limit'] = $row_limit;
|
||||
$this->drupalPostForm('admin/config/development/logging', $edit, t('Save configuration'));
|
||||
$this->assertResponse(200);
|
||||
|
||||
// Check row limit variable.
|
||||
$current_limit = $this->config('dblog.settings')->get('row_limit');
|
||||
$this->assertTrue($current_limit == $row_limit, format_string('[Cache] Row limit variable of @count equals row limit of @limit', array('@count' => $current_limit, '@limit' => $row_limit)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Verifies that cron correctly applies the database log row limit.
|
||||
*
|
||||
* @param int $row_limit
|
||||
* The row limit.
|
||||
*/
|
||||
private function verifyCron($row_limit) {
|
||||
// Generate additional log entries.
|
||||
$this->generateLogEntries($row_limit + 10);
|
||||
// Verify that the database log row count exceeds the row limit.
|
||||
$count = db_query('SELECT COUNT(wid) FROM {watchdog}')->fetchField();
|
||||
$this->assertTrue($count > $row_limit, format_string('Dblog row count of @count exceeds row limit of @limit', array('@count' => $count, '@limit' => $row_limit)));
|
||||
|
||||
// Get last ID to compare against; log entries get deleted, so we can't
|
||||
// reliably add the number of newly created log entries to the current count
|
||||
// to measure number of log entries created by cron.
|
||||
$last_id = db_query('SELECT MAX(wid) FROM {watchdog}')->fetchField();
|
||||
|
||||
// Run a cron job.
|
||||
$this->cronRun();
|
||||
|
||||
// Get last ID after cron was run.
|
||||
$current_id = db_query('SELECT MAX(wid) FROM {watchdog}')->fetchField();
|
||||
|
||||
// Get the number of enabled modules. Cron adds a log entry for each module.
|
||||
$list = \Drupal::moduleHandler()->getImplementations('cron');
|
||||
$module_count = count($list);
|
||||
|
||||
$count = $current_id - $last_id;
|
||||
$this->assertTrue(($current_id - $last_id) == $module_count + 2, format_string('Cron added @count of @expected new log entries', array('@count' => $count, '@expected' => $module_count + 2)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates a number of random database log events.
|
||||
*
|
||||
* @param int $count
|
||||
* Number of watchdog entries to generate.
|
||||
* @param array $options
|
||||
* These options are used to override the defaults for the test.
|
||||
* An associative array containing any of the following keys:
|
||||
* - 'channel': String identifying the log channel to be output to.
|
||||
* If the channel is not set, the default of 'custom' will be used.
|
||||
* - 'message': String containing a message to be output to the log.
|
||||
* A simple default message is used if not provided.
|
||||
* - 'variables': Array of variables that match the message string.
|
||||
* - 'severity': Log severity level as defined in logging_severity_levels.
|
||||
* - 'link': String linking to view the result of the event.
|
||||
* - 'user': String identifying the username.
|
||||
* - 'uid': Int identifying the user id for the user.
|
||||
* - 'request_uri': String identifying the location of the request.
|
||||
* - 'referer': String identifying the referring url.
|
||||
* - 'ip': String The ip address of the client machine triggering the log
|
||||
* entry.
|
||||
* - 'timestamp': Int unix timestamp.
|
||||
*/
|
||||
private function generateLogEntries($count, $options = array()) {
|
||||
global $base_root;
|
||||
|
||||
// This long URL makes it just a little bit harder to pass the link part of
|
||||
// the test with a mix of English words and a repeating series of random
|
||||
// percent-encoded Chinese characters.
|
||||
$link = urldecode('/content/xo%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A-lake-isabelle');
|
||||
|
||||
// Prepare the fields to be logged
|
||||
$log = $options + array(
|
||||
'channel' => 'custom',
|
||||
'message' => 'Dblog test log message',
|
||||
'variables' => array(),
|
||||
'severity' => RfcLogLevel::NOTICE,
|
||||
'link' => $link,
|
||||
'user' => $this->adminUser,
|
||||
'uid' => $this->adminUser->id(),
|
||||
'request_uri' => $base_root . \Drupal::request()->getRequestUri(),
|
||||
'referer' => \Drupal::request()->server->get('HTTP_REFERER'),
|
||||
'ip' => '127.0.0.1',
|
||||
'timestamp' => REQUEST_TIME,
|
||||
);
|
||||
|
||||
$logger = $this->container->get('logger.dblog');
|
||||
$message = $log['message'] . ' Entry #';
|
||||
for ($i = 0; $i < $count; $i++) {
|
||||
$log['message'] = $message . $i;
|
||||
$logger->log($log['severity'], $log['message'], $log);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Clear the entry logs by clicking on 'Clear log messages' button.
|
||||
*/
|
||||
protected function clearLogsEntries() {
|
||||
$this->drupalGet(Url::fromRoute('dblog.confirm'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Filters the logs according to the specific severity and log entry type.
|
||||
*
|
||||
* @param string $type
|
||||
* (optional) The log entry type.
|
||||
* @param string $severity
|
||||
* (optional) The log entry severity.
|
||||
*/
|
||||
protected function filterLogsEntries($type = NULL, $severity = NULL) {
|
||||
$edit = array();
|
||||
if (!is_null($type)) {
|
||||
$edit['type[]'] = $type;
|
||||
}
|
||||
if (!is_null($severity)) {
|
||||
$edit['severity[]'] = $severity;
|
||||
}
|
||||
$this->drupalPostForm(NULL, $edit, t('Filter'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Confirms that database log reports are displayed at the correct paths.
|
||||
*
|
||||
* @param int $response
|
||||
* (optional) HTTP response code. Defaults to 200.
|
||||
*/
|
||||
private function verifyReports($response = 200) {
|
||||
// View the database log help page.
|
||||
$this->drupalGet('admin/help/dblog');
|
||||
$this->assertResponse($response);
|
||||
if ($response == 200) {
|
||||
$this->assertText(t('Database Logging'), 'DBLog help was displayed');
|
||||
}
|
||||
|
||||
// View the database log report page.
|
||||
$this->drupalGet('admin/reports/dblog');
|
||||
$this->assertResponse($response);
|
||||
if ($response == 200) {
|
||||
$this->assertText(t('Recent log messages'), 'DBLog report was displayed');
|
||||
}
|
||||
|
||||
// View the database log page-not-found report page.
|
||||
$this->drupalGet('admin/reports/page-not-found');
|
||||
$this->assertResponse($response);
|
||||
if ($response == 200) {
|
||||
$this->assertText("Top 'page not found' errors", 'DBLog page-not-found report was displayed');
|
||||
}
|
||||
|
||||
// View the database log access-denied report page.
|
||||
$this->drupalGet('admin/reports/access-denied');
|
||||
$this->assertResponse($response);
|
||||
if ($response == 200) {
|
||||
$this->assertText("Top 'access denied' errors", 'DBLog access-denied report was displayed');
|
||||
}
|
||||
|
||||
// View the database log event page.
|
||||
$wid = db_query('SELECT MIN(wid) FROM {watchdog}')->fetchField();
|
||||
$this->drupalGet('admin/reports/dblog/event/' . $wid);
|
||||
$this->assertResponse($response);
|
||||
if ($response == 200) {
|
||||
$this->assertText(t('Details'), 'DBLog event node was displayed');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates and then verifies breadcrumbs.
|
||||
*/
|
||||
private function verifyBreadcrumbs() {
|
||||
// View the database log event page.
|
||||
$wid = db_query('SELECT MIN(wid) FROM {watchdog}')->fetchField();
|
||||
$this->drupalGet('admin/reports/dblog/event/' . $wid);
|
||||
$xpath = '//nav[@class="breadcrumb"]/ol/li[last()]/a';
|
||||
$this->assertEqual(current($this->xpath($xpath)), 'Recent log messages', 'DBLogs link displayed at breadcrumb in event page.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates and then verifies various types of events.
|
||||
*/
|
||||
private function verifyEvents() {
|
||||
// Invoke events.
|
||||
$this->doUser();
|
||||
$this->drupalCreateContentType(array('type' => 'article', 'name' => t('Article')));
|
||||
$this->drupalCreateContentType(array('type' => 'page', 'name' => t('Basic page')));
|
||||
$this->doNode('article');
|
||||
$this->doNode('page');
|
||||
$this->doNode('forum');
|
||||
|
||||
// When a user account is canceled, any content they created remains but the
|
||||
// uid = 0. Records in the watchdog table related to that user have the uid
|
||||
// set to zero.
|
||||
}
|
||||
|
||||
/**
|
||||
* Verifies the sorting functionality of the database logging reports table.
|
||||
*
|
||||
* @param string $sort
|
||||
* The sort direction.
|
||||
* @param string $order
|
||||
* The order by which the table should be sorted.
|
||||
*/
|
||||
public function verifySort($sort = 'asc', $order = 'Date') {
|
||||
$this->drupalGet('admin/reports/dblog', array('query' => array('sort' => $sort, 'order' => $order)));
|
||||
$this->assertResponse(200);
|
||||
$this->assertText(t('Recent log messages'), 'DBLog report was displayed correctly and sorting went fine.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the escaping of links in the operation row of a database log detail
|
||||
* page.
|
||||
*/
|
||||
private function verifyLinkEscaping() {
|
||||
$link = \Drupal::l('View', Url::fromRoute('entity.node.canonical', array('node' => 1)));
|
||||
$message = 'Log entry added to do the verifyLinkEscaping test.';
|
||||
$this->generateLogEntries(1, array(
|
||||
'message' => $message,
|
||||
'link' => $link,
|
||||
));
|
||||
|
||||
$result = db_query_range('SELECT wid FROM {watchdog} ORDER BY wid DESC', 0, 1);
|
||||
$this->drupalGet('admin/reports/dblog/event/' . $result->fetchField());
|
||||
|
||||
// Check if the link exists (unescaped).
|
||||
$this->assertRaw($link);
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates and then verifies some user events.
|
||||
*/
|
||||
private function doUser() {
|
||||
// Set user variables.
|
||||
$name = $this->randomMachineName();
|
||||
$pass = user_password();
|
||||
// Add a user using the form to generate an add user event (which is not
|
||||
// triggered by drupalCreateUser).
|
||||
$edit = array();
|
||||
$edit['name'] = $name;
|
||||
$edit['mail'] = $name . '@example.com';
|
||||
$edit['pass[pass1]'] = $pass;
|
||||
$edit['pass[pass2]'] = $pass;
|
||||
$edit['status'] = 1;
|
||||
$this->drupalPostForm('admin/people/create', $edit, t('Create new account'));
|
||||
$this->assertResponse(200);
|
||||
// Retrieve the user object.
|
||||
$user = user_load_by_name($name);
|
||||
$this->assertTrue($user != NULL, format_string('User @name was loaded', array('@name' => $name)));
|
||||
// pass_raw property is needed by drupalLogin.
|
||||
$user->pass_raw = $pass;
|
||||
// Log in user.
|
||||
$this->drupalLogin($user);
|
||||
// Log out user.
|
||||
$this->drupalLogout();
|
||||
// Fetch the row IDs in watchdog that relate to the user.
|
||||
$result = db_query('SELECT wid FROM {watchdog} WHERE uid = :uid', array(':uid' => $user->id()));
|
||||
foreach ($result as $row) {
|
||||
$ids[] = $row->wid;
|
||||
}
|
||||
$count_before = (isset($ids)) ? count($ids) : 0;
|
||||
$this->assertTrue($count_before > 0, format_string('DBLog contains @count records for @name', array('@count' => $count_before, '@name' => $user->getUsername())));
|
||||
|
||||
// Log in the admin user.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
// Delete the user created at the start of this test.
|
||||
// We need to POST here to invoke batch_process() in the internal browser.
|
||||
$this->drupalPostForm('user/' . $user->id() . '/cancel', array('user_cancel_method' => 'user_cancel_reassign'), t('Cancel account'));
|
||||
|
||||
// View the database log report.
|
||||
$this->drupalGet('admin/reports/dblog');
|
||||
$this->assertResponse(200);
|
||||
|
||||
// Verify that the expected events were recorded.
|
||||
// Add user.
|
||||
// Default display includes name and email address; if too long, the email
|
||||
// address is replaced by three periods.
|
||||
$this->assertLogMessage(t('New user: %name %email.', array('%name' => $name, '%email' => '<' . $user->getEmail() . '>')), 'DBLog event was recorded: [add user]');
|
||||
// Log in user.
|
||||
$this->assertLogMessage(t('Session opened for %name.', array('%name' => $name)), 'DBLog event was recorded: [login user]');
|
||||
// Log out user.
|
||||
$this->assertLogMessage(t('Session closed for %name.', array('%name' => $name)), 'DBLog event was recorded: [logout user]');
|
||||
// Delete user.
|
||||
$message = t('Deleted user: %name %email.', array('%name' => $name, '%email' => '<' . $user->getEmail() . '>'));
|
||||
$message_text = Unicode::truncate(Html::decodeEntities(strip_tags($message)), 56, TRUE, TRUE);
|
||||
// Verify that the full message displays on the details page.
|
||||
$link = FALSE;
|
||||
if ($links = $this->xpath('//a[text()="' . $message_text . '"]')) {
|
||||
// Found link with the message text.
|
||||
$links = array_shift($links);
|
||||
foreach ($links->attributes() as $attr => $value) {
|
||||
if ($attr == 'href') {
|
||||
// Extract link to details page.
|
||||
$link = Unicode::substr($value, strpos($value, 'admin/reports/dblog/event/'));
|
||||
$this->drupalGet($link);
|
||||
// Check for full message text on the details page.
|
||||
$this->assertRaw($message, 'DBLog event details was found: [delete user]');
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
$this->assertTrue($link, 'DBLog event was recorded: [delete user]');
|
||||
// Visit random URL (to generate page not found event).
|
||||
$not_found_url = $this->randomMachineName(60);
|
||||
$this->drupalGet($not_found_url);
|
||||
$this->assertResponse(404);
|
||||
// View the database log page-not-found report page.
|
||||
$this->drupalGet('admin/reports/page-not-found');
|
||||
$this->assertResponse(200);
|
||||
// Check that full-length URL displayed.
|
||||
$this->assertText($not_found_url, 'DBLog event was recorded: [page not found]');
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates and then verifies some node events.
|
||||
*
|
||||
* @param string $type
|
||||
* A node type (e.g., 'article', 'page' or 'forum').
|
||||
*/
|
||||
private function doNode($type) {
|
||||
// Create user.
|
||||
$perm = array('create ' . $type . ' content', 'edit own ' . $type . ' content', 'delete own ' . $type . ' content');
|
||||
$user = $this->drupalCreateUser($perm);
|
||||
// Log in user.
|
||||
$this->drupalLogin($user);
|
||||
|
||||
// Create a node using the form in order to generate an add content event
|
||||
// (which is not triggered by drupalCreateNode).
|
||||
$edit = $this->getContent($type);
|
||||
$title = $edit['title[0][value]'];
|
||||
$this->drupalPostForm('node/add/' . $type, $edit, t('Save'));
|
||||
$this->assertResponse(200);
|
||||
// Retrieve the node object.
|
||||
$node = $this->drupalGetNodeByTitle($title);
|
||||
$this->assertTrue($node != NULL, format_string('Node @title was loaded', array('@title' => $title)));
|
||||
// Edit the node.
|
||||
$edit = $this->getContentUpdate($type);
|
||||
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
|
||||
$this->assertResponse(200);
|
||||
// Delete the node.
|
||||
$this->drupalPostForm('node/' . $node->id() . '/delete', array(), t('Delete'));
|
||||
$this->assertResponse(200);
|
||||
// View the node (to generate page not found event).
|
||||
$this->drupalGet('node/' . $node->id());
|
||||
$this->assertResponse(404);
|
||||
// View the database log report (to generate access denied event).
|
||||
$this->drupalGet('admin/reports/dblog');
|
||||
$this->assertResponse(403);
|
||||
|
||||
// Log in the admin user.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
// View the database log report.
|
||||
$this->drupalGet('admin/reports/dblog');
|
||||
$this->assertResponse(200);
|
||||
|
||||
// Verify that node events were recorded.
|
||||
// Was node content added?
|
||||
$this->assertLogMessage(t('@type: added %title.', array('@type' => $type, '%title' => $title)), 'DBLog event was recorded: [content added]');
|
||||
// Was node content updated?
|
||||
$this->assertLogMessage(t('@type: updated %title.', array('@type' => $type, '%title' => $title)), 'DBLog event was recorded: [content updated]');
|
||||
// Was node content deleted?
|
||||
$this->assertLogMessage(t('@type: deleted %title.', array('@type' => $type, '%title' => $title)), 'DBLog event was recorded: [content deleted]');
|
||||
|
||||
// View the database log access-denied report page.
|
||||
$this->drupalGet('admin/reports/access-denied');
|
||||
$this->assertResponse(200);
|
||||
// Verify that the 'access denied' event was recorded.
|
||||
$this->assertText('admin/reports/dblog', 'DBLog event was recorded: [access denied]');
|
||||
|
||||
// View the database log page-not-found report page.
|
||||
$this->drupalGet('admin/reports/page-not-found');
|
||||
$this->assertResponse(200);
|
||||
// Verify that the 'page not found' event was recorded.
|
||||
$this->assertText('node/' . $node->id(), 'DBLog event was recorded: [page not found]');
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates random content based on node content type.
|
||||
*
|
||||
* @param string $type
|
||||
* Node content type (e.g., 'article').
|
||||
*
|
||||
* @return array
|
||||
* Random content needed by various node types.
|
||||
*/
|
||||
private function getContent($type) {
|
||||
switch ($type) {
|
||||
case 'forum':
|
||||
$content = array(
|
||||
'title[0][value]' => $this->randomMachineName(8),
|
||||
'taxonomy_forums' => array(1),
|
||||
'body[0][value]' => $this->randomMachineName(32),
|
||||
);
|
||||
break;
|
||||
|
||||
default:
|
||||
$content = array(
|
||||
'title[0][value]' => $this->randomMachineName(8),
|
||||
'body[0][value]' => $this->randomMachineName(32),
|
||||
);
|
||||
break;
|
||||
}
|
||||
return $content;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates random content as an update based on node content type.
|
||||
*
|
||||
* @param string $type
|
||||
* Node content type (e.g., 'article').
|
||||
*
|
||||
* @return array
|
||||
* Random content needed by various node types.
|
||||
*/
|
||||
private function getContentUpdate($type) {
|
||||
$content = array(
|
||||
'body[0][value]' => $this->randomMachineName(32),
|
||||
);
|
||||
return $content;
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the addition and clearing of log events through the admin interface.
|
||||
*
|
||||
* Logs in the admin user, creates a database log event, and tests the
|
||||
* functionality of clearing the database log through the admin interface.
|
||||
*/
|
||||
public function testDBLogAddAndClear() {
|
||||
global $base_root;
|
||||
// Get a count of how many watchdog entries already exist.
|
||||
$count = db_query('SELECT COUNT(*) FROM {watchdog}')->fetchField();
|
||||
$log = array(
|
||||
'channel' => 'system',
|
||||
'message' => 'Log entry added to test the doClearTest clear down.',
|
||||
'variables' => array(),
|
||||
'severity' => RfcLogLevel::NOTICE,
|
||||
'link' => NULL,
|
||||
'user' => $this->adminUser,
|
||||
'uid' => $this->adminUser->id(),
|
||||
'request_uri' => $base_root . \Drupal::request()->getRequestUri(),
|
||||
'referer' => \Drupal::request()->server->get('HTTP_REFERER'),
|
||||
'ip' => '127.0.0.1',
|
||||
'timestamp' => REQUEST_TIME,
|
||||
);
|
||||
// Add a watchdog entry.
|
||||
$this->container->get('logger.dblog')->log($log['severity'], $log['message'], $log);
|
||||
// Make sure the table count has actually been incremented.
|
||||
$this->assertEqual($count + 1, db_query('SELECT COUNT(*) FROM {watchdog}')->fetchField(), format_string('\Drupal\dblog\Logger\DbLog->log() added an entry to the dblog :count', array(':count' => $count)));
|
||||
// Log in the admin user.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
// Post in order to clear the database table.
|
||||
$this->clearLogsEntries();
|
||||
// Confirm that the logs should be cleared.
|
||||
$this->drupalPostForm(NULL, array(), 'Confirm');
|
||||
// Count the rows in watchdog that previously related to the deleted user.
|
||||
$count = db_query('SELECT COUNT(*) FROM {watchdog}')->fetchField();
|
||||
$this->assertEqual($count, 0, format_string('DBLog contains :count records after a clear.', array(':count' => $count)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the database log filter functionality at admin/reports/dblog.
|
||||
*/
|
||||
public function testFilter() {
|
||||
$this->drupalLogin($this->adminUser);
|
||||
|
||||
// Clear the log to ensure that only generated entries will be found.
|
||||
db_delete('watchdog')->execute();
|
||||
|
||||
// Generate 9 random watchdog entries.
|
||||
$type_names = array();
|
||||
$types = array();
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$type_names[] = $type_name = $this->randomMachineName();
|
||||
$severity = RfcLogLevel::EMERGENCY;
|
||||
for ($j = 0; $j < 3; $j++) {
|
||||
$types[] = $type = array(
|
||||
'count' => $j + 1,
|
||||
'type' => $type_name,
|
||||
'severity' => $severity++,
|
||||
);
|
||||
$this->generateLogEntries($type['count'], array(
|
||||
'channel' => $type['type'],
|
||||
'severity' => $type['severity'],
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
// View the database log page.
|
||||
$this->drupalGet('admin/reports/dblog');
|
||||
|
||||
// Confirm that all the entries are displayed.
|
||||
$count = $this->getTypeCount($types);
|
||||
foreach ($types as $key => $type) {
|
||||
$this->assertEqual($count[$key], $type['count'], 'Count matched');
|
||||
}
|
||||
|
||||
// Filter by each type and confirm that entries with various severities are
|
||||
// displayed.
|
||||
foreach ($type_names as $type_name) {
|
||||
$this->filterLogsEntries($type_name);
|
||||
|
||||
// Count the number of entries of this type.
|
||||
$type_count = 0;
|
||||
foreach ($types as $type) {
|
||||
if ($type['type'] == $type_name) {
|
||||
$type_count += $type['count'];
|
||||
}
|
||||
}
|
||||
|
||||
$count = $this->getTypeCount($types);
|
||||
$this->assertEqual(array_sum($count), $type_count, 'Count matched');
|
||||
}
|
||||
|
||||
// Set the filter to match each of the two filter-type attributes and
|
||||
// confirm the correct number of entries are displayed.
|
||||
foreach ($types as $type) {
|
||||
$this->filterLogsEntries($type['type'], $type['severity']);
|
||||
|
||||
$count = $this->getTypeCount($types);
|
||||
$this->assertEqual(array_sum($count), $type['count'], 'Count matched');
|
||||
}
|
||||
|
||||
$this->drupalGet('admin/reports/dblog', array('query' => array('order' => 'Type')));
|
||||
$this->assertResponse(200);
|
||||
$this->assertText(t('Operations'), 'Operations text found');
|
||||
|
||||
// Clear all logs and make sure the confirmation message is found.
|
||||
$this->clearLogsEntries();
|
||||
// Confirm that the logs should be cleared.
|
||||
$this->drupalPostForm(NULL, array(), 'Confirm');
|
||||
$this->assertText(t('Database log cleared.'), 'Confirmation message found');
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the database log event information from the browser page.
|
||||
*
|
||||
* @return array
|
||||
* List of log events where each event is an array with following keys:
|
||||
* - severity: (int) A database log severity constant.
|
||||
* - type: (string) The type of database log event.
|
||||
* - message: (string) The message for this database log event.
|
||||
* - user: (string) The user associated with this database log event.
|
||||
*/
|
||||
protected function getLogEntries() {
|
||||
$entries = array();
|
||||
if ($table = $this->getLogsEntriesTable()) {
|
||||
$table = array_shift($table);
|
||||
foreach ($table->tbody->tr as $row) {
|
||||
$entries[] = array(
|
||||
'severity' => $this->getSeverityConstant($row['class']),
|
||||
'type' => $this->asText($row->td[1]),
|
||||
'message' => $this->asText($row->td[3]),
|
||||
'user' => $this->asText($row->td[4]),
|
||||
);
|
||||
}
|
||||
}
|
||||
return $entries;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the Logs table in the DOM.
|
||||
*
|
||||
* @return \SimpleXMLElement[]
|
||||
* The return value of a xpath search.
|
||||
*/
|
||||
protected function getLogsEntriesTable() {
|
||||
return $this->xpath('.//table[@id="admin-dblog"]');
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the count of database log entries by database log event type.
|
||||
*
|
||||
* @param array $types
|
||||
* The type information to compare against.
|
||||
*
|
||||
* @return array
|
||||
* The count of each type keyed by the key of the $types array.
|
||||
*/
|
||||
protected function getTypeCount(array $types) {
|
||||
$entries = $this->getLogEntries();
|
||||
$count = array_fill(0, count($types), 0);
|
||||
foreach ($entries as $entry) {
|
||||
foreach ($types as $key => $type) {
|
||||
if ($entry['type'] == $type['type'] && $entry['severity'] == $type['severity']) {
|
||||
$count[$key]++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return $count;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the watchdog severity constant corresponding to the CSS class.
|
||||
*
|
||||
* @param string $class
|
||||
* CSS class attribute.
|
||||
*
|
||||
* @return int|null
|
||||
* The watchdog severity constant or NULL if not found.
|
||||
*/
|
||||
protected function getSeverityConstant($class) {
|
||||
$map = array_flip(DbLogController::getLogLevelClassMap());
|
||||
|
||||
// Find the class that contains the severity.
|
||||
$classes = explode(' ', $class);
|
||||
foreach ($classes as $class) {
|
||||
if (isset($map[$class])) {
|
||||
return $map[$class];
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Extracts the text contained by the XHTML element.
|
||||
*
|
||||
* @param \SimpleXMLElement $element
|
||||
* Element to extract text from.
|
||||
*
|
||||
* @return string
|
||||
* Extracted text.
|
||||
*/
|
||||
protected function asText(\SimpleXMLElement $element) {
|
||||
if (!is_object($element)) {
|
||||
return $this->fail('The element is not an element.');
|
||||
}
|
||||
return trim(html_entity_decode(strip_tags($element->asXML())));
|
||||
}
|
||||
|
||||
/**
|
||||
* Confirms that a log message appears on the database log overview screen.
|
||||
*
|
||||
* This function should only be used for the admin/reports/dblog page, because
|
||||
* it checks for the message link text truncated to 56 characters. Other log
|
||||
* pages have no detail links so they contain the full message text.
|
||||
*
|
||||
* @param string $log_message
|
||||
* The database log message to check.
|
||||
* @param string $message
|
||||
* The message to pass to simpletest.
|
||||
*/
|
||||
protected function assertLogMessage($log_message, $message) {
|
||||
$message_text = Unicode::truncate(Html::decodeEntities(strip_tags($log_message)), 56, TRUE, TRUE);
|
||||
$this->assertLink($message_text, 0, $message);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that the details page displays correctly for a temporary user.
|
||||
*/
|
||||
public function testTemporaryUser() {
|
||||
// Create a temporary user.
|
||||
$tempuser = $this->drupalCreateUser();
|
||||
$tempuser_uid = $tempuser->id();
|
||||
|
||||
// Log in as the admin user.
|
||||
$this->drupalLogin($this->adminUser);
|
||||
|
||||
// Generate a single watchdog entry.
|
||||
$this->generateLogEntries(1, array('user' => $tempuser, 'uid' => $tempuser_uid));
|
||||
$wid = db_query('SELECT MAX(wid) FROM {watchdog}')->fetchField();
|
||||
|
||||
// Check if the full message displays on the details page.
|
||||
$this->drupalGet('admin/reports/dblog/event/' . $wid);
|
||||
$this->assertText('Dblog test log message');
|
||||
|
||||
// Delete the user.
|
||||
user_delete($tempuser->id());
|
||||
$this->drupalGet('user/' . $tempuser_uid);
|
||||
$this->assertResponse(404);
|
||||
|
||||
// Check if the full message displays on the details page.
|
||||
$this->drupalGet('admin/reports/dblog/event/' . $wid);
|
||||
$this->assertText('Dblog test log message');
|
||||
}
|
||||
|
||||
/**
|
||||
* Make sure HTML tags are filtered out in the log overview links.
|
||||
*/
|
||||
public function testOverviewLinks() {
|
||||
$this->drupalLogin($this->adminUser);
|
||||
$this->generateLogEntries(1, ['message' => "<script>alert('foo');</script><strong>Lorem</strong> ipsum dolor sit amet, consectetur adipiscing & elit."]);
|
||||
$this->drupalGet('admin/reports/dblog');
|
||||
$this->assertResponse(200);
|
||||
// Make sure HTML tags are filtered out.
|
||||
$this->assertRaw('title="alert('foo');Lorem ipsum dolor sit amet, consectetur adipiscing & elit. Entry #0"><script>alert('foo');</script>Lorem ipsum dolor sit…</a>');
|
||||
$this->assertNoRaw("<script>alert('foo');</script>");
|
||||
|
||||
// Make sure HTML tags are filtered out in admin/reports/dblog/event/ too.
|
||||
$this->generateLogEntries(1, ['message' => "<script>alert('foo');</script> <strong>Lorem ipsum</strong>"]);
|
||||
$wid = db_query('SELECT MAX(wid) FROM {watchdog}')->fetchField();
|
||||
$this->drupalGet('admin/reports/dblog/event/' . $wid);
|
||||
$this->assertNoRaw("<script>alert('foo');</script>");
|
||||
$this->assertRaw("alert('foo'); <strong>Lorem ipsum</strong>");
|
||||
}
|
||||
|
||||
}
|
||||
65
web/core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php
Normal file
65
web/core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\dblog\Tests\Rest;
|
||||
|
||||
use Drupal\Component\Serialization\Json;
|
||||
use Drupal\Core\Url;
|
||||
use Drupal\rest\Tests\RESTTestBase;
|
||||
|
||||
/**
|
||||
* Tests the watchdog database log resource.
|
||||
*
|
||||
* @group dblog
|
||||
*/
|
||||
class DbLogResourceTest extends RESTTestBase {
|
||||
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = array('hal', 'dblog');
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
// Enable REST API for the watchdog resource.
|
||||
$this->enableService('dblog');
|
||||
}
|
||||
|
||||
/**
|
||||
* Writes a log messages and retrieves it via the REST API.
|
||||
*/
|
||||
public function testWatchdog() {
|
||||
// Write a log message to the DB.
|
||||
$this->container->get('logger.channel.rest')->notice('Test message');
|
||||
// Get the ID of the written message.
|
||||
$id = db_query_range("SELECT wid FROM {watchdog} WHERE type = :type ORDER BY wid DESC", 0, 1, array(':type' => 'rest'))
|
||||
->fetchField();
|
||||
|
||||
// Create a user account that has the required permissions to read
|
||||
// the watchdog resource via the REST API.
|
||||
$account = $this->drupalCreateUser(array('restful get dblog'));
|
||||
$this->drupalLogin($account);
|
||||
|
||||
$response = $this->httpRequest(Url::fromRoute('rest.dblog.GET.' . $this->defaultFormat, ['id' => $id, '_format' => $this->defaultFormat]), 'GET');
|
||||
$this->assertResponse(200);
|
||||
$this->assertHeader('content-type', $this->defaultMimeType);
|
||||
$log = Json::decode($response);
|
||||
$this->assertEqual($log['wid'], $id, 'Log ID is correct.');
|
||||
$this->assertEqual($log['type'], 'rest', 'Type of log message is correct.');
|
||||
$this->assertEqual($log['message'], 'Test message', 'Log message text is correct.');
|
||||
|
||||
// Request an unknown log entry.
|
||||
$response = $this->httpRequest(Url::fromRoute('rest.dblog.GET.' . $this->defaultFormat, ['id' => 9999, '_format' => $this->defaultFormat]), 'GET');
|
||||
$this->assertResponse(404);
|
||||
$decoded = Json::decode($response);
|
||||
$this->assertEqual($decoded['message'], 'Log entry with ID 9999 was not found', 'Response message is correct.');
|
||||
|
||||
// Make a bad request (a true malformed request would never be a route match).
|
||||
$response = $this->httpRequest(Url::fromRoute('rest.dblog.GET.' . $this->defaultFormat, ['id' => 0, '_format' => $this->defaultFormat]), 'GET');
|
||||
$this->assertResponse(400);
|
||||
$decoded = Json::decode($response);
|
||||
$this->assertEqual($decoded['message'], 'No log entry ID was provided', 'Response message is correct.');
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
name: 'Dblog test views'
|
||||
type: module
|
||||
description: 'Provides default views for views dblog tests.'
|
||||
package: Testing
|
||||
version: VERSION
|
||||
core: 8.x
|
||||
dependencies:
|
||||
- dblog
|
||||
- views
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
langcode: en
|
||||
status: true
|
||||
dependencies:
|
||||
module:
|
||||
- dblog
|
||||
id: test_dblog
|
||||
label: test_dblog
|
||||
module: views
|
||||
description: ''
|
||||
tag: ''
|
||||
base_table: watchdog
|
||||
base_field: wid
|
||||
core: 8.x
|
||||
display:
|
||||
default:
|
||||
display_plugin: default
|
||||
id: default
|
||||
display_title: Master
|
||||
position: null
|
||||
display_options:
|
||||
access:
|
||||
type: none
|
||||
cache:
|
||||
type: tag
|
||||
query:
|
||||
type: views_query
|
||||
exposed_form:
|
||||
type: basic
|
||||
pager:
|
||||
type: full
|
||||
style:
|
||||
type: default
|
||||
row:
|
||||
type: fields
|
||||
fields:
|
||||
wid:
|
||||
id: wid
|
||||
table: watchdog
|
||||
field: wid
|
||||
plugin_id: numeric
|
||||
message:
|
||||
id: message
|
||||
table: watchdog
|
||||
field: message
|
||||
plugin_id: dblog_message
|
||||
link:
|
||||
id: link
|
||||
table: watchdog
|
||||
field: link
|
||||
plugin_id: dblog_operations
|
||||
filters: { }
|
||||
sorts:
|
||||
wid:
|
||||
id: wid
|
||||
table: watchdog
|
||||
field: wid
|
||||
order: ASC
|
||||
plugin_id: standard
|
||||
page_1:
|
||||
display_plugin: page
|
||||
id: page_1
|
||||
display_title: Page
|
||||
position: null
|
||||
display_options:
|
||||
path: test-dblog
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\dblog\Kernel;
|
||||
|
||||
use Drupal\dblog\Controller\DbLogController;
|
||||
use Drupal\KernelTests\KernelTestBase;
|
||||
|
||||
/**
|
||||
* Tests for the DbLogController class.
|
||||
*
|
||||
* @group dblog
|
||||
*/
|
||||
class DbLogControllerTest extends KernelTestBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static $modules = ['dblog', 'user'];
|
||||
|
||||
/**
|
||||
* Tests corrupted log entries can still display available data.
|
||||
*/
|
||||
public function testDbLogCorrupted() {
|
||||
$this->installEntitySchema('user');
|
||||
$dblog_controller = DbLogController::create($this->container);
|
||||
|
||||
// Check message with properly serialized data.
|
||||
$message = (object) [
|
||||
'message' => 'Sample message with placeholder: @placeholder',
|
||||
'variables' => serialize(['@placeholder' => 'test placeholder']),
|
||||
];
|
||||
|
||||
$this->assertEquals('Sample message with placeholder: test placeholder', $dblog_controller->formatMessage($message));
|
||||
|
||||
// Check that controller work with corrupted data.
|
||||
$message->variables = 'BAD SERIALIZED DATA';
|
||||
$formatted = $dblog_controller->formatMessage($message);
|
||||
$this->assertEquals('Log data is corrupted and cannot be unserialized: Sample message with placeholder: @placeholder', $formatted);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,109 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\dblog\Kernel;
|
||||
|
||||
|
||||
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
|
||||
use Drupal\Core\Form\FormInterface;
|
||||
use Drupal\Core\Form\FormState;
|
||||
use Drupal\Core\Form\FormStateInterface;
|
||||
use Drupal\KernelTests\KernelTestBase;
|
||||
use Drupal\user\Entity\User;
|
||||
|
||||
/**
|
||||
* Tests serializing a form with an injected dblog logger instance.
|
||||
*
|
||||
* @group dblog
|
||||
*/
|
||||
class DbLogFormInjectionTest extends KernelTestBase implements FormInterface {
|
||||
|
||||
use DependencySerializationTrait;
|
||||
|
||||
/**
|
||||
* A Dblog logger instance.
|
||||
*
|
||||
* @var \Psr\Log\LoggerInterface
|
||||
*/
|
||||
protected $logger;
|
||||
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = array('system', 'dblog', 'user');
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getFormId() {
|
||||
return 'dblog_test_injection_form';
|
||||
}
|
||||
|
||||
/**
|
||||
* Process callback.
|
||||
*
|
||||
* @param array $element
|
||||
* Form element
|
||||
*
|
||||
* @return array
|
||||
* Processed element.
|
||||
*/
|
||||
public function process($element) {
|
||||
return $element;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function buildForm(array $form, FormStateInterface $form_state) {
|
||||
$form['#process'][] = [$this, 'process'];
|
||||
return $form;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function validateForm(array &$form, FormStateInterface $form_state) {}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function submitForm(array &$form, FormStateInterface $form_state) {
|
||||
$form_state->setRebuild();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
$this->installSchema('dblog', ['watchdog']);
|
||||
$this->installSchema('system', ['key_value_expire', 'sequences']);
|
||||
$this->installEntitySchema('user');
|
||||
$this->logger = \Drupal::logger('test_logger');
|
||||
$test_user = User::create(array(
|
||||
'name' => 'foobar',
|
||||
'mail' => 'foobar@example.com',
|
||||
));
|
||||
$test_user->save();
|
||||
\Drupal::service('current_user')->setAccount($test_user);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests db log injection serialization.
|
||||
*/
|
||||
public function testLoggerSerialization() {
|
||||
$form_state = new FormState();
|
||||
|
||||
// Forms are only serialized during POST requests.
|
||||
$form_state->setRequestMethod('POST');
|
||||
$form_state->setCached();
|
||||
$form_builder = $this->container->get('form_builder');
|
||||
$form_id = $form_builder->getFormId($this, $form_state);
|
||||
$form = $form_builder->retrieveForm($form_id, $form_state);
|
||||
$form_builder->prepareForm($form_id, $form, $form_state);
|
||||
$form_builder->processForm($form_id, $form, $form_state);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\dblog\Kernel\Migrate\d6;
|
||||
|
||||
use Drupal\config\Tests\SchemaCheckTestTrait;
|
||||
use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
|
||||
|
||||
/**
|
||||
* Upgrade variables to dblog.settings.yml.
|
||||
*
|
||||
* @group migrate_drupal_6
|
||||
*/
|
||||
class MigrateDblogConfigsTest extends MigrateDrupal6TestBase {
|
||||
|
||||
use SchemaCheckTestTrait;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static $modules = ['dblog'];
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
$this->executeMigration('d6_dblog_settings');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests migration of dblog variables to dblog.settings.yml.
|
||||
*/
|
||||
public function testBookSettings() {
|
||||
$config = $this->config('dblog.settings');
|
||||
$this->assertIdentical(10000, $config->get('row_limit'));
|
||||
$this->assertConfigSchema(\Drupal::service('config.typed'), 'dblog.settings', $config->get());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\dblog\Kernel\Migrate\d7;
|
||||
|
||||
use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
|
||||
|
||||
/**
|
||||
* Upgrade variables to dblog.settings.yml.
|
||||
*
|
||||
* @group migrate_drupal_7
|
||||
*/
|
||||
class MigrateDblogConfigsTest extends MigrateDrupal7TestBase {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static $modules = ['dblog'];
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
$this->installConfig(static::$modules);
|
||||
$this->executeMigration('d7_dblog_settings');
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests migration of dblog variables to dblog.settings.yml.
|
||||
*/
|
||||
public function testDblogSettings() {
|
||||
$config = $this->config('dblog.settings');
|
||||
$this->assertIdentical(10000, $config->get('row_limit'));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,116 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\Tests\dblog\Kernel\Views;
|
||||
|
||||
use Drupal\Component\Utility\SafeMarkup;
|
||||
use Drupal\Component\Utility\Xss;
|
||||
use Drupal\Core\Logger\RfcLogLevel;
|
||||
use Drupal\Core\Url;
|
||||
use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
|
||||
use Drupal\views\Views;
|
||||
use Drupal\views\Tests\ViewTestData;
|
||||
|
||||
/**
|
||||
* Tests the views integration of dblog module.
|
||||
*
|
||||
* @group dblog
|
||||
*/
|
||||
class ViewsIntegrationTest extends ViewsKernelTestBase {
|
||||
|
||||
/**
|
||||
* Views used by this test.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $testViews = array('test_dblog');
|
||||
|
||||
/**
|
||||
* Modules to enable.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $modules = array('dblog', 'dblog_test_views', 'user');
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function setUp($import_test_views = TRUE) {
|
||||
parent::setUp();
|
||||
|
||||
// Rebuild the router, otherwise we can't generate links.
|
||||
$this->container->get('router.builder')->rebuild();
|
||||
|
||||
$this->installSchema('dblog', array('watchdog'));
|
||||
|
||||
ViewTestData::createTestViews(get_class($this), array('dblog_test_views'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests the integration.
|
||||
*/
|
||||
public function testIntegration() {
|
||||
|
||||
// Remove the watchdog entries added by the potential batch process.
|
||||
$this->container->get('database')->truncate('watchdog')->execute();
|
||||
|
||||
$entries = array();
|
||||
// Setup a watchdog entry without tokens.
|
||||
$entries[] = array(
|
||||
'message' => $this->randomMachineName(),
|
||||
'variables' => array('link' => \Drupal::l('Link', new Url('<front>'))),
|
||||
);
|
||||
// Setup a watchdog entry with one token.
|
||||
$entries[] = array(
|
||||
'message' => '@token1',
|
||||
'variables' => array('@token1' => $this->randomMachineName(), 'link' => \Drupal::l('Link', new Url('<front>'))),
|
||||
);
|
||||
// Setup a watchdog entry with two tokens.
|
||||
$entries[] = array(
|
||||
'message' => '@token1 @token2',
|
||||
// Setup a link with a tag which is filtered by
|
||||
// \Drupal\Component\Utility\Xss::filterAdmin() in order to make sure
|
||||
// that strings which are not marked as safe get filtered.
|
||||
'variables' => array(
|
||||
'@token1' => $this->randomMachineName(),
|
||||
'@token2' => $this->randomMachineName(),
|
||||
'link' => '<a href="' . \Drupal::url('<front>') . '"><object>Link</object></a>',
|
||||
),
|
||||
);
|
||||
$logger_factory = $this->container->get('logger.factory');
|
||||
foreach ($entries as $entry) {
|
||||
$entry += array(
|
||||
'type' => 'test-views',
|
||||
'severity' => RfcLogLevel::NOTICE,
|
||||
);
|
||||
$logger_factory->get($entry['type'])->log($entry['severity'], $entry['message'], $entry['variables']);
|
||||
}
|
||||
|
||||
$view = Views::getView('test_dblog');
|
||||
$this->executeView($view);
|
||||
$view->initStyle();
|
||||
|
||||
foreach ($entries as $index => $entry) {
|
||||
$this->assertEqual($view->style_plugin->getField($index, 'message'), SafeMarkup::format($entry['message'], $entry['variables']));
|
||||
$link_field = $view->style_plugin->getField($index, 'link');
|
||||
// The 3rd entry contains some unsafe markup that needs to get filtered.
|
||||
if ($index == 2) {
|
||||
// Make sure that unsafe link differs from the rendered link, so we know
|
||||
// that some filtering actually happened.
|
||||
$this->assertNotEqual($link_field, $entry['variables']['link']);
|
||||
}
|
||||
$this->assertEqual($link_field, Xss::filterAdmin($entry['variables']['link']));
|
||||
}
|
||||
|
||||
// Disable replacing variables and check that the tokens aren't replaced.
|
||||
$view->destroy();
|
||||
$view->storage->invalidateCaches();
|
||||
$view->initHandlers();
|
||||
$this->executeView($view);
|
||||
$view->initStyle();
|
||||
$view->field['message']->options['replace_variables'] = FALSE;
|
||||
foreach ($entries as $index => $entry) {
|
||||
$this->assertEqual($view->style_plugin->getField($index, 'message'), $entry['message']);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in a new issue