diff options
| -rw-r--r-- | openstack_auth/backend.py | 3 | ||||
| -rw-r--r-- | openstack_auth/locale/fr/LC_MESSAGES/django.po | 8 | ||||
| -rw-r--r-- | openstack_auth/locale/ja/LC_MESSAGES/django.po | 8 | ||||
| -rw-r--r-- | openstack_auth/locale/ko_KR/LC_MESSAGES/django.po | 8 | ||||
| -rw-r--r-- | openstack_auth/plugin/__init__.py | 4 | ||||
| -rw-r--r-- | openstack_auth/plugin/token.py | 41 |
6 files changed, 58 insertions, 14 deletions
diff --git a/openstack_auth/backend.py b/openstack_auth/backend.py index cc97c0a..f2d08fa 100644 --- a/openstack_auth/backend.py +++ b/openstack_auth/backend.py @@ -42,7 +42,8 @@ class KeystoneBackend(object): plugins = getattr( settings, 'AUTHENTICATION_PLUGINS', - ['openstack_auth.plugin.password.PasswordPlugin']) + ['openstack_auth.plugin.password.PasswordPlugin', + 'openstack_auth.plugin.token.TokenPlugin']) self._auth_plugins = [utils.import_string(p)() for p in plugins] diff --git a/openstack_auth/locale/fr/LC_MESSAGES/django.po b/openstack_auth/locale/fr/LC_MESSAGES/django.po index 4195976..5b93df4 100644 --- a/openstack_auth/locale/fr/LC_MESSAGES/django.po +++ b/openstack_auth/locale/fr/LC_MESSAGES/django.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Horizon\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-03-26 06:03+0000\n" -"PO-Revision-Date: 2015-03-25 17:08+0000\n" -"Last-Translator: openstackjenkins <jenkins@openstack.org>\n" +"POT-Creation-Date: 2015-03-30 06:02+0000\n" +"PO-Revision-Date: 2015-03-27 21:02+0000\n" +"Last-Translator: Maxime COQUEREL <max.coquerel@gmail.com>\n" "Language-Team: French " "(http://www.transifex.com/projects/p/horizon/language/fr/)\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" @@ -27,7 +27,7 @@ msgstr "Le jeton d'authentification délivré par le service d'Identité a expir #: openstack_auth/backend.py:111 msgid "Invalid credentials." -msgstr "" +msgstr "Identifiants de connexion non valide" #: openstack_auth/backend.py:114 msgid "An error occurred authenticating. Please try again later." diff --git a/openstack_auth/locale/ja/LC_MESSAGES/django.po b/openstack_auth/locale/ja/LC_MESSAGES/django.po index ce9acd4..346e6c5 100644 --- a/openstack_auth/locale/ja/LC_MESSAGES/django.po +++ b/openstack_auth/locale/ja/LC_MESSAGES/django.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Horizon\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-03-26 06:03+0000\n" -"PO-Revision-Date: 2015-03-25 17:08+0000\n" -"Last-Translator: openstackjenkins <jenkins@openstack.org>\n" +"POT-Creation-Date: 2015-03-30 06:02+0000\n" +"PO-Revision-Date: 2015-03-27 23:30+0000\n" +"Last-Translator: Akihiro Motoki <amotoki@gmail.com>\n" "Language-Team: Japanese " "(http://www.transifex.com/projects/p/horizon/language/ja/)\n" "Plural-Forms: nplurals=1; plural=0\n" @@ -26,7 +26,7 @@ msgstr "Identity Service により発行された認証トークンの期限が #: openstack_auth/backend.py:111 msgid "Invalid credentials." -msgstr "" +msgstr "無効な認証情報です。" #: openstack_auth/backend.py:114 msgid "An error occurred authenticating. Please try again later." diff --git a/openstack_auth/locale/ko_KR/LC_MESSAGES/django.po b/openstack_auth/locale/ko_KR/LC_MESSAGES/django.po index 16bfaa3..e359fed 100644 --- a/openstack_auth/locale/ko_KR/LC_MESSAGES/django.po +++ b/openstack_auth/locale/ko_KR/LC_MESSAGES/django.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Horizon\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-03-26 06:03+0000\n" -"PO-Revision-Date: 2015-03-25 17:08+0000\n" -"Last-Translator: openstackjenkins <jenkins@openstack.org>\n" +"POT-Creation-Date: 2015-03-30 06:02+0000\n" +"PO-Revision-Date: 2015-03-27 14:31+0000\n" +"Last-Translator: Ian Y. Choi <ianyrchoi@gmail.com>\n" "Language-Team: Korean (Korea) " "(http://www.transifex.com/projects/p/horizon/language/ko_KR/)\n" "Plural-Forms: nplurals=1; plural=0\n" @@ -27,7 +27,7 @@ msgstr "Identity 서비스에서 발급한 인증 토큰이 만료되었습니 #: openstack_auth/backend.py:111 msgid "Invalid credentials." -msgstr "" +msgstr "잘못된 자격 증명입니다." #: openstack_auth/backend.py:114 msgid "An error occurred authenticating. Please try again later." diff --git a/openstack_auth/plugin/__init__.py b/openstack_auth/plugin/__init__.py index 26c2b49..64caeac 100644 --- a/openstack_auth/plugin/__init__.py +++ b/openstack_auth/plugin/__init__.py @@ -12,7 +12,9 @@ from openstack_auth.plugin.base import * # noqa from openstack_auth.plugin.password import * # noqa +from openstack_auth.plugin.token import * # noqa __all__ = ['BasePlugin', - 'PasswordPlugin'] + 'PasswordPlugin', + 'TokenPlugin'] diff --git a/openstack_auth/plugin/token.py b/openstack_auth/plugin/token.py new file mode 100644 index 0000000..cea10a3 --- /dev/null +++ b/openstack_auth/plugin/token.py @@ -0,0 +1,41 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from keystoneclient.auth.identity import v2 as v2_auth +from keystoneclient.auth.identity import v3 as v3_auth + +from openstack_auth.plugin import base +from openstack_auth import utils + + +__all__ = ['TokenPlugin'] + + +class TokenPlugin(base.BasePlugin): + """Authenticate against keystone with an existing token.""" + + def get_plugin(self, auth_url=None, token=None, project_id=None, + **kwargs): + if not all((auth_url, token)): + return None + + if utils.get_keystone_version() >= 3: + return v3_auth.Token(auth_url=auth_url, + token=token, + project_id=project_id, + reauthenticate=False) + + else: + return v2_auth.Token(auth_url=auth_url, + token=token, + tenant_id=project_id, + reauthenticate=False) |