Force SSL on a page if system.force_ssl is enabled (#899)

* Force SSL on a page if system.force_ssl is enabled * Blueprint for force_ssl option * Add default false for force_ssl
getgrav · Jul 20, 2016 · 98534bc · 98534bc
1 parent 9b67359
commit 98534bc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
@@ -513,7 +513,7 @@ form:
                     label: PLUGIN_ADMIN.MEMCACHED_PORT
                     help: PLUGIN_ADMIN.MEMCACHED_PORT_HELP
                     placeholder: "11211"
-                
+
                 cache.redis.server:
                     type: text
                     size: medium
@@ -1018,3 +1018,14 @@ form:
                     options:
                         ':': ': (default)'
                         ';': '; (for Apache running on Windows)'
+
+                force_ssl:
+                    type: toggle
+                    label: PLUGIN_ADMIN.FORCE_SSL
+                    highlight: 0
+                    help: PLUGIN_ADMIN.FORCE_SSL_HELP
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
diff --git a/system/config/system.yaml b/system/config/system.yaml
@@ -4,7 +4,7 @@ default_locale:                             # Default locale (defaults to system
 param_sep: ':'                              # Parameter separator, use ';' for Apache on windows
 wrapped_site: false                         # For themes/plugins to know if Grav is wrapped by another platform
 reverse_proxy_setup: false                  # Running in a reverse proxy scenario with different webserver ports than proxy
-
+force_ssl: false                            # If enabled, Grav forces to be accessed via HTTPS
 
 languages:
   supported: []                             # List of languages supported. eg: [en, fr, de]

diff --git a/system/src/Grav/Common/Service/PageServiceProvider.php b/system/src/Grav/Common/Service/PageServiceProvider.php
@@ -33,6 +33,12 @@ public function register(Container $container) {
 
             // Redirection tests
             if ($page) {
+                if ($c['config']->get('system.force_ssl')) {
+                    if (!isset($_SERVER['HTTPS']) || $_SERVER["HTTPS"] != "on") {
+                        $url = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
+                        $c->redirect($url);
+                    }                    
+                }
 
                 $url = $page->route();