L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-71920 libraries: Migrate LTI lib away from pure curl

Browse Source
This commit is contained in:
Mathew May
2022-11-11 12:54:11 +08:00
committed by Jun Pataleta
parent e3ce8c37bd
commit 6ade6d6060
2 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ltiprovider/readme_moodle.txt
+2
View File
@@ -16,6 +16,8 @@ These changes can be reverted once the following pull requests have been integra
This local changes can be reverted once it's checked that they are present upstream (note the
LTI-Tool-Provider-Library-PHP repo has been archived so it doesn't accept pull requests anymore):
* MDL-67034 php74 compliance fixes
* MDL-71920: Migrated from curl_exec and friends to use our Moodle curl wrapper,
so we can better handle site security settings
It is recommended by upstream to install depdencies via composer - but the composer installation is bundled
with an autoloader so it's better to do it manually.
lib/ltiprovider/src/HTTPMessage.php
+28 -20
View File
@@ -2,6 +2,9 @@
namespace IMSGlobal\LTI;
global $CFG;
require_once($CFG->libdir . '/filelib.php');
/**
* Class to represent an HTTP message
*
@@ -110,31 +113,33 @@ class HTTPMessage
{
$this->ok = false;
// Try using curl if available
// Try using curl if available
if (function_exists('curl_init')) {
$resp = '';
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $this->url);
$chResp = '';
$curl = new \curl();
$options = [
'CURLOPT_HEADER' => true,
'CURLINFO_HEADER_OUT' => true,
];
if (!empty($this->requestHeaders)) {
curl_setopt($ch, CURLOPT_HTTPHEADER, $this->requestHeaders);
$options['CURLOPT_HTTPHEADER'] = $this->requestHeaders;
} else {
curl_setopt($ch, CURLOPT_HEADER, 0);
$options['CURLOPT_HEADER'] = 0;
}
if ($this->method === 'POST') {
curl_setopt($ch, CURLOPT_POST, true);
curl_setopt($ch, CURLOPT_POSTFIELDS, $this->request);
$chResp = $curl->post($this->url, $this->request, $options);
} else if ($this->method !== 'GET') {
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->method);
if (!is_null($this->request)) {
curl_setopt($ch, CURLOPT_POSTFIELDS, $this->request);
$chResp = $curl->post($this->url, $this->request, $options);
}
} else {
$chResp = $curl->get($this->url, null, $options);
}
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLINFO_HEADER_OUT, true);
curl_setopt($ch, CURLOPT_HEADER, true);
$chResp = curl_exec($ch);
$this->ok = $chResp !== false;
if ($this->ok) {
$info = $curl->get_info();
if (!$curl->get_errno() && !$curl->error) {
$chResp = str_replace("\r\n", "\n", $chResp);
$chRespSplit = explode("\n\n", $chResp, 2);
if ((count($chRespSplit) > 1) && (substr($chRespSplit[1], 0, 5) === 'HTTP/')) {
@@ -142,17 +147,20 @@ class HTTPMessage
}
$this->responseHeaders = $chRespSplit[0];
$resp = $chRespSplit[1];
$this->status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$this->status = $info['http_code'];
$this->ok = $this->status < 400;
if (!$this->ok) {
$this->error = curl_error($ch);
$this->error = $curl->error;
}
} else {
$this->error = $curl->error;
$resp = $chResp;
}
$this->requestHeaders = str_replace("\r\n", "\n", curl_getinfo($ch, CURLINFO_HEADER_OUT));
curl_close($ch);
$this->response = $resp;
$this->requestHeaders = !empty($info['request_header']) ? str_replace("\r\n", "\n", $info['request_header']) : '';
} else {
// Try using fopen if curl was not available
// Try using fopen if curl was not available
$opts = array('method' => $this->method,
'content' => $this->request
);