clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10231 from MrPetovan/bug/warnings 

Make birthday time comparison 32-bit safe in Protocol\DFRN
This commit is contained in:
Tobias Diekershoff 2021-05-13 17:58:59 +02:00 committed by GitHub
parent 1d44b97576 aeef4960a1
commit af1896f4d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Protocol/DFRN.php
View File

@ -1441,19 +1441,19 @@ class DFRN
/** /**
* Fetch the author data from head or entry items * Fetch the author data from head or entry items
* *
* @param object $xpath XPath object * @param \DOMXPath $xpath XPath object
* @param object $context In which context should the data be searched * @param \DOMNode $context In which context should the data be searched
* @param array $importer Record of the importer user mixed with contact of the content * @param array $importer Record of the importer user mixed with contact of the content
* @param string $element Element name from which the data is fetched * @param string $element Element name from which the data is fetched
* @param bool $onlyfetch Should the data only be fetched or should it update the contact record as well * @param bool $onlyfetch Should the data only be fetched or should it update the contact record as well
* @param string $xml optional, default empty * @param string $xml optional, default empty
* *
* @return array Relevant data of the author * @return array Relevant data of the author
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
* @todo Find good type-hints for all parameter * @todo Find good type-hints for all parameter
*/ */
private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") private static function fetchauthor(\DOMXPath $xpath, \DOMNode $context, $importer, $element, $onlyfetch, $xml = "")
{ {
$author = []; $author = [];
$author["name"] = XML::getFirstNodeValue($xpath, $element."/atom:name/text()", $context); $author["name"] = XML::getFirstNodeValue($xpath, $element."/atom:name/text()", $context);
@ -1609,12 +1609,14 @@ class DFRN
} }
// "dfrn:birthday" contains the birthday converted to UTC // "dfrn:birthday" contains the birthday converted to UTC
$birthday = XML::getFirstNodeValue($xpath, $element . "/poco:birthday/text()", $context); $birthday = XML::getFirstNodeValue($xpath, $element . "/dfrn:birthday/text()", $context);
try {
if (strtotime($birthday) > time()) { $birthday_date = new \DateTime($birthday);
$bd_timestamp = strtotime($birthday); if ($birthday_date > new \DateTime()) {
$poco["bdyear"] = $birthday_date->format("Y");
$poco["bdyear"] = date("Y", $bd_timestamp); }
} catch (\Exception $e) {
// Invalid birthday
} }
// "poco:birthday" is the birthday in the format "yyyy-mm-dd" // "poco:birthday" is the birthday in the format "yyyy-mm-dd"