diff --git a/.travis.yml b/.travis.yml index e00d4db..a81c37f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,10 @@ matrix: env: TOX_ENV=py35-django111 - python: "3.6" env: TOX_ENV=py36-django111 + - python: "3.5" + env: TOX_ENV=py35-django20 + - python: "3.6" + env: TOX_ENV=py36-django20 - python: "2.7" env: TOX_ENV=coverage cache: diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9852488..3826ab6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -16,7 +16,7 @@ Added * Support for Django 2.0 Fixes ----- +----- * Add missing attributes authenticationDate, longTermAuthenticationRequestTokenUsed and isFromNewLogin from service validation response @@ -31,6 +31,12 @@ Deprecated * Support for python 3.4 is dropped, it should still works for this version. Next versions may or may not works with python 3.4. +Other +----- + +* Migrations have been squashed for Django 2.0 support. Be sur to apply all migration before + updating to this version + v0.9.0 - 2017-11-17 =================== diff --git a/Makefile b/Makefile index 4025a3a..62773c5 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,8 @@ dist: python setup.py sdist test_venv/bin/python: - virtualenv test_venv - test_venv/bin/pip install -U --requirement requirements-dev.txt 'Django<1.11' + python3 -m venv test_venv + test_venv/bin/pip install -U --requirement requirements-dev.txt 'Django>=2.0,<2.1' test_venv/cas/manage.py: test_venv mkdir -p test_venv/cas diff --git a/cas_server/migrations/0001_squashed_0013_auto_20170329_1748.py b/cas_server/migrations/0001_squashed_0013_auto_20170329_1748.py new file mode 100644 index 0000000..5b08f32 --- /dev/null +++ b/cas_server/migrations/0001_squashed_0013_auto_20170329_1748.py @@ -0,0 +1,469 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.8 on 2018-04-29 17:40 +from __future__ import unicode_literals + +import cas_server.utils +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + replaces = [(b'cas_server', '0001_squashed_0021_auto_20150611_2102'), (b'cas_server', '0002_auto_20151212_1300'), (b'cas_server', '0003_auto_20151212_1721'), (b'cas_server', '0004_auto_20151218_1032'), (b'cas_server', '0005_auto_20160616_1018'), (b'cas_server', '0006_auto_20160706_1727'), (b'cas_server', '0007_auto_20160723_2252'), (b'cas_server', '0008_newversionwarning'), (b'cas_server', '0009_auto_20160814_0619'), (b'cas_server', '0010_auto_20160824_2112'), (b'cas_server', '0011_auto_20161007_1258'), (b'cas_server', '0012_auto_20170328_1610'), (b'cas_server', '0013_auto_20170329_1748')] + + initial = True + + dependencies = [ + ('sessions', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Proxy', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('url', models.CharField(max_length=255)), + ], + options={ + 'ordering': ('-pk',), + }, + ), + migrations.CreateModel( + name='ProxyGrantingTicket', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('attributs', models.TextField(blank=True, default=None, null=True)), + ('validate', models.BooleanField(default=False)), + ('service', models.TextField()), + ('creation', models.DateTimeField(auto_now_add=True)), + ('renew', models.BooleanField(default=False)), + ('value', models.CharField(default=cas_server.utils.gen_pgt, max_length=255, unique=True)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='ProxyTicket', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('attributs', models.TextField(blank=True, default=None, null=True)), + ('validate', models.BooleanField(default=False)), + ('service', models.TextField()), + ('creation', models.DateTimeField(auto_now_add=True)), + ('renew', models.BooleanField(default=False)), + ('value', models.CharField(default=cas_server.utils.gen_pt, max_length=255, unique=True)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='ServicePattern', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('pos', models.IntegerField(default=100)), + ('pattern', models.CharField(max_length=255, unique=True)), + ('user_field', models.CharField(blank=True, default=b'', help_text=b"Nom de l'attribut transmit comme username, vide = login", max_length=255)), + ('usernames', models.CharField(blank=True, default=b'', help_text=b"Liste d'utilisateurs accept\xc3\xa9s s\xc3\xa9par\xc3\xa9 par des virgules, vide = tous les utilisateur", max_length=255)), + ('attributs', models.CharField(blank=True, default=b'', help_text=b"Liste des nom d'attributs \xc3\xa0 transmettre au service, s\xc3\xa9par\xc3\xa9 par une virgule. vide = aucun", max_length=255)), + ('proxy', models.BooleanField(default=False, help_text=b"Un ProxyGrantingTicket peut \xc3\xaatre d\xc3\xa9livr\xc3\xa9 au service pour s'authentifier en temps que l'utilisateur sur d'autres services")), + ('filter', models.CharField(blank=True, default=b'', help_text=b'Une lambda fonction pour filtrer sur les utilisateur o\xc3\xb9 leurs attribut, arg1: username, arg2:attrs_dict. vide = pas de filtre', max_length=255)), + ], + options={ + 'ordering': ('pos',), + }, + ), + migrations.CreateModel( + name='ServiceTicket', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('attributs', models.TextField(blank=True, default=None, null=True)), + ('validate', models.BooleanField(default=False)), + ('service', models.TextField()), + ('creation', models.DateTimeField(auto_now_add=True)), + ('renew', models.BooleanField(default=False)), + ('value', models.CharField(default=cas_server.utils.gen_st, max_length=255, unique=True)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('username', models.CharField(max_length=30)), + ('date', models.DateTimeField(auto_now=True)), + ('session_key', models.CharField(blank=True, max_length=40, null=True)), + ], + ), + migrations.AddField( + model_name='serviceticket', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='serviceticket', to='cas_server.User'), + ), + migrations.AddField( + model_name='proxyticket', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='proxyticket', to='cas_server.User'), + ), + migrations.AddField( + model_name='proxygrantingticket', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='proxygrantingticket', to='cas_server.User'), + ), + migrations.AddField( + model_name='proxy', + name='proxy_ticket', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='proxies', to='cas_server.ProxyTicket'), + ), + migrations.AddField( + model_name='proxygrantingticket', + name='service_pattern', + field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='proxygrantingticket', to='cas_server.ServicePattern'), + preserve_default=False, + ), + migrations.AddField( + model_name='proxyticket', + name='service_pattern', + field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='proxyticket', to='cas_server.ServicePattern'), + preserve_default=False, + ), + migrations.AddField( + model_name='serviceticket', + name='service_pattern', + field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='serviceticket', to='cas_server.ServicePattern'), + preserve_default=False, + ), + migrations.CreateModel( + name='ReplaceAttributName', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(help_text="nom d'un attributs \xe0 transmettre au service", max_length=255)), + ('replace', models.CharField(blank=True, help_text="nom sous lequel l'attribut sera pr\xe9sent\xe9 au service. vide = inchang\xe9", max_length=255)), + ('service_pattern', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attributs', to='cas_server.ServicePattern')), + ], + ), + migrations.RemoveField( + model_name='servicepattern', + name='attributs', + ), + migrations.CreateModel( + name='FilterAttributValue', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('attribut', models.CharField(help_text='Name of the attribute which must verify pattern', max_length=255, verbose_name='attribute')), + ('pattern', models.CharField(help_text='a regular expression', max_length=255, validators=[cas_server.utils.regexpr_validator], verbose_name='pattern')), + ('service_pattern', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='filters', to='cas_server.ServicePattern')), + ], + ), + migrations.CreateModel( + name='ReplaceAttributValue', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('attribut', models.CharField(help_text='Name of the attribute for which the value must be replace', max_length=255, verbose_name='attribute')), + ('pattern', models.CharField(help_text='An regular expression maching whats need to be replaced', max_length=255, validators=[cas_server.utils.regexpr_validator], verbose_name='pattern')), + ('replace', models.CharField(blank=True, help_text='replace expression, groups are capture by \\1, \\2 \u2026', max_length=255, verbose_name='replace')), + ('service_pattern', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='replacements', to='cas_server.ServicePattern')), + ], + ), + migrations.RemoveField( + model_name='servicepattern', + name='filter', + ), + migrations.CreateModel( + name='Username', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('value', models.CharField(help_text='username allowed to connect to the service', max_length=255, verbose_name='username')), + ('service_pattern', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='usernames', to='cas_server.ServicePattern')), + ], + ), + migrations.RemoveField( + model_name='servicepattern', + name='usernames', + ), + migrations.AddField( + model_name='servicepattern', + name='restrict_users', + field=models.BooleanField(default=False, help_text='Limit username allowed to connect to the list provided bellow', verbose_name='restrict username'), + ), + migrations.AddField( + model_name='servicepattern', + name='name', + field=models.CharField(blank=True, help_text='A name for the service', max_length=255, null=True, unique=True, verbose_name='name'), + ), + migrations.AlterUniqueTogether( + name='replaceattributname', + unique_together=set([('name', 'replace', 'service_pattern')]), + ), + migrations.AddField( + model_name='servicepattern', + name='single_log_out', + field=models.BooleanField(default=False, help_text='Enable SLO for the service', verbose_name='single log out'), + ), + migrations.AlterField( + model_name='replaceattributname', + name='name', + field=models.CharField(help_text='name of an attribut to send to the service', max_length=255, verbose_name='name'), + ), + migrations.AlterField( + model_name='replaceattributname', + name='replace', + field=models.CharField(blank=True, help_text='name under which the attribut will be showto the service. empty = default name of the attribut', max_length=255, verbose_name='replace'), + ), + migrations.AlterField( + model_name='servicepattern', + name='pattern', + field=models.CharField(max_length=255, unique=True, verbose_name='pattern'), + ), + migrations.AlterField( + model_name='servicepattern', + name='pos', + field=models.IntegerField(default=100, verbose_name='position'), + ), + migrations.AlterField( + model_name='servicepattern', + name='proxy', + field=models.BooleanField(default=False, help_text='A ProxyGrantingTicket can be delivered to the service in order to authenticate for the user on a backend service', verbose_name='proxy'), + ), + migrations.AlterField( + model_name='servicepattern', + name='user_field', + field=models.CharField(blank=True, default=b'', help_text='Name of the attribut to transmit as username, empty = login', max_length=255, verbose_name='user field'), + ), + migrations.AddField( + model_name='proxygrantingticket', + name='single_log_out', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='proxyticket', + name='single_log_out', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='serviceticket', + name='single_log_out', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='servicepattern', + name='proxy_callback', + field=models.BooleanField(default=False, help_text='can be used as a proxy callback to deliver PGT', verbose_name='proxy callback'), + ), + migrations.AlterField( + model_name='servicepattern', + name='proxy', + field=models.BooleanField(default=False, help_text='Proxy tickets can be delivered to the service', verbose_name='proxy'), + ), + migrations.AddField( + model_name='servicepattern', + name='single_log_out_callback', + field=models.CharField(blank=True, default=b'', help_text='URL where the SLO request will be POST. empty = service url\nThis is usefull for non HTTP proxied services.', max_length=255, verbose_name='single log out callback'), + ), + migrations.AlterField( + model_name='replaceattributname', + name='name', + field=models.CharField(help_text='name of an attribut to send to the service, use * for all attributes', max_length=255, verbose_name='name'), + ), + migrations.AlterUniqueTogether( + name='user', + unique_together=set([('username', 'session_key')]), + ), + migrations.AlterField( + model_name='servicepattern', + name='pattern', + field=models.CharField(help_text="A regular expression matching services. Will usually looks like '^https://some\\.server\\.com/path/.*$'.As it is a regular expression, special character must be escaped with a '\\'.", max_length=255, unique=True, verbose_name='pattern'), + ), + migrations.AlterModelOptions( + name='servicepattern', + options={'ordering': ('pos',), 'verbose_name': 'Service pattern', 'verbose_name_plural': 'Services patterns'}, + ), + migrations.AlterModelOptions( + name='user', + options={'verbose_name': 'User', 'verbose_name_plural': 'Users'}, + ), + migrations.AlterField( + model_name='servicepattern', + name='pos', + field=models.IntegerField(default=100, help_text='service patterns are sorted using the position attribute', verbose_name='position'), + ), + migrations.CreateModel( + name='FederatedIendityProvider', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('suffix', models.CharField(help_text='Suffix append to backend CAS returner username: `returned_username`@`suffix`', max_length=30, unique=True, verbose_name='suffix')), + ('server_url', models.CharField(max_length=255, verbose_name='server url')), + ('cas_protocol_version', models.CharField(choices=[(b'1', b'CAS 1.0'), (b'2', b'CAS 2.0'), (b'3', b'CAS 3.0'), (b'CAS_2_SAML_1_0', b'SAML 1.1')], default=b'3', help_text='Version of the CAS protocol to use when sending requests the the backend CAS', max_length=30, verbose_name='CAS protocol version')), + ('verbose_name', models.CharField(help_text='Name for this identity provider displayed on the login page', max_length=255, verbose_name='verbose name')), + ('pos', models.IntegerField(default=100, help_text='Identity provider are sorted using the (position, verbose name, suffix) attributes', verbose_name='position')), + ('display', models.BooleanField(default=True, help_text='Display the provider on the login page', verbose_name='display')), + ], + options={ + 'verbose_name': 'identity provider', + 'verbose_name_plural': 'identity providers', + }, + ), + migrations.CreateModel( + name='FederatedUser', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('username', models.CharField(max_length=124)), + ('provider', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cas_server.FederatedIendityProvider')), + ('ticket', models.CharField(max_length=255)), + ('last_update', models.DateTimeField(auto_now=True)), + ('_attributs', models.TextField(blank=True, default=None, null=True)), + ], + ), + migrations.AlterUniqueTogether( + name='federateduser', + unique_together=set([('username', 'provider')]), + ), + migrations.CreateModel( + name='FederateSLO', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('username', models.CharField(max_length=30)), + ('session_key', models.CharField(blank=True, max_length=40, null=True)), + ('ticket', models.CharField(db_index=True, max_length=255)), + ], + ), + migrations.AlterUniqueTogether( + name='federateslo', + unique_together=set([('username', 'session_key', 'ticket')]), + ), + migrations.AlterField( + model_name='federatediendityprovider', + name='cas_protocol_version', + field=models.CharField(choices=[(b'1', b'CAS 1.0'), (b'2', b'CAS 2.0'), (b'3', b'CAS 3.0'), (b'CAS_2_SAML_1_0', b'SAML 1.1')], default=b'3', help_text='Version of the CAS protocol to use when sending requests the the backend CAS.', max_length=30, verbose_name='CAS protocol version'), + ), + migrations.AlterField( + model_name='federatediendityprovider', + name='display', + field=models.BooleanField(default=True, help_text='Display the provider on the login page.', verbose_name='display'), + ), + migrations.AlterField( + model_name='federatediendityprovider', + name='pos', + field=models.IntegerField(default=100, help_text='Position of the identity provider on the login page. Identity provider are sorted using the (position, verbose name, suffix) attributes.', verbose_name='position'), + ), + migrations.AlterField( + model_name='federatediendityprovider', + name='suffix', + field=models.CharField(help_text='Suffix append to backend CAS returner username: ``returned_username`` @ ``suffix``.', max_length=30, unique=True, verbose_name='suffix'), + ), + migrations.AlterField( + model_name='federatediendityprovider', + name='verbose_name', + field=models.CharField(help_text='Name for this identity provider displayed on the login page.', max_length=255, verbose_name='verbose name'), + ), + migrations.RemoveField( + model_name='proxygrantingticket', + name='attributs', + ), + migrations.RemoveField( + model_name='proxyticket', + name='attributs', + ), + migrations.RemoveField( + model_name='serviceticket', + name='attributs', + ), + migrations.AddField( + model_name='proxygrantingticket', + name='_attributs', + field=models.TextField(blank=True, default=None, null=True), + ), + migrations.AddField( + model_name='proxyticket', + name='_attributs', + field=models.TextField(blank=True, default=None, null=True), + ), + migrations.AddField( + model_name='serviceticket', + name='_attributs', + field=models.TextField(blank=True, default=None, null=True), + ), + migrations.AlterField( + model_name='federatediendityprovider', + name='suffix', + field=models.CharField(help_text='Suffix append to backend CAS returned username: ``returned_username`` @ ``suffix``.', max_length=30, unique=True, verbose_name='suffix'), + ), + migrations.CreateModel( + name='NewVersionWarning', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('version', models.CharField(max_length=255)), + ], + ), + migrations.AlterField( + model_name='replaceattributname', + name='name', + field=models.CharField(help_text='name of an attribute to send to the service, use * for all attributes', max_length=255, verbose_name='name'), + ), + migrations.AlterField( + model_name='replaceattributname', + name='replace', + field=models.CharField(blank=True, help_text='name under which the attribute will be showto the service. empty = default name of the attribut', max_length=255, verbose_name='replace'), + ), + migrations.AlterField( + model_name='servicepattern', + name='user_field', + field=models.CharField(blank=True, default=b'', help_text='Name of the attribute to transmit as username, empty = login', max_length=255, verbose_name='user field'), + ), + migrations.AlterField( + model_name='replaceattributname', + name='replace', + field=models.CharField(blank=True, help_text='name under which the attribute will be show to the service. empty = default name of the attribut', max_length=255, verbose_name='replace'), + ), + migrations.AlterField( + model_name='servicepattern', + name='pattern', + field=models.CharField(help_text="A regular expression matching services. Will usually looks like '^https://some\\.server\\.com/path/.*$'.As it is a regular expression, special character must be escaped with a '\\'.", max_length=255, unique=True, validators=[cas_server.utils.regexpr_validator], verbose_name='pattern'), + ), + migrations.CreateModel( + name='UserAttributes', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('_attributs', models.TextField(blank=True, default=None, null=True)), + ('username', models.CharField(max_length=155, unique=True)), + ], + options={ + 'verbose_name': 'User attributes cache', + 'verbose_name_plural': 'User attributes caches', + }, + ), + migrations.AlterModelOptions( + name='federateduser', + options={'verbose_name': 'Federated user', 'verbose_name_plural': 'Federated users'}, + ), + migrations.AddField( + model_name='user', + name='last_login', + field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), + preserve_default=False, + ), + migrations.AlterField( + model_name='federatediendityprovider', + name='cas_protocol_version', + field=models.CharField(choices=[('1', 'CAS 1.0'), ('2', 'CAS 2.0'), ('3', 'CAS 3.0'), ('CAS_2_SAML_1_0', 'SAML 1.1')], default='3', help_text='Version of the CAS protocol to use when sending requests the the backend CAS.', max_length=30, verbose_name='CAS protocol version'), + ), + migrations.AlterField( + model_name='servicepattern', + name='single_log_out_callback', + field=models.CharField(blank=True, default='', help_text='URL where the SLO request will be POST. empty = service url\nThis is usefull for non HTTP proxied services.', max_length=255, verbose_name='single log out callback'), + ), + migrations.AlterField( + model_name='servicepattern', + name='user_field', + field=models.CharField(blank=True, default='', help_text='Name of the attribute to transmit as username, empty = login', max_length=255, verbose_name='user field'), + ), + migrations.AlterField( + model_name='user', + name='username', + field=models.CharField(max_length=250), + ), + ] diff --git a/cas_server/migrations/0001_squashed_0021_auto_20150611_2102.py b/cas_server/migrations/0001_squashed_0021_auto_20150611_2102.py deleted file mode 100644 index c3d3785..0000000 --- a/cas_server/migrations/0001_squashed_0021_auto_20150611_2102.py +++ /dev/null @@ -1,316 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations -import django.db.models.deletion -import cas_server.utils - - -class Migration(migrations.Migration): - - #replaces = [(b'cas_server', '0001_initial'), (b'cas_server', '0002_auto_20150517_1406'), (b'cas_server', '0003_auto_20150518_1648'), (b'cas_server', '0004_auto_20150518_1659'), (b'cas_server', '0005_auto_20150518_1717'), (b'cas_server', '0006_auto_20150518_1720'), (b'cas_server', '0007_auto_20150518_1727'), (b'cas_server', '0008_servicepattern_name'), (b'cas_server', '0009_auto_20150518_1740'), (b'cas_server', '0010_auto_20150518_2139'), (b'cas_server', '0011_auto_20150523_1731'), (b'cas_server', '0012_auto_20150527_1956'), (b'cas_server', '0013_servicepattern_single_sign_out'), (b'cas_server', '0014_auto_20150528_0012'), (b'cas_server', '0015_auto_20150528_1202'), (b'cas_server', '0016_auto_20150528_1326'), (b'cas_server', '0017_remove_user_attributs'), (b'cas_server', '0018_auto_20150608_1621'), (b'cas_server', '0019_auto_20150609_1903'), (b'cas_server', '0020_auto_20150609_1917'), (b'cas_server', '0021_auto_20150611_2102')] - - dependencies = [ - ('sessions', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Proxy', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('url', models.CharField(max_length=255)), - ], - options={ - 'ordering': ('-pk',), - }, - bases=(models.Model,), - ), - migrations.CreateModel( - name='ProxyGrantingTicket', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('attributs', models.TextField(blank=True, default=None, null=True)), - ('validate', models.BooleanField(default=False)), - ('service', models.TextField()), - ('creation', models.DateTimeField(auto_now_add=True)), - ('renew', models.BooleanField(default=False)), - ('value', models.CharField(default=cas_server.utils.gen_pgt, unique=True, max_length=255)), - ], - options={ - 'abstract': False, - }, - bases=(models.Model,), - ), - migrations.CreateModel( - name='ProxyTicket', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('attributs', models.TextField(blank=True, default=None, null=True)), - ('validate', models.BooleanField(default=False)), - ('service', models.TextField()), - ('creation', models.DateTimeField(auto_now_add=True)), - ('renew', models.BooleanField(default=False)), - ('value', models.CharField(default=cas_server.utils.gen_pt, unique=True, max_length=255)), - ], - options={ - 'abstract': False, - }, - bases=(models.Model,), - ), - migrations.CreateModel( - name='ServicePattern', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('pos', models.IntegerField(default=100)), - ('pattern', models.CharField(unique=True, max_length=255)), - ('user_field', models.CharField(default=b'', help_text=b"Nom de l'attribut transmit comme username, vide = login", max_length=255, blank=True)), - ('usernames', models.CharField(default=b'', help_text=b"Liste d'utilisateurs accept\xc3\xa9s s\xc3\xa9par\xc3\xa9 par des virgules, vide = tous les utilisateur", max_length=255, blank=True)), - ('attributs', models.CharField(default=b'', help_text=b"Liste des nom d'attributs \xc3\xa0 transmettre au service, s\xc3\xa9par\xc3\xa9 par une virgule. vide = aucun", max_length=255, blank=True)), - ('proxy', models.BooleanField(default=False, help_text=b"Un ProxyGrantingTicket peut \xc3\xaatre d\xc3\xa9livr\xc3\xa9 au service pour s'authentifier en temps que l'utilisateur sur d'autres services")), - ('filter', models.CharField(default=b'', help_text=b'Une lambda fonction pour filtrer sur les utilisateur o\xc3\xb9 leurs attribut, arg1: username, arg2:attrs_dict. vide = pas de filtre', max_length=255, blank=True)), - ], - options={ - 'ordering': ('pos',), - }, - bases=(models.Model,), - ), - migrations.CreateModel( - name='ServiceTicket', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('attributs', models.TextField(blank=True, default=None, null=True)), - ('validate', models.BooleanField(default=False)), - ('service', models.TextField()), - ('creation', models.DateTimeField(auto_now_add=True)), - ('renew', models.BooleanField(default=False)), - ('value', models.CharField(default=cas_server.utils.gen_st, unique=True, max_length=255)), - ], - options={ - 'abstract': False, - }, - bases=(models.Model,), - ), - migrations.CreateModel( - name='User', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('username', models.CharField(max_length=30)), - ('date', models.DateTimeField(auto_now=True, auto_now_add=True)), - ('session_key', models.CharField(max_length=40, null=True, blank=True)), - ], - options={ - }, - bases=(models.Model,), - ), - migrations.AddField( - model_name='serviceticket', - name='user', - field=models.ForeignKey(related_name='serviceticket', to='cas_server.User'), - preserve_default=True, - ), - migrations.AddField( - model_name='proxyticket', - name='user', - field=models.ForeignKey(related_name='proxyticket', to='cas_server.User'), - preserve_default=True, - ), - migrations.AddField( - model_name='proxygrantingticket', - name='user', - field=models.ForeignKey(related_name='proxygrantingticket', to='cas_server.User'), - preserve_default=True, - ), - migrations.AddField( - model_name='proxy', - name='proxy_ticket', - field=models.ForeignKey(related_name='proxies', to='cas_server.ProxyTicket'), - preserve_default=True, - ), - migrations.AddField( - model_name='proxygrantingticket', - name='service_pattern', - field=models.ForeignKey(related_name='proxygrantingticket', default=1, to='cas_server.ServicePattern'), - preserve_default=False, - ), - migrations.AddField( - model_name='proxyticket', - name='service_pattern', - field=models.ForeignKey(related_name='proxyticket', default=1, to='cas_server.ServicePattern'), - preserve_default=False, - ), - migrations.AddField( - model_name='serviceticket', - name='service_pattern', - field=models.ForeignKey(related_name='serviceticket', default=1, to='cas_server.ServicePattern'), - preserve_default=False, - ), - migrations.CreateModel( - name='ReplaceAttributName', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(help_text="nom d'un attributs \xe0 transmettre au service", max_length=255)), - ('replace', models.CharField(help_text="nom sous lequel l'attribut sera pr\xe9sent\xe9 au service. vide = inchang\xe9", max_length=255, blank=True)), - ('service_pattern', models.ForeignKey(related_name='attributs', to='cas_server.ServicePattern')), - ], - options={ - }, - bases=(models.Model,), - ), - migrations.RemoveField( - model_name='servicepattern', - name='attributs', - ), - migrations.CreateModel( - name='FilterAttributValue', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('attribut', models.CharField(help_text='Name of the attribut which must verify pattern', max_length=255, verbose_name='attribut')), - ('pattern', models.CharField(help_text='a regular expression', max_length=255, verbose_name='pattern')), - ('service_pattern', models.ForeignKey(related_name='filters', to='cas_server.ServicePattern')), - ], - options={ - }, - bases=(models.Model,), - ), - migrations.CreateModel( - name='ReplaceAttributValue', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('attribut', models.CharField(help_text='Name of the attribut for which the value must be replace', max_length=255, verbose_name='attribut')), - ('pattern', models.CharField(help_text='An regular expression maching whats need to be replaced', max_length=255, verbose_name='pattern')), - ('replace', models.CharField(help_text='replace expression, groups are capture by \\1, \\2 \u2026', max_length=255, verbose_name='replace', blank=True)), - ('service_pattern', models.ForeignKey(related_name='replacements', to='cas_server.ServicePattern')), - ], - options={ - }, - bases=(models.Model,), - ), - migrations.RemoveField( - model_name='servicepattern', - name='filter', - ), - migrations.CreateModel( - name='Username', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('value', models.CharField(help_text='username allowed to connect to the service', max_length=255, verbose_name='username')), - ('service_pattern', models.ForeignKey(related_name='usernames', to='cas_server.ServicePattern')), - ], - options={ - }, - bases=(models.Model,), - ), - migrations.RemoveField( - model_name='servicepattern', - name='usernames', - ), - migrations.AddField( - model_name='servicepattern', - name='restrict_users', - field=models.BooleanField(default=False, help_text='Limit username allowed to connect to the list provided bellow', verbose_name='restrict username'), - preserve_default=True, - ), - migrations.AddField( - model_name='servicepattern', - name='name', - field=models.CharField(null=True, max_length=255, blank=True, help_text='A name for the service', unique=True, verbose_name='name'), - preserve_default=True, - ), - migrations.AlterUniqueTogether( - name='replaceattributname', - unique_together=set([('name', 'service_pattern')]), - ), - migrations.AlterUniqueTogether( - name='replaceattributname', - unique_together=set([('name', 'replace', 'service_pattern')]), - ), - migrations.AddField( - model_name='servicepattern', - name='single_log_out', - field=models.BooleanField(default=False, help_text='Enable SLO for the service', verbose_name='single log out'), - preserve_default=True, - ), - migrations.AlterField( - model_name='replaceattributname', - name='name', - field=models.CharField(help_text='name of an attribut to send to the service', max_length=255, verbose_name='name'), - preserve_default=True, - ), - migrations.AlterField( - model_name='replaceattributname', - name='replace', - field=models.CharField(help_text='name under which the attribut will be showto the service. empty = default name of the attribut', max_length=255, verbose_name='replace', blank=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='servicepattern', - name='pattern', - field=models.CharField(unique=True, max_length=255, verbose_name='pattern'), - preserve_default=True, - ), - migrations.AlterField( - model_name='servicepattern', - name='pos', - field=models.IntegerField(default=100, verbose_name='position'), - preserve_default=True, - ), - migrations.AlterField( - model_name='servicepattern', - name='proxy', - field=models.BooleanField(default=False, help_text='A ProxyGrantingTicket can be delivered to the service in order to authenticate for the user on a backend service', verbose_name='proxy'), - preserve_default=True, - ), - migrations.AlterField( - model_name='servicepattern', - name='user_field', - field=models.CharField(default=b'', help_text='Name of the attribut to transmit as username, empty = login', max_length=255, verbose_name='user field', blank=True), - preserve_default=True, - ), - migrations.AddField( - model_name='proxygrantingticket', - name='single_log_out', - field=models.BooleanField(default=False), - preserve_default=True, - ), - migrations.AddField( - model_name='proxyticket', - name='single_log_out', - field=models.BooleanField(default=False), - preserve_default=True, - ), - migrations.AddField( - model_name='serviceticket', - name='single_log_out', - field=models.BooleanField(default=False), - preserve_default=True, - ), - migrations.AddField( - model_name='servicepattern', - name='proxy_callback', - field=models.BooleanField(default=False, help_text='can be used as a proxy callback to deliver PGT', verbose_name='proxy callback'), - preserve_default=True, - ), - migrations.AlterField( - model_name='servicepattern', - name='proxy', - field=models.BooleanField(default=False, help_text='Proxy tickets can be delivered to the service', verbose_name='proxy'), - preserve_default=True, - ), - migrations.AddField( - model_name='servicepattern', - name='single_log_out_callback', - field=models.CharField(default=b'', help_text='URL where the SLO request will be POST. empty = service url\nThis is usefull for non HTTP proxied services.', max_length=255, verbose_name='single log out callback', blank=True), - preserve_default=True, - ), - migrations.AlterField( - model_name='replaceattributname', - name='name', - field=models.CharField(help_text='name of an attribut to send to the service, use * for all attributes', max_length=255, verbose_name='name'), - preserve_default=True, - ), - migrations.AlterUniqueTogether( - name='user', - unique_together=set([('username', 'session_key')]), - ), - ] diff --git a/cas_server/migrations/0002_auto_20151212_1300.py b/cas_server/migrations/0002_auto_20151212_1300.py deleted file mode 100644 index 6553d49..0000000 --- a/cas_server/migrations/0002_auto_20151212_1300.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0001_squashed_0021_auto_20150611_2102'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='date', - field=models.DateTimeField(auto_now=True), - preserve_default=True, - ), - ] diff --git a/cas_server/migrations/0003_auto_20151212_1721.py b/cas_server/migrations/0003_auto_20151212_1721.py deleted file mode 100644 index 22ac819..0000000 --- a/cas_server/migrations/0003_auto_20151212_1721.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0002_auto_20151212_1300'), - ] - - operations = [ - migrations.AlterField( - model_name='servicepattern', - name='pattern', - field=models.CharField(help_text="A regular expression matching services. Will usually looks like '^https://some\\.server\\.com/path/.*$'.As it is a regular expression, special character must be escaped with a '\\'.", unique=True, max_length=255, verbose_name='pattern'), - preserve_default=True, - ), - ] diff --git a/cas_server/migrations/0004_auto_20151218_1032.py b/cas_server/migrations/0004_auto_20151218_1032.py deleted file mode 100644 index caade21..0000000 --- a/cas_server/migrations/0004_auto_20151218_1032.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0003_auto_20151212_1721'), - ] - - operations = [ - migrations.AlterModelOptions( - name='servicepattern', - options={'ordering': ('pos',), 'verbose_name': 'Service pattern', 'verbose_name_plural': 'Services patterns'}, - ), - migrations.AlterModelOptions( - name='user', - options={'verbose_name': 'User', 'verbose_name_plural': 'Users'}, - ), - ] diff --git a/cas_server/migrations/0005_auto_20160616_1018.py b/cas_server/migrations/0005_auto_20160616_1018.py deleted file mode 100644 index 8d361b9..0000000 --- a/cas_server/migrations/0005_auto_20160616_1018.py +++ /dev/null @@ -1,65 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.6 on 2016-06-16 10:18 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0004_auto_20151218_1032'), - ] - - operations = [ - migrations.AlterField( - model_name='servicepattern', - name='pos', - field=models.IntegerField(default=100, help_text='service patterns are sorted using the position attribute', verbose_name='position'), - ), - migrations.CreateModel( - name='FederatedIendityProvider', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('suffix', models.CharField(help_text='Suffix append to backend CAS returner username: `returned_username`@`suffix`', max_length=30, unique=True, verbose_name='suffix')), - ('server_url', models.CharField(max_length=255, verbose_name='server url')), - ('cas_protocol_version', models.CharField(choices=[(b'1', b'CAS 1.0'), (b'2', b'CAS 2.0'), (b'3', b'CAS 3.0'), (b'CAS_2_SAML_1_0', b'SAML 1.1')], default=b'3', help_text='Version of the CAS protocol to use when sending requests the the backend CAS', max_length=30, verbose_name='CAS protocol version')), - ('verbose_name', models.CharField(help_text='Name for this identity provider displayed on the login page', max_length=255, verbose_name='verbose name')), - ('pos', models.IntegerField(default=100, help_text='Identity provider are sorted using the (position, verbose name, suffix) attributes', verbose_name='position')), - ('display', models.BooleanField(default=True, help_text='Display the provider on the login page', verbose_name='display')), - ], - options={ - 'verbose_name': 'identity provider', - 'verbose_name_plural': 'identity providers', - }, - ), - migrations.CreateModel( - name='FederatedUser', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('username', models.CharField(max_length=124)), - ('provider', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cas_server.FederatedIendityProvider')), - ('attributs', models.TextField(blank=True, default=None, null=True)), - ('ticket', models.CharField(max_length=255)), - ('last_update', models.DateTimeField(auto_now=True)), - ], - ), - migrations.AlterUniqueTogether( - name='federateduser', - unique_together=set([('username', 'provider')]), - ), - migrations.CreateModel( - name='FederateSLO', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('username', models.CharField(max_length=30)), - ('session_key', models.CharField(blank=True, max_length=40, null=True)), - ('ticket', models.CharField(db_index=True, max_length=255)), - ], - ), - migrations.AlterUniqueTogether( - name='federateslo', - unique_together=set([('username', 'session_key', 'ticket')]), - ), - ] diff --git a/cas_server/migrations/0006_auto_20160706_1727.py b/cas_server/migrations/0006_auto_20160706_1727.py deleted file mode 100644 index 0a30642..0000000 --- a/cas_server/migrations/0006_auto_20160706_1727.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-06 17:27 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0005_auto_20160616_1018'), - ] - - operations = [ - migrations.AlterField( - model_name='federatediendityprovider', - name='cas_protocol_version', - field=models.CharField(choices=[(b'1', b'CAS 1.0'), (b'2', b'CAS 2.0'), (b'3', b'CAS 3.0'), (b'CAS_2_SAML_1_0', b'SAML 1.1')], default=b'3', help_text='Version of the CAS protocol to use when sending requests the the backend CAS.', max_length=30, verbose_name='CAS protocol version'), - ), - migrations.AlterField( - model_name='federatediendityprovider', - name='display', - field=models.BooleanField(default=True, help_text='Display the provider on the login page.', verbose_name='display'), - ), - migrations.AlterField( - model_name='federatediendityprovider', - name='pos', - field=models.IntegerField(default=100, help_text='Position of the identity provider on the login page. Identity provider are sorted using the (position, verbose name, suffix) attributes.', verbose_name='position'), - ), - migrations.AlterField( - model_name='federatediendityprovider', - name='suffix', - field=models.CharField(help_text='Suffix append to backend CAS returner username: ``returned_username`` @ ``suffix``.', max_length=30, unique=True, verbose_name='suffix'), - ), - migrations.AlterField( - model_name='federatediendityprovider', - name='verbose_name', - field=models.CharField(help_text='Name for this identity provider displayed on the login page.', max_length=255, verbose_name='verbose name'), - ), - ] diff --git a/cas_server/migrations/0007_auto_20160723_2252.py b/cas_server/migrations/0007_auto_20160723_2252.py deleted file mode 100644 index fd0c8a1..0000000 --- a/cas_server/migrations/0007_auto_20160723_2252.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.8 on 2016-07-23 22:52 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0006_auto_20160706_1727'), - ] - - operations = [ - migrations.RemoveField( - model_name='federateduser', - name='attributs', - ), - migrations.RemoveField( - model_name='proxygrantingticket', - name='attributs', - ), - migrations.RemoveField( - model_name='proxyticket', - name='attributs', - ), - migrations.RemoveField( - model_name='serviceticket', - name='attributs', - ), - migrations.AddField( - model_name='federateduser', - name='_attributs', - field=models.TextField(blank=True, default=None, null=True), - ), - migrations.AddField( - model_name='proxygrantingticket', - name='_attributs', - field=models.TextField(blank=True, default=None, null=True), - ), - migrations.AddField( - model_name='proxyticket', - name='_attributs', - field=models.TextField(blank=True, default=None, null=True), - ), - migrations.AddField( - model_name='serviceticket', - name='_attributs', - field=models.TextField(blank=True, default=None, null=True), - ), - migrations.AlterField( - model_name='federatediendityprovider', - name='suffix', - field=models.CharField(help_text='Suffix append to backend CAS returned username: ``returned_username`` @ ``suffix``.', max_length=30, unique=True, verbose_name='suffix'), - ), - ] diff --git a/cas_server/migrations/0008_newversionwarning.py b/cas_server/migrations/0008_newversionwarning.py deleted file mode 100644 index f5e4b19..0000000 --- a/cas_server/migrations/0008_newversionwarning.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-27 21:59 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0007_auto_20160723_2252'), - ] - - operations = [ - migrations.CreateModel( - name='NewVersionWarning', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('version', models.CharField(max_length=255)), - ], - ), - ] diff --git a/cas_server/migrations/0009_auto_20160814_0619.py b/cas_server/migrations/0009_auto_20160814_0619.py deleted file mode 100644 index 4eeeb50..0000000 --- a/cas_server/migrations/0009_auto_20160814_0619.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.8 on 2016-08-14 06:19 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0008_newversionwarning'), - ] - - operations = [ - migrations.AlterField( - model_name='filterattributvalue', - name='attribut', - field=models.CharField(help_text='Name of the attribute which must verify pattern', max_length=255, verbose_name='attribute'), - ), - migrations.AlterField( - model_name='replaceattributname', - name='name', - field=models.CharField(help_text='name of an attribute to send to the service, use * for all attributes', max_length=255, verbose_name='name'), - ), - migrations.AlterField( - model_name='replaceattributname', - name='replace', - field=models.CharField(blank=True, help_text='name under which the attribute will be showto the service. empty = default name of the attribut', max_length=255, verbose_name='replace'), - ), - migrations.AlterField( - model_name='replaceattributvalue', - name='attribut', - field=models.CharField(help_text='Name of the attribute for which the value must be replace', max_length=255, verbose_name='attribute'), - ), - migrations.AlterField( - model_name='servicepattern', - name='user_field', - field=models.CharField(blank=True, default=b'', help_text='Name of the attribute to transmit as username, empty = login', max_length=255, verbose_name='user field'), - ), - ] diff --git a/cas_server/migrations/0010_auto_20160824_2112.py b/cas_server/migrations/0010_auto_20160824_2112.py deleted file mode 100644 index 7fc9e4e..0000000 --- a/cas_server/migrations/0010_auto_20160824_2112.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-08-24 21:12 -from __future__ import unicode_literals - -import cas_server.utils -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0009_auto_20160814_0619'), - ] - - operations = [ - migrations.AlterField( - model_name='filterattributvalue', - name='pattern', - field=models.CharField(help_text='a regular expression', max_length=255, validators=[cas_server.utils.regexpr_validator], verbose_name='pattern'), - ), - migrations.AlterField( - model_name='replaceattributname', - name='replace', - field=models.CharField(blank=True, help_text='name under which the attribute will be show to the service. empty = default name of the attribut', max_length=255, verbose_name='replace'), - ), - migrations.AlterField( - model_name='replaceattributvalue', - name='pattern', - field=models.CharField(help_text='An regular expression maching whats need to be replaced', max_length=255, validators=[cas_server.utils.regexpr_validator], verbose_name='pattern'), - ), - migrations.AlterField( - model_name='servicepattern', - name='pattern', - field=models.CharField(help_text="A regular expression matching services. Will usually looks like '^https://some\\.server\\.com/path/.*$'.As it is a regular expression, special character must be escaped with a '\\'.", max_length=255, unique=True, validators=[cas_server.utils.regexpr_validator], verbose_name='pattern'), - ), - ] diff --git a/cas_server/migrations/0011_auto_20161007_1258.py b/cas_server/migrations/0011_auto_20161007_1258.py deleted file mode 100644 index e21f8ec..0000000 --- a/cas_server/migrations/0011_auto_20161007_1258.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-10-07 12:58 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0010_auto_20160824_2112'), - ] - - operations = [ - migrations.CreateModel( - name='UserAttributes', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('_attributs', models.TextField(blank=True, default=None, null=True)), - ('username', models.CharField(max_length=155, unique=True)), - ], - options={ - 'verbose_name': 'User attributes cache', - 'verbose_name_plural': 'User attributes caches', - }, - ), - migrations.AlterModelOptions( - name='federateduser', - options={'verbose_name': 'Federated user', 'verbose_name_plural': 'Federated users'}, - ), - migrations.AddField( - model_name='user', - name='last_login', - field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), - preserve_default=False, - ), - ] diff --git a/cas_server/migrations/0012_auto_20170328_1610.py b/cas_server/migrations/0012_auto_20170328_1610.py deleted file mode 100644 index 207348e..0000000 --- a/cas_server/migrations/0012_auto_20170328_1610.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.5 on 2017-03-28 14:10 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0011_auto_20161007_1258'), - ] - - operations = [ - migrations.AlterField( - model_name='federatediendityprovider', - name='cas_protocol_version', - field=models.CharField(choices=[('1', 'CAS 1.0'), ('2', 'CAS 2.0'), ('3', 'CAS 3.0'), ('CAS_2_SAML_1_0', 'SAML 1.1')], default='3', help_text='Version of the CAS protocol to use when sending requests the the backend CAS.', max_length=30, verbose_name='CAS protocol version'), - ), - migrations.AlterField( - model_name='servicepattern', - name='single_log_out_callback', - field=models.CharField(blank=True, default='', help_text='URL where the SLO request will be POST. empty = service url\nThis is usefull for non HTTP proxied services.', max_length=255, verbose_name='single log out callback'), - ), - migrations.AlterField( - model_name='servicepattern', - name='user_field', - field=models.CharField(blank=True, default='', help_text='Name of the attribute to transmit as username, empty = login', max_length=255, verbose_name='user field'), - ), - ] diff --git a/cas_server/migrations/0013_auto_20170329_1748.py b/cas_server/migrations/0013_auto_20170329_1748.py deleted file mode 100644 index a49f908..0000000 --- a/cas_server/migrations/0013_auto_20170329_1748.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.5 on 2017-03-29 15:48 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cas_server', '0012_auto_20170328_1610'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='username', - field=models.CharField(max_length=250), - ), - ] diff --git a/cas_server/models.py b/cas_server/models.py index 4b6596f..21d5d8b 100644 --- a/cas_server/models.py +++ b/cas_server/models.py @@ -641,7 +641,7 @@ class Username(models.Model): #: ForeignKey to a :class:`ServicePattern`. :class:`Username` instances for a #: :class:`ServicePattern` are accessible thought its :attr:`ServicePattern.usernames` #: attribute. - service_pattern = models.ForeignKey(ServicePattern, related_name="usernames") + service_pattern = models.ForeignKey(ServicePattern, related_name="usernames", on_delete=models.CASCADE) def __str__(self): return self.value @@ -676,7 +676,7 @@ class ReplaceAttributName(models.Model): #: ForeignKey to a :class:`ServicePattern`. :class:`ReplaceAttributName` instances for a #: :class:`ServicePattern` are accessible thought its :attr:`ServicePattern.attributs` #: attribute. - service_pattern = models.ForeignKey(ServicePattern, related_name="attributs") + service_pattern = models.ForeignKey(ServicePattern, related_name="attributs", on_delete=models.CASCADE) def __str__(self): if not self.replace: @@ -711,7 +711,7 @@ class FilterAttributValue(models.Model): #: ForeignKey to a :class:`ServicePattern`. :class:`FilterAttributValue` instances for a #: :class:`ServicePattern` are accessible thought its :attr:`ServicePattern.filters` #: attribute. - service_pattern = models.ForeignKey(ServicePattern, related_name="filters") + service_pattern = models.ForeignKey(ServicePattern, related_name="filters", on_delete=models.CASCADE) def __str__(self): return u"%s %s" % (self.attribut, self.pattern) @@ -748,7 +748,7 @@ class ReplaceAttributValue(models.Model): #: ForeignKey to a :class:`ServicePattern`. :class:`ReplaceAttributValue` instances for a #: :class:`ServicePattern` are accessible thought its :attr:`ServicePattern.replacements` #: attribute. - service_pattern = models.ForeignKey(ServicePattern, related_name="replacements") + service_pattern = models.ForeignKey(ServicePattern, related_name="replacements", on_delete=models.CASCADE) def __str__(self): return u"%s %s %s" % (self.attribut, self.pattern, self.replace) @@ -764,14 +764,14 @@ class Ticket(JsonAttributes): class Meta: abstract = True #: ForeignKey to a :class:`User`. - user = models.ForeignKey(User, related_name="%(class)s") + user = models.ForeignKey(User, related_name="%(class)s", on_delete=models.CASCADE) #: A boolean. ``True`` if the ticket has been validated validate = models.BooleanField(default=False) #: The service url for the ticket service = models.TextField() #: ForeignKey to a :class:`ServicePattern`. The :class:`ServicePattern` corresponding to #: :attr:`service`. Use :meth:`ServicePattern.validate` to find it. - service_pattern = models.ForeignKey(ServicePattern, related_name="%(class)s") + service_pattern = models.ForeignKey(ServicePattern, related_name="%(class)s", on_delete=models.CASCADE) #: Date of the ticket creation creation = models.DateTimeField(auto_now_add=True) #: A boolean. ``True`` if the user has just renew his authentication @@ -1034,7 +1034,7 @@ class Proxy(models.Model): #: ForeignKey to a :class:`ProxyTicket`. :class:`Proxy` instances for a #: :class:`ProxyTicket` are accessible thought its :attr:`ProxyTicket.proxies` #: attribute. - proxy_ticket = models.ForeignKey(ProxyTicket, related_name="proxies") + proxy_ticket = models.ForeignKey(ProxyTicket, related_name="proxies", on_delete=models.CASCADE) def __str__(self): return self.url diff --git a/cas_server/tests/settings.py b/cas_server/tests/settings.py index 617f364..1a06d3c 100644 --- a/cas_server/tests/settings.py +++ b/cas_server/tests/settings.py @@ -46,7 +46,6 @@ MIDDLEWARE = [ 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.locale.LocaleMiddleware', diff --git a/cas_server/tests/utils.py b/cas_server/tests/utils.py index 3c74516..5435c5b 100644 --- a/cas_server/tests/utils.py +++ b/cas_server/tests/utils.py @@ -263,7 +263,7 @@ class DummyCAS(BaseHTTPServer.BaseHTTPRequestHandler): if self.test_params(): template = loader.get_template('cas_server/serviceValidate.xml') context = Context({ - 'username': self.server.username, + 'username': self.server.username.decode('utf-8'), 'attributes': self.server.attributes, 'auth_date': timezone.now().replace(microsecond=0).isoformat(), 'is_new_login': 'true', @@ -301,7 +301,7 @@ class DummyCAS(BaseHTTPServer.BaseHTTPRequestHandler): 'expireInstant': (timezone.now() + timedelta(seconds=60)).isoformat(), 'Recipient': self.server.service, 'ResponseID': utils.gen_saml_id(), - 'username': self.server.username, + 'username': self.server.username.decode('utf-8'), 'attributes': self.server.attributes, 'auth_date': timezone.now().replace(microsecond=0).isoformat(), 'is_new_login': 'true', diff --git a/tox.ini b/tox.ini index 392fee5..1a1c2cf 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,9 @@ envlist= flake8, check_rst, py27-django111, + py35-django111, py36-django111, + py35-django20, py36-django20, [flake8] @@ -90,6 +92,12 @@ deps = Django>=1.11,<1.12 {[base]deps} +[testenv:py35-django20] +basepython=python3.5 +deps = + Django>=2.0,<2.1 + {[base]deps} + [testenv:py36-django20] basepython=python3.6 deps =