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

Merge pull request #10383 from annando/http-options 

Support HTTP OPTIONS requests
This commit is contained in:
Hypolite Petovan 2021-06-09 07:45:04 -04:00 committed by GitHub
parent a99b619338 5e36d10730
commit b1e0c5128e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/App/Module.php
View File

@ -265,6 +265,20 @@ class Module
$logger->debug('index.php: page not found.', ['request_uri' => $server['REQUEST_URI'], 'address' => $server['REMOTE_ADDR'], 'query' => $server['QUERY_STRING']]); $logger->debug('index.php: page not found.', ['request_uri' => $server['REQUEST_URI'], 'address' => $server['REMOTE_ADDR'], 'query' => $server['QUERY_STRING']]);
} }
// @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/OPTIONS
// @todo Check allowed methods per requested path
if ($server['REQUEST_METHOD'] === Router::OPTIONS) {
header('HTTP/1.1 204 No Content');
header('Allow: ' . implode(',', Router::ALLOWED_METHODS));
// Deactivated until we know about possible side effects
// header('Access-Control-Allow-Credentials: true');
// header('Access-Control-Allow-Headers: Authorization,Content-Type');
// header('Access-Control-Allow-Methods: ' . implode(',', Router::ALLOWED_METHODS));
// header('Access-Control-Allow-Origin: ' . DI::baseUrl());
// header('Access-Control-Max-Age: 86400');
exit();
}
$placeholder = ''; $placeholder = '';
$profiler->set(microtime(true), 'ready'); $profiler->set(microtime(true), 'ready');

12
src/App/Router.php
View File

@ -44,11 +44,12 @@ use Friendica\Network\HTTPException;
*/ */
class Router class Router
{ {
const DELETE = 'DELETE'; const DELETE = 'DELETE';
const GET = 'GET'; const GET = 'GET';
const PATCH = 'PATCH'; const PATCH = 'PATCH';
const POST = 'POST'; const POST = 'POST';
const PUT = 'PUT'; const PUT = 'PUT';
const OPTIONS = 'OPTIONS';
const ALLOWED_METHODS = [ const ALLOWED_METHODS = [
self::DELETE, self::DELETE,
@ -56,6 +57,7 @@ class Router
self::PATCH, self::PATCH,
self::POST, self::POST,
self::PUT, self::PUT,
self::OPTIONS
]; ];
/** @var RouteCollector */ /** @var RouteCollector */