moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-67818-check-api-fixes' of https://github.com/brendanheywood/moodle

Browse source
This commit is contained in:
Andrew Nicols 2020-04-07 10:09:34 +08:00
commit c8eca1f642
25 changed files with 249 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/classes/check/access/defaultuserrole.php
View file

@ -41,13 +41,22 @@ use core\check\result;
class defaultuserrole extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
public function get_name(): string {
return get_string('check_defaultuserrole_name', 'report_security');
}
/**
* A link to a place to action this
*
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
global $CFG;
$this->id = 'defaultuserrole';
$this->name = get_string('check_defaultuserrole_name', 'report_security');
$this->actionlink = new \action_link(
return new \action_link(
new \moodle_url('/admin/roles/define.php?action=view&roleid=' . $CFG->defaultuserroleid),
get_string('userpolicies', 'admin'));
}

19
lib/classes/check/access/frontpagerole.php
View file

@ -41,12 +41,21 @@ use core\check\result;
class frontpagerole extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
$this->id = 'frontpagerole';
$this->name = get_string('check_frontpagerole_name', 'report_security');
$this->actionlink = new \action_link(
public function get_name(): string {
return get_string('check_frontpagerole_name', 'report_security');
}
/**
* A link to a place to action this
*
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
return new \action_link(
new \moodle_url('/admin/settings.php?section=frontpagesettings#admin-defaultfrontpageroleid'),
get_string('frontpagesettings', 'admin'));
}

18
lib/classes/check/access/guestrole.php
View file

@ -41,13 +41,21 @@ use core\check\result;
class guestrole extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
public function get_name(): string {
return get_string('check_guestrole_name', 'report_security');
}
$this->id = 'guestrole';
$this->name = get_string('check_guestrole_name', 'report_security');
$this->actionlink = new \action_link(
/**
* A link to a place to action this
*
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
return new \action_link(
new \moodle_url('/admin/settings.php?section=userpolicies'),
get_string('userpolicies', 'admin'));
}

19
lib/classes/check/access/riskadmin.php
View file

@ -41,12 +41,21 @@ use core\check\result;
class riskadmin extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
$this->id = 'riskadmin';
$this->name = get_string('check_riskadmin_name', 'report_security');
$this->actionlink = new \action_link(
public function get_name(): string {
return get_string('check_riskadmin_name', 'report_security');
}
/**
* A link to a place to action this
*
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
return new \action_link(
new \moodle_url('/admin/roles/admins.php'),
get_string('siteadministrators', 'role'));
}

18
lib/classes/check/access/riskbackup.php
View file

@ -39,13 +39,21 @@ use core\check\result;
class riskbackup extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
public function get_name(): string {
return get_string('check_riskbackup_name', 'report_security');
}
$this->id = 'riskbackup';
$this->name = get_string('check_riskbackup_name', 'report_security');
$this->actionlink = new \action_link(
/**
* A link to a place to action this
*
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
return new \action_link(
new \moodle_url('/admin/roles/manage.php'),
get_string('manageroles', 'role'));
}

18
lib/classes/check/access/riskxss.php
View file

@ -46,13 +46,21 @@ use core\check\result;
class riskxss extends \core\check\check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
public function get_name(): string {
return get_string('check_riskxss_name', 'report_security');
}
$this->id = 'riskxss';
$this->name = get_string('check_riskxss_name', 'report_security');
$this->actionlink = new \action_link(
/**
* A link to a place to action this
*
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
return new \action_link(
new \moodle_url('/admin/roles/manage.php'),
get_string('manageroles', 'role'));
}

30
lib/classes/check/check.php
View file

@ -41,21 +41,6 @@ abstract class check {
*/
protected $component = 'core';
/**
* @var string $id - Should be unique identifier within a component.
*/
protected $id = '';
/**
* @var string $name - Name for the check, should be the same regardless of state.
*/
protected $name = '';
/**
* @var action_link - an optional link to a place to address the check.
*/
protected $actionlink = null;
/**
* Get the frankenstyle component name
*
@ -77,10 +62,16 @@ abstract class check {
/**
* Get the check's id
*
* @return string must be unique for it's component
* This defaults to the base name of the class which is ok in the most
* cases but if you have a check which can have multiple instances then
* you should override this to be unique.
*
* @return string must be unique within a component
*/
public function get_id(): string {
return $this->id;
$class = get_class($this);
$id = explode("\\", $class);
return end($id);
}
/**
@ -103,7 +94,8 @@ abstract class check {
* @return string
*/
public function get_name(): string {
return $this->name;
$id = $this->get_id();
return get_string("check{$id}", $this->get_component());
}
/**
@ -112,7 +104,7 @@ abstract class check {
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
return $this->actionlink;
return null;
}
/**

10
lib/classes/check/environment/configrw.php
View file

@ -41,12 +41,12 @@ use core\check\result;
class configrw extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
global $CFG;
$this->id = 'configrw';
$this->name = get_string('check_configrw_name', 'report_security');
public function get_name(): string {
return get_string('check_configrw_name', 'report_security');
}
/**

10
lib/classes/check/environment/displayerrors.php
View file

@ -47,12 +47,12 @@ use core\check\check;
class displayerrors extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
$this->id = 'displayerrors';
$this->name = get_string('check_displayerrors_name', 'report_security');
public function get_name(): string {
return get_string('check_displayerrors_name', 'report_security');
}
/**

10
lib/classes/check/environment/nodemodules.php
View file

@ -41,12 +41,12 @@ use core\check\result;
class nodemodules extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
global $CFG;
$this->id = 'nodemodules';
$this->name = get_string('check_nodemodules_name', 'report_security');
public function get_name(): string {
return get_string('check_nodemodules_name', 'report_security');
}
/**

11
lib/classes/check/environment/preventexecpath.php
View file

@ -41,13 +41,12 @@ use core\check\result;
class preventexecpath extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
global $CFG;
$this->id = 'preventexecpath';
$this->name = get_string('check_preventexecpath_name', 'report_security');
public function get_name(): string {
return get_string('check_preventexecpath_name', 'report_security');
}
/**

12
lib/classes/check/environment/unsecuredataroot.php
View file

@ -40,14 +40,12 @@ use core\check\result;
class unsecuredataroot extends \core\check\check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
global $CFG;
$this->id = 'unsecuredataroot';
$this->name = get_string('check_unsecuredataroot_name', 'report_security');
public function get_name(): string {
return get_string('check_unsecuredataroot_name', 'report_security');
}
/**

10
lib/classes/check/environment/vendordir.php
View file

@ -41,12 +41,12 @@ use core\check\result;
class vendordir extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
global $CFG;
$this->id = 'vendordir';
$this->name = get_string('check_vendordir_name', 'report_security');
public function get_name(): string {
return get_string('check_vendordir_name', 'report_security');
}
/**

18
lib/classes/check/http/cookiesecure.php
View file

@ -45,13 +45,21 @@ use core\check\result;
class cookiesecure extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
public function get_name(): string {
return get_string('check_cookiesecure_name', 'report_security');
}
$this->id = 'cookiesecure';
$this->name = get_string('check_cookiesecure_name', 'report_security');
$this->actionlink = new \action_link(
/**
* A link to a place to action this
*
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
return new \action_link(
new \moodle_url('/admin/settings.php?section=httpsecurity#admin-cookiesecure'),
get_string('httpsecurity', 'admin'));
}

18
lib/classes/check/security/crawlers.php
View file

@ -47,13 +47,21 @@ use core\check\result;
class crawlers extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
public function get_name(): string {
return get_string('check_crawlers_name', 'report_security');
}
$this->id = 'crawlers';
$this->name = get_string('check_crawlers_name', 'report_security');
$this->actionlink = new \action_link(
/**
* A link to a place to action this
*
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
return new \action_link(
new \moodle_url('/admin/settings.php?section=sitepolicies#admin-opentowebcrawlers'),
get_string('sitepolicies', 'admin'));
}

19
lib/classes/check/security/emailchangeconfirmation.php
View file

@ -41,12 +41,21 @@ use core\check\result;
class emailchangeconfirmation extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
$this->id = 'emailchangeconfirmation';
$this->name = get_string('check_emailchangeconfirmation_name', 'report_security');
$this->actionlink = new \action_link(
public function get_name(): string {
return get_string('check_emailchangeconfirmation_name', 'report_security');
}
/**
* A link to a place to action this
*
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
return new \action_link(
new \moodle_url('/admin/settings.php?section=sitepolicies#admin-emailchangeconfirmation'),
get_string('sitepolicies', 'admin'));
}

19
lib/classes/check/security/embed.php
View file

@ -41,12 +41,21 @@ use core\check\result;
class embed extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
$this->id = 'embed';
$this->name = get_string('check_embed_name', 'report_security');
$this->actionlink = new \action_link(
public function get_name(): string {
return get_string('check_embed_name', 'report_security');
}
/**
* A link to a place to action this
*
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
return new \action_link(
new \moodle_url('/admin/settings.php?section=sitepolicies#admin-allowobjectembed'),
get_string('sitepolicies', 'admin'));
}

20
lib/classes/check/security/mediafilterswf.php
View file

@ -41,13 +41,21 @@ use core\check\result;
class mediafilterswf extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
global $CFG;
$this->id = 'mediafilterswf';
$this->name = get_string('check_mediafilterswf_name', 'report_security');
$this->actionlink = new \action_link(
public function get_name(): string {
return get_string('check_mediafilterswf_name', 'report_security');
}
/**
* A link to a place to action this
*
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
return new \action_link(
new \moodle_url('/admin/settings.php?section=managemediaplayers'),
get_string('managemediaplayers', 'media'));
}

18
lib/classes/check/security/openprofiles.php
View file

@ -41,13 +41,21 @@ use core\check\result;
class openprofiles extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
public function get_name(): string {
return get_string('check_openprofiles_name', 'report_security');
}
$this->id = 'openprofiles';
$this->name = get_string('check_openprofiles_name', 'report_security');
$this->actionlink = new \action_link(
/**
* A link to a place to action this
*
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
return new \action_link(
new \moodle_url('/admin/settings.php?section=sitepolicies#admin-forcelogin'),
get_string('sitepolicies', 'admin'));
}

19
lib/classes/check/security/passwordpolicy.php
View file

@ -41,12 +41,21 @@ use core\check\result;
class passwordpolicy extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
$this->id = 'passwordpolicy';
$this->name = get_string('check_passwordpolicy_name', 'report_security');
$this->actionlink = new \action_link(
public function get_name(): string {
return get_string('check_passwordpolicy_name', 'report_security');
}
/**
* A link to a place to action this
*
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
return new \action_link(
new \moodle_url('/admin/settings.php?section=sitepolicies#admin-passwordpolicy'),
get_string('sitepolicies', 'admin'));
}

23
lib/classes/check/security/webcron.php
View file

@ -41,14 +41,23 @@ use core\check\result;
class webcron extends check {
/**
* Constructor
* Get the short check name
*
* @return string
*/
public function __construct() {
$this->id = 'webcron';
$this->name = get_string('check_webcron_name', 'report_security');
$this->actionlink = new \action_link(
new \moodle_url('/admin/settings.php?section=sitepolicies#admin-cronclionly'),
get_string('sitepolicies', 'admin'));
public function get_name(): string {
return get_string('check_webcron_name', 'report_security');
}
/**
* A link to a place to action this
*
* @return action_link|null
*/
public function get_action_link(): ?\action_link {
return new \action_link(
new \moodle_url('/admin/settings.php?section=sitepolicies#admin-cronclionly'),
get_string('sitepolicies', 'admin'));
}
/**

6
lib/outputrenderers.php
View file

@ -1687,7 +1687,7 @@ class core_renderer extends renderer_base {
* @param result $result
* @return string HTML fragment
*/
protected function render_result(core\check\result $result) {
protected function render_check_result(core\check\result $result) {
return $this->render_from_template($result->get_template_name(), $result->export_for_template($this));
}
@ -1697,8 +1697,8 @@ class core_renderer extends renderer_base {
* @param result $result
* @return string HTML fragment
*/
public function result(core\check\result $result) {
return $this->render_result($result);
public function check_result(core\check\result $result) {
return $this->render_check_result($result);
}
/**