From b6b22b5a6a89fce272fcd8118daee0b7101e58a7 Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Wed, 12 Apr 2017 00:46:18 +0200
Subject: [PATCH] [WarpInfra] Added Register Redirection for internal Page
---
www/web/warpauth/views/register.py | 4 +++-
www/web/warpauth/views/reset_password.py | 7 ++++++-
www/web/warpzone/settings.py | 5 +++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/www/web/warpauth/views/register.py b/www/web/warpauth/views/register.py
index 099f678..5533791 100644
--- a/www/web/warpauth/views/register.py
+++ b/www/web/warpauth/views/register.py
@@ -10,7 +10,7 @@ from warpauth.models import LdapUser, ActivationToken, LdapGroup
from warpauth.util import *
from django.utils.translation import ugettext as _
from django.core.exceptions import ObjectDoesNotExist
-
+from warpzone.settings import INSTANCE_NAME
def send_token(token):
email_content = _("https://infra.warpzone.ms/account/registration/activate/%(token)s") % {'token': token.token }
@@ -20,6 +20,8 @@ def send_token(token):
def register(request):
page_context['success'] = False
+ if "INTERN" in INSTANCE_NAME:
+ return redirect('http://infra.warpzone.ms/registration/')
if request.method == "POST":
username = request.POST['username']
diff --git a/www/web/warpauth/views/reset_password.py b/www/web/warpauth/views/reset_password.py
index 15b6d79..15741ae 100644
--- a/www/web/warpauth/views/reset_password.py
+++ b/www/web/warpauth/views/reset_password.py
@@ -14,13 +14,16 @@ from warpzone.util import send_email
from warpauth.util import *
from warpauth.models import PasswordResetToken, LdapUser
-from warpzone.settings import PW_RESET_TOKEN_LIFETIME
+from warpzone.settings import PW_RESET_TOKEN_LIFETIME, INSTANCE_NAME
#
# Function to generate a password reset Token
#
def gen_token(request):
+ if "INTERN" in INSTANCE_NAME:
+ return redirect('http://infra.warpzone.ms/reset_password/')
+
if request.POST:
try:
usr = LdapUser.objects.get(uid=request.POST["username"])
@@ -45,6 +48,8 @@ def gen_token(request):
#
def change_password(request, reset_hash=None):
+ if "INTERN" in INSTANCE_NAME:
+ return redirect('http://infra.warpzone.ms/reset_password/')
try:
pw_reset_token = PasswordResetToken.objects.get(hash=reset_hash)
time_difference = datetime.datetime.now() - pw_reset_token.created
diff --git a/www/web/warpzone/settings.py b/www/web/warpzone/settings.py
index b0f7bb2..d9e6d65 100644
--- a/www/web/warpzone/settings.py
+++ b/www/web/warpzone/settings.py
@@ -52,10 +52,11 @@ SECRET_KEY = config.get('security','SECRET_KEY')
API_KEY = config.get('mattermost','API_KEY')
# DEBUG
-DEBUG = config.getboolean('debug','DEBUG')
+DEBUG = config.getboolean('debug', 'DEBUG')
# MISC
-LOG_PATH = config.get('misc','LOG_PATH')
+LOG_PATH = config.get('misc', 'LOG_PATH')
+INSTANCE_NAME = config.get('common', 'INSTANCE_NAME')
ALLOWED_HOSTS = [config.get('security','ALLOWED_HOSTS')]
--
GitLab