From 486dea035ff2dea626e8d7b6f027b7a3e8344356 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 25 Apr 2020 17:08:22 +0200 Subject: [PATCH] Add base config for ldap --- ubookmark/admin.py | 5 ++++ ubookmark/migrations/0001_initial.py | 44 ++++++++++++++++++++++++++++ ubookmark/migrations/__init__.py | 0 ubookmark/models.py | 4 +++ ubookmark/settings.py | 35 ++++++++++++++++++---- 5 files changed, 82 insertions(+), 6 deletions(-) create mode 100644 ubookmark/admin.py create mode 100644 ubookmark/migrations/0001_initial.py create mode 100644 ubookmark/migrations/__init__.py create mode 100644 ubookmark/models.py diff --git a/ubookmark/admin.py b/ubookmark/admin.py new file mode 100644 index 0000000..f91be8f --- /dev/null +++ b/ubookmark/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin +from django.contrib.auth.admin import UserAdmin +from .models import User + +admin.site.register(User, UserAdmin) diff --git a/ubookmark/migrations/0001_initial.py b/ubookmark/migrations/0001_initial.py new file mode 100644 index 0000000..69c4c24 --- /dev/null +++ b/ubookmark/migrations/0001_initial.py @@ -0,0 +1,44 @@ +# Generated by Django 3.0.5 on 2020-04-25 15:07 + +import django.contrib.auth.models +import django.contrib.auth.validators +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0011_update_proxy_permissions'), + ] + + operations = [ + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), + ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')), + ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), + ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), + ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), + ], + options={ + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + 'abstract': False, + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + ] diff --git a/ubookmark/migrations/__init__.py b/ubookmark/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ubookmark/models.py b/ubookmark/models.py new file mode 100644 index 0000000..4c9c171 --- /dev/null +++ b/ubookmark/models.py @@ -0,0 +1,4 @@ +from django.contrib.auth.models import AbstractUser + +class User(AbstractUser): + pass diff --git a/ubookmark/settings.py b/ubookmark/settings.py index e87faec..f549c21 100644 --- a/ubookmark/settings.py +++ b/ubookmark/settings.py @@ -35,6 +35,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'ubookmark' ] MIDDLEWARE = [ @@ -68,18 +69,16 @@ TEMPLATES = [ WSGI_APPLICATION = 'ubookmark.wsgi.application' -# Database -# https://docs.djangoproject.com/en/3.0/ref/settings/#databases - +# Defaults vs your settings try: - from ubookmark.local_settings import LOGGING, DATABASES, DEBUG -except ModuleNotFoundError: + from ubookmark.local_settings import * + +except (ModuleNotFoundError, ImportError): LOGGING = {} # https://docs.djangoproject.com/en/3.0/ref/settings/#databases DEBUG = True - DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', @@ -87,6 +86,21 @@ except ModuleNotFoundError: } } + ################################################################################ + # LDAP: you probably want to set those, if you are using ubookmark + + AUTH_LDAP_SERVER_URI = "" + + AUTH_LDAP_USER_ATTR_MAP = { + "first_name": "givenName", + "last_name": "sn", + "email": "mail" + } + + AUTH_LDAP_BIND_PASSWORD = "" + AUTH_LDAP_USER_SEARCH = "" + + # Password validation # https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators @@ -125,3 +139,12 @@ USE_TZ = True # https://docs.djangoproject.com/en/3.0/howto/static-files/ STATIC_URL = '/static/' +STATICFILES_DIRS = [ os.path.join(BASE_DIR, "static") ] + + +AUTHENTICATION_BACKENDS = [ + "django_auth_ldap.backend.LDAPBackend", + "django.contrib.auth.backends.ModelBackend" +] + +AUTH_USER_MODEL = 'ubookmark.User'