mirror of https://github.com/nextcloud/calendar
optimize routes.php, remove ProxyController
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
This commit is contained in:
Georg Ehrke
parent
3f8874a64f
commit
b4dd09f9c6
|
|
@ -23,33 +23,24 @@
|
|||
*/
|
||||
return [
|
||||
'routes' => [
|
||||
//Main view
|
||||
// User views
|
||||
['name' => 'view#index', 'url' => '/', 'verb' => 'GET'],
|
||||
// we need to reflect all our javascript routes here as well,
|
||||
// so that you don't get forwarded to the files app on reload
|
||||
['name' => 'view#indexViewTimerange', 'url' => '/month/{timeRange}/', 'verb' => 'GET'],
|
||||
// ['name' => 'view#indexViewTimerange', 'url' => '/agendaDay/{timeRange}/', 'verb' => 'GET'],
|
||||
// ['name' => 'view#indexViewTimerange', 'url' => '/agendaWeek/{timeRange}/', 'verb' => 'GET'],
|
||||
['name' => 'view#indexViewTimerangeNew', 'url' => '/month/{timeRange}/new/{mode}/{recurrenceId}/', 'verb' => 'GET'],
|
||||
// ['name' => 'view#indexViewTimerangeNew', 'url' => '/agendaDay/{timeRange}/new/{mode}/{recurrenceId}/', 'verb' => 'GET'],
|
||||
// ['name' => 'view#indexViewTimerangeNew', 'url' => '/agendaWeek/{timeRange}/new/{mode}/{recurrenceId}/', 'verb' => 'GET'],
|
||||
['name' => 'view#indexViewTimerangeEdit', 'url' => '/month/{timeRange}/edit/{mode}/{objectId}/{recurrenceId}/', 'verb' => 'GET'],
|
||||
// ['name' => 'view#indexViewTimerangeEdit', 'url' => '/agendaDay/{timeRange}/edit/{mode}/{objectId}/{recurrenceId}/', 'verb' => 'GET'],
|
||||
// ['name' => 'view#indexViewTimerangeEdit', 'url' => '/agendaWeek/{timeRange}/edit/{mode}/{objectId}/{recurrenceId}/', 'verb' => 'GET'],
|
||||
|
||||
['name' => 'view#index', 'url' => '/{view}/{timeRange}/', 'verb' => 'GET', 'requirements' => ['view' => 'agendaDay|agendaWeek|month'], 'postfix' => 'view.timerange'],
|
||||
['name' => 'view#index', 'url' => '/{view}/{timeRange}/new/{mode}/{recurrenceId}/', 'verb' => 'GET', 'requirements' => ['view' => 'agendaDay|agendaWeek|month'], 'postfix' => 'view.timerange.new'],
|
||||
['name' => 'view#index', 'url' => '/{view}/{timeRange}/edit/{mode}/{objectId}/{recurrenceId}/', 'verb' => 'GET', 'requirements' => ['view' => 'agendaDay|agendaWeek|month'], 'postfix' => 'view.timerange.edit'],
|
||||
// Public views
|
||||
['name' => 'view#public_index_with_branding', 'url' => '/p/{token}', 'verb' => 'GET'],
|
||||
['name' => 'view#public_index_with_branding_and_fancy_name', 'url' => '/p/{token}/{fancyName}', 'verb' => 'GET'],
|
||||
['name' => 'view#public_index_with_branding', 'url' => '/p/{token}/{fancyName}', 'verb' => 'GET', 'postfix' => 'fancy.name'],
|
||||
['name' => 'view#public_index_for_embedding', 'url' => '/embed/{token}', 'verb' => 'GET'],
|
||||
['name' => 'view#public_index_for_embedding_legacy', 'url' => '/public/{token}', 'verb' => 'GET'], // keep public/ for legacy reasons
|
||||
// Tools
|
||||
['name' => 'email#sendEmailPublicLink', 'url' => '/v1/public/sendmail', 'verb' => 'POST'],
|
||||
//Settings
|
||||
['name' => 'settings#getConfig', 'url' => '/v1/config', 'verb' => 'GET'],
|
||||
['name' => 'settings#setConfig', 'url' => '/v1/config', 'verb' => 'POST'],
|
||||
['name' => 'view#public_index_for_embedding', 'url' => '/public/{token}', 'verb' => 'GET', 'postfix' => 'legacy'], // keep public/ for legacy reasons
|
||||
|
||||
//Autocompletion
|
||||
['name' => 'contact#searchAttendee', 'url' => '/v1/autocompletion/attendee', 'verb' => 'POST'],
|
||||
['name' => 'contact#searchLocation', 'url' => '/v1/autocompletion/location', 'verb' => 'POST'],
|
||||
|
||||
['name' => 'proxy#proxy', 'url' => '/v1/proxy', 'verb' => 'GET'],
|
||||
//Settings
|
||||
['name' => 'settings#getConfig', 'url' => '/v1/config', 'verb' => 'GET'],
|
||||
['name' => 'settings#setConfig', 'url' => '/v1/config', 'verb' => 'POST'],
|
||||
// Tools
|
||||
['name' => 'email#sendEmailPublicLink', 'url' => '/v1/public/sendmail', 'verb' => 'POST'],
|
||||
]
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,230 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* ownCloud - Calendar App
|
||||
*
|
||||
* @author Georg Ehrke
|
||||
* @copyright 2016 Georg Ehrke <oc.list@georgehrke.com>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
namespace OCA\Calendar\Controller;
|
||||
|
||||
use GuzzleHttp\Exception\RequestException;
|
||||
use GuzzleHttp\Exception\ClientException;
|
||||
use GuzzleHttp\Exception\ConnectException;
|
||||
|
||||
use OCP\AppFramework\Http;
|
||||
use OCP\AppFramework\Http\JSONResponse;
|
||||
use OCP\AppFramework\Http\DataDisplayResponse;
|
||||
use OCP\AppFramework\Controller;
|
||||
use OCP\Http\Client\IClientService;
|
||||
use OCP\IConfig;
|
||||
use OCP\IL10N;
|
||||
use OCP\ILogger;
|
||||
use OCP\IRequest;
|
||||
use Sabre\VObject\Reader;
|
||||
|
||||
class ProxyController extends Controller {
|
||||
|
||||
/**
|
||||
* @var IClientService
|
||||
*/
|
||||
protected $client;
|
||||
|
||||
/**
|
||||
* @var IL10N
|
||||
*/
|
||||
protected $l10n;
|
||||
|
||||
/**
|
||||
* @var ILogger
|
||||
*/
|
||||
protected $logger;
|
||||
|
||||
/**
|
||||
* @var IConfig
|
||||
*/
|
||||
protected $config;
|
||||
|
||||
/**
|
||||
* @param string $appName
|
||||
* @param IRequest $request an instance of the request
|
||||
* @param IClientService $client
|
||||
* @param IL10N $l10n
|
||||
* @param ILogger $logger
|
||||
* @param IConfig $config
|
||||
*/
|
||||
public function __construct($appName, IRequest $request,
|
||||
IClientService $client,
|
||||
IL10N $l10n, ILogger $logger,
|
||||
IConfig $config) {
|
||||
parent::__construct($appName, $request);
|
||||
$this->client = $client;
|
||||
$this->l10n = $l10n;
|
||||
$this->logger = $logger;
|
||||
$this->config = $config;
|
||||
}
|
||||
|
||||
/**
|
||||
* @NoAdminRequired
|
||||
*
|
||||
* @param $url
|
||||
* @return DataDisplayResponse|JSONResponse
|
||||
*/
|
||||
public function proxy($url) {
|
||||
$client = $this->client->newClient();
|
||||
try {
|
||||
$queryUrl = $url;
|
||||
$allow_redirects = false; // try to handle redirects manually at first
|
||||
$redirect_count = 0;
|
||||
$max_redirects = 5;
|
||||
$done = false;
|
||||
|
||||
$allowLocalAccess = $this->config->getAppValue('dav', 'webcalAllowLocalAccess', 'no');
|
||||
if ($allowLocalAccess !== 'yes') {
|
||||
$host = strtolower(parse_url($url, PHP_URL_HOST));
|
||||
// remove brackets from IPv6 addresses
|
||||
if (strpos($host, '[') === 0 && substr($host, -1) === ']') {
|
||||
$host = substr($host, 1, -1);
|
||||
}
|
||||
|
||||
// Disallow localhost and local network
|
||||
if ($host === 'localhost' || substr($host, -6) === '.local' || substr($host, -10) === '.localhost') {
|
||||
$this->logger->warning("ProxyController: Subscription $url was not refreshed because it violates local access rules");
|
||||
|
||||
$response = new JSONResponse([
|
||||
'message' => $this->l10n->t('URL violates local access rules'),
|
||||
'proxy_code' => 403
|
||||
], Http::STATUS_UNPROCESSABLE_ENTITY);
|
||||
|
||||
return $response;
|
||||
}
|
||||
|
||||
// Disallow hostname only
|
||||
if (substr_count($host, '.') === 0) {
|
||||
$this->logger->warning("ProxyController: Subscription $url was not refreshed because it violates local access rules");
|
||||
|
||||
$response = new JSONResponse([
|
||||
'message' => $this->l10n->t('URL violates local access rules'),
|
||||
'proxy_code' => 403
|
||||
], Http::STATUS_UNPROCESSABLE_ENTITY);
|
||||
|
||||
return $response;
|
||||
}
|
||||
|
||||
if ((bool)filter_var($host, FILTER_VALIDATE_IP) && !filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
|
||||
$this->logger->warning("ProxyController: Subscription $url was not refreshed because it violates local access rules");
|
||||
|
||||
$response = new JSONResponse([
|
||||
'message' => $this->l10n->t('URL violates local access rules'),
|
||||
'proxy_code' => 403
|
||||
], Http::STATUS_UNPROCESSABLE_ENTITY);
|
||||
|
||||
return $response;
|
||||
}
|
||||
}
|
||||
|
||||
// try to find a chain of 301s
|
||||
do {
|
||||
$clientResponse = $client->get($queryUrl, [
|
||||
'allow_redirects' => $allow_redirects,
|
||||
]);
|
||||
|
||||
$statusCode = $clientResponse->getStatusCode();
|
||||
if ($statusCode === 301) { // 400+ goes straight to catch
|
||||
$redirect_count++;
|
||||
$queryUrl = $clientResponse->getHeader('Location');
|
||||
} elseif ($statusCode >= 300) {
|
||||
if ($redirect_count > 0) {
|
||||
// $redirect_count > 0 => There have been 301s before,
|
||||
// break and return Location from last 301
|
||||
break;
|
||||
} else {
|
||||
// this is the very first request
|
||||
// it's being redirected, but the redirection is not
|
||||
// permanently, just let Guzzle take care
|
||||
$allow_redirects = [
|
||||
'max' => $max_redirects
|
||||
];
|
||||
}
|
||||
} else {
|
||||
$done = true;
|
||||
}
|
||||
} while(!$done && $redirect_count <= $max_redirects);
|
||||
|
||||
if ($redirect_count > 0 && $redirect_count <= $max_redirects) {
|
||||
$response = new JSONResponse([
|
||||
'proxy_code' => -4,
|
||||
'new_url' => $queryUrl,
|
||||
], Http::STATUS_BAD_REQUEST);
|
||||
} elseif ($done) {
|
||||
$icsData = $clientResponse->getBody();
|
||||
|
||||
try {
|
||||
Reader::read($icsData, Reader::OPTION_FORGIVING);
|
||||
} catch(\Exception $ex) {
|
||||
$response = new JSONResponse([
|
||||
'message' => $this->l10n->t('The remote server did not give us access to the calendar (HTTP 404 error)'),
|
||||
'proxy_code' => 404
|
||||
], Http::STATUS_UNPROCESSABLE_ENTITY);
|
||||
|
||||
return $response;
|
||||
}
|
||||
|
||||
$response = new DataDisplayResponse($icsData, 200);
|
||||
$response->setHeaders([
|
||||
'Content-Type' => 'text/calendar',
|
||||
]);
|
||||
} else {
|
||||
$response = new JSONResponse([
|
||||
'message' => $this->l10n->t('Too many redirects. Aborting ...'),
|
||||
'proxy_code' => -3
|
||||
], Http::STATUS_UNPROCESSABLE_ENTITY);
|
||||
}
|
||||
} catch (ClientException $e) {
|
||||
$error_code = $e->getResponse()->getStatusCode();
|
||||
$message = $e->getMessage();
|
||||
|
||||
$this->logger->debug($message);
|
||||
$response = new JSONResponse([
|
||||
'message' => $this->l10n->t('The remote server did not give us access to the calendar (HTTP {%s} error)', [
|
||||
(string) $error_code
|
||||
]),
|
||||
'proxy_code' => $error_code
|
||||
], Http::STATUS_UNPROCESSABLE_ENTITY);
|
||||
} catch (ConnectException $e) {
|
||||
$this->logger->debug($e->getMessage());
|
||||
$response = new JSONResponse([
|
||||
'message' => $this->l10n->t('Error connecting to remote server'),
|
||||
'proxy_code' => -1
|
||||
], Http::STATUS_UNPROCESSABLE_ENTITY);
|
||||
} catch (RequestException $e) {
|
||||
$this->logger->debug($e->getMessage());
|
||||
|
||||
if (substr($url, 0, 8) === 'https://') {
|
||||
$message = $this->l10n->t('Error requesting resource on remote server. This could possible be related to a certificate mismatch');
|
||||
} else {
|
||||
$message = $this->l10n->t('Error requesting resource on remote server');
|
||||
}
|
||||
|
||||
$response = new JSONResponse([
|
||||
'message' => $message,
|
||||
'proxy_code' => -2,
|
||||
], Http::STATUS_UNPROCESSABLE_ENTITY);
|
||||
}
|
||||
|
||||
return $response;
|
||||
}
|
||||
}
|
||||
|
|
@ -73,16 +73,6 @@ class ViewController extends Controller {
|
|||
return new TemplateResponse('calendar', 'main');
|
||||
}
|
||||
|
||||
/**
|
||||
* @NoAdminRequired
|
||||
* @NoCSRFRequired
|
||||
*
|
||||
* @return TemplateResponse
|
||||
*/
|
||||
public function indexViewTimerange():TemplateResponse {
|
||||
return $this->index();
|
||||
}
|
||||
|
||||
/**
|
||||
* @PublicPage
|
||||
* @NoCSRFRequired
|
||||
|
|
@ -98,18 +88,6 @@ class ViewController extends Controller {
|
|||
return new TemplateResponse('calendar', 'public', $params, 'base');
|
||||
}
|
||||
|
||||
/**
|
||||
* @PublicPage
|
||||
* @NoCSRFRequired
|
||||
*
|
||||
* @param string $token
|
||||
*
|
||||
* @return TemplateResponse
|
||||
*/
|
||||
public function publicIndexWithBrandingAndFancyName(string $token):TemplateResponse {
|
||||
return $this->publicIndexWithBranding($token);
|
||||
}
|
||||
|
||||
/**
|
||||
* @PublicPage
|
||||
* @NoCSRFRequired
|
||||
|
|
@ -128,18 +106,6 @@ class ViewController extends Controller {
|
|||
return $response;
|
||||
}
|
||||
|
||||
/**
|
||||
* @PublicPage
|
||||
* @NoCSRFRequired
|
||||
*
|
||||
* @param string $token
|
||||
*
|
||||
* @return TemplateResponse
|
||||
*/
|
||||
public function publicIndexForEmbeddingLegacy(string $token):TemplateResponse {
|
||||
return $this->publicIndexForEmbedding($token);
|
||||
}
|
||||
|
||||
/**
|
||||
* add parameters to javascript for user sites
|
||||
*
|
||||
|
|
|
|||
Loading…
Reference in New Issue