github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3134 from jumpserver/v52 

V52
pull/3048/head^2
BaiJiangJie 2019-08-16 16:34:20 +08:00 committed by GitHub
parent 088f815a30 48826a9ad9
commit fe6f7bcfc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/common/utils/common.py
View File

@ -12,7 +12,7 @@ import copy
import ipaddress
UUID_PATTERN = re.compile(r'[0-9a-zA-Z\-]{36}')
UUID_PATTERN = re.compile(r'\w{8}(-\w{4}){3}-\w{12}')
ipip_db = None

10
apps/orgs/views.py
View File

@ -4,6 +4,7 @@ from django.http import HttpResponseForbidden
from django.views.generic import DetailView, View
from .models import Organization
from common.utils import UUID_PATTERN
class SwitchOrgView(DetailView):
@ -17,10 +18,11 @@ class SwitchOrgView(DetailView):
request.session['oid'] = oid
host = request.get_host()
referer = request.META.get('HTTP_REFERER')
if referer.find(host) != -1:
return redirect(referer)
else:
return redirect('index')
if referer.find(host) == -1:
return redirect(reverse('index'))
if UUID_PATTERN.search(referer):
return redirect(reverse('index'))
return redirect(referer)
class SwitchToAOrgView(View):