From e8fa8f6d13118db5a76e900bf11f162540c53ed7 Mon Sep 17 00:00:00 2001
From: smile <smile@c-base.org>
Date: Sat, 11 Jun 2022 21:10:41 +0200
Subject: [PATCH] django4 fixes

---
 account/locale/de/LC_MESSAGES/django.mo | Bin 8819 -> 8778 bytes
 account/locale/de/LC_MESSAGES/django.po |   2 +-
 account/password_encryption.py          |   4 ++--
 cbmi/settings.py                        |   8 ++++----
 guni.sh                                 |   4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/account/locale/de/LC_MESSAGES/django.mo b/account/locale/de/LC_MESSAGES/django.mo
index 8624a23ba98bc97ea6e8a236bfea1257b898a0fa..751f43fda1cdeeb2b8379e4a9ab949a007deb69f 100644
GIT binary patch
delta 612
zcmXZaODIHP6u|N0JqAMt^YEHsMw5jmuS}HG6w?$%k<Bb56dN_AG`W+7m4)SOHAza6
ziIRooNKsa^L=k0SAv+8IGxyf*{?0kw?|$by_x?ohqvy+|hO0#6vr*&$rAdTP9-Bof
z@D=Ou1N-n7Z!yp!GKO#HLO-_vMz9kT*o8Y7#6#qgJhwG`MmtWq#V7`IZjpHk2~6W9
z>c+z!(<oAsS=7eX(T1B=zK!+dY19K8paZi=&vJp<z@1fp!F}>?k0H`Skn)-@%;E_7
zDRMY@M<@OvYowvII3(%CD)Mp5NvtNHK|T2*YNII(<1QvKhdRkn8_(i`L2yNIj1fLT
zqTOsD(;;$1{Rw@z#awk^2D>qjy3rTvh#fw&;X%td#;Gr12+yz|3#iZA{pKf#g$Z=j
zqeu@DL*6MXs0;Rxp5z(_uz)&=8g|!_2a(@KhH@w6DMxPFc~e<7v60NxdRJ}#YScr>

delta 651
zcmXZZKS*0q6vy$O{hJgLOOw{9ZA@(qmXh*bQfLz#3eBQLr6_`f7K_0+SZzq5VBiIp
z3<@rtItfLJbWjKsTohM{;36Fq2VER39STl<j|n{9=bXd4_nv#+ZuVbxWAd8!rb#-x
zC+*?0utcc;_obV7=YbT!yZ8d5xQ+eTgMk)_M}54W;z#Vj3U=a8?805-(K)X?`XcO&
zpCj_Ff)a%h3KcBlG1|c&TI<drCC#HX_6>dby^;UGX7V+(3v6N#Ysg)6h}OX0M%~{g
zEs;msJSk4FO2Ia);cGlVE~#L<6v8fKt<uPlG=#S?-*687<X_QlzJS)~DmwTJi+F@K
z$@dSXK`eU&zX|p+%`d1tsyDC`Wij;&jNuA%wS_zQ1kce93diareudWXSi>T|BVWXB
z{DVo<<NEh0v|rFWN?@a&M0!vG*;~tK3)YdIbb=|gQ*9D2(MCRiHj(k_+Ko~$KAd=4
w$W0WdXFnyf6UAI6mUP@y!c8U|H|98*RQkE&I!?7Sv~}zHK<-QRv~|jN36wrg5C8xG

diff --git a/account/locale/de/LC_MESSAGES/django.po b/account/locale/de/LC_MESSAGES/django.po
index d0e24ab..4c38151 100644
--- a/account/locale/de/LC_MESSAGES/django.po
+++ b/account/locale/de/LC_MESSAGES/django.po
@@ -51,7 +51,7 @@ msgstr "WLAN-Präsenzerkennung einschalten"
 
 #: forms.py:68
 msgid "Old password"
-msgstr "Neues Passwort"
+msgstr "Altes Passwort"
 
 #: forms.py:69
 msgid "Enter your current password here."
diff --git a/account/password_encryption.py b/account/password_encryption.py
index 6eb6ff5..6cfe8d0 100644
--- a/account/password_encryption.py
+++ b/account/password_encryption.py
@@ -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)
+    message = iv + aes.encrypt(cleartext_pw.encode())
     return base64.b64encode(message).decode(), base64.b64encode(key).decode()
 
 
@@ -46,7 +46,7 @@ def decrypt_ldap_password(message, key):
 
     # decrypt it
     aes = AES.new(decoded_key, AES.MODE_CFB, iv)
-    cleartext_pw = aes.decrypt(ciphertext)
+    cleartext_pw = aes.decrypt(ciphertext).decode()
     return cleartext_pw
 
 
diff --git a/cbmi/settings.py b/cbmi/settings.py
index 854dc35..1abfdf2 100644
--- a/cbmi/settings.py
+++ b/cbmi/settings.py
@@ -5,7 +5,7 @@ DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
-    ('smile', 'smile@c-base.org')
+    # ('smile', 'smile@c-base.org')
     # ('Your Name', 'your_email@example.com'),
 )
 
@@ -146,7 +146,7 @@ TEMPLATES = [
 import ldap
 from django_auth_ldap.config import LDAPSearch, GroupOfNamesType
 
-AUTH_LDAP_SERVER_URI = "ldap://lea.cbrp3.c-base.org"
+AUTH_LDAP_SERVER_URI = "ldaps://lea.cbrp3.c-base.org"
 AUTH_LDAP_USER_DN_TEMPLATE = "uid=%(user)s,ou=crew,dc=c-base,dc=org"
 AUTH_LDAP_START_TLS = True
 AUTH_LDAP_BIND_AS_AUTHENTICATING_USER = True
@@ -235,7 +235,7 @@ LOGGING = {
     'loggers': {
         'django.request': {
             'handlers': ['mail_admins'],
-            'level': 'ERROR',
+            'level': 'DEBUG',
             'propagate': True,
         },
         "django_auth_ldap": {"level": "DEBUG", "handlers": ["console"]}
@@ -245,7 +245,7 @@ LOGGING = {
 CRISPY_TEMPLATE_PACK = 'bootstrap'
 
 # c-base specific settings
-CBASE_LDAP_URL = 'ldap://lea.cbrp3.c-base.org:389/'
+CBASE_LDAP_URL = 'ldaps://lea.cbrp3.c-base.org:389/'
 CBASE_BASE_DN = 'ou=crew,dc=c-base,dc=org'
 
 # Set session cookie timeout to 10 minutes
diff --git a/guni.sh b/guni.sh
index a369be2..39de5d5 100755
--- a/guni.sh
+++ b/guni.sh
@@ -9,11 +9,11 @@ GROUP=cbmi
 ADDRESS=127.0.0.1:8000
 DJANGO_SETTINGS=cbmi.settings
 DJANGO_SETTINGS_MODULE=cbmi.settings
-source /home/cbmi/cbmi/bin/activate
+source /home/cbmi/cbmi/venv/bin/activate
 cd /home/cbmi/cbmi
 test -d $LOGDIR || mkdir -p $LOGDIR
 echo "foo"
-exec bin/gunicorn -w $NUM_WORKERS --bind=$ADDRESS \
+exec venv/bin/gunicorn -w $NUM_WORKERS --bind=$ADDRESS \
   --user=$USER --group=$GROUP --log-level=debug \
   cbmi.wsgi:application \
   --log-file=$LOGFILE 2>>$LOGFILE