wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19229 from nextcloud/backport/19215/stable17

Browse source 
[stable17] WebcalRefreshJob: Fix reading refresh rate
This commit is contained in:
Roeland Jago Douma 2020-02-04 15:49:27 +01:00 committed by GitHub
commit 79617a2b23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
apps/dav/lib/BackgroundJob/RefreshWebcalJob.php
View file

@ -63,6 +63,11 @@ class RefreshWebcalJob extends Job {
/** @var array */
private $subscription;
private const REFRESH_RATE = '{http://apple.com/ns/ical/}refreshrate';
private const STRIP_ALARMS = '{http://calendarserver.org/ns/}subscribed-strip-alarms';
private const STRIP_ATTACHMENTS = '{http://calendarserver.org/ns/}subscribed-strip-attachments';
private const STRIP_TODOS = '{http://calendarserver.org/ns/}subscribed-strip-todos';
/**
* RefreshWebcalJob constructor.
*
@ -91,9 +96,11 @@ class RefreshWebcalJob extends Job {
return;
}
$this->fixSubscriptionRowTyping($subscription);
// if no refresh rate was configured, just refresh once a week
$subscriptionId = $subscription['id'];
$refreshrate = $subscription['refreshrate'] ?? 'P1W';
$refreshrate = $subscription[self::REFRESH_RATE] ?? 'P1W';
try {
/** @var \DateInterval $dateInterval */
@ -127,9 +134,9 @@ class RefreshWebcalJob extends Job {
return;
}
$stripTodos = $subscription['striptodos'] ?? 1;
$stripAlarms = $subscription['stripalarms'] ?? 1;
$stripAttachments = $subscription['stripattachments'] ?? 1;
$stripTodos = ($subscription[self::STRIP_TODOS] ?? 1) === 1;
$stripAlarms = ($subscription[self::STRIP_ALARMS] ?? 1) === 1;
$stripAttachments = ($subscription[self::STRIP_ATTACHMENTS] ?? 1) === 1;
try {
$splitter = new ICalendar($webcalData, Reader::OPTION_FORGIVING);
@ -175,7 +182,7 @@ class RefreshWebcalJob extends Job {
$newRefreshRate = $this->checkWebcalDataForRefreshRate($subscription, $webcalData);
if ($newRefreshRate) {
$mutations['{http://apple.com/ns/ical/}refreshrate'] = $newRefreshRate;
$mutations[self::REFRESH_RATE] = $newRefreshRate;
}
$this->updateSubscription($subscription, $mutations);
@ -374,33 +381,33 @@ class RefreshWebcalJob extends Job {
private function checkWebcalDataForRefreshRate($subscription, $webcalData) {
// if there is no refreshrate stored in the database, check the webcal feed
// whether it suggests any refresh rate and store that in the database
if (isset($subscription['refreshrate']) && $subscription['refreshrate'] !== null) {
if (isset($subscription[self::REFRESH_RATE]) && $subscription[self::REFRESH_RATE] !== null) {
return null;
}
/** @var Component\VCalendar $vCalendar */
$vCalendar = Reader::read($webcalData);
$newRefreshrate = null;
$newRefreshRate = null;
if (isset($vCalendar->{'X-PUBLISHED-TTL'})) {
$newRefreshrate = $vCalendar->{'X-PUBLISHED-TTL'}->getValue();
$newRefreshRate = $vCalendar->{'X-PUBLISHED-TTL'}->getValue();
}
if (isset($vCalendar->{'REFRESH-INTERVAL'})) {
$newRefreshrate = $vCalendar->{'REFRESH-INTERVAL'}->getValue();
$newRefreshRate = $vCalendar->{'REFRESH-INTERVAL'}->getValue();
}
if (!$newRefreshrate) {
if (!$newRefreshRate) {
return null;
}
// check if new refresh rate is even valid
try {
DateTimeParser::parseDuration($newRefreshrate);
DateTimeParser::parseDuration($newRefreshRate);
} catch(InvalidDataException $ex) {
return null;
}
return $newRefreshrate;
return $newRefreshRate;
}
/**
@ -457,4 +464,25 @@ class RefreshWebcalJob extends Job {
return $cleanURL;
}
/**
* Fixes types of rows
*
* @param array $row
*/
private function fixSubscriptionRowTyping(array &$row):void {
$forceInt = [
'id',
'lastmodified',
self::STRIP_ALARMS,
self::STRIP_ATTACHMENTS,
self::STRIP_TODOS,
];
foreach($forceInt as $column) {
if (isset($row[$column])) {
$row[$column] = (int) $row[$column];
}
}
}
}

20
apps/dav/tests/unit/BackgroundJob/RefreshWebcalJobTest.php
View file

@ -95,21 +95,21 @@ class RefreshWebcalJobTest extends TestCase {
->with('principals/users/testuser')
->will($this->returnValue([
[
'id' => 99,
'id' => '99',
'uri' => 'sub456',
'refreshreate' => 'P1D',
'striptodos' => 1,
'stripalarms' => 1,
'stripattachments' => 1,
'{http://apple.com/ns/ical/}refreshrate' => 'P1D',
'{http://calendarserver.org/ns/}subscribed-strip-todos' => '1',
'{http://calendarserver.org/ns/}subscribed-strip-alarms' => '1',
'{http://calendarserver.org/ns/}subscribed-strip-attachments' => '1',
'source' => 'webcal://foo.bar/bla'
],
[
'id' => 42,
'id' => '42',
'uri' => 'sub123',
'refreshreate' => 'P1H',
'striptodos' => 1,
'stripalarms' => 1,
'stripattachments' => 1,
'{http://apple.com/ns/ical/}refreshrate' => 'PT1H',
'{http://calendarserver.org/ns/}subscribed-strip-todos' => '1',
'{http://calendarserver.org/ns/}subscribed-strip-alarms' => '1',
'{http://calendarserver.org/ns/}subscribed-strip-attachments' => '1',
'source' => 'webcal://foo.bar/bla2'
],
]));

2
lib/private/BackgroundJob/JobList.php
View file

@ -274,7 +274,7 @@ class JobList implements IJobList {
}
$job->setId((int) $row['id']);
$job->setLastRun($row['last_run']);
$job->setLastRun((int) $row['last_run']);
$job->setArgument(json_decode($row['argument'], true));
return $job;
} catch (AutoloadNotAllowedException $e) {