mirror/moodle-auth_outage
1
0
Fork 0
mirror of https://github.com/catalyst/moodle-auth_outage.git synced 2026-06-19 05:38:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix URL is blocked message when not behind a proxy/load balancer"

Browse Source 
This reverts commit 51db933862.
This commit is contained in:
Tomo Tsuyuki
2026-06-18 11:46:03 +10:00
committed by Brendan Heywood
parent 20fef09b03
commit 9bab491666
3 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/local/outagelib.php
+1 -1
View File
@@ -56,7 +56,7 @@ class outagelib {
global $CFG;
require_once($CFG->libdir . '/filelib.php');
$curl = new curl(['ignoresecurity' => true]);
$curl = new curl();
$contents = $curl->get($file);
$info = $curl->get_info();
if (!empty($info['content_type'])) {
tests/local/controllers/maintenance_static_page_test.php
-33
View File
@@ -431,39 +431,6 @@ final class maintenance_static_page_test extends \auth_outage\base_testcase {
maintenance_static_page_io::file_get_data(200);
}
/**
* Test file_get_data with curlsecurityblockedhosts.
* We will use an external URL to test passing ignoresecurity inside of file_get_data works,
* ideally in real code we should only be calling file_get_data with internal URLs.
*/
public function test_file_get_data_curlsecurityblockedhosts(): void {
global $CFG, $USER;
$testhtml = $this->getExternalTestFileUrl('/test.html');
$url = new \moodle_url($testhtml);
$host = $url->get_host();
set_config('curlsecurityblockedhosts', $host); // Blocks $host.
// Test a regular curl with the default security enabled does in fact get blocked.
$curl = new \curl();
$contents = $curl->get($testhtml);
$expected = $curl->get_security()->get_blocked_url_string();
self::assertSame($expected, $contents);
self::assertSame(0, $curl->get_errno());
if ($CFG->branch >= 403) {
self::assertDebuggingCalled(
"Blocked $testhtml: The URL is blocked. [user {$USER->id}]",
DEBUG_NONE
);
}
// Test file_get_data does return the page and isn't blocked by security.
$found = maintenance_static_page_io::file_get_data($url->out());
$expected = 'Moodle is a software package for producing internet-based courses and web sites.';
self::assertStringContainsString($expected, $found['contents']);
self::assertSame('text/html', $found['mime']);
}
/**
* Test remove css selector.
*/
version.php
+2 -2
View File
@@ -28,8 +28,8 @@
defined('MOODLE_INTERNAL') || die();
$plugin->component = "auth_outage";
$plugin->version = 2024081904; // The current plugin version (Date: YYYYMMDDXX).
$plugin->release = 2024081904; // Human-readable release information.
$plugin->version = 2024081905; // The current plugin version (Date: YYYYMMDDXX).
$plugin->release = 2024081905; // Human-readable release information.
$plugin->requires = 2017111309; // 2017111309 = T13, but this really requires 3.9 and higher.
$plugin->maturity = MATURITY_STABLE; // Suitable for PRODUCTION environments!
$plugin->supported = [39, 405]; // A range of branch numbers of supported moodle versions.