upgrade to django 1.11.16 and python3.6
This commit is contained in:
cmile
parent
b32465e85f
commit
bc0258ea8f
17 changed files with 155 additions and 84 deletions
|
|
@ -5,7 +5,7 @@ import ldap
|
|||
import copy
|
||||
|
||||
from django.conf import settings
|
||||
from password_encryption import get_ldap_password
|
||||
from account.password_encryption import get_ldap_password
|
||||
|
||||
"""
|
||||
Example configuration:
|
||||
|
|
@ -14,11 +14,12 @@ CBASE_LDAP_URL = 'ldap://lea.cbrp3.c-base.org:389/'
|
|||
CBASE_BASE_DN = 'ou=crew,dc=c-base,dc=org'
|
||||
"""
|
||||
|
||||
|
||||
def retrieve_member(request):
|
||||
ldap_password = get_ldap_password(request)
|
||||
session = dict(request.session)
|
||||
print "session:", session
|
||||
print "cookies:", request.COOKIES
|
||||
print("session:", session)
|
||||
print("cookies:", request.COOKIES)
|
||||
return MemberValues(request.user.username, ldap_password)
|
||||
|
||||
|
||||
|
|
@ -26,6 +27,7 @@ class MemberValues(object):
|
|||
"""
|
||||
Dictionary-like abstraction of the c-base member attributes.
|
||||
"""
|
||||
|
||||
def __init__(self, username, password):
|
||||
self._username = username
|
||||
self._password = password
|
||||
|
|
@ -42,6 +44,9 @@ class MemberValues(object):
|
|||
else:
|
||||
value = default
|
||||
|
||||
if value is not None:
|
||||
value = value.decode()
|
||||
|
||||
# Decode
|
||||
if value == 'TRUE':
|
||||
return True
|
||||
|
|
@ -79,7 +84,7 @@ class MemberValues(object):
|
|||
action = ldap.MOD_REPLACE
|
||||
if new_key not in self._old.keys():
|
||||
action = ldap.MOD_ADD
|
||||
mod_attrs.append((action, '%s' % new_key, new_value ))
|
||||
mod_attrs.append((action, '%s' % new_key, new_value))
|
||||
continue
|
||||
if self._old[new_key][0] != None and new_value == [None]:
|
||||
action = ldap.MOD_DELETE
|
||||
|
|
@ -88,14 +93,13 @@ class MemberValues(object):
|
|||
# Set the attribute and wait for the LDAP server to complete.
|
||||
if self._old[new_key][0] != new_value[0]:
|
||||
action = ldap.MOD_REPLACE
|
||||
mod_attrs.append((action, '%s' % new_key, new_value ))
|
||||
mod_attrs.append((action, '%s' % new_key, new_value))
|
||||
continue
|
||||
|
||||
|
||||
print "modattrs: ",mod_attrs
|
||||
print("modattrs: ", mod_attrs)
|
||||
result = l.modify_s(dn, mod_attrs)
|
||||
#
|
||||
# print "result is: ", result
|
||||
# print("result is: ", result)
|
||||
l.unbind_s()
|
||||
|
||||
def change_password(self, new_password):
|
||||
|
|
@ -142,9 +146,10 @@ class MemberValues(object):
|
|||
searchFilter = "uid=%s" % self._username
|
||||
|
||||
dn = settings.CBASE_BASE_DN
|
||||
result = session.search_s(dn, searchScope, searchFilter, retrieveAttributes)
|
||||
result = session.search_s(
|
||||
dn, searchScope, searchFilter, retrieveAttributes)
|
||||
# TODO: latin1
|
||||
print "result is: ", result
|
||||
print("result is: ", result)
|
||||
# TODO: if len(result)==0
|
||||
session.unbind_s()
|
||||
return result[0][1]
|
||||
|
|
@ -176,7 +181,7 @@ class MemberValues(object):
|
|||
l.simple_bind_s(user_dn, self._password)
|
||||
try:
|
||||
result_id = l.search(settings.CBASE_BASE_DN, ldap.SCOPE_SUBTREE,
|
||||
"memberOf=cn=crew,ou=groups,dc=c-base,dc=org", None)
|
||||
"memberOf=cn=crew,ou=groups,dc=c-base,dc=org", None)
|
||||
result_set = []
|
||||
while True:
|
||||
result_type, result_data = l.result(result_id, 0)
|
||||
|
|
@ -187,7 +192,14 @@ class MemberValues(object):
|
|||
result_set.append(result_data)
|
||||
|
||||
# list comprehension to get a list of user tupels in the format ("nickname", "nickname (real name)")
|
||||
userlist = [(x[0][1]['uid'][0], '%s (%s, %s)' % (x[0][1]['uid'][0], x[0][1]['cn'][0], x[0][1]['uidNumber'][0])) for x in result_set]
|
||||
userlist = [(
|
||||
x[0][1]['uid'][0].decode(),
|
||||
'%s (%s, %s)' % (
|
||||
x[0][1]['uid'][0].decode(),
|
||||
x[0][1]['cn'][0].decode(),
|
||||
x[0][1]['uidNumber'][0].decode()
|
||||
)
|
||||
) for x in result_set]
|
||||
return sorted(userlist)
|
||||
except:
|
||||
except Exception:
|
||||
return []
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ from django.db.models import signals
|
|||
from account.signals import create_profile, delete_profile
|
||||
|
||||
class UserProfile(models.Model):
|
||||
user = models.OneToOneField(User, editable=False)
|
||||
user = models.OneToOneField(User, editable=False, on_delete=models.CASCADE)
|
||||
uid = models.CharField(verbose_name="User-ID",
|
||||
max_length=8,
|
||||
null=True,
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ def encrypt_ldap_password(cleartext_pw):
|
|||
# do the encryption
|
||||
aes = AES.new(key, AES.MODE_CFB, iv)
|
||||
message = iv + aes.encrypt(cleartext_pw)
|
||||
return base64.b64encode(message), base64.b64encode(key)
|
||||
return base64.b64encode(message).decode(), base64.b64encode(key).decode()
|
||||
|
||||
def decrypt_ldap_password(message, key):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{% load i18n %}
|
||||
{% load crispy_forms_tags %}
|
||||
{% load static from staticfiles %}
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
|
|
@ -66,7 +67,7 @@
|
|||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<span class="brand"><a href="/"><img style="margin-top: -10px;"
|
||||
src="{{ STATIC_URL }}img/logo.gif" /></a>
|
||||
src="{% static 'img/logo.gif' %}" /></a>
|
||||
<a href="/">{% trans "member interface" %}</a>
|
||||
</span>
|
||||
<div class="nav-collapse collapse">
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@
|
|||
<div class="row">
|
||||
<div class="text-center span4 offset4" style="background-color: #eee;">
|
||||
|
||||
<img src="{{ STATIC_URL }}img/mchammer.gif" />
|
||||
<img src='{% static "img/mchammer.gif" %}' />
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ class PasswordEncryptionTest(TestCase):
|
|||
|
||||
def test_encrypt_ldap_password(self):
|
||||
message, key = self.encrypt_it()
|
||||
print 'key:', key
|
||||
print 'message:', message
|
||||
print('key:', key)
|
||||
print('message:', message)
|
||||
|
||||
|
||||
def test_decrypt_ldap_password(self):
|
||||
|
|
|
|||
|
|
@ -1,20 +1,21 @@
|
|||
from django.conf.urls import patterns, url
|
||||
from account.views import (admin, auth_login, auth_logout, clabpin, gastropin,
|
||||
groups_list, home, memberstatus, nrf24, password,
|
||||
preferred_email, rfid, sippin, wlan_presence)
|
||||
from django.conf.urls import url
|
||||
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
url(r'^login/$', 'account.views.auth_login', name="cbase_auth_login"),
|
||||
url(r'^logout/$', 'account.views.auth_logout', name="auth_logout"),
|
||||
url(r'^gastropin/$', 'account.views.gastropin', name='gastropin'),
|
||||
url(r'^wlan_presence/$', 'account.views.wlan_presence', name='wlan_presence'),
|
||||
url(r'^rfid/$', 'account.views.rfid', name='rfid'),
|
||||
url(r'^nrf24/$', 'account.views.nrf24', name='nrf24'),
|
||||
url(r'^password/$', 'account.views.password', name='password'),
|
||||
url(r'^sippin/$', 'account.views.sippin', name='sippin'),
|
||||
url(r'^clabpin/$', 'account.views.clabpin', name='clabpin'),
|
||||
url(r'^preferred_email/$', 'account.views.preferred_email', name='preferred_email'),
|
||||
url(r'^admin/$', 'account.views.admin', name='admin'),
|
||||
url(r'^memberstatus/$', 'account.views.memberstatus', name='memberstatus'),
|
||||
url(r'^$', 'account.views.home', name="home"),
|
||||
url(r'^groups/(?P<group_name>[^/]+)/', 'account.views.groups_list'),
|
||||
)
|
||||
urlpatterns = [
|
||||
url(r'^login/$', auth_login, name="cbase_auth_login"),
|
||||
url(r'^logout/$', auth_logout, name="auth_logout"),
|
||||
url(r'^gastropin/$', gastropin, name='gastropin'),
|
||||
url(r'^wlan_presence/$', wlan_presence, name='wlan_presence'),
|
||||
url(r'^rfid/$', rfid, name='rfid'),
|
||||
url(r'^nrf24/$', nrf24, name='nrf24'),
|
||||
url(r'^password/$', password, name='password'),
|
||||
url(r'^sippin/$', sippin, name='sippin'),
|
||||
url(r'^clabpin/$', clabpin, name='clabpin'),
|
||||
url(r'^preferred_email/$', preferred_email, name='preferred_email'),
|
||||
url(r'^admin/$', admin, name='admin'),
|
||||
url(r'^memberstatus/$', memberstatus, name='memberstatus'),
|
||||
url(r'^$', home, name="home"),
|
||||
url(r'^groups/(?P<group_name>[^/]+)/', groups_list),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@ from django.contrib.auth.models import Group
|
|||
from django.shortcuts import render
|
||||
from django.utils.translation import ugettext as _
|
||||
|
||||
from forms import GastroPinForm, WlanPresenceForm, LoginForm, PasswordForm, \
|
||||
from account.forms import GastroPinForm, WlanPresenceForm, LoginForm, PasswordForm, \
|
||||
RFIDForm, NRF24Form, SIPPinForm, CLabPinForm, AdminForm, PreferredEmailForm
|
||||
from cbase_members import retrieve_member, MemberValues
|
||||
from password_encryption import *
|
||||
from account.cbase_members import retrieve_member, MemberValues
|
||||
from account.password_encryption import *
|
||||
|
||||
def landingpage(request):
|
||||
if request.user.is_authenticated():
|
||||
if request.user.is_authenticated:
|
||||
return HttpResponseRedirect('/account')
|
||||
login_form = LoginForm()
|
||||
try:
|
||||
|
|
@ -77,8 +77,7 @@ def auth_login(request):
|
|||
else:
|
||||
form = LoginForm()
|
||||
|
||||
return render_to_response('login.html',
|
||||
RequestContext(request, locals()))
|
||||
return render_to_response('login.html', locals())
|
||||
|
||||
@login_required
|
||||
def home(request):
|
||||
|
|
@ -88,13 +87,13 @@ def home(request):
|
|||
username = request.user.username
|
||||
url = "https://vorstand.c-base.org/cteward-api/legacy/member/%s" % username
|
||||
cteward = None
|
||||
#try:
|
||||
#r = requests.get(url, verify=False, auth=(username, password))
|
||||
#cteward = r.json()
|
||||
#except:
|
||||
#pass
|
||||
try:
|
||||
r = requests.get(url, verify=False, auth=(username, password))
|
||||
cteward = r.json()
|
||||
except Exception:
|
||||
pass
|
||||
context = {'member': member.to_dict(),
|
||||
'groups': sorted(list(request.user.groups.all())),
|
||||
'groups': list(request.user.groups.all().order_by('name')),
|
||||
'number_of_members': number_of_members,
|
||||
'cteward': cteward,
|
||||
}
|
||||
|
|
@ -137,7 +136,7 @@ def set_hash_field(request, form_type, in_field, out_field, hash_func,
|
|||
form = form_type(request.POST)
|
||||
if form.is_valid():
|
||||
hashed_value = hash_func(form.cleaned_data[in_field])
|
||||
print 'hashed value: ', hashed_value
|
||||
print('hashed value: ', hashed_value)
|
||||
member.set(out_field, hashed_value)
|
||||
member.save()
|
||||
new_form = form_type(initial=initial)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue