4 files changed, 18 insertions, 4 deletions
diff --git a/app.py b/app.py
index 13627af..bb4b072 100644
--- a/app.py
+++ b/app.py
@@ -7,7 +7,7 @@ import account
 import ldap
 import os
 from copy import deepcopy
-from flask import flash, Flask, g, redirect, request, session, url_for
+from flask import flash, Flask, g, redirect, request, session
 from utils import *
 
 
diff --git a/default_settings.py b/default_settings.py
index 8581bdb..2a74829 100644
--- a/default_settings.py
+++ b/default_settings.py
@@ -19,3 +19,5 @@ LDAP_HOST = 'ldap://localhost:5678'
 LDAP_BASE_DN = [('dc','accounts'),('dc','spline'),('dc','inf'),('dc','fu-berlin'),('dc','de')]
 LDAP_ADMIN_USER = 'admin'
 LDAP_ADMIN_PASS = 'admin'
+
+PREFERRED_URL_SCHEME = 'https'
diff --git a/forms.py b/forms.py
index bbdfabe..b14e612 100644
--- a/forms.py
+++ b/forms.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 from account import SERVICES, NoSuchUserError
-from flask import g, current_app, session, url_for, Markup
+from flask import g, current_app, session, Markup
 from flask.ext.wtf import Form, validators, TextField, PasswordField,\
                           ValidationError, BooleanField
 from functools import partial
-from utils import _username_re, _username_exclude_re, decrypt_password, NotRegexp
+from utils import _username_re, _username_exclude_re, decrypt_password,\
+                  NotRegexp, url_for
 
 
 username = partial(TextField, 'Benutzername', [validators.Regexp(_username_re,
diff --git a/utils.py b/utils.py
index 573345d..595f770 100644
--- a/utils.py
+++ b/utils.py
@@ -9,7 +9,8 @@ from base64 import urlsafe_b64encode, urlsafe_b64decode
 from Crypto.Cipher import AES
 from email.mime.text import MIMEText
 from functools import wraps
-from flask import current_app, flash, g, redirect, render_template, request, session, url_for
+from flask import current_app, flash, g, redirect, render_template, request, session
+from flask import url_for as flask_url_for
 from flask.ext.wtf import ValidationError
 from hashlib import sha1
 from random import randint
@@ -227,3 +228,13 @@ class NotRegexp(Regexp):
                 self.message = field.gettext(u'Invalid input.')
 
             raise ValidationError(self.message)
+
+
+def url_for(endpoint, **values):
+    """Wrap `flask.url_for` so that it always returns https links"""
+    #XXX: Drop this in favor of config.PREFERRED_URL_SCHEME when we require Flask 0.9
+    u = flask_url_for(endpoint, **values)
+    if '_external' in values and u.startswith('http://'):
+        return 'https://' + u[7:]
+    else:
+        return u