Support force_ssl option in admin plugin #1479

getgrav · Jul 13, 2018 · 9a1dec5 · 9a1dec5
1 parent e87217a
commit 9a1dec5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 1. [](#bugfix)
     * Force `html` for markdown preview [grav#2066](https://github.com/getgrav/grav/issues/2066)
     * Add missing `authorizeTask()` checks in controller [#1483](https://github.com/getgrav/grav/issues/1483)
+    * Add support for `force_ssl` to admin URLs [#1479](https://github.com/getgrav/grav-plugin-admin/issues/1479)
 
 # v1.8.5
 ## 06/20/2018

diff --git a/admin.php b/admin.php
@@ -317,6 +317,16 @@ protected function initializeController($task, $post)
      */
     public function onPagesInitialized()
     {
+        $config = $this->config;
+
+        // Force SSL with redirect if required
+        if ($config->get('system.force_ssl')) {
+            if (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] !== 'on') {
+                $url = 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+                $this->grav->redirect($url);
+            }
+        }
+
         $this->session = $this->grav['session'];
 
         // Set original route for the home page.