diff --git a/cas_server/admin.py b/cas_server/admin.py index 16706c9..bad95c6 100644 --- a/cas_server/admin.py +++ b/cas_server/admin.py @@ -59,7 +59,7 @@ class ServicePatternAdmin(admin.ModelAdmin): ReplaceAttributValueInline, FilterAttributValueInline ) - list_display = ('pos', 'name', 'pattern', 'proxy', 'single_sign_out') + list_display = ('pos', 'name', 'pattern', 'proxy', 'single_log_out') admin.site.register(User, UserAdmin) diff --git a/cas_server/locale/en/LC_MESSAGES/django.mo b/cas_server/locale/en/LC_MESSAGES/django.mo index 756e260..5acc92e 100644 Binary files a/cas_server/locale/en/LC_MESSAGES/django.mo and b/cas_server/locale/en/LC_MESSAGES/django.mo differ diff --git a/cas_server/locale/en/LC_MESSAGES/django.po b/cas_server/locale/en/LC_MESSAGES/django.po index 2419f2b..9a30362 100644 --- a/cas_server/locale/en/LC_MESSAGES/django.po +++ b/cas_server/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cas_server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-27 22:56+0200\n" +"POT-Creation-Date: 2015-05-28 02:10+0200\n" "PO-Revision-Date: 2015-05-23 19:03+0100\n" "Last-Translator: Valentin Samir \n" "Language-Team: django \n" @@ -84,13 +84,13 @@ msgid "" msgstr "" #: models.py:182 -msgid "single sign out" +msgid "single log out" msgstr "" #: models.py:183 #, fuzzy #| msgid "Connect to the service" -msgid "Enable SSO for the service" +msgid "Enable SLO for the service" msgstr "Connect to the service" #: models.py:225 diff --git a/cas_server/locale/fr/LC_MESSAGES/django.mo b/cas_server/locale/fr/LC_MESSAGES/django.mo index 033a5f4..a9f29a6 100644 Binary files a/cas_server/locale/fr/LC_MESSAGES/django.mo and b/cas_server/locale/fr/LC_MESSAGES/django.mo differ diff --git a/cas_server/locale/fr/LC_MESSAGES/django.po b/cas_server/locale/fr/LC_MESSAGES/django.po index c354e96..140c162 100644 --- a/cas_server/locale/fr/LC_MESSAGES/django.po +++ b/cas_server/locale/fr/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: cas_server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-27 22:56+0200\n" -"PO-Revision-Date: 2015-05-27 23:05+0100\n" +"POT-Creation-Date: 2015-05-28 02:10+0200\n" +"PO-Revision-Date: 2015-05-28 02:15+0100\n" "Last-Translator: Valentin Samir \n" "Language-Team: django \n" "Language: fr\n" @@ -88,12 +88,12 @@ msgstr "" "s'authentifier en temps l'utilisateur à un autre service" #: models.py:182 -msgid "single sign out" +msgid "single log out" msgstr "" #: models.py:183 -msgid "Enable SSO for the service" -msgstr "Active le SSO pour le service" +msgid "Enable SLO for the service" +msgstr "Active le SLO pour le service" #: models.py:225 msgid "username" @@ -140,7 +140,7 @@ msgstr "une expression régulière reconnaissant ce qui doit être remplacé" #: models.py:290 msgid "replace expression, groups are capture by \\1, \\2 …" -msgstr "" +msgstr "expression de remplacement, les groupe sont capturé par \\1, \\2" #: models.py:337 #, python-format diff --git a/cas_server/migrations/0014_auto_20150528_0012.py b/cas_server/migrations/0014_auto_20150528_0012.py new file mode 100644 index 0000000..a62e7f6 --- /dev/null +++ b/cas_server/migrations/0014_auto_20150528_0012.py @@ -0,0 +1,108 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('cas_server', '0013_servicepattern_single_sign_out'), + ] + + operations = [ + migrations.RemoveField( + model_name='servicepattern', + name='single_sign_out', + ), + 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='filterattributvalue', + name='attribut', + field=models.CharField(help_text='Name of the attribut which must verify pattern', max_length=255, verbose_name='attribut'), + preserve_default=True, + ), + migrations.AlterField( + model_name='filterattributvalue', + name='pattern', + field=models.CharField(help_text='a regular expression', max_length=255, verbose_name='pattern'), + 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='replaceattributvalue', + name='attribut', + field=models.CharField(help_text='Name of the attribut for which the value must be replace', max_length=255, verbose_name='attribut'), + preserve_default=True, + ), + migrations.AlterField( + model_name='replaceattributvalue', + name='pattern', + field=models.CharField(help_text='An regular expression maching whats need to be replaced', max_length=255, verbose_name='pattern'), + preserve_default=True, + ), + migrations.AlterField( + model_name='replaceattributvalue', + name='replace', + field=models.CharField(help_text='replace expression, groups are capture by \\1, \\2 \u2026', max_length=255, verbose_name='replace', blank=True), + preserve_default=True, + ), + migrations.AlterField( + 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.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='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.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.AlterField( + model_name='username', + name='value', + field=models.CharField(help_text='username allowed to connect to the service', max_length=255, verbose_name='username'), + preserve_default=True, + ), + ] diff --git a/cas_server/models.py b/cas_server/models.py index 61b7644..401ebd1 100644 --- a/cas_server/models.py +++ b/cas_server/models.py @@ -66,7 +66,7 @@ class User(models.Model): return self.username def logout(self, request): - """Sending SSO request to all services the user logged in""" + """Sending SLO request to all services the user logged in""" async_list = [] session = FuturesSession(executor=ThreadPoolExecutor(max_workers=10)) for ticket in ServiceTicket.objects.filter(user=self, validate=True): @@ -177,10 +177,10 @@ class ServicePattern(models.Model): help_text=_("A ProxyGrantingTicket can be delivered to the service " \ "in order to authenticate for the user on a backend service") ) - single_sign_out = models.BooleanField( + single_log_out = models.BooleanField( default=False, - verbose_name=_(u"single sign out"), - help_text=_("Enable SSO for the service") + verbose_name=_(u"single log out"), + help_text=_("Enable SLO for the service") ) def __unicode__(self): @@ -311,8 +311,8 @@ class Ticket(models.Model): return u"Ticket(%s, %s)" % (self.user, self.service) def logout(self, request, session): - """Send a SSO request to the ticket service""" - if self.validate and self.service_pattern.single_sign_out: + """Send a SLO request to the ticket service""" + if self.validate and self.service_pattern.single_log_out: xml = """