Add a feature flag to disable HSTS grants by default

HSTS is great, but a pain when you have HTTP-only services running
on your dev machine
This commit is contained in:
Jordan Milne
2014-08-15 12:43:33 -03:00
committed by Neil Williams
parent 25a890d8ed
commit ebdf16bade
2 changed files with 6 additions and 1 deletions

View File

@@ -676,3 +676,7 @@ feature_search_auto_restrict_sr = off
feature_allow_force_https = {"employee": true}
# Who is required to use HTTPS?
feature_require_https = off
# HSTS grants are disabled by default since they make it a pain for devs
# to use local HTTP services. Beware that this will disable grant revocation
# as well.
feature_give_hsts_grants = off

View File

@@ -43,6 +43,7 @@ from pylons import c, g, request, response
from pylons.i18n import _
from pylons.i18n.translation import LanguageError
from r2.config import feature
from r2.config.extensions import is_api, set_extension
from r2.lib import filters, pages, utils, hooks
from r2.lib.authentication import authenticate_user
@@ -804,7 +805,7 @@ def enforce_https():
change_user_cookie_security(False)
need_grant = True
if grant is not None:
if feature.is_enabled("give_hsts_grants") and grant is not None:
if request.host == g.domain and c.secure:
# Always set an HSTS header if we can and we're on the base domain
c.hsts_grant = grant