Skip to content

J
jumpserver
Commit 0b406b69 authored by ibuler's avatar ibuler
Browse files
Options

Add captch login using

parent 6f0cfd23
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 15 deletions
apps/jumpserver/settings.py
View file @ 0b406b69
...@@ -303,3 +303,7 @@ BROKER_URL = 'redis://%(password)s%(host)s:%(port)s/3' % { ...@@ -303,3 +303,7 @@ BROKER_URL = 'redis://%(password)s%(host)s:%(port)s/3' % {
} }
CELERY_RESULT_BACKEND = BROKER_URL CELERY_RESULT_BACKEND = BROKER_URL
# Captcha settings, more see https://django-simple-captcha.readthedocs.io/en/latest/advanced.html
CAPTCHA_IMAGE_SIZE = (75, 33)
CAPTCHA_FOREGROUND_COLOR = '#001100'
apps/jumpserver/urls.py
View file @ 0b406b69
...@@ -20,22 +20,14 @@ from django.views.generic.base import TemplateView ...@@ -20,22 +20,14 @@ from django.views.generic.base import TemplateView
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
# def view(request, **kwargs):
# if kwargs:
# print kwargs
# return HttpResponseRedirect('/' + kwargs["module"] + '/' + kwargs["version"] + '/' + kwargs["api"])
urlpatterns = [ urlpatterns = [
url(r'^captcha/', include('captcha.urls')),
url(r'^$', TemplateView.as_view(template_name='base.html'), name='index'), url(r'^$', TemplateView.as_view(template_name='base.html'), name='index'),
url(r'^(api/)?users/', include('users.urls')), url(r'^(api/)?users/', include('users.urls')),
url(r'^assets/', include('assets.urls')), url(r'^assets/', include('assets.urls')),
url(r'^terminal/', include('webterminal.urls')), url(r'^terminal/', include('webterminal.urls')),
] ]
#urlpatterns += [
# url(r'^api/users/', include('users.api_urls')),
#]
if settings.DEBUG: if settings.DEBUG:
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
......
apps/templates/captcha/field.html 0 → 100644
View file @ 0b406b69
{{image}}{{hidden_field}}{{text_field}}
<script>
function refresh_captcha() {
$.getJSON("{% url "captcha-refresh" %}",
function (result) {
$('.captcha').attr('src', result['image_url']);
$('#id_captcha_0').val(result['key'])
})
}
$('.captcha').click(refresh_captcha)
</script>
\ No newline at end of file
apps/templates/captcha/hidden_field.html 0 → 100644
View file @ 0b406b69
<input id="{{id}}_0" name="{{name}}_0" type="hidden" value="{{key}}" />
apps/templates/captcha/image.html 0 → 100644
View file @ 0b406b69
{% load i18n %}
{% spaceless %}
{% if audio %}<a title="{% trans "Play CAPTCHA as audio file" %}" href="{{audio}}">{% endif %}<img src="{{image}}" alt="captcha" class="captcha" />{% if audio %}</a>{% endif %}
{% endspaceless %}
\ No newline at end of file
apps/templates/captcha/text_field.html 0 → 100644
View file @ 0b406b69
<div class="row">
<div class="col-sm-6">
<input autocomplete="off" id="{{id}}_1" class="form-control" name="{{name}}_1" type="text" />
<span class="red-fonts" id="captcha-error" style="display: none">验证码错误</span>
</div>
</div>
</br>
apps/users/forms.py
View file @ 0b406b69
...@@ -10,7 +10,7 @@ from .models import User, UserGroup ...@@ -10,7 +10,7 @@ from .models import User, UserGroup
class UserLoginForm(forms.Form): class UserLoginForm(forms.Form):
username = forms.CharField(label='用户名', max_length=100) username = forms.CharField(label='用户名', max_length=100)
password = forms.CharField(label='密码', widget=forms.PasswordInput, max_length=100) password = forms.CharField(label='密码', widget=forms.PasswordInput, max_length=100)
# captcha = CaptchaField() captcha = CaptchaField()
class UserAddForm(ModelForm): class UserAddForm(ModelForm):
......
apps/users/templates/users/forget_password.html
View file @ 0b406b69
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="{% static "img/facio.ico" %}" type="image/x-icon">
<title>INSPINIA | Forgot password</title> <title>忘记密码</title>
{% include '_head_css_js.html' %} {% include '_head_css_js.html' %}
<link href="{% static "css/jumpserver.css" %}" rel="stylesheet"> <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
......
apps/users/templates/users/login.html
View file @ 0b406b69
...@@ -10,6 +10,14 @@ ...@@ -10,6 +10,14 @@
{% include '_head_css_js.html' %} {% include '_head_css_js.html' %}
<link href="{% static "css/jumpserver.css" %}" rel="stylesheet"> <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
<script src="{% static "js/jumpserver.js" %}"></script> <script src="{% static "js/jumpserver.js" %}"></script>
<style>
.captcha {
float: right;
}
#id_captcha_1 {
}
</style>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
...@@ -43,7 +51,9 @@ ...@@ -43,7 +51,9 @@
<form class="m-t" role="form" method="post" action="{% url 'users:login' %}"> <form class="m-t" role="form" method="post" action="{% url 'users:login' %}">
{% csrf_token %} {% csrf_token %}
{% if form.errors %} {% if form.errors %}
<p class="red-fonts">{{ form.errors }}</p> {% if 'captcha' in form.errors %}
<p class="red-fonts">验证码错误</p>
{% endif %}
{% endif %} {% endif %}
{% if errors %} {% if errors %}
<p class="red-fonts">{{ errors }}</p> <p class="red-fonts">{{ errors }}</p>
...@@ -54,6 +64,9 @@ ...@@ -54,6 +64,9 @@
<div class="form-group"> <div class="form-group">
<input type="password" class="form-control" name="{{ form.password.html_name }}" placeholder="Password" required=""> <input type="password" class="form-control" name="{{ form.password.html_name }}" placeholder="Password" required="">
</div> </div>
<div>
{{ form.captcha }}
</div>
<button type="submit" class="btn btn-primary block full-width m-b">Login</button> <button type="submit" class="btn btn-primary block full-width m-b">Login</button>
<a href="{% url 'users:forget-password' %}"> <a href="{% url 'users:forget-password' %}">
...@@ -78,7 +91,6 @@ ...@@ -78,7 +91,6 @@
</div> </div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>
......
apps/users/urls.py
View file @ 0b406b69
...@@ -10,7 +10,6 @@ app_name = 'users' ...@@ -10,7 +10,6 @@ app_name = 'users'
urlpatterns = [ urlpatterns = [
url(r'^login$', views.UserLoginView.as_view(), name='login'), url(r'^login$', views.UserLoginView.as_view(), name='login'),
url(r'^logout$', views.UserLogoutView.as_view(), name='logout'), url(r'^logout$', views.UserLogoutView.as_view(), name='logout'),
url(r'^captcha/', include('captcha.urls')),
url(r'^password/forget$', views.UserForgetPasswordView.as_view(), name='forget-password'), url(r'^password/forget$', views.UserForgetPasswordView.as_view(), name='forget-password'),
url(r'^password/forget/sendmail-success$', url(r'^password/forget/sendmail-success$',
views.UserForgetPasswordSendmailSuccessView.as_view(), name='forget-password-sendmail-success'), views.UserForgetPasswordSendmailSuccessView.as_view(), name='forget-password-sendmail-success'),
......
apps/users/views.py
View file @ 0b406b69
...@@ -42,6 +42,9 @@ class UserLoginView(FormView): ...@@ -42,6 +42,9 @@ class UserLoginView(FormView):
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
form = self.get_form() form = self.get_form()
if not form.is_valid():
return self.form_invalid(form)
username = form['username'].value() username = form['username'].value()
password = form['password'].value() password = form['password'].value()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment