3131namespace OCA \DAV \CalDAV \WebcalCaching ;
3232
3333use Exception ;
34- use GuzzleHttp \HandlerStack ;
35- use GuzzleHttp \Middleware ;
34+ use GuzzleHttp \RequestOptions ;
3635use OCA \DAV \CalDAV \CalDavBackend ;
3736use OCP \Http \Client \IClientService ;
3837use OCP \Http \Client \LocalServerException ;
3938use OCP \IConfig ;
40- use Psr \Http \Message \RequestInterface ;
41- use Psr \Http \Message \ResponseInterface ;
4239use Psr \Log \LoggerInterface ;
4340use Sabre \DAV \Exception \BadRequest ;
4441use Sabre \DAV \PropPatch ;
45- use Sabre \DAV \Xml \Property \Href ;
4642use Sabre \VObject \Component ;
4743use Sabre \VObject \DateTimeParser ;
4844use Sabre \VObject \InvalidDataException ;
@@ -76,15 +72,15 @@ public function __construct(CalDavBackend $calDavBackend, IClientService $client
7672 $ this logger = $ logger
7773 }
7874
79- public function refreshSubscription (string $ principalUristring $ uri
75+ public function refreshSubscription (string $ principalUristring $ uri: void {
8076 $ subscription$ this getSubscription ($ principalUri$ uri
8177 $ mutations
8278 if (!$ subscription
8379 return ;
8480 }
8581
8682 $ webcalData$ this queryWebcalFeed ($ subscription$ mutations
87- if (! $ webcalData
83+ if ($ webcalData === null ) {
8884 return ;
8985 }
9086
@@ -127,7 +123,7 @@ public function refreshSubscription(string $principalUri, string $uri) {
127123 $ calendarData$ vObjectserialize ();
128124 try {
129125 $ this calDavBackend ->createCalendarObject ($ subscription'id ' ], $ objectUri$ calendarDataCALENDAR_TYPE_SUBSCRIPTION );
130- } catch (NoInstancesException | BadRequest $ ex
126+ } catch (NoInstancesException | BadRequest $ ex
131127 $ this logger ->error ('Unable to create calendar object from subscription {subscriptionId} ' , ['exception ' => $ ex'subscriptionId ' => $ subscription'id ' ], 'source ' => $ subscription'source ' ]]);
132128 }
133129 }
@@ -139,7 +135,7 @@ public function refreshSubscription(string $principalUri, string $uri) {
139135
140136 $ this updateSubscription ($ subscription$ mutations
141137 } catch (ParseException $ ex
142- $ this logger ->error (" Subscription {subscriptionId} could not be refreshed due to a parsing error " 'exception ' => $ ex'subscriptionId ' => $ subscription'id ' ]]);
138+ $ this logger ->error (' Subscription {subscriptionId} could not be refreshed due to a parsing error ' 'exception ' => $ ex'subscriptionId ' => $ subscription'id ' ]]);
143139 }
144140 }
145141
@@ -165,106 +161,81 @@ function ($sub) use ($uri) {
165161 * gets webcal feed from remote server
166162 */
167163 private function queryWebcalFeed (array $ subscriptionarray &$ mutationsstring {
168- $ client$ this clientService ->newClient ();
169-
170- $ didBreak301Chainfalse ;
171- $ latestLocationnull ;
172-
173- $ handlerStackcreate ();
174- $ handlerStackpush (Middleware::mapRequest (function (RequestInterface $ request
175- return $ request
176- ->withHeader ('Accept ' , 'text/calendar, application/calendar+json, application/calendar+xml ' )
177- ->withHeader ('User-Agent ' , 'Nextcloud Webcal Service ' );
178- }));
179- $ handlerStackpush (Middleware::mapResponse (function (ResponseInterface $ responseuse (&$ didBreak301Chain$ latestLocation
180- if (!$ didBreak301Chain
181- if ($ responsegetStatusCode () !== 301 ) {
182- $ didBreak301Chaintrue ;
183- } else {
184- $ latestLocation$ responsegetHeader ('Location ' );
185- }
186- }
187- return $ response
188- }));
189-
190- $ allowLocalAccess$ this config ->getAppValue ('dav ' , 'webcalAllowLocalAccess ' , 'no ' );
191164 $ subscriptionId$ subscription'id ' ];
192165 $ url$ this cleanURL ($ subscription'source ' ]);
193166 if ($ urlnull ) {
194167 return null ;
195168 }
196169
197- try {
198- $ params
199- 'allow_redirects ' => [
200- 'redirects ' => 10
201- ],
202- 'handler ' => $ handlerStack
203- 'nextcloud ' => [
204- 'allow_local_address ' => $ allowLocalAccess'yes ' ,
205- ]
206- ];
207-
208- $ userparse_url ($ subscription'source ' ], PHP_URL_USER );
209- $ passparse_url ($ subscription'source ' ], PHP_URL_PASS );
210- if ($ usernull && $ passnull ) {
211- $ params'auth ' ] = [$ user$ pass
212- }
213-
214- $ response$ clientget ($ url$ params
215- $ body$ responsegetBody ();
170+ $ allowLocalAccess$ this config ->getAppValue ('dav ' , 'webcalAllowLocalAccess ' , 'no ' );
216171
217- if ($ latestLocation
218- $ mutations'{http://calendarserver.org/ns/}source ' ] = new Href ($ latestLocation
219- }
172+ $ params
173+ 'nextcloud ' => [
174+ 'allow_local_address ' => $ allowLocalAccess'yes ' ,
175+ ],
176+ RequestOptions::HEADERS => [
177+ 'User-Agent ' => 'Nextcloud Webcal Service ' ,
178+ 'Accept ' => 'text/calendar, application/calendar+json, application/calendar+xml ' ,
179+ ],
180+ ];
181+
182+ $ userparse_url ($ subscription'source ' ], PHP_URL_USER );
183+ $ passparse_url ($ subscription'source ' ], PHP_URL_PASS );
184+ if ($ usernull && $ passnull ) {
185+ $ paramsAUTH ] = [$ user$ pass
186+ }
220187
221- $ contentType$ responsegetHeader ('Content-Type ' );
222- $ contentTypeexplode ('; ' , $ contentType2 )[0 ];
223- switch ($ contentType
224- case 'application/calendar+json ' :
225- try {
226- $ jCalendarreadJson ($ bodyOPTION_FORGIVING );
227- } catch (Exception $ ex
228- // In case of a parsing error return null
229- $ this logger ->warning ("Subscription $ subscriptionId could not be parsed " , ['exception ' => $ ex
230- return null ;
231- }
232- return $ jCalendarserialize ();
233-
234- case 'application/calendar+xml ' :
235- try {
236- $ xCalendarreadXML ($ body
237- } catch (Exception $ ex
238- // In case of a parsing error return null
239- $ this logger ->warning ("Subscription $ subscriptionId could not be parsed " , ['exception ' => $ ex
240- return null ;
241- }
242- return $ xCalendarserialize ();
243-
244- case 'text/calendar ' :
245- default :
246- try {
247- $ vCalendarread ($ body
248- } catch (Exception $ ex
249- // In case of a parsing error return null
250- $ this logger ->warning ("Subscription $ subscriptionId could not be parsed " , ['exception ' => $ ex
251- return null ;
252- }
253- return $ vCalendarserialize ();
254- }
188+ try {
189+ $ client$ this clientService ->newClient ();
190+ $ response$ clientget ($ url$ params
255191 } catch (LocalServerException $ ex
256192 $ this logger ->warning ("Subscription $ subscriptionId was not refreshed because it violates local access rules " , [
257193 'exception ' => $ ex
258194 ]);
259-
260195 return null ;
261196 } catch (Exception $ ex
262197 $ this logger ->warning ("Subscription $ subscriptionId could not be refreshed due to a network error " , [
263198 'exception ' => $ ex
264199 ]);
265-
266200 return null ;
267201 }
202+
203+ $ body$ responsegetBody ();
204+
205+ $ contentType$ responsegetHeader ('Content-Type ' );
206+ $ contentTypeexplode ('; ' , $ contentType2 )[0 ];
207+ switch ($ contentType
208+ case 'application/calendar+json ' :
209+ try {
210+ $ jCalendarreadJson ($ bodyOPTION_FORGIVING );
211+ } catch (Exception $ ex
212+ // In case of a parsing error return null
213+ $ this logger ->warning ("Subscription $ subscriptionId could not be parsed " , ['exception ' => $ ex
214+ return null ;
215+ }
216+ return $ jCalendarserialize ();
217+
218+ case 'application/calendar+xml ' :
219+ try {
220+ $ xCalendarreadXML ($ body
221+ } catch (Exception $ ex
222+ // In case of a parsing error return null
223+ $ this logger ->warning ("Subscription $ subscriptionId could not be parsed " , ['exception ' => $ ex
224+ return null ;
225+ }
226+ return $ xCalendarserialize ();
227+
228+ case 'text/calendar ' :
229+ default :
230+ try {
231+ $ vCalendarread ($ body
232+ } catch (Exception $ ex
233+ // In case of a parsing error return null
234+ $ this logger ->warning ("Subscription $ subscriptionId could not be parsed " , ['exception ' => $ ex
235+ return null ;
236+ }
237+ return $ vCalendarserialize ();
238+ }
268239 }
269240
270241 /**
0 commit comments