v/rss-bridge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BugzillaBridge] Explicitly request JSON (#3364)

Browse Source
This commit is contained in:
mrnoname1000 2023-04-27 12:24:29 -05:00 committed by GitHub
parent 212c56fde5
commit 887f4bbe15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bridges/BugzillaBridge.php
View File

@ -85,7 +85,7 @@ class BugzillaBridge extends BridgeAbstract
protected function getTitle($url)
{
// Only request the summary for a faster request
$json = json_decode(getContents($url . '?include_fields=summary'), true);
$json = self::getJSON($url . '?include_fields=summary');
$this->title = 'Bug ' . $this->bugid . ' - ' .
$json['bugs'][0]['summary'] . ' - ' .
// Remove https://
@ -94,7 +94,7 @@ class BugzillaBridge extends BridgeAbstract
protected function collectComments($url)
{
$json = json_decode(getContents($url), true);
$json = self::getJSON($url);
// Array of comments is here
if (!isset($json['bugs'][$this->bugid]['comments'])) {
@ -127,7 +127,7 @@ class BugzillaBridge extends BridgeAbstract
protected function collectUpdates($url)
{
$json = json_decode(getContents($url), true);
$json = self::getJSON($url);
// Array of changesets which contain an array of changes
if (!isset($json['bugs']['0']['history'])) {
@ -170,7 +170,7 @@ class BugzillaBridge extends BridgeAbstract
$url = $this->instance . '/rest/user/' . $user . '?include_fields=real_name';
try {
$json = json_decode(getContents($url), true);
$json = self::getJSON($url);
if (isset($json['error']) and $json['error']) {
throw new Exception();
}
@ -187,4 +187,12 @@ class BugzillaBridge extends BridgeAbstract
$this->saveCacheValue($this->instance . $user, $username);
return $username;
}
protected static function getJSON($url)
{
$headers = [
'Accept: application/json',
];
return json_decode(getContents($url, $headers), true);
}
}