EBernhardson has submitted this change and it was merged.
Change subject: Force redirect to canonical domain if present
......................................................................
Force redirect to canonical domain if present
Change-Id: I1b5b784b5913a61beecf3af750ed410a652c2385
---
M app.php
1 file changed, 8 insertions(+), 2 deletions(-)
Approvals:
EBernhardson: Verified; Looks good to me, approved
diff --git a/app.php b/app.php
index a352fff..00a88b5 100644
--- a/app.php
+++ b/app.php
@@ -95,9 +95,15 @@
// bare bones authentication / firewall
$app->before(function (Request $request) use ($app) {
+ if (isset($app['canonical_domain'])) {
+ if (strtolower($request->getHost()) !==
strtolower($app['canonical_domain'])) {
+ return $app->redirect('https://'.$app['canonical_domain']);
+ }
+ }
+
$uri = $request->getRequestUri();
if ($uri === '/login' || substr($uri, 0, 7) === '/oauth/') {
- return null;
+ return;
}
$session = $app['session'];
$cred = $session->get('oauth.credentials');
@@ -125,7 +131,7 @@
$app['twig']->addGlobal('user', $user);
- return null;
+ return;
});
$app->get('/', function () use ($app) {
--
To view, visit https://gerrit.wikimedia.org/r/287756
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b5b784b5913a61beecf3af750ed410a652c2385
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/discovery/discernatron
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
