[tryton-debian-vcs] tryton-modules-ldap-authentication branch upstream created. 62cb6e0263de6a500b543a07515b27f2281d3799
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:02:52 UTC 2013
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-ldap-authentication.git;a=commitdiff;h=62cb6e0263de6a500b543a07515b27f2281d3799
commit 62cb6e0263de6a500b543a07515b27f2281d3799
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:20 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 831ac3d..b661834 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index d30bcae..961beed 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_ldap_authentication
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_ldap_authentication
===========================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 312c0cb..8783db4 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -2,7 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "error:res.user:"
msgid "You can not set the password of ldap user \"%s\"."
msgstr "No podeu establir la contrasenya de l'usuari \"%s\" d'ldap."
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 79e2b7c..726478c 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,7 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "error:res.user:"
msgid "You can not set the password of ldap user \"%s\"."
msgstr "No puede establecer la contraseña del usuario \"%s\" de ldap."
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 5a75798..d43b296 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:res.user:"
msgid "You can not set the password of ldap user \"%s\"."
-msgstr ""
+msgstr "Vous ne pouvez pas définir le mot de passe de l'utilisateur LDAP \"%s\"."
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
@@ -43,14 +43,6 @@ msgid "Base"
msgstr "Base"
msgctxt "selection:ldap.connection,auth_scope:"
-msgid "Base"
-msgstr "Base"
-
-msgctxt "selection:ldap.connection,auth_scope:"
-msgid "OneLevel"
-msgstr "Un niveau"
-
-msgctxt "selection:ldap.connection,auth_scope:"
msgid "OneLevel"
msgstr "Un niveau"
@@ -58,14 +50,6 @@ msgctxt "selection:ldap.connection,auth_scope:"
msgid "Subtree"
msgstr "Sous-arbre"
-msgctxt "selection:ldap.connection,auth_scope:"
-msgid "Subtree"
-msgstr "Sous-arbre"
-
-msgctxt "view:ldap.connection:"
-msgid "Authentication"
-msgstr "Authentification"
-
msgctxt "view:ldap.connection:"
msgid "Authentication"
msgstr "Authentification"
diff --git a/locale/ca_ES.po b/locale/sl_SI.po
similarity index 72%
copy from locale/ca_ES.po
copy to locale/sl_SI.po
index 312c0cb..65cc365 100644
--- a/locale/ca_ES.po
+++ b/locale/sl_SI.po
@@ -2,26 +2,25 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "error:res.user:"
msgid "You can not set the password of ldap user \"%s\"."
-msgstr "No podeu establir la contrasenya de l'usuari \"%s\" d'ldap."
+msgstr "Za LDAP uporabnika \"%s\" ni možno nastaviti gesla."
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
-msgstr "DN base"
+msgstr "Osnovni DN"
msgctxt "field:ldap.connection,auth_create_user:"
msgid "Create User"
-msgstr "Crea usuari"
+msgstr "Ustvari uporabnika"
msgctxt "field:ldap.connection,auth_require_filter:"
msgid "Require Filter"
-msgstr "Filtre requerit"
+msgstr "Zahtevan filter"
msgctxt "field:ldap.connection,auth_scope:"
msgid "Scope"
-msgstr "Àmbit"
+msgstr "Pristojnost"
msgctxt "field:ldap.connection,auth_uid:"
msgid "UID"
@@ -29,28 +28,28 @@ msgstr "UID"
msgctxt "help:ldap.connection,auth_base_dn:"
msgid "Base DN for authentication"
-msgstr "DN base per a l'autenticació"
+msgstr "Osnovni DN za avtentifikacijo"
msgctxt "help:ldap.connection,auth_create_user:"
msgid "Create user if not in database"
-msgstr "Crea l'usuari si no existeix a la base de dades"
+msgstr "Ustvari uporabnik, če ga ni v bazi podatkov"
msgctxt "help:ldap.connection,auth_uid:"
msgid "UID Attribute for authentication"
-msgstr "Atribut UID per a l'autenticació"
+msgstr "Atribut UID za avtentifikacijo"
msgctxt "selection:ldap.connection,auth_scope:"
msgid "Base"
-msgstr "Base"
+msgstr "Osnova"
msgctxt "selection:ldap.connection,auth_scope:"
msgid "OneLevel"
-msgstr "UnNivell"
+msgstr "Ena raven"
msgctxt "selection:ldap.connection,auth_scope:"
msgid "Subtree"
-msgstr "Subarbre"
+msgstr "Poddrevo"
msgctxt "view:ldap.connection:"
msgid "Authentication"
-msgstr "Autenticació"
+msgstr "Avtentifikacija"
diff --git a/res.py b/res.py
index bb196b2..a9131c8 100644
--- a/res.py
+++ b/res.py
@@ -15,8 +15,8 @@ class User:
def __setup__(cls):
super(User, cls).__setup__()
cls._error_messages.update({
- 'set_passwd_ldap_user': ('You can not set the password of ldap '
- 'user "%s".'),
+ 'set_passwd_ldap_user': (
+ 'You can not set the password of ldap user "%s".'),
})
@staticmethod
@@ -113,7 +113,9 @@ class User:
@classmethod
def get_login(cls, login, password):
- Connection = Pool().get('ldap.connection')
+ pool = Pool()
+ Connection = pool.get('ldap.connection')
+ LoginAttempt = pool.get('res.user.login.attempt')
with Transaction().set_user(0):
connection, = Connection.search([], limit=1)
try:
@@ -129,6 +131,7 @@ class User:
if password and con.simple_bind_s(dn, password):
user_id, _, _ = cls._get_login(login)
if user_id:
+ LoginAttempt.remove(login)
return user_id
elif connection.auth_create_user:
user, = cls.create([{
diff --git a/setup.py b/setup.py
index fa334b2..d1e9b98 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_ldap_authentication',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 3670e97..a33f381 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_ldap_authentication import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index faf13d5..1f8c8ad 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
ir
ldap_connection
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index 751999d..ad11540 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-ldap-authentication
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_ldap_authentication
===========================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_ldap_authentication.egg-info/SOURCES.txt b/trytond_ldap_authentication.egg-info/SOURCES.txt
index a54a7ad..f366a96 100644
--- a/trytond_ldap_authentication.egg-info/SOURCES.txt
+++ b/trytond_ldap_authentication.egg-info/SOURCES.txt
@@ -22,6 +22,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_ldap_authentication.egg-info/PKG-INFO
trytond_ldap_authentication.egg-info/SOURCES.txt
trytond_ldap_authentication.egg-info/dependency_links.txt
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
index a7e3c14..fa0fbc9 100644
--- a/trytond_ldap_authentication.egg-info/requires.txt
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-ldap
-trytond_ldap_connection >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_ldap_connection >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit 1640a698c070ef467a9b59c8104a6d09555a1521
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:36:28 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 44487f6..831ac3d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.0 - 2013-04-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 2c9cbcc..86ba1bd 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2006-2012 Cédric Krier.
+Copyright (C) 2006-2013 Cédric Krier.
Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 B2CK SPRL.
Copyright (C) 2008-2012 Udo Spallek.
Copyright (C) 2008-2011 virtual things.
diff --git a/MANIFEST.in b/MANIFEST.in
index 97a9596..2569955 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
+include view/*.xml
include *.odt
include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 6e0036e..d30bcae 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_ldap_authentication
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_ldap_authentication
===========================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/connection.xml b/connection.xml
index 3b40eaf..1b5bb22 100644
--- a/connection.xml
+++ b/connection.xml
@@ -7,31 +7,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="model">ldap.connection</field>
<field name="type">form</field>
<field name="inherit" ref="ldap_connection.connection_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/group[@id="buttons"]"
- position="before">
- <separator string="Authentication" id="authentication"
- colspan="6"/>
- <label name="auth_uid"/>
- <field name="auth_uid"/>
- <label name="auth_base_dn"/>
- <field name="auth_base_dn"/>
- <newline/>
- <label name="auth_require_filter"/>
- <field name="auth_require_filter"/>
- <label name="auth_scope"/>
- <field name="auth_scope"/>
- <newline/>
- <label name="auth_create_user"/>
- <field name="auth_create_user"/>
- <newline/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">connection_form</field>
</record>
</data>
</tryton>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 8735e3a..ad33793 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:res.user:"
-msgid "You can not set a password to a ldap user!"
-msgstr "Не може да зададете парола на LDAP потребител!"
+msgid "You can not set the password of ldap user \"%s\"."
+msgstr ""
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index d809611..312c0cb 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -2,9 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "error:res.user:"
-msgid "You can not set a password to a ldap user!"
-msgstr "No pot establir la contrasenya d'un usuari LDAP"
+msgid "You can not set the password of ldap user \"%s\"."
+msgstr "No podeu establir la contrasenya de l'usuari \"%s\" d'ldap."
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
@@ -12,7 +13,7 @@ msgstr "DN base"
msgctxt "field:ldap.connection,auth_create_user:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Crea usuari"
msgctxt "field:ldap.connection,auth_require_filter:"
msgid "Require Filter"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index be10745..31a305f 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:res.user:"
-msgid "You can not set a password to a ldap user!"
+msgid "You can not set the password of ldap user \"%s\"."
msgstr ""
msgctxt "field:ldap.connection,auth_base_dn:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 80086ea..8de1388 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:res.user:"
-msgid "You can not set a password to a ldap user!"
-msgstr "Für einen LDAP-Benutzer kann kein Passwort gesetzt werden!"
+msgid "You can not set the password of ldap user \"%s\"."
+msgstr "Passwort von LDAP-Benutzer \"%s\" kann nicht gesetzt werden."
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 7ee1e16..19ddfc4 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:res.user:"
-msgid "You can not set a password to a ldap user!"
-msgstr "¡No puede establecer la contraseña de un usuario LDAP!"
+msgid "You can not set the password of ldap user \"%s\"."
+msgstr "No puede establecer la contraseña del usuario LDAP «%s»."
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 6b7f902..43c8e4a 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:res.user:"
-msgid "You can not set a password to a ldap user!"
-msgstr "No puede establecer la contraseña de un usuario LDAP!"
+msgid "You can not set the password of ldap user \"%s\"."
+msgstr ""
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 85df1d7..79e2b7c 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,9 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "error:res.user:"
-msgid "You can not set a password to a ldap user!"
-msgstr "No puede establecer la contraseña de un usuario LDAP."
+msgid "You can not set the password of ldap user \"%s\"."
+msgstr "No puede establecer la contraseña del usuario \"%s\" de ldap."
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
@@ -32,7 +33,7 @@ msgstr "DN base para la autenticación."
msgctxt "help:ldap.connection,auth_create_user:"
msgid "Create user if not in database"
-msgstr "Crea el usuario si no existe en la base de datos."
+msgstr "Crea un usuario si no existe en la base de datos."
msgctxt "help:ldap.connection,auth_uid:"
msgid "UID Attribute for authentication"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 6800771..5a75798 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -3,12 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:res.user:"
-msgid "You can not set a password to a ldap user!"
-msgstr "Vous ne pouvez pas donner un mot de passe à un utilisateur ldap !"
-
-msgctxt "error:res.user:"
-msgid "You can not set a password to a ldap user!"
-msgstr "Vous ne pouvez pas donner un mot de passe à un utilisateur ldap !"
+msgid "You can not set the password of ldap user \"%s\"."
+msgstr ""
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 20cdb2f..4a87ea1 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:res.user:"
-msgid "You can not set a password to a ldap user!"
+msgid "You can not set the password of ldap user \"%s\"."
msgstr ""
msgctxt "field:ldap.connection,auth_base_dn:"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index be10745..9fff19c 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -3,16 +3,17 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:res.user:"
-msgid "You can not set a password to a ldap user!"
+msgid "You can not set the password of ldap user \"%s\"."
msgstr ""
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
msgstr ""
+#, fuzzy
msgctxt "field:ldap.connection,auth_create_user:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
msgctxt "field:ldap.connection,auth_require_filter:"
msgid "Require Filter"
@@ -38,9 +39,10 @@ msgctxt "help:ldap.connection,auth_uid:"
msgid "UID Attribute for authentication"
msgstr ""
+#, fuzzy
msgctxt "selection:ldap.connection,auth_scope:"
msgid "Base"
-msgstr ""
+msgstr "База"
msgctxt "selection:ldap.connection,auth_scope:"
msgid "OneLevel"
diff --git a/res.py b/res.py
index 3256c55..bb196b2 100644
--- a/res.py
+++ b/res.py
@@ -15,8 +15,8 @@ class User:
def __setup__(cls):
super(User, cls).__setup__()
cls._error_messages.update({
- 'set_passwd_ldap_user': \
- 'You can not set a password to a ldap user!',
+ 'set_passwd_ldap_user': ('You can not set the password of ldap '
+ 'user "%s".'),
})
@staticmethod
@@ -61,16 +61,21 @@ class User:
if cls.ldap_search_user(login,
con, connection, attrs=[]):
find = True
+ break
except Exception:
pass
if find:
- cls.raise_user_error('set_passwd_ldap_user')
+ cls.raise_user_error('set_passwd_ldap_user', (login.rec_name,))
@classmethod
- def create(cls, values):
- if values.get('password') and 'login' in values:
- cls._check_passwd_ldap_user([values['login']])
- return super(User, cls).create(values)
+ def create(cls, vlist):
+ tocheck = []
+ for values in vlist:
+ if values.get('password') and 'login' in values:
+ tocheck.append(values['login'])
+ if tocheck:
+ cls._check_passwd_ldap_user(tocheck)
+ return super(User, cls).create(vlist)
@classmethod
def write(cls, users, values):
@@ -126,11 +131,11 @@ class User:
if user_id:
return user_id
elif connection.auth_create_user:
- user = cls.create({
- 'name': attrs.get(str(connection.auth_uid),
- [login])[0],
- 'login': login,
- })
+ user, = cls.create([{
+ 'name': attrs.get(str(connection.auth_uid),
+ [login])[0],
+ 'login': login,
+ }])
return user.id
except Exception:
pass
diff --git a/setup.py b/setup.py
index 90acf25..fa334b2 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = ['python-ldap']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_ldap_authentication',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_ldap_authentication',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.ldap_authentication': '.'},
packages=[
'trytond.modules.ldap_authentication',
'trytond.modules.ldap_authentication.tests',
],
package_data={
- 'trytond.modules.ldap_authentication': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.ldap_authentication': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -56,6 +56,7 @@ setup(name='trytond_ldap_authentication',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
@@ -67,8 +68,8 @@ setup(name='trytond_ldap_authentication',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- 'Topic :: System :: Systems Administration ' \
- ':: Authentication/Directory :: LDAP',
+ ('Topic :: System :: Systems Administration '
+ ':: Authentication/Directory :: LDAP'),
],
license='GPL-3',
install_requires=requires,
diff --git a/tryton.cfg b/tryton.cfg
index 1d4fd64..faf13d5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.8.0
depends:
ir
ldap_connection
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index 8ccca26..751999d 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-ldap-authentication
-Version: 2.6.0
+Version: 2.8.0
Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_ldap_authentication
===========================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_ldap_authentication.egg-info/SOURCES.txt b/trytond_ldap_authentication.egg-info/SOURCES.txt
index a11304a..a54a7ad 100644
--- a/trytond_ldap_authentication.egg-info/SOURCES.txt
+++ b/trytond_ldap_authentication.egg-info/SOURCES.txt
@@ -28,4 +28,5 @@ trytond_ldap_authentication.egg-info/dependency_links.txt
trytond_ldap_authentication.egg-info/entry_points.txt
trytond_ldap_authentication.egg-info/not-zip-safe
trytond_ldap_authentication.egg-info/requires.txt
-trytond_ldap_authentication.egg-info/top_level.txt
\ No newline at end of file
+trytond_ldap_authentication.egg-info/top_level.txt
+view/connection_form.xml
\ No newline at end of file
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
index 13ddfe4..a7e3c14 100644
--- a/trytond_ldap_authentication.egg-info/requires.txt
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-ldap
-trytond_ldap_connection >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_ldap_connection >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/connection_form.xml b/view/connection_form.xml
new file mode 100644
index 0000000..690fed0
--- /dev/null
+++ b/view/connection_form.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath expr="/form/group[@id='buttons']" position="before">
+ <separator string="Authentication" id="authentication"
+ colspan="6"/>
+ <label name="auth_uid"/>
+ <field name="auth_uid"/>
+ <label name="auth_base_dn"/>
+ <field name="auth_base_dn"/>
+ <newline/>
+ <label name="auth_require_filter"/>
+ <field name="auth_require_filter"/>
+ <label name="auth_scope"/>
+ <field name="auth_scope"/>
+ <newline/>
+ <label name="auth_create_user"/>
+ <field name="auth_create_user"/>
+ <newline/>
+ </xpath>
+</data>
commit bee56cffa3e2f6f0bcc8c15b83847d7838150b88
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:35 2012 +0200
Adding upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index ad5f3f2..44487f6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.4.0 - 2012-04-24
* Bug fixes (see mercurial logs for details)
* Always check if a password is not empty to avoid unauthenticated bind.
diff --git a/MANIFEST.in b/MANIFEST.in
index 32879df..97a9596 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
+include tryton.cfg
include *.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 6348c26..6e0036e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,48 @@
Metadata-Version: 1.0
Name: trytond_ldap_authentication
-Version: 2.4.0
-Summary: Authenticate users with LDAP server.
+Version: 2.6.0
+Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
-Author: B2CK, Josh Dukes & Udo Spallek
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_ldap_authentication
+ ===========================
+
+ The ldap_authentication module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/README b/README
index 336d580..ab3ac98 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_ldap_authentication
===========================
The ldap_authentication module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index f4a1989..2bc2b00 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,13 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
+from trytond.pool import Pool
from .connection import *
from .res import *
+
+
+def register():
+ Pool.register(
+ Connection,
+ User,
+ module='ldap_authentication', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 3a80ee8..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
-{
- 'name': 'LDAP Authentication',
- 'name_bg_BG': 'LDAP Проверка',
- 'name_ca_ES': 'Autenticació LDAP',
- 'name_de_DE': 'LDAP Authentifizierung',
- 'name_es_AR': 'Autentificación LDAP',
- 'name_es_CO': 'Autentificación LDAP',
- 'name_es_ES': 'Autentificación LDAP',
- 'name_fr_FR': 'Authentification LDAP',
- 'version': '2.4.0',
- 'author': 'B2CK, Josh Dukes & Udo Spallek',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': '''Authenticate users with LDAP server.''',
- 'description_bg_BG': 'Проверка на потребители чрез LDAP сървър.',
- 'description_ca_ES': '''Autentica els usuaris contra un servidor LDAP.''',
- 'description_de_DE': '''Authentifizierung über LDAP
- - Fügt Unterstützung für Authentifizierung über einen LDAP-Server hinzu.
-''',
- 'description_es_AR': 'Autentifica usuarios contra un servidor LDAP.',
- 'description_es_CO': 'Autentica usuarios frente a un servidor LDAP.',
- 'description_es_ES': 'Autentifica usuarios contra un servidor LDAP.',
- 'description_fr_FR': '''Authentification des utilisateurs via un serveur LDAP.''',
- 'depends': [
- 'ir',
- 'res',
- 'ldap_connection',
- ],
- 'xml': [
- 'connection.xml',
- ],
- 'translation': [
- 'locale/bg_BG.po',
- 'locale/ca_ES.po',
- 'locale/cs_CZ.po',
- 'locale/de_DE.po',
- 'locale/es_AR.po',
- 'locale/es_CO.po',
- 'locale/es_ES.po',
- 'locale/fr_FR.po',
- 'locale/nl_NL.po',
- 'locale/ru_RU.po',
- ],
-}
diff --git a/connection.py b/connection.py
index 2bf209b..8120132 100644
--- a/connection.py
+++ b/connection.py
@@ -1,10 +1,14 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from trytond.model import ModelView, ModelSQL, ModelSingleton, fields
+from trytond.model import fields
+from trytond.pool import PoolMeta
+__all__ = ['Connection']
+__metaclass__ = PoolMeta
-class Connection(ModelSingleton, ModelSQL, ModelView):
- _name = 'ldap.connection'
+
+class Connection:
+ __name__ = 'ldap.connection'
auth_uid = fields.Char('UID', help='UID Attribute for authentication',
required=True)
@@ -19,13 +23,14 @@ class Connection(ModelSingleton, ModelSQL, ModelView):
auth_create_user = fields.Boolean('Create User',
help='Create user if not in database')
- def default_auth_uid(self):
+ @staticmethod
+ def default_auth_uid():
return 'uid'
- def default_auth_scope(self):
+ @staticmethod
+ def default_auth_scope():
return 'base'
- def default_auth_create_user(self):
+ @staticmethod
+ def default_auth_create_user():
return False
-
-Connection()
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 0db0737..6b7f902 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:res.user:"
msgid "You can not set a password to a ldap user!"
-msgstr "¡No puede establecer la contraseña de un usuario LDAP"
+msgstr "No puede establecer la contraseña de un usuario LDAP!"
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
diff --git a/res.py b/res.py
index d8d7a00..3256c55 100644
--- a/res.py
+++ b/res.py
@@ -1,30 +1,30 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
import ldap
-from trytond.model import ModelView, ModelSQL
from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
+__all__ = ['User']
+__metaclass__ = PoolMeta
-class User(ModelSQL, ModelView):
- _name = 'res.user'
- def __init__(self):
- super(User, self).__init__()
- self._error_messages.update({
- 'set_passwd_ldap_user': \
+class User:
+ __name__ = 'res.user'
+
+ @classmethod
+ def __setup__(cls):
+ super(User, cls).__setup__()
+ cls._error_messages.update({
+ 'set_passwd_ldap_user': \
'You can not set a password to a ldap user!',
- })
+ })
- def ldap_search_user(self, login, con, connection, attrs=None):
+ @staticmethod
+ def ldap_search_user(login, con, connection, attrs=None):
'''
- Return the resule of a ldap search for the login
-
- :param login: the login
- :param con: the ldap connection
- :param connection: a BrowseRecord of ldap.connection
- :param attrs: a list of attribute to return
- :return: the ldap search result
+ Return the result of a ldap search for the login using the ldap
+ connection con based on connection.
+ The attributes values defined in attrs will be return.
'''
scope = {
'base': ldap.SCOPE_BASE,
@@ -43,11 +43,11 @@ class User(ModelSQL, ModelView):
result = [x for x in result if x[0]]
return result
- def _check_passwd_ldap_user(self, logins):
- connection_obj = Pool().get('ldap.connection')
- connection_ids = connection_obj.search([], limit=1)
+ @classmethod
+ def _check_passwd_ldap_user(cls, logins):
+ Connection = Pool().get('ldap.connection')
with Transaction().set_user(0):
- connection = connection_obj.browse(connection_ids[0])
+ connection, = Connection.search([], limit=1)
find = False
try:
con = ldap.initialize(connection.uri)
@@ -58,35 +58,33 @@ class User(ModelSQL, ModelView):
if connection.bind_dn:
con.simple_bind_s(connection.bind_dn, connection.bind_pass)
for login in logins:
- if self.ldap_search_user(login,
+ if cls.ldap_search_user(login,
con, connection, attrs=[]):
find = True
except Exception:
pass
if find:
- self.raise_user_error('set_passwd_ldap_user')
+ cls.raise_user_error('set_passwd_ldap_user')
- def create(self, vals):
- if vals.get('password') and 'login' in vals:
- self._check_passwd_ldap_user([vals['login']])
- return super(User, self).create(vals)
+ @classmethod
+ def create(cls, values):
+ if values.get('password') and 'login' in values:
+ cls._check_passwd_ldap_user([values['login']])
+ return super(User, cls).create(values)
- def write(self, ids, vals):
- if vals.get('password'):
- if isinstance(ids, (int, long)):
- ids2 = [ids]
- else:
- ids2 = ids
- logins = [x.login for x in self.browse(ids2)]
- self._check_passwd_ldap_user(logins)
- return super(User, self).write(ids, vals)
+ @classmethod
+ def write(cls, users, values):
+ if values.get('password'):
+ logins = [x.login for x in users]
+ cls._check_passwd_ldap_user(logins)
+ super(User, cls).write(users, values)
- def set_preferences(self, values, old_password=False):
- connection_obj = Pool().get('ldap.connection')
+ @classmethod
+ def set_preferences(cls, values, old_password=False):
+ Connection = Pool().get('ldap.connection')
if 'password' in values:
- connection_ids = connection_obj.search([], limit=1)
with Transaction().set_user(0):
- connection = connection_obj.browse(connection_ids[0])
+ connection, = Connection.search([], limit=1)
try:
con = ldap.initialize(connection.uri)
if connection.active_directory:
@@ -95,25 +93,24 @@ class User(ModelSQL, ModelView):
con.start_tls_s()
if connection.bind_dn:
con.simple_bind_s(connection.bind_dn, connection.bind_pass)
- user = self.browse(Transaction().user)
- [(dn, attrs)] = self.ldap_search_user(user.login, con,
- connection, attrs=[str(connection.auth_uid)])
+ user = cls(Transaction().user)
+ [(dn, attrs)] = cls.ldap_search_user(user.login, con,
+ connection, attrs=[str(connection.auth_uid)])
if con.simple_bind_s(dn, old_password):
con.passwd_s(dn, old_password, values['password'])
values = values.copy()
del values['password']
else:
- self.raise_user_error('wrong_password')
+ cls.raise_user_error('wrong_password')
except Exception:
pass
- return super(User, self).set_preferences(values,
- old_password=old_password)
+ super(User, cls).set_preferences(values, old_password=old_password)
- def get_login(self, login, password):
- connection_obj = Pool().get('ldap.connection')
- connection_ids = connection_obj.search([], limit=1)
+ @classmethod
+ def get_login(cls, login, password):
+ Connection = Pool().get('ldap.connection')
with Transaction().set_user(0):
- connection = connection_obj.browse(connection_ids[0])
+ connection, = Connection.search([], limit=1)
try:
con = ldap.initialize(connection.uri)
if connection.active_directory:
@@ -122,21 +119,19 @@ class User(ModelSQL, ModelView):
con.start_tls_s()
if connection.bind_dn:
con.simple_bind_s(connection.bind_dn, connection.bind_pass)
- [(dn, attrs)] = self.ldap_search_user(login, con, connection,
- attrs=[str(connection.auth_uid)])
+ [(dn, attrs)] = cls.ldap_search_user(login, con, connection,
+ attrs=[str(connection.auth_uid)])
if password and con.simple_bind_s(dn, password):
- user_id, _, _ = self._get_login(login)
+ user_id, _, _ = cls._get_login(login)
if user_id:
return user_id
elif connection.auth_create_user:
- user_id = self.create({
- 'name': attrs.get(str(connection.auth_uid),
+ user = cls.create({
+ 'name': attrs.get(str(connection.auth_uid),
[login])[0],
- 'login': login,
- })
- return user_id
+ 'login': login,
+ })
+ return user.id
except Exception:
pass
- return super(User, self).get_login(login, password)
-
-User()
+ return super(User, cls).get_login(login, password)
diff --git a/setup.py b/setup.py
index abd0cd4..90acf25 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
from setuptools import setup
import re
+import os
+import ConfigParser
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+config = ConfigParser.ConfigParser()
+config.readfp(open('tryton.cfg'))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+ if key in info:
+ info[key] = info[key].strip().splitlines()
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
@@ -21,21 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
setup(name='trytond_ldap_authentication',
version=info.get('version', '0.0.1'),
- description=info.get('description', ''),
- author=info.get('author', ''),
- author_email=info.get('email', ''),
- url=info.get('website', ''),
+ description='Tryton module to authenticate users through LDAP',
+ long_description=read('README'),
+ author='Tryton',
+ url='http://www.tryton.org/',
download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
package_dir={'trytond.modules.ldap_authentication': '.'},
packages=[
'trytond.modules.ldap_authentication',
'trytond.modules.ldap_authentication.tests',
- ],
+ ],
package_data={
'trytond.modules.ldap_authentication': info.get('xml', []) \
- + info.get('translation', []),
- },
+ + ['tryton.cfg', 'locale/*.po'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -56,8 +67,9 @@ setup(name='trytond_ldap_authentication',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- 'Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP',
- ],
+ 'Topic :: System :: Systems Administration ' \
+ ':: Authentication/Directory :: LDAP',
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -67,4 +79,4 @@ setup(name='trytond_ldap_authentication',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..1d4fd64
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,8 @@
+[tryton]
+version=2.6.0
+depends:
+ ir
+ ldap_connection
+ res
+xml:
+ connection.xml
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index 9f0b2e3..8ccca26 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,13 +1,48 @@
Metadata-Version: 1.0
Name: trytond-ldap-authentication
-Version: 2.4.0
-Summary: Authenticate users with LDAP server.
+Version: 2.6.0
+Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
-Author: B2CK, Josh Dukes & Udo Spallek
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_ldap_authentication
+ ===========================
+
+ The ldap_authentication module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/trytond_ldap_authentication.egg-info/SOURCES.txt b/trytond_ldap_authentication.egg-info/SOURCES.txt
index fdd6a89..a11304a 100644
--- a/trytond_ldap_authentication.egg-info/SOURCES.txt
+++ b/trytond_ldap_authentication.egg-info/SOURCES.txt
@@ -6,8 +6,8 @@ MANIFEST.in
README
connection.xml
setup.py
+tryton.cfg
./__init__.py
-./__tryton__.py
./connection.py
./res.py
./tests/__init__.py
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
index 44d5aab..13ddfe4 100644
--- a/trytond_ldap_authentication.egg-info/requires.txt
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-ldap
-trytond_ldap_connection >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_ldap_connection >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit f313d3e9faa5ca9eb4ecfa99b50dd0bffbfa3c82
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:30:45 2012 +0200
Adding upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index f989c92..ad5f3f2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 2.4.0 - 2012-04-24
+* Bug fixes (see mercurial logs for details)
+* Always check if a password is not empty to avoid unauthenticated bind.
+
Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index c81459d..2c9cbcc 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2006-2011 Cédric Krier.
-Copyright (C) 2009-2011 Bertrand Chenal.
-Copyright (C) 2009-2011 B2CK SPRL.
-Copyright (C) 2008-2011 Udo Spallek.
+Copyright (C) 2006-2012 Cédric Krier.
+Copyright (C) 2009-2012 Bertrand Chenal.
+Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2008-2012 Udo Spallek.
Copyright (C) 2008-2011 virtual things.
This program is free software: you can redistribute it and/or modify
diff --git a/INSTALL b/INSTALL
index 27bab4b..e3de39e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_ldap_authentication
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_ldap_connection (http://www.tryton.org/)
* python-ldap (http://python-ldap.sourceforge.net/)
diff --git a/PKG-INFO b/PKG-INFO
index 9905c08..6348c26 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_ldap_authentication
-Version: 2.2.0
+Version: 2.4.0
Summary: Authenticate users with LDAP server.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index c33b814..f4a1989 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from connection import *
-from res import *
+from .connection import *
+from .res import *
diff --git a/__tryton__.py b/__tryton__.py
index f1e2a7d..3a80ee8 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,20 +2,24 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'LDAP Authentication',
- 'name_bg_BG' : 'LDAP Проверка',
- 'name_de_DE' : 'LDAP Authentifizierung',
+ 'name_bg_BG': 'LDAP Проверка',
+ 'name_ca_ES': 'Autenticació LDAP',
+ 'name_de_DE': 'LDAP Authentifizierung',
+ 'name_es_AR': 'Autentificación LDAP',
'name_es_CO': 'Autentificación LDAP',
'name_es_ES': 'Autentificación LDAP',
'name_fr_FR': 'Authentification LDAP',
- 'version': '2.2.0',
+ 'version': '2.4.0',
'author': 'B2CK, Josh Dukes & Udo Spallek',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': '''Authenticate users with LDAP server.''',
'description_bg_BG': 'Проверка на потребители чрез LDAP сървър.',
- 'description_de_DE' : '''Authentifizierung über LDAP
+ 'description_ca_ES': '''Autentica els usuaris contra un servidor LDAP.''',
+ 'description_de_DE': '''Authentifizierung über LDAP
- Fügt Unterstützung für Authentifizierung über einen LDAP-Server hinzu.
''',
+ 'description_es_AR': 'Autentifica usuarios contra un servidor LDAP.',
'description_es_CO': 'Autentica usuarios frente a un servidor LDAP.',
'description_es_ES': 'Autentifica usuarios contra un servidor LDAP.',
'description_fr_FR': '''Authentification des utilisateurs via un serveur LDAP.''',
@@ -29,8 +33,10 @@
],
'translation': [
'locale/bg_BG.po',
+ 'locale/ca_ES.po',
'locale/cs_CZ.po',
'locale/de_DE.po',
+ 'locale/es_AR.po',
'locale/es_CO.po',
'locale/es_ES.po',
'locale/fr_FR.po',
diff --git a/connection.py b/connection.py
index 9bbdfdf..2bf209b 100644
--- a/connection.py
+++ b/connection.py
@@ -29,4 +29,3 @@ class Connection(ModelSingleton, ModelSQL, ModelView):
return False
Connection()
-
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 8dd328d..8735e3a 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,54 +2,54 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:res.user:0"
+msgctxt "error:res.user:"
msgid "You can not set a password to a ldap user!"
msgstr "Не може да зададете парола на LDAP потребител!"
-msgctxt "field:ldap.connection,auth_base_dn:0"
+msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
msgstr "Base DN"
-msgctxt "field:ldap.connection,auth_create_user:0"
+msgctxt "field:ldap.connection,auth_create_user:"
msgid "Create User"
-msgstr "Създаване на потребител"
+msgstr "Създадено от"
-msgctxt "field:ldap.connection,auth_require_filter:0"
+msgctxt "field:ldap.connection,auth_require_filter:"
msgid "Require Filter"
msgstr "Допълнителен филтър"
-msgctxt "field:ldap.connection,auth_scope:0"
+msgctxt "field:ldap.connection,auth_scope:"
msgid "Scope"
msgstr "Обсег"
-msgctxt "field:ldap.connection,auth_uid:0"
+msgctxt "field:ldap.connection,auth_uid:"
msgid "UID"
msgstr "UID"
-msgctxt "help:ldap.connection,auth_base_dn:0"
+msgctxt "help:ldap.connection,auth_base_dn:"
msgid "Base DN for authentication"
msgstr "Base DN за проверка"
-msgctxt "help:ldap.connection,auth_create_user:0"
+msgctxt "help:ldap.connection,auth_create_user:"
msgid "Create user if not in database"
msgstr "Създаване на потребител ако го няма в базата данни"
-msgctxt "help:ldap.connection,auth_uid:0"
+msgctxt "help:ldap.connection,auth_uid:"
msgid "UID Attribute for authentication"
msgstr "UID атрибут за проверка"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Base"
msgstr "Основа"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "OneLevel"
msgstr "Едно ниво"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Subtree"
msgstr "Поддърво"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "Authentication"
msgstr "Проверка"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..d809611
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,55 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:res.user:"
+msgid "You can not set a password to a ldap user!"
+msgstr "No pot establir la contrasenya d'un usuari LDAP"
+
+msgctxt "field:ldap.connection,auth_base_dn:"
+msgid "Base DN"
+msgstr "DN base"
+
+msgctxt "field:ldap.connection,auth_create_user:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:ldap.connection,auth_require_filter:"
+msgid "Require Filter"
+msgstr "Filtre requerit"
+
+msgctxt "field:ldap.connection,auth_scope:"
+msgid "Scope"
+msgstr "Àmbit"
+
+msgctxt "field:ldap.connection,auth_uid:"
+msgid "UID"
+msgstr "UID"
+
+msgctxt "help:ldap.connection,auth_base_dn:"
+msgid "Base DN for authentication"
+msgstr "DN base per a l'autenticació"
+
+msgctxt "help:ldap.connection,auth_create_user:"
+msgid "Create user if not in database"
+msgstr "Crea l'usuari si no existeix a la base de dades"
+
+msgctxt "help:ldap.connection,auth_uid:"
+msgid "UID Attribute for authentication"
+msgstr "Atribut UID per a l'autenticació"
+
+msgctxt "selection:ldap.connection,auth_scope:"
+msgid "Base"
+msgstr "Base"
+
+msgctxt "selection:ldap.connection,auth_scope:"
+msgid "OneLevel"
+msgstr "UnNivell"
+
+msgctxt "selection:ldap.connection,auth_scope:"
+msgid "Subtree"
+msgstr "Subarbre"
+
+msgctxt "view:ldap.connection:"
+msgid "Authentication"
+msgstr "Autenticació"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index f5b0402..be10745 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,54 +2,54 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:res.user:0"
+msgctxt "error:res.user:"
msgid "You can not set a password to a ldap user!"
msgstr ""
-msgctxt "field:ldap.connection,auth_base_dn:0"
+msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
msgstr ""
-msgctxt "field:ldap.connection,auth_create_user:0"
+msgctxt "field:ldap.connection,auth_create_user:"
msgid "Create User"
msgstr ""
-msgctxt "field:ldap.connection,auth_require_filter:0"
+msgctxt "field:ldap.connection,auth_require_filter:"
msgid "Require Filter"
msgstr ""
-msgctxt "field:ldap.connection,auth_scope:0"
+msgctxt "field:ldap.connection,auth_scope:"
msgid "Scope"
msgstr ""
-msgctxt "field:ldap.connection,auth_uid:0"
+msgctxt "field:ldap.connection,auth_uid:"
msgid "UID"
msgstr ""
-msgctxt "help:ldap.connection,auth_base_dn:0"
+msgctxt "help:ldap.connection,auth_base_dn:"
msgid "Base DN for authentication"
msgstr ""
-msgctxt "help:ldap.connection,auth_create_user:0"
+msgctxt "help:ldap.connection,auth_create_user:"
msgid "Create user if not in database"
msgstr ""
-msgctxt "help:ldap.connection,auth_uid:0"
+msgctxt "help:ldap.connection,auth_uid:"
msgid "UID Attribute for authentication"
msgstr ""
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Base"
msgstr ""
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "OneLevel"
msgstr ""
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Subtree"
msgstr ""
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "Authentication"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index c9a1831..80086ea 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,54 +2,54 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:res.user:0"
+msgctxt "error:res.user:"
msgid "You can not set a password to a ldap user!"
msgstr "Für einen LDAP-Benutzer kann kein Passwort gesetzt werden!"
-msgctxt "field:ldap.connection,auth_base_dn:0"
+msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
msgstr "Basis DN"
-msgctxt "field:ldap.connection,auth_create_user:0"
+msgctxt "field:ldap.connection,auth_create_user:"
msgid "Create User"
msgstr "Benutzer erstellen"
-msgctxt "field:ldap.connection,auth_require_filter:0"
+msgctxt "field:ldap.connection,auth_require_filter:"
msgid "Require Filter"
msgstr "Require Filter"
-msgctxt "field:ldap.connection,auth_scope:0"
+msgctxt "field:ldap.connection,auth_scope:"
msgid "Scope"
msgstr "Suchbereich"
-msgctxt "field:ldap.connection,auth_uid:0"
+msgctxt "field:ldap.connection,auth_uid:"
msgid "UID"
msgstr "UID"
-msgctxt "help:ldap.connection,auth_base_dn:0"
+msgctxt "help:ldap.connection,auth_base_dn:"
msgid "Base DN for authentication"
msgstr "Basis DN für die Authentifizierung"
-msgctxt "help:ldap.connection,auth_create_user:0"
+msgctxt "help:ldap.connection,auth_create_user:"
msgid "Create user if not in database"
msgstr "Erstellt den Benutzer, wenn er nicht in der Datenbank vorhanden ist"
-msgctxt "help:ldap.connection,auth_uid:0"
+msgctxt "help:ldap.connection,auth_uid:"
msgid "UID Attribute for authentication"
msgstr "UID-Attribut für die Authentifizierung"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Base"
msgstr "Base"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "OneLevel"
msgstr "OneLevel"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Subtree"
msgstr "Subtree"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "Authentication"
msgstr "Authentifizierung"
diff --git a/locale/es_ES.po b/locale/es_AR.po
similarity index 52%
copy from locale/es_ES.po
copy to locale/es_AR.po
index d4a850f..7ee1e16 100644
--- a/locale/es_ES.po
+++ b/locale/es_AR.po
@@ -2,54 +2,54 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:res.user:0"
+msgctxt "error:res.user:"
msgid "You can not set a password to a ldap user!"
-msgstr "No puede establecer la contraseña de un usuario LDAP"
+msgstr "¡No puede establecer la contraseña de un usuario LDAP!"
-msgctxt "field:ldap.connection,auth_base_dn:0"
+msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
msgstr "DN base"
-msgctxt "field:ldap.connection,auth_create_user:0"
+msgctxt "field:ldap.connection,auth_create_user:"
msgid "Create User"
msgstr "Crear usuario"
-msgctxt "field:ldap.connection,auth_require_filter:0"
+msgctxt "field:ldap.connection,auth_require_filter:"
msgid "Require Filter"
msgstr "Filtro requerido"
-msgctxt "field:ldap.connection,auth_scope:0"
+msgctxt "field:ldap.connection,auth_scope:"
msgid "Scope"
msgstr "Ámbito"
-msgctxt "field:ldap.connection,auth_uid:0"
+msgctxt "field:ldap.connection,auth_uid:"
msgid "UID"
msgstr "UID"
-msgctxt "help:ldap.connection,auth_base_dn:0"
+msgctxt "help:ldap.connection,auth_base_dn:"
msgid "Base DN for authentication"
msgstr "DN base para la autentificación"
-msgctxt "help:ldap.connection,auth_create_user:0"
+msgctxt "help:ldap.connection,auth_create_user:"
msgid "Create user if not in database"
msgstr "Crea el usuario si no existe en la base de datos"
-msgctxt "help:ldap.connection,auth_uid:0"
+msgctxt "help:ldap.connection,auth_uid:"
msgid "UID Attribute for authentication"
msgstr "Atributo UID para la autentificación"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Base"
msgstr "Base"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "OneLevel"
msgstr "UnNivel"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Subtree"
msgstr "Subárbol"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "Authentication"
msgstr "Autentificación"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index ec26e8a..0db0737 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,54 +2,54 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:res.user:0"
+msgctxt "error:res.user:"
msgid "You can not set a password to a ldap user!"
msgstr "¡No puede establecer la contraseña de un usuario LDAP"
-msgctxt "field:ldap.connection,auth_base_dn:0"
+msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
msgstr "DN base"
-msgctxt "field:ldap.connection,auth_create_user:0"
+msgctxt "field:ldap.connection,auth_create_user:"
msgid "Create User"
msgstr "Crear usuario"
-msgctxt "field:ldap.connection,auth_require_filter:0"
+msgctxt "field:ldap.connection,auth_require_filter:"
msgid "Require Filter"
msgstr "Filtro requerido"
-msgctxt "field:ldap.connection,auth_scope:0"
+msgctxt "field:ldap.connection,auth_scope:"
msgid "Scope"
msgstr "Ámbito"
-msgctxt "field:ldap.connection,auth_uid:0"
+msgctxt "field:ldap.connection,auth_uid:"
msgid "UID"
msgstr "UID"
-msgctxt "help:ldap.connection,auth_base_dn:0"
+msgctxt "help:ldap.connection,auth_base_dn:"
msgid "Base DN for authentication"
msgstr "DN base para la autenticación"
-msgctxt "help:ldap.connection,auth_create_user:0"
+msgctxt "help:ldap.connection,auth_create_user:"
msgid "Create user if not in database"
msgstr "Crea el usuario si no existe en la base de datos"
-msgctxt "help:ldap.connection,auth_uid:0"
+msgctxt "help:ldap.connection,auth_uid:"
msgid "UID Attribute for authentication"
msgstr "Atributo UID para la autenticación"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Base"
msgstr "Base"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "OneLevel"
msgstr "UnNivel"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Subtree"
msgstr "Subárbol"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "Authentication"
msgstr "Autenticación"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index d4a850f..85df1d7 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,54 +2,54 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:res.user:0"
+msgctxt "error:res.user:"
msgid "You can not set a password to a ldap user!"
-msgstr "No puede establecer la contraseña de un usuario LDAP"
+msgstr "No puede establecer la contraseña de un usuario LDAP."
-msgctxt "field:ldap.connection,auth_base_dn:0"
+msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
msgstr "DN base"
-msgctxt "field:ldap.connection,auth_create_user:0"
+msgctxt "field:ldap.connection,auth_create_user:"
msgid "Create User"
msgstr "Crear usuario"
-msgctxt "field:ldap.connection,auth_require_filter:0"
+msgctxt "field:ldap.connection,auth_require_filter:"
msgid "Require Filter"
msgstr "Filtro requerido"
-msgctxt "field:ldap.connection,auth_scope:0"
+msgctxt "field:ldap.connection,auth_scope:"
msgid "Scope"
msgstr "Ámbito"
-msgctxt "field:ldap.connection,auth_uid:0"
+msgctxt "field:ldap.connection,auth_uid:"
msgid "UID"
msgstr "UID"
-msgctxt "help:ldap.connection,auth_base_dn:0"
+msgctxt "help:ldap.connection,auth_base_dn:"
msgid "Base DN for authentication"
-msgstr "DN base para la autentificación"
+msgstr "DN base para la autenticación."
-msgctxt "help:ldap.connection,auth_create_user:0"
+msgctxt "help:ldap.connection,auth_create_user:"
msgid "Create user if not in database"
-msgstr "Crea el usuario si no existe en la base de datos"
+msgstr "Crea el usuario si no existe en la base de datos."
-msgctxt "help:ldap.connection,auth_uid:0"
+msgctxt "help:ldap.connection,auth_uid:"
msgid "UID Attribute for authentication"
-msgstr "Atributo UID para la autentificación"
+msgstr "Atributo UID para la autenticación."
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Base"
msgstr "Base"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "OneLevel"
msgstr "UnNivel"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Subtree"
msgstr "Subárbol"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "Authentication"
-msgstr "Autentificación"
+msgstr "Autenticación"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 72232f8..6800771 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,54 +2,74 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:res.user:0"
+msgctxt "error:res.user:"
msgid "You can not set a password to a ldap user!"
msgstr "Vous ne pouvez pas donner un mot de passe à un utilisateur ldap !"
-msgctxt "field:ldap.connection,auth_base_dn:0"
+msgctxt "error:res.user:"
+msgid "You can not set a password to a ldap user!"
+msgstr "Vous ne pouvez pas donner un mot de passe à un utilisateur ldap !"
+
+msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
msgstr "DN de base"
-msgctxt "field:ldap.connection,auth_create_user:0"
+msgctxt "field:ldap.connection,auth_create_user:"
msgid "Create User"
msgstr "Créer l'utilisateur"
-msgctxt "field:ldap.connection,auth_require_filter:0"
+msgctxt "field:ldap.connection,auth_require_filter:"
msgid "Require Filter"
msgstr "Filtre requis"
-msgctxt "field:ldap.connection,auth_scope:0"
+msgctxt "field:ldap.connection,auth_scope:"
msgid "Scope"
msgstr "Portée"
-msgctxt "field:ldap.connection,auth_uid:0"
+msgctxt "field:ldap.connection,auth_uid:"
msgid "UID"
msgstr "UID"
-msgctxt "help:ldap.connection,auth_base_dn:0"
+msgctxt "help:ldap.connection,auth_base_dn:"
msgid "Base DN for authentication"
msgstr "DN de base pour l'authentification"
-msgctxt "help:ldap.connection,auth_create_user:0"
+msgctxt "help:ldap.connection,auth_create_user:"
msgid "Create user if not in database"
msgstr "Créer l'utilisateur s'il n'est pas dans la base de données"
-msgctxt "help:ldap.connection,auth_uid:0"
+msgctxt "help:ldap.connection,auth_uid:"
msgid "UID Attribute for authentication"
msgstr "Attribut UID de l'authentification"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
+msgid "Base"
+msgstr "Base"
+
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Base"
msgstr "Base"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "OneLevel"
msgstr "Un niveau"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
+msgid "OneLevel"
+msgstr "Un niveau"
+
+msgctxt "selection:ldap.connection,auth_scope:"
+msgid "Subtree"
+msgstr "Sous-arbre"
+
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Subtree"
msgstr "Sous-arbre"
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
+msgid "Authentication"
+msgstr "Authentification"
+
+msgctxt "view:ldap.connection:"
msgid "Authentication"
msgstr "Authentification"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 0c0a9e2..20cdb2f 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,55 +2,55 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:res.user:0"
+msgctxt "error:res.user:"
msgid "You can not set a password to a ldap user!"
msgstr ""
-msgctxt "field:ldap.connection,auth_base_dn:0"
+msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
msgstr ""
-msgctxt "field:ldap.connection,auth_create_user:0"
+msgctxt "field:ldap.connection,auth_create_user:"
msgid "Create User"
msgstr ""
-msgctxt "field:ldap.connection,auth_require_filter:0"
+msgctxt "field:ldap.connection,auth_require_filter:"
msgid "Require Filter"
msgstr ""
-msgctxt "field:ldap.connection,auth_scope:0"
+msgctxt "field:ldap.connection,auth_scope:"
msgid "Scope"
msgstr ""
-msgctxt "field:ldap.connection,auth_uid:0"
+msgctxt "field:ldap.connection,auth_uid:"
msgid "UID"
msgstr ""
-msgctxt "help:ldap.connection,auth_base_dn:0"
+msgctxt "help:ldap.connection,auth_base_dn:"
msgid "Base DN for authentication"
msgstr ""
-msgctxt "help:ldap.connection,auth_create_user:0"
+msgctxt "help:ldap.connection,auth_create_user:"
msgid "Create user if not in database"
msgstr ""
-msgctxt "help:ldap.connection,auth_uid:0"
+msgctxt "help:ldap.connection,auth_uid:"
msgid "UID Attribute for authentication"
msgstr ""
#, fuzzy
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Base"
msgstr "Basisbedrag"
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "OneLevel"
msgstr ""
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Subtree"
msgstr ""
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "Authentication"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index f5b0402..be10745 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,54 +2,54 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:res.user:0"
+msgctxt "error:res.user:"
msgid "You can not set a password to a ldap user!"
msgstr ""
-msgctxt "field:ldap.connection,auth_base_dn:0"
+msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
msgstr ""
-msgctxt "field:ldap.connection,auth_create_user:0"
+msgctxt "field:ldap.connection,auth_create_user:"
msgid "Create User"
msgstr ""
-msgctxt "field:ldap.connection,auth_require_filter:0"
+msgctxt "field:ldap.connection,auth_require_filter:"
msgid "Require Filter"
msgstr ""
-msgctxt "field:ldap.connection,auth_scope:0"
+msgctxt "field:ldap.connection,auth_scope:"
msgid "Scope"
msgstr ""
-msgctxt "field:ldap.connection,auth_uid:0"
+msgctxt "field:ldap.connection,auth_uid:"
msgid "UID"
msgstr ""
-msgctxt "help:ldap.connection,auth_base_dn:0"
+msgctxt "help:ldap.connection,auth_base_dn:"
msgid "Base DN for authentication"
msgstr ""
-msgctxt "help:ldap.connection,auth_create_user:0"
+msgctxt "help:ldap.connection,auth_create_user:"
msgid "Create user if not in database"
msgstr ""
-msgctxt "help:ldap.connection,auth_uid:0"
+msgctxt "help:ldap.connection,auth_uid:"
msgid "UID Attribute for authentication"
msgstr ""
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Base"
msgstr ""
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "OneLevel"
msgstr ""
-msgctxt "selection:ldap.connection,auth_scope:0"
+msgctxt "selection:ldap.connection,auth_scope:"
msgid "Subtree"
msgstr ""
-msgctxt "view:ldap.connection:0"
+msgctxt "view:ldap.connection:"
msgid "Authentication"
msgstr ""
diff --git a/res.py b/res.py
index d34e93e..d8d7a00 100644
--- a/res.py
+++ b/res.py
@@ -124,13 +124,14 @@ class User(ModelSQL, ModelView):
con.simple_bind_s(connection.bind_dn, connection.bind_pass)
[(dn, attrs)] = self.ldap_search_user(login, con, connection,
attrs=[str(connection.auth_uid)])
- if con.simple_bind_s(dn, password):
+ if password and con.simple_bind_s(dn, password):
user_id, _, _ = self._get_login(login)
if user_id:
return user_id
elif connection.auth_create_user:
user_id = self.create({
- 'name': attrs.get(str(connection.auth_uid), [login])[0],
+ 'name': attrs.get(str(connection.auth_uid),
+ [login])[0],
'login': login,
})
return user_id
diff --git a/setup.py b/setup.py
index 1750a82..abd0cd4 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
requires = ['python-ldap']
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
(dep, major_version, minor_version, major_version,
minor_version + 1))
diff --git a/tests/__init__.py b/tests/__init__.py
index ac50bc1..3670e97 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from test_ldap_authentication import suite
+from .test_ldap_authentication import suite
diff --git a/tests/test_ldap_authentication.py b/tests/test_ldap_authentication.py
index 7dcfd65..34a1557 100644
--- a/tests/test_ldap_authentication.py
+++ b/tests/test_ldap_authentication.py
@@ -2,7 +2,8 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-import sys, os
+import sys
+import os
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
'..', '..', '..', '..', '..', 'trytond')))
if os.path.isdir(DIR):
@@ -33,6 +34,7 @@ class LDAPAuthenticationTestCase(unittest.TestCase):
'''
test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index 363f61f..9f0b2e3 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-ldap-authentication
-Version: 2.2.0
+Version: 2.4.0
Summary: Authenticate users with LDAP server.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_ldap_authentication.egg-info/SOURCES.txt b/trytond_ldap_authentication.egg-info/SOURCES.txt
index c602047..fdd6a89 100644
--- a/trytond_ldap_authentication.egg-info/SOURCES.txt
+++ b/trytond_ldap_authentication.egg-info/SOURCES.txt
@@ -13,8 +13,10 @@ setup.py
./tests/__init__.py
./tests/test_ldap_authentication.py
locale/bg_BG.po
+locale/ca_ES.po
locale/cs_CZ.po
locale/de_DE.po
+locale/es_AR.po
locale/es_CO.po
locale/es_ES.po
locale/fr_FR.po
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
index 3773eda..44d5aab 100644
--- a/trytond_ldap_authentication.egg-info/requires.txt
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-ldap
-trytond_ldap_connection >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_ldap_connection >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit 437ddb5ec7c87c5ccae2415fc06d363b87e93e9a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:20:55 2011 +0100
Adding upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index f621102..f989c92 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-24
+* Bug fixes (see mercurial logs for details)
+
Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index dcb2afa..32879df 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,5 @@ include CHANGELOG
include LICENSE
include *.xml
include *.odt
-include *.csv
+include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index bd6801b..9905c08 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,27 +1,30 @@
Metadata-Version: 1.0
Name: trytond_ldap_authentication
-Version: 2.0.0
+Version: 2.2.0
Summary: Authenticate users with LDAP server.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index 29f741d..f1e2a7d 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Autentificación LDAP',
'name_es_ES': 'Autentificación LDAP',
'name_fr_FR': 'Authentification LDAP',
- 'version': '2.0.0',
+ 'version': '2.2.0',
'author': 'B2CK, Josh Dukes & Udo Spallek',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -28,10 +28,13 @@
'connection.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
+ 'locale/bg_BG.po',
+ 'locale/cs_CZ.po',
+ 'locale/de_DE.po',
+ 'locale/es_CO.po',
+ 'locale/es_ES.po',
+ 'locale/fr_FR.po',
+ 'locale/nl_NL.po',
+ 'locale/ru_RU.po',
],
}
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index e451cdf..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,res.user,0,You can not set a password to a ldap user!,Не може да зададете парола на LDAP потребител!,0
-field,"ldap.connection,auth_base_dn",0,Base DN,Base DN,0
-field,"ldap.connection,auth_create_user",0,Create User,Създаване на потребител,0
-field,"ldap.connection,auth_require_filter",0,Require Filter,Допълнителен филтър,0
-field,"ldap.connection,auth_scope",0,Scope,Обсег,0
-field,"ldap.connection,auth_uid",0,UID,UID,0
-help,"ldap.connection,auth_base_dn",0,Base DN for authentication,Base DN за проверка,0
-help,"ldap.connection,auth_create_user",0,Create user if not in database,Създаване на потребител ако го няма в базата данни,0
-help,"ldap.connection,auth_uid",0,UID Attribute for authentication,UID атрибут за проверка,0
-selection,"ldap.connection,auth_scope",0,Base,Основа,0
-selection,"ldap.connection,auth_scope",0,OneLevel,Едно ниво,0
-selection,"ldap.connection,auth_scope",0,Subtree,Поддърво,0
-view,ldap.connection,0,Authentication,Проверка,0
diff --git a/connection.xml b/connection.xml
index a4d2529..3b40eaf 100644
--- a/connection.xml
+++ b/connection.xml
@@ -11,7 +11,7 @@ this repository contains the full copyright notices and license terms. -->
<![CDATA[
<data>
<xpath
- expr="/form/separator[@id="buttons"]"
+ expr="/form/group[@id="buttons"]"
position="before">
<separator string="Authentication" id="authentication"
colspan="6"/>
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index 743399f..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,res.user,0,You can not set a password to a ldap user!,Für einen LDAP-Benutzer kann kein Passwort gesetzt werden!,0
-field,"ldap.connection,auth_base_dn",0,Base DN,Basis DN,0
-field,"ldap.connection,auth_create_user",0,Create User,Benutzer erstellen,0
-field,"ldap.connection,auth_require_filter",0,Require Filter,Require Filter,0
-field,"ldap.connection,auth_scope",0,Scope,Suchbereich,0
-field,"ldap.connection,auth_uid",0,UID,UID,0
-help,"ldap.connection,auth_base_dn",0,Base DN for authentication,Basis DN für die Authentifizierung,0
-help,"ldap.connection,auth_create_user",0,Create user if not in database,"Erstellt den Benutzer, wenn er nicht in der Datenbank vorhanden ist",0
-help,"ldap.connection,auth_uid",0,UID Attribute for authentication,UID-Attribut für die Authentifizierung,0
-selection,"ldap.connection,auth_scope",0,Base,Base,0
-selection,"ldap.connection,auth_scope",0,OneLevel,OneLevel,0
-selection,"ldap.connection,auth_scope",0,Subtree,Subtree,0
-view,ldap.connection,0,Authentication,Authentifizierung,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 7f9fc6f..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,res.user,0,You can not set a password to a ldap user!,¡No puede establecer la contraseña de un usuario LDAP,0
-field,"ldap.connection,auth_base_dn",0,Base DN,DN base,0
-field,"ldap.connection,auth_create_user",0,Create User,Crear usuario,0
-field,"ldap.connection,auth_require_filter",0,Require Filter,Filtro requerido,0
-field,"ldap.connection,auth_scope",0,Scope,Ámbito,0
-field,"ldap.connection,auth_uid",0,UID,UID,0
-help,"ldap.connection,auth_base_dn",0,Base DN for authentication,DN base para la autenticación,0
-help,"ldap.connection,auth_create_user",0,Create user if not in database,Crea el usuario si no existe en la base de datos,0
-help,"ldap.connection,auth_uid",0,UID Attribute for authentication,Atributo UID para la autenticación,0
-selection,"ldap.connection,auth_scope",0,Base,Base,0
-selection,"ldap.connection,auth_scope",0,OneLevel,UnNivel,0
-selection,"ldap.connection,auth_scope",0,Subtree,Subárbol,0
-view,ldap.connection,0,Authentication,Autenticación,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index fbe1a8a..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,res.user,0,You can not set a password to a ldap user!,No puede establecer la contraseña de un usuario LDAP,0
-field,"ldap.connection,auth_base_dn",0,Base DN,DN base,0
-field,"ldap.connection,auth_create_user",0,Create User,Crear usuario,0
-field,"ldap.connection,auth_require_filter",0,Require Filter,Filtro requerido,0
-field,"ldap.connection,auth_scope",0,Scope,Ámbito,0
-field,"ldap.connection,auth_uid",0,UID,UID,0
-help,"ldap.connection,auth_base_dn",0,Base DN for authentication,DN base para la autentificación,0
-help,"ldap.connection,auth_create_user",0,Create user if not in database,Crea el usuario si no existe en la base de datos,0
-help,"ldap.connection,auth_uid",0,UID Attribute for authentication,Atributo UID para la autentificación,0
-selection,"ldap.connection,auth_scope",0,Base,Base,0
-selection,"ldap.connection,auth_scope",0,OneLevel,UnNivel,0
-selection,"ldap.connection,auth_scope",0,Subtree,Subárbol,0
-view,ldap.connection,0,Authentication,Autentificación,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index 2ebf8fe..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,res.user,0,You can not set a password to a ldap user!,Vous ne pouvez pas donner un mot de passe à un utilisateur ldap !,0
-field,"ldap.connection,auth_base_dn",0,Base DN,DN de base,0
-field,"ldap.connection,auth_create_user",0,Create User,Créer l'utilisateur,0
-field,"ldap.connection,auth_require_filter",0,Require Filter,Filtre requis,0
-field,"ldap.connection,auth_scope",0,Scope,Portée,0
-field,"ldap.connection,auth_uid",0,UID,UID,0
-help,"ldap.connection,auth_base_dn",0,Base DN for authentication,DN de base pour l'authentification,0
-help,"ldap.connection,auth_create_user",0,Create user if not in database,Créer l'utilisateur s'il n'est pas dans la base de données,0
-help,"ldap.connection,auth_uid",0,UID Attribute for authentication,Attribut UID de l'authentification,0
-selection,"ldap.connection,auth_scope",0,Base,Base,0
-selection,"ldap.connection,auth_scope",0,OneLevel,Un niveau,0
-selection,"ldap.connection,auth_scope",0,Subtree,Sous-arbre,0
-view,ldap.connection,0,Authentication,Authentification,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..8dd328d
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,55 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:res.user:0"
+msgid "You can not set a password to a ldap user!"
+msgstr "Не може да зададете парола на LDAP потребител!"
+
+msgctxt "field:ldap.connection,auth_base_dn:0"
+msgid "Base DN"
+msgstr "Base DN"
+
+msgctxt "field:ldap.connection,auth_create_user:0"
+msgid "Create User"
+msgstr "Създаване на потребител"
+
+msgctxt "field:ldap.connection,auth_require_filter:0"
+msgid "Require Filter"
+msgstr "Допълнителен филтър"
+
+msgctxt "field:ldap.connection,auth_scope:0"
+msgid "Scope"
+msgstr "Обсег"
+
+msgctxt "field:ldap.connection,auth_uid:0"
+msgid "UID"
+msgstr "UID"
+
+msgctxt "help:ldap.connection,auth_base_dn:0"
+msgid "Base DN for authentication"
+msgstr "Base DN за проверка"
+
+msgctxt "help:ldap.connection,auth_create_user:0"
+msgid "Create user if not in database"
+msgstr "Създаване на потребител ако го няма в базата данни"
+
+msgctxt "help:ldap.connection,auth_uid:0"
+msgid "UID Attribute for authentication"
+msgstr "UID атрибут за проверка"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Base"
+msgstr "Основа"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "OneLevel"
+msgstr "Едно ниво"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Subtree"
+msgstr "Поддърво"
+
+msgctxt "view:ldap.connection:0"
+msgid "Authentication"
+msgstr "Проверка"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..f5b0402
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,55 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:res.user:0"
+msgid "You can not set a password to a ldap user!"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_base_dn:0"
+msgid "Base DN"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_create_user:0"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_require_filter:0"
+msgid "Require Filter"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_scope:0"
+msgid "Scope"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_uid:0"
+msgid "UID"
+msgstr ""
+
+msgctxt "help:ldap.connection,auth_base_dn:0"
+msgid "Base DN for authentication"
+msgstr ""
+
+msgctxt "help:ldap.connection,auth_create_user:0"
+msgid "Create user if not in database"
+msgstr ""
+
+msgctxt "help:ldap.connection,auth_uid:0"
+msgid "UID Attribute for authentication"
+msgstr ""
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Base"
+msgstr ""
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "OneLevel"
+msgstr ""
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Subtree"
+msgstr ""
+
+msgctxt "view:ldap.connection:0"
+msgid "Authentication"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..c9a1831
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,55 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:res.user:0"
+msgid "You can not set a password to a ldap user!"
+msgstr "Für einen LDAP-Benutzer kann kein Passwort gesetzt werden!"
+
+msgctxt "field:ldap.connection,auth_base_dn:0"
+msgid "Base DN"
+msgstr "Basis DN"
+
+msgctxt "field:ldap.connection,auth_create_user:0"
+msgid "Create User"
+msgstr "Benutzer erstellen"
+
+msgctxt "field:ldap.connection,auth_require_filter:0"
+msgid "Require Filter"
+msgstr "Require Filter"
+
+msgctxt "field:ldap.connection,auth_scope:0"
+msgid "Scope"
+msgstr "Suchbereich"
+
+msgctxt "field:ldap.connection,auth_uid:0"
+msgid "UID"
+msgstr "UID"
+
+msgctxt "help:ldap.connection,auth_base_dn:0"
+msgid "Base DN for authentication"
+msgstr "Basis DN für die Authentifizierung"
+
+msgctxt "help:ldap.connection,auth_create_user:0"
+msgid "Create user if not in database"
+msgstr "Erstellt den Benutzer, wenn er nicht in der Datenbank vorhanden ist"
+
+msgctxt "help:ldap.connection,auth_uid:0"
+msgid "UID Attribute for authentication"
+msgstr "UID-Attribut für die Authentifizierung"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Base"
+msgstr "Base"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "OneLevel"
+msgstr "OneLevel"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Subtree"
+msgstr "Subtree"
+
+msgctxt "view:ldap.connection:0"
+msgid "Authentication"
+msgstr "Authentifizierung"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..ec26e8a
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,55 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:res.user:0"
+msgid "You can not set a password to a ldap user!"
+msgstr "¡No puede establecer la contraseña de un usuario LDAP"
+
+msgctxt "field:ldap.connection,auth_base_dn:0"
+msgid "Base DN"
+msgstr "DN base"
+
+msgctxt "field:ldap.connection,auth_create_user:0"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:ldap.connection,auth_require_filter:0"
+msgid "Require Filter"
+msgstr "Filtro requerido"
+
+msgctxt "field:ldap.connection,auth_scope:0"
+msgid "Scope"
+msgstr "Ámbito"
+
+msgctxt "field:ldap.connection,auth_uid:0"
+msgid "UID"
+msgstr "UID"
+
+msgctxt "help:ldap.connection,auth_base_dn:0"
+msgid "Base DN for authentication"
+msgstr "DN base para la autenticación"
+
+msgctxt "help:ldap.connection,auth_create_user:0"
+msgid "Create user if not in database"
+msgstr "Crea el usuario si no existe en la base de datos"
+
+msgctxt "help:ldap.connection,auth_uid:0"
+msgid "UID Attribute for authentication"
+msgstr "Atributo UID para la autenticación"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Base"
+msgstr "Base"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "OneLevel"
+msgstr "UnNivel"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Subtree"
+msgstr "Subárbol"
+
+msgctxt "view:ldap.connection:0"
+msgid "Authentication"
+msgstr "Autenticación"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..d4a850f
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,55 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:res.user:0"
+msgid "You can not set a password to a ldap user!"
+msgstr "No puede establecer la contraseña de un usuario LDAP"
+
+msgctxt "field:ldap.connection,auth_base_dn:0"
+msgid "Base DN"
+msgstr "DN base"
+
+msgctxt "field:ldap.connection,auth_create_user:0"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:ldap.connection,auth_require_filter:0"
+msgid "Require Filter"
+msgstr "Filtro requerido"
+
+msgctxt "field:ldap.connection,auth_scope:0"
+msgid "Scope"
+msgstr "Ámbito"
+
+msgctxt "field:ldap.connection,auth_uid:0"
+msgid "UID"
+msgstr "UID"
+
+msgctxt "help:ldap.connection,auth_base_dn:0"
+msgid "Base DN for authentication"
+msgstr "DN base para la autentificación"
+
+msgctxt "help:ldap.connection,auth_create_user:0"
+msgid "Create user if not in database"
+msgstr "Crea el usuario si no existe en la base de datos"
+
+msgctxt "help:ldap.connection,auth_uid:0"
+msgid "UID Attribute for authentication"
+msgstr "Atributo UID para la autentificación"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Base"
+msgstr "Base"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "OneLevel"
+msgstr "UnNivel"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Subtree"
+msgstr "Subárbol"
+
+msgctxt "view:ldap.connection:0"
+msgid "Authentication"
+msgstr "Autentificación"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..72232f8
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,55 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:res.user:0"
+msgid "You can not set a password to a ldap user!"
+msgstr "Vous ne pouvez pas donner un mot de passe à un utilisateur ldap !"
+
+msgctxt "field:ldap.connection,auth_base_dn:0"
+msgid "Base DN"
+msgstr "DN de base"
+
+msgctxt "field:ldap.connection,auth_create_user:0"
+msgid "Create User"
+msgstr "Créer l'utilisateur"
+
+msgctxt "field:ldap.connection,auth_require_filter:0"
+msgid "Require Filter"
+msgstr "Filtre requis"
+
+msgctxt "field:ldap.connection,auth_scope:0"
+msgid "Scope"
+msgstr "Portée"
+
+msgctxt "field:ldap.connection,auth_uid:0"
+msgid "UID"
+msgstr "UID"
+
+msgctxt "help:ldap.connection,auth_base_dn:0"
+msgid "Base DN for authentication"
+msgstr "DN de base pour l'authentification"
+
+msgctxt "help:ldap.connection,auth_create_user:0"
+msgid "Create user if not in database"
+msgstr "Créer l'utilisateur s'il n'est pas dans la base de données"
+
+msgctxt "help:ldap.connection,auth_uid:0"
+msgid "UID Attribute for authentication"
+msgstr "Attribut UID de l'authentification"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Base"
+msgstr "Base"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "OneLevel"
+msgstr "Un niveau"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Subtree"
+msgstr "Sous-arbre"
+
+msgctxt "view:ldap.connection:0"
+msgid "Authentication"
+msgstr "Authentification"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..0c0a9e2
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,56 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:res.user:0"
+msgid "You can not set a password to a ldap user!"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_base_dn:0"
+msgid "Base DN"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_create_user:0"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_require_filter:0"
+msgid "Require Filter"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_scope:0"
+msgid "Scope"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_uid:0"
+msgid "UID"
+msgstr ""
+
+msgctxt "help:ldap.connection,auth_base_dn:0"
+msgid "Base DN for authentication"
+msgstr ""
+
+msgctxt "help:ldap.connection,auth_create_user:0"
+msgid "Create user if not in database"
+msgstr ""
+
+msgctxt "help:ldap.connection,auth_uid:0"
+msgid "UID Attribute for authentication"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Base"
+msgstr "Basisbedrag"
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "OneLevel"
+msgstr ""
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Subtree"
+msgstr ""
+
+msgctxt "view:ldap.connection:0"
+msgid "Authentication"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..f5b0402
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,55 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:res.user:0"
+msgid "You can not set a password to a ldap user!"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_base_dn:0"
+msgid "Base DN"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_create_user:0"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_require_filter:0"
+msgid "Require Filter"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_scope:0"
+msgid "Scope"
+msgstr ""
+
+msgctxt "field:ldap.connection,auth_uid:0"
+msgid "UID"
+msgstr ""
+
+msgctxt "help:ldap.connection,auth_base_dn:0"
+msgid "Base DN for authentication"
+msgstr ""
+
+msgctxt "help:ldap.connection,auth_create_user:0"
+msgid "Create user if not in database"
+msgstr ""
+
+msgctxt "help:ldap.connection,auth_uid:0"
+msgid "UID Attribute for authentication"
+msgstr ""
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Base"
+msgstr ""
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "OneLevel"
+msgstr ""
+
+msgctxt "selection:ldap.connection,auth_scope:0"
+msgid "Subtree"
+msgstr ""
+
+msgctxt "view:ldap.connection:0"
+msgid "Authentication"
+msgstr ""
diff --git a/res.py b/res.py
index 7317820..d34e93e 100644
--- a/res.py
+++ b/res.py
@@ -1,9 +1,10 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from __future__ import with_statement
import ldap
from trytond.model import ModelView, ModelSQL
from trytond.transaction import Transaction
+from trytond.pool import Pool
+
class User(ModelSQL, ModelView):
_name = 'res.user'
@@ -43,7 +44,7 @@ class User(ModelSQL, ModelView):
return result
def _check_passwd_ldap_user(self, logins):
- connection_obj = self.pool.get('ldap.connection')
+ connection_obj = Pool().get('ldap.connection')
connection_ids = connection_obj.search([], limit=1)
with Transaction().set_user(0):
connection = connection_obj.browse(connection_ids[0])
@@ -81,7 +82,7 @@ class User(ModelSQL, ModelView):
return super(User, self).write(ids, vals)
def set_preferences(self, values, old_password=False):
- connection_obj = self.pool.get('ldap.connection')
+ connection_obj = Pool().get('ldap.connection')
if 'password' in values:
connection_ids = connection_obj.search([], limit=1)
with Transaction().set_user(0):
@@ -109,7 +110,7 @@ class User(ModelSQL, ModelView):
old_password=old_password)
def get_login(self, login, password):
- connection_obj = self.pool.get('ldap.connection')
+ connection_obj = Pool().get('ldap.connection')
connection_ids = connection_obj.search([], limit=1)
with Transaction().set_user(0):
connection = connection_obj.browse(connection_ids[0])
diff --git a/setup.py b/setup.py
index b7fbd8b..1750a82 100644
--- a/setup.py
+++ b/setup.py
@@ -39,17 +39,20 @@ setup(name='trytond_ldap_authentication',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Czech',
+ 'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Russian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
diff --git a/tests/test_ldap_authentication.py b/tests/test_ldap_authentication.py
index 8863f69..7dcfd65 100644
--- a/tests/test_ldap_authentication.py
+++ b/tests/test_ldap_authentication.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view
+from trytond.tests.test_tryton import test_view, test_depends
class LDAPAuthenticationTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class LDAPAuthenticationTestCase(unittest.TestCase):
'''
test_view('ldap_authentication')
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index d13d560..363f61f 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,27 +1,30 @@
Metadata-Version: 1.0
Name: trytond-ldap-authentication
-Version: 2.0.0
+Version: 2.2.0
Summary: Authenticate users with LDAP server.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_ldap_authentication.egg-info/SOURCES.txt b/trytond_ldap_authentication.egg-info/SOURCES.txt
index 8a45875..c602047 100644
--- a/trytond_ldap_authentication.egg-info/SOURCES.txt
+++ b/trytond_ldap_authentication.egg-info/SOURCES.txt
@@ -4,12 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
connection.xml
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
setup.py
./__init__.py
./__tryton__.py
@@ -17,6 +12,14 @@ setup.py
./res.py
./tests/__init__.py
./tests/test_ldap_authentication.py
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.po
trytond_ldap_authentication.egg-info/PKG-INFO
trytond_ldap_authentication.egg-info/SOURCES.txt
trytond_ldap_authentication.egg-info/dependency_links.txt
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
index 430fdaf..3773eda 100644
--- a/trytond_ldap_authentication.egg-info/requires.txt
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-ldap
-trytond_ldap_connection >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_ldap_connection >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit 8f68605e875a71d4988e8ab4eff8c36bc4e29bb8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:49 2011 +0200
Adding upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index f94aaac..f621102 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.0 - 2011-04-27
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 42f14f2..c81459d 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,8 +1,8 @@
-Copyright (C) 2006-2010 Cédric Krier.
-Copyright (C) 2009-2010 Bertrand Chenal.
-Copyright (C) 2009-2010 B2CK SPRL.
-Copyright (C) 2008-2010 Udo Spallek.
-Copyright (C) 2008-2010 virtual things.
+Copyright (C) 2006-2011 Cédric Krier.
+Copyright (C) 2009-2011 Bertrand Chenal.
+Copyright (C) 2009-2011 B2CK SPRL.
+Copyright (C) 2008-2011 Udo Spallek.
+Copyright (C) 2008-2011 virtual things.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index ade41b4..bd6801b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_ldap_authentication
-Version: 1.8.0
+Version: 2.0.0
Summary: Authenticate users with LDAP server.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -15,11 +15,14 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP
diff --git a/__tryton__.py b/__tryton__.py
index 439c94d..29f741d 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,15 +2,17 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'LDAP Authentication',
+ 'name_bg_BG' : 'LDAP Проверка',
'name_de_DE' : 'LDAP Authentifizierung',
'name_es_CO': 'Autentificación LDAP',
'name_es_ES': 'Autentificación LDAP',
'name_fr_FR': 'Authentification LDAP',
- 'version': '1.8.0',
+ 'version': '2.0.0',
'author': 'B2CK, Josh Dukes & Udo Spallek',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': '''Authenticate users with LDAP server.''',
+ 'description_bg_BG': 'Проверка на потребители чрез LDAP сървър.',
'description_de_DE' : '''Authentifizierung über LDAP
- Fügt Unterstützung für Authentifizierung über einen LDAP-Server hinzu.
''',
@@ -26,6 +28,7 @@
'connection.xml',
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..e451cdf
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,14 @@
+type,name,res_id,src,value,fuzzy
+error,res.user,0,You can not set a password to a ldap user!,Не може да зададете парола на LDAP потребител!,0
+field,"ldap.connection,auth_base_dn",0,Base DN,Base DN,0
+field,"ldap.connection,auth_create_user",0,Create User,Създаване на потребител,0
+field,"ldap.connection,auth_require_filter",0,Require Filter,Допълнителен филтър,0
+field,"ldap.connection,auth_scope",0,Scope,Обсег,0
+field,"ldap.connection,auth_uid",0,UID,UID,0
+help,"ldap.connection,auth_base_dn",0,Base DN for authentication,Base DN за проверка,0
+help,"ldap.connection,auth_create_user",0,Create user if not in database,Създаване на потребител ако го няма в базата данни,0
+help,"ldap.connection,auth_uid",0,UID Attribute for authentication,UID атрибут за проверка,0
+selection,"ldap.connection,auth_scope",0,Base,Основа,0
+selection,"ldap.connection,auth_scope",0,OneLevel,Едно ниво,0
+selection,"ldap.connection,auth_scope",0,Subtree,Поддърво,0
+view,ldap.connection,0,Authentication,Проверка,0
diff --git a/connection.xml b/connection.xml
index 91782d3..a4d2529 100644
--- a/connection.xml
+++ b/connection.xml
@@ -13,7 +13,7 @@ this repository contains the full copyright notices and license terms. -->
<xpath
expr="/form/separator[@id="buttons"]"
position="before">
- <separator string="Authentification" id="authentication"
+ <separator string="Authentication" id="authentication"
colspan="6"/>
<label name="auth_uid"/>
<field name="auth_uid"/>
diff --git a/de_DE.csv b/de_DE.csv
index 34e57ba..743399f 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -11,4 +11,4 @@ help,"ldap.connection,auth_uid",0,UID Attribute for authentication,UID-Attribut
selection,"ldap.connection,auth_scope",0,Base,Base,0
selection,"ldap.connection,auth_scope",0,OneLevel,OneLevel,0
selection,"ldap.connection,auth_scope",0,Subtree,Subtree,0
-view,ldap.connection,0,Authentification,Authentifizierung,0
+view,ldap.connection,0,Authentication,Authentifizierung,0
diff --git a/es_CO.csv b/es_CO.csv
index 35c67d7..7f9fc6f 100644
--- a/es_CO.csv
+++ b/es_CO.csv
@@ -11,4 +11,4 @@ help,"ldap.connection,auth_uid",0,UID Attribute for authentication,Atributo UID
selection,"ldap.connection,auth_scope",0,Base,Base,0
selection,"ldap.connection,auth_scope",0,OneLevel,UnNivel,0
selection,"ldap.connection,auth_scope",0,Subtree,Subárbol,0
-view,ldap.connection,0,Authentification,Autenticación,0
+view,ldap.connection,0,Authentication,Autenticación,0
diff --git a/es_ES.csv b/es_ES.csv
index 4459574..fbe1a8a 100644
--- a/es_ES.csv
+++ b/es_ES.csv
@@ -11,4 +11,4 @@ help,"ldap.connection,auth_uid",0,UID Attribute for authentication,Atributo UID
selection,"ldap.connection,auth_scope",0,Base,Base,0
selection,"ldap.connection,auth_scope",0,OneLevel,UnNivel,0
selection,"ldap.connection,auth_scope",0,Subtree,Subárbol,0
-view,ldap.connection,0,Authentification,Autentificación,0
+view,ldap.connection,0,Authentication,Autentificación,0
diff --git a/fr_FR.csv b/fr_FR.csv
index d310ae6..2ebf8fe 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -11,4 +11,4 @@ help,"ldap.connection,auth_uid",0,UID Attribute for authentication,Attribut UID
selection,"ldap.connection,auth_scope",0,Base,Base,0
selection,"ldap.connection,auth_scope",0,OneLevel,Un niveau,0
selection,"ldap.connection,auth_scope",0,Subtree,Sous-arbre,0
-view,ldap.connection,0,Authentification,Authentification,0
+view,ldap.connection,0,Authentication,Authentification,0
diff --git a/setup.py b/setup.py
index db1075e..b7fbd8b 100644
--- a/setup.py
+++ b/setup.py
@@ -43,12 +43,15 @@ setup(name='trytond_ldap_authentication',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: Bulgarian',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2.5',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
'Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP',
],
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index 03795ea..d13d560 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-ldap-authentication
-Version: 1.8.0
+Version: 2.0.0
Summary: Authenticate users with LDAP server.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -15,11 +15,14 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP
diff --git a/trytond_ldap_authentication.egg-info/SOURCES.txt b/trytond_ldap_authentication.egg-info/SOURCES.txt
index 7c0de0f..8a45875 100644
--- a/trytond_ldap_authentication.egg-info/SOURCES.txt
+++ b/trytond_ldap_authentication.egg-info/SOURCES.txt
@@ -4,6 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
connection.xml
de_DE.csv
es_CO.csv
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
index 8b7db72..430fdaf 100644
--- a/trytond_ldap_authentication.egg-info/requires.txt
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-ldap
-trytond_ldap_connection >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_ldap_connection >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit 2df6da8183368847b58f88f3d15a599bdb9663e4
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:12:21 2010 +0100
Adding upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 4bca67f..f94aaac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
Version 1.6.0 -2010-05-10
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 6f9168d..27bab4b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_ldap_authentication
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_ldap_connection (http://www.tryton.org/)
* python-ldap (http://python-ldap.sourceforge.net/)
diff --git a/PKG-INFO b/PKG-INFO
index 0235d91..ade41b4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_ldap_authentication
-Version: 1.6.0
+Version: 1.8.0
Summary: Authenticate users with LDAP server.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 7b40569..439c94d 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Autentificación LDAP',
'name_es_ES': 'Autentificación LDAP',
'name_fr_FR': 'Authentification LDAP',
- 'version': '1.6.0',
+ 'version': '1.8.0',
'author': 'B2CK, Josh Dukes & Udo Spallek',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/connection.py b/connection.py
index bf29a84..9bbdfdf 100644
--- a/connection.py
+++ b/connection.py
@@ -19,13 +19,13 @@ class Connection(ModelSingleton, ModelSQL, ModelView):
auth_create_user = fields.Boolean('Create User',
help='Create user if not in database')
- def default_auth_uid(self, cursor, user, context=None):
+ def default_auth_uid(self):
return 'uid'
- def default_auth_scope(self, cursor, user, context=None):
+ def default_auth_scope(self):
return 'base'
- def default_auth_create_user(self, cursor, user, context=None):
+ def default_auth_create_user(self):
return False
Connection()
diff --git a/res.py b/res.py
index d1e7261..7317820 100644
--- a/res.py
+++ b/res.py
@@ -1,8 +1,9 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from trytond.model import ModelView, ModelSQL
+from __future__ import with_statement
import ldap
-
+from trytond.model import ModelView, ModelSQL
+from trytond.transaction import Transaction
class User(ModelSQL, ModelView):
_name = 'res.user'
@@ -14,18 +15,14 @@ class User(ModelSQL, ModelView):
'You can not set a password to a ldap user!',
})
- def ldap_search_user(self, cursor, user, login, con, connection,
- attrs=None, context=None):
+ def ldap_search_user(self, login, con, connection, attrs=None):
'''
Return the resule of a ldap search for the login
- :param cursor: the database cursor
- :param user: the user id
:param login: the login
:param con: the ldap connection
:param connection: a BrowseRecord of ldap.connection
:param attrs: a list of attribute to return
- :param context: the context
:return: the ldap search result
'''
scope = {
@@ -45,12 +42,11 @@ class User(ModelSQL, ModelView):
result = [x for x in result if x[0]]
return result
- def _check_passwd_ldap_user(self, cursor, user, logins, context=None):
+ def _check_passwd_ldap_user(self, logins):
connection_obj = self.pool.get('ldap.connection')
- connection_ids = connection_obj.search(cursor, 0, [], limit=1,
- context=context)
- connection = connection_obj.browse(cursor, 0, connection_ids[0],
- context=context)
+ connection_ids = connection_obj.search([], limit=1)
+ with Transaction().set_user(0):
+ connection = connection_obj.browse(connection_ids[0])
find = False
try:
con = ldap.initialize(connection.uri)
@@ -61,41 +57,35 @@ class User(ModelSQL, ModelView):
if connection.bind_dn:
con.simple_bind_s(connection.bind_dn, connection.bind_pass)
for login in logins:
- if self.ldap_search_user(cursor, user, login,
- con, connection, attrs=[], context=context):
+ if self.ldap_search_user(login,
+ con, connection, attrs=[]):
find = True
- except:
+ except Exception:
pass
if find:
- self.raise_user_error(cursor, 'set_passwd_ldap_user',
- context=context)
+ self.raise_user_error('set_passwd_ldap_user')
- def create(self, cursor, user, vals, context=None):
+ def create(self, vals):
if vals.get('password') and 'login' in vals:
- self._check_passwd_ldap_user(cursor, user, [vals['login']],
- context=context)
- return super(User, self).create(cursor, user, vals, context=context)
+ self._check_passwd_ldap_user([vals['login']])
+ return super(User, self).create(vals)
- def write(self, cursor, user, ids, vals, context=None):
+ def write(self, ids, vals):
if vals.get('password'):
if isinstance(ids, (int, long)):
ids2 = [ids]
else:
ids2 = ids
- logins = [x.login for x in self.browse(cursor, user, ids2,
- context=context)]
- self._check_passwd_ldap_user(cursor, user, logins, context=context)
- return super(User, self).write(cursor, user, ids, vals, context=context)
+ logins = [x.login for x in self.browse(ids2)]
+ self._check_passwd_ldap_user(logins)
+ return super(User, self).write(ids, vals)
- def set_preferences(self, cursor, user_id, values, old_password=False,
- context=None):
+ def set_preferences(self, values, old_password=False):
connection_obj = self.pool.get('ldap.connection')
-
if 'password' in values:
- connection_ids = connection_obj.search(cursor, 0, [], limit=1,
- context=context)
- connection = connection_obj.browse(cursor, 0, connection_ids[0],
- context=context)
+ connection_ids = connection_obj.search([], limit=1)
+ with Transaction().set_user(0):
+ connection = connection_obj.browse(connection_ids[0])
try:
con = ldap.initialize(connection.uri)
if connection.active_directory:
@@ -104,28 +94,25 @@ class User(ModelSQL, ModelView):
con.start_tls_s()
if connection.bind_dn:
con.simple_bind_s(connection.bind_dn, connection.bind_pass)
- user = self.browse(cursor, user_id, user_id, context=context)
- [(dn, attrs)] = self.ldap_search_user(cursor, user_id,
- user.login, con, connection,
- attrs=[str(connection.auth_uid)], context=context)
+ user = self.browse(Transaction().user)
+ [(dn, attrs)] = self.ldap_search_user(user.login, con,
+ connection, attrs=[str(connection.auth_uid)])
if con.simple_bind_s(dn, old_password):
con.passwd_s(dn, old_password, values['password'])
values = values.copy()
del values['password']
else:
- self.raise_user_error(cursor, 'wrong_password',
- context=context)
- except:
+ self.raise_user_error('wrong_password')
+ except Exception:
pass
- return super(User, self).set_preferences(cursor, user_id, values,
- old_password=old_password, context=context)
+ return super(User, self).set_preferences(values,
+ old_password=old_password)
- def get_login(self, cursor, user, login, password, context=None):
+ def get_login(self, login, password):
connection_obj = self.pool.get('ldap.connection')
- connection_ids = connection_obj.search(cursor, 0, [], limit=1,
- context=context)
- connection = connection_obj.browse(cursor, 0, connection_ids[0],
- context=context)
+ connection_ids = connection_obj.search([], limit=1)
+ with Transaction().set_user(0):
+ connection = connection_obj.browse(connection_ids[0])
try:
con = ldap.initialize(connection.uri)
if connection.active_directory:
@@ -134,23 +121,20 @@ class User(ModelSQL, ModelView):
con.start_tls_s()
if connection.bind_dn:
con.simple_bind_s(connection.bind_dn, connection.bind_pass)
- [(dn, attrs)] = self.ldap_search_user(cursor, user, login,
- con, connection, attrs=[str(connection.auth_uid)],
- context=context)
+ [(dn, attrs)] = self.ldap_search_user(login, con, connection,
+ attrs=[str(connection.auth_uid)])
if con.simple_bind_s(dn, password):
- user_id, _, _ = self._get_login(cursor, user, login,
- context=context)
+ user_id, _, _ = self._get_login(login)
if user_id:
return user_id
elif connection.auth_create_user:
- user_id = self.create(cursor, 0, {
+ user_id = self.create({
'name': attrs.get(str(connection.auth_uid), [login])[0],
'login': login,
- }, context=context)
+ })
return user_id
- except:
+ except Exception:
pass
- return super(User, self).get_login(cursor, user, login, password,
- context=context)
+ return super(User, self).get_login(login, password)
User()
diff --git a/tests/test_ldap_authentication.py b/tests/test_ldap_authentication.py
index 93f8a5e..8863f69 100644
--- a/tests/test_ldap_authentication.py
+++ b/tests/test_ldap_authentication.py
@@ -25,7 +25,7 @@ class LDAPAuthenticationTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view('ldap_authentication'))
+ test_view('ldap_authentication')
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index 0260ce2..03795ea 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-ldap-authentication
-Version: 1.6.0
+Version: 1.8.0
Summary: Authenticate users with LDAP server.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
index f3f1120..8b7db72 100644
--- a/trytond_ldap_authentication.egg-info/requires.txt
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-ldap
-trytond_ldap_connection >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_ldap_connection >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit 62d48dc5eb89c247d4dd3fced34c723676230649
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 11:29:04 2010 +0200
Adding upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 269aded..4bca67f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
-Version 1.4.1 - 2010-02-17
-* Some bug fixes (see mercurial logs for details)
+Version 1.6.0 -2010-05-10
+* Bug fixes (see mercurial logs for details)
Version 1.4.0 - 2009-10-19
* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
index 0a6cb26..42f14f2 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (C) 2006-2009 Cédric Krier.
+Copyright (C) 2006-2010 Cédric Krier.
Copyright (C) 2009-2010 Bertrand Chenal.
Copyright (C) 2009-2010 B2CK SPRL.
Copyright (C) 2008-2010 Udo Spallek.
diff --git a/MANIFEST.in b/MANIFEST.in
index b2a140e..dcb2afa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,5 +7,4 @@ include LICENSE
include *.xml
include *.odt
include *.csv
-include tests/*
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 94394f4..0235d91 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond_ldap_authentication
-Version: 1.4.1
+Version: 1.6.0
Summary: Authenticate users with LDAP server.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 08aa5a4..7b40569 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Autentificación LDAP',
'name_es_ES': 'Autentificación LDAP',
'name_fr_FR': 'Authentification LDAP',
- 'version': '1.4.1',
+ 'version': '1.6.0',
'author': 'B2CK, Josh Dukes & Udo Spallek',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/setup.py b/setup.py
index 2ca9712..db1075e 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from setuptools import setup, find_packages
+from setuptools import setup
import re
-info = eval(file('__tryton__.py').read())
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
requires = ['python-ldap']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
- requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+ requires.append('trytond_%s >= %s.%s, < %s.%s' %
+ (dep, major_version, minor_version, major_version,
+ minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' %
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_ldap_authentication',
version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_ldap_authentication',
package_dir={'trytond.modules.ldap_authentication': '.'},
packages=[
'trytond.modules.ldap_authentication',
+ 'trytond.modules.ldap_authentication.tests',
],
package_data={
'trytond.modules.ldap_authentication': info.get('xml', []) \
@@ -55,4 +59,6 @@ setup(name='trytond_ldap_authentication',
[trytond.modules]
ldap_authentication = trytond.modules.ldap_authentication
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 2c8dbdf..ac50bc1 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from test_ldap_authentication import *
+from test_ldap_authentication import suite
diff --git a/tests/test_ldap_authentication.py b/tests/test_ldap_authentication.py
index 2e50308..93f8a5e 100644
--- a/tests/test_ldap_authentication.py
+++ b/tests/test_ldap_authentication.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.tests.test_tryton import test_view
class LDAPAuthenticationTestCase(unittest.TestCase):
@@ -28,11 +28,10 @@ class LDAPAuthenticationTestCase(unittest.TestCase):
self.assertRaises(Exception, test_view('ldap_authentication'))
def suite():
- return unittest.TestLoader().loadTestsFromTestCase(LDAPAuthenticationTestCase)
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ LDAPAuthenticationTestCase))
+ return suite
if __name__ == '__main__':
- suiteTrytond = trytond.tests.test_tryton.suite()
- suiteLDAPAuthentication = suite()
- alltests = unittest.TestSuite([suiteTrytond, suiteLDAPAuthentication])
- unittest.TextTestRunner(verbosity=2).run(alltests)
- SOCK.disconnect()
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index 6540954..0260ce2 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.0
Name: trytond-ldap-authentication
-Version: 1.4.1
+Version: 1.6.0
Summary: Authenticate users with LDAP server.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_ldap_authentication.egg-info/SOURCES.txt b/trytond_ldap_authentication.egg-info/SOURCES.txt
index 99e98d8..7c0de0f 100644
--- a/trytond_ldap_authentication.egg-info/SOURCES.txt
+++ b/trytond_ldap_authentication.egg-info/SOURCES.txt
@@ -14,8 +14,8 @@ setup.py
./__tryton__.py
./connection.py
./res.py
-tests/__init__.py
-tests/test_ldap_authentication.py
+./tests/__init__.py
+./tests/test_ldap_authentication.py
trytond_ldap_authentication.egg-info/PKG-INFO
trytond_ldap_authentication.egg-info/SOURCES.txt
trytond_ldap_authentication.egg-info/dependency_links.txt
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
index 41b44ec..f3f1120 100644
--- a/trytond_ldap_authentication.egg-info/requires.txt
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -1,4 +1,3 @@
python-ldap
-trytond_ldap_connection
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_ldap_connection >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit 753bc879ac9960d618b711b9f83841289f34fc60
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 20 10:32:35 2010 +0100
Adding upstream version 1.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index 931601e..269aded 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.4.1 - 2010-02-17
+* Some bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2009-10-19
* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
index cf3ddcc..0a6cb26 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,8 +1,8 @@
Copyright (C) 2006-2009 Cédric Krier.
-Copyright (C) 2009 Bertrand Chenal.
-Copyright (C) 2009 B2CK SPRL.
-Copyright (C) 2008 Udo Spallek.
-Copyright (C) 2008 virtual things.
+Copyright (C) 2009-2010 Bertrand Chenal.
+Copyright (C) 2009-2010 B2CK SPRL.
+Copyright (C) 2008-2010 Udo Spallek.
+Copyright (C) 2008-2010 virtual things.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/INSTALL b/INSTALL
index c46bd6c..6f9168d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,6 +6,7 @@ Prerequisites
* Python 2.4 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
+ * trytond_ldap_connection (http://www.tryton.org/)
* python-ldap (http://python-ldap.sourceforge.net/)
Installation
diff --git a/PKG-INFO b/PKG-INFO
index d1ddd5c..94394f4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_ldap_authentication
-Version: 1.4.0
+Version: 1.4.1
Summary: Authenticate users with LDAP server.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
diff --git a/__tryton__.py b/__tryton__.py
index 5fd8103..08aa5a4 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Autentificación LDAP',
'name_es_ES': 'Autentificación LDAP',
'name_fr_FR': 'Authentification LDAP',
- 'version': '1.4.0',
+ 'version': '1.4.1',
'author': 'B2CK, Josh Dukes & Udo Spallek',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/res.py b/res.py
index 5ec2ecf..d1e7261 100644
--- a/res.py
+++ b/res.py
@@ -71,13 +71,13 @@ class User(ModelSQL, ModelView):
context=context)
def create(self, cursor, user, vals, context=None):
- if 'password' in vals and 'login' in vals:
+ if vals.get('password') and 'login' in vals:
self._check_passwd_ldap_user(cursor, user, [vals['login']],
context=context)
return super(User, self).create(cursor, user, vals, context=context)
def write(self, cursor, user, ids, vals, context=None):
- if 'password' in vals:
+ if vals.get('password'):
if isinstance(ids, (int, long)):
ids2 = [ids]
else:
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index b2805c2..6540954 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-ldap-authentication
-Version: 1.4.0
+Version: 1.4.1
Summary: Authenticate users with LDAP server.
Home-page: http://www.tryton.org/
Author: B2CK, Josh Dukes & Udo Spallek
commit cc428021d10c7cac3db156df0b883e9cf8d57b71
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 22:54:48 2009 +0200
Adding upstream version 1.4.0.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..931601e
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.4.0 - 2009-10-19
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..cf3ddcc
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,18 @@
+Copyright (C) 2006-2009 Cédric Krier.
+Copyright (C) 2009 Bertrand Chenal.
+Copyright (C) 2009 B2CK SPRL.
+Copyright (C) 2008 Udo Spallek.
+Copyright (C) 2008 virtual things.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..c46bd6c
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,30 @@
+Installing trytond_ldap_authentication
+======================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * python-ldap (http://python-ldap.sourceforge.net/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_ldap_authentication source release, enter the
+directory where the archive was unpacked, and run:
+
+ python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+ http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://docs.python.org/inst/inst.html
+
+To use without installation, extract the archive into ``trytond/modules`` with
+the directory name ldap_authentication.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..b2a140e
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,11 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
+include tests/*
+include doc/*
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..d1ddd5c
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond_ldap_authentication
+Version: 1.4.0
+Summary: Authenticate users with LDAP server.
+Home-page: http://www.tryton.org/
+Author: B2CK, Josh Dukes & Udo Spallek
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
+Classifier: Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP
diff --git a/README b/README
new file mode 100644
index 0000000..336d580
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_ldap_authentication
+===========================
+
+The ldap_authentication module of the Tryton application platform.
+See __tryton__.py
+
+Installing
+----------
+
+See INSTALL
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..c33b814
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,5 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from connection import *
+from res import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..5fd8103
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,34 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+ 'name': 'LDAP Authentication',
+ 'name_de_DE' : 'LDAP Authentifizierung',
+ 'name_es_CO': 'Autentificación LDAP',
+ 'name_es_ES': 'Autentificación LDAP',
+ 'name_fr_FR': 'Authentification LDAP',
+ 'version': '1.4.0',
+ 'author': 'B2CK, Josh Dukes & Udo Spallek',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': '''Authenticate users with LDAP server.''',
+ 'description_de_DE' : '''Authentifizierung über LDAP
+ - Fügt Unterstützung für Authentifizierung über einen LDAP-Server hinzu.
+''',
+ 'description_es_CO': 'Autentica usuarios frente a un servidor LDAP.',
+ 'description_es_ES': 'Autentifica usuarios contra un servidor LDAP.',
+ 'description_fr_FR': '''Authentification des utilisateurs via un serveur LDAP.''',
+ 'depends': [
+ 'ir',
+ 'res',
+ 'ldap_connection',
+ ],
+ 'xml': [
+ 'connection.xml',
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'es_CO.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
+ ],
+}
diff --git a/connection.py b/connection.py
new file mode 100644
index 0000000..bf29a84
--- /dev/null
+++ b/connection.py
@@ -0,0 +1,32 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from trytond.model import ModelView, ModelSQL, ModelSingleton, fields
+
+
+class Connection(ModelSingleton, ModelSQL, ModelView):
+ _name = 'ldap.connection'
+
+ auth_uid = fields.Char('UID', help='UID Attribute for authentication',
+ required=True)
+ auth_base_dn = fields.Char('Base DN', help='Base DN for authentication',
+ required=True)
+ auth_require_filter = fields.Char('Require Filter')
+ auth_scope = fields.Selection([
+ ('base', 'Base'),
+ ('onelevel', 'OneLevel'),
+ ('subtree', 'Subtree'),
+ ], 'Scope', required=True)
+ auth_create_user = fields.Boolean('Create User',
+ help='Create user if not in database')
+
+ def default_auth_uid(self, cursor, user, context=None):
+ return 'uid'
+
+ def default_auth_scope(self, cursor, user, context=None):
+ return 'base'
+
+ def default_auth_create_user(self, cursor, user, context=None):
+ return False
+
+Connection()
+
diff --git a/connection.xml b/connection.xml
new file mode 100644
index 0000000..91782d3
--- /dev/null
+++ b/connection.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+ <record model="ir.ui.view" id="connection_view_form">
+ <field name="model">ldap.connection</field>
+ <field name="type">form</field>
+ <field name="inherit" ref="ldap_connection.connection_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath
+ expr="/form/separator[@id="buttons"]"
+ position="before">
+ <separator string="Authentification" id="authentication"
+ colspan="6"/>
+ <label name="auth_uid"/>
+ <field name="auth_uid"/>
+ <label name="auth_base_dn"/>
+ <field name="auth_base_dn"/>
+ <newline/>
+ <label name="auth_require_filter"/>
+ <field name="auth_require_filter"/>
+ <label name="auth_scope"/>
+ <field name="auth_scope"/>
+ <newline/>
+ <label name="auth_create_user"/>
+ <field name="auth_create_user"/>
+ <newline/>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+ </data>
+</tryton>
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..34e57ba
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,14 @@
+type,name,res_id,src,value,fuzzy
+error,res.user,0,You can not set a password to a ldap user!,Für einen LDAP-Benutzer kann kein Passwort gesetzt werden!,0
+field,"ldap.connection,auth_base_dn",0,Base DN,Basis DN,0
+field,"ldap.connection,auth_create_user",0,Create User,Benutzer erstellen,0
+field,"ldap.connection,auth_require_filter",0,Require Filter,Require Filter,0
+field,"ldap.connection,auth_scope",0,Scope,Suchbereich,0
+field,"ldap.connection,auth_uid",0,UID,UID,0
+help,"ldap.connection,auth_base_dn",0,Base DN for authentication,Basis DN für die Authentifizierung,0
+help,"ldap.connection,auth_create_user",0,Create user if not in database,"Erstellt den Benutzer, wenn er nicht in der Datenbank vorhanden ist",0
+help,"ldap.connection,auth_uid",0,UID Attribute for authentication,UID-Attribut für die Authentifizierung,0
+selection,"ldap.connection,auth_scope",0,Base,Base,0
+selection,"ldap.connection,auth_scope",0,OneLevel,OneLevel,0
+selection,"ldap.connection,auth_scope",0,Subtree,Subtree,0
+view,ldap.connection,0,Authentification,Authentifizierung,0
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..35c67d7
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,14 @@
+type,name,res_id,src,value,fuzzy
+error,res.user,0,You can not set a password to a ldap user!,¡No puede establecer la contraseña de un usuario LDAP,0
+field,"ldap.connection,auth_base_dn",0,Base DN,DN base,0
+field,"ldap.connection,auth_create_user",0,Create User,Crear usuario,0
+field,"ldap.connection,auth_require_filter",0,Require Filter,Filtro requerido,0
+field,"ldap.connection,auth_scope",0,Scope,Ámbito,0
+field,"ldap.connection,auth_uid",0,UID,UID,0
+help,"ldap.connection,auth_base_dn",0,Base DN for authentication,DN base para la autenticación,0
+help,"ldap.connection,auth_create_user",0,Create user if not in database,Crea el usuario si no existe en la base de datos,0
+help,"ldap.connection,auth_uid",0,UID Attribute for authentication,Atributo UID para la autenticación,0
+selection,"ldap.connection,auth_scope",0,Base,Base,0
+selection,"ldap.connection,auth_scope",0,OneLevel,UnNivel,0
+selection,"ldap.connection,auth_scope",0,Subtree,Subárbol,0
+view,ldap.connection,0,Authentification,Autenticación,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..4459574
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,14 @@
+type,name,res_id,src,value,fuzzy
+error,res.user,0,You can not set a password to a ldap user!,No puede establecer la contraseña de un usuario LDAP,0
+field,"ldap.connection,auth_base_dn",0,Base DN,DN base,0
+field,"ldap.connection,auth_create_user",0,Create User,Crear usuario,0
+field,"ldap.connection,auth_require_filter",0,Require Filter,Filtro requerido,0
+field,"ldap.connection,auth_scope",0,Scope,Ámbito,0
+field,"ldap.connection,auth_uid",0,UID,UID,0
+help,"ldap.connection,auth_base_dn",0,Base DN for authentication,DN base para la autentificación,0
+help,"ldap.connection,auth_create_user",0,Create user if not in database,Crea el usuario si no existe en la base de datos,0
+help,"ldap.connection,auth_uid",0,UID Attribute for authentication,Atributo UID para la autentificación,0
+selection,"ldap.connection,auth_scope",0,Base,Base,0
+selection,"ldap.connection,auth_scope",0,OneLevel,UnNivel,0
+selection,"ldap.connection,auth_scope",0,Subtree,Subárbol,0
+view,ldap.connection,0,Authentification,Autentificación,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..d310ae6
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,14 @@
+type,name,res_id,src,value,fuzzy
+error,res.user,0,You can not set a password to a ldap user!,Vous ne pouvez pas donner un mot de passe à un utilisateur ldap !,0
+field,"ldap.connection,auth_base_dn",0,Base DN,DN de base,0
+field,"ldap.connection,auth_create_user",0,Create User,Créer l'utilisateur,0
+field,"ldap.connection,auth_require_filter",0,Require Filter,Filtre requis,0
+field,"ldap.connection,auth_scope",0,Scope,Portée,0
+field,"ldap.connection,auth_uid",0,UID,UID,0
+help,"ldap.connection,auth_base_dn",0,Base DN for authentication,DN de base pour l'authentification,0
+help,"ldap.connection,auth_create_user",0,Create user if not in database,Créer l'utilisateur s'il n'est pas dans la base de données,0
+help,"ldap.connection,auth_uid",0,UID Attribute for authentication,Attribut UID de l'authentification,0
+selection,"ldap.connection,auth_scope",0,Base,Base,0
+selection,"ldap.connection,auth_scope",0,OneLevel,Un niveau,0
+selection,"ldap.connection,auth_scope",0,Subtree,Sous-arbre,0
+view,ldap.connection,0,Authentification,Authentification,0
diff --git a/res.py b/res.py
new file mode 100644
index 0000000..5ec2ecf
--- /dev/null
+++ b/res.py
@@ -0,0 +1,156 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from trytond.model import ModelView, ModelSQL
+import ldap
+
+
+class User(ModelSQL, ModelView):
+ _name = 'res.user'
+
+ def __init__(self):
+ super(User, self).__init__()
+ self._error_messages.update({
+ 'set_passwd_ldap_user': \
+ 'You can not set a password to a ldap user!',
+ })
+
+ def ldap_search_user(self, cursor, user, login, con, connection,
+ attrs=None, context=None):
+ '''
+ Return the resule of a ldap search for the login
+
+ :param cursor: the database cursor
+ :param user: the user id
+ :param login: the login
+ :param con: the ldap connection
+ :param connection: a BrowseRecord of ldap.connection
+ :param attrs: a list of attribute to return
+ :param context: the context
+ :return: the ldap search result
+ '''
+ scope = {
+ 'base': ldap.SCOPE_BASE,
+ 'onelevel': ldap.SCOPE_ONELEVEL,
+ 'subtree': ldap.SCOPE_SUBTREE,
+ }.get(connection.auth_scope)
+ if connection.auth_require_filter:
+ filter = '(&(%s=%s)%s)' % (connection.auth_uid, login,
+ connection.auth_require_filter)
+ else:
+ filter = '(%s=%s)' % (connection.auth_uid, login)
+
+ result = con.search_s(connection.auth_base_dn or '', scope,
+ filter, attrs)
+ if connection.active_directory:
+ result = [x for x in result if x[0]]
+ return result
+
+ def _check_passwd_ldap_user(self, cursor, user, logins, context=None):
+ connection_obj = self.pool.get('ldap.connection')
+ connection_ids = connection_obj.search(cursor, 0, [], limit=1,
+ context=context)
+ connection = connection_obj.browse(cursor, 0, connection_ids[0],
+ context=context)
+ find = False
+ try:
+ con = ldap.initialize(connection.uri)
+ if connection.active_directory:
+ con.set_option(ldap.OPT_REFERRALS, 0)
+ if connection.secure == 'tls':
+ con.start_tls_s()
+ if connection.bind_dn:
+ con.simple_bind_s(connection.bind_dn, connection.bind_pass)
+ for login in logins:
+ if self.ldap_search_user(cursor, user, login,
+ con, connection, attrs=[], context=context):
+ find = True
+ except:
+ pass
+ if find:
+ self.raise_user_error(cursor, 'set_passwd_ldap_user',
+ context=context)
+
+ def create(self, cursor, user, vals, context=None):
+ if 'password' in vals and 'login' in vals:
+ self._check_passwd_ldap_user(cursor, user, [vals['login']],
+ context=context)
+ return super(User, self).create(cursor, user, vals, context=context)
+
+ def write(self, cursor, user, ids, vals, context=None):
+ if 'password' in vals:
+ if isinstance(ids, (int, long)):
+ ids2 = [ids]
+ else:
+ ids2 = ids
+ logins = [x.login for x in self.browse(cursor, user, ids2,
+ context=context)]
+ self._check_passwd_ldap_user(cursor, user, logins, context=context)
+ return super(User, self).write(cursor, user, ids, vals, context=context)
+
+ def set_preferences(self, cursor, user_id, values, old_password=False,
+ context=None):
+ connection_obj = self.pool.get('ldap.connection')
+
+ if 'password' in values:
+ connection_ids = connection_obj.search(cursor, 0, [], limit=1,
+ context=context)
+ connection = connection_obj.browse(cursor, 0, connection_ids[0],
+ context=context)
+ try:
+ con = ldap.initialize(connection.uri)
+ if connection.active_directory:
+ con.set_option(ldap.OPT_REFERRALS, 0)
+ if connection.secure == 'tls':
+ con.start_tls_s()
+ if connection.bind_dn:
+ con.simple_bind_s(connection.bind_dn, connection.bind_pass)
+ user = self.browse(cursor, user_id, user_id, context=context)
+ [(dn, attrs)] = self.ldap_search_user(cursor, user_id,
+ user.login, con, connection,
+ attrs=[str(connection.auth_uid)], context=context)
+ if con.simple_bind_s(dn, old_password):
+ con.passwd_s(dn, old_password, values['password'])
+ values = values.copy()
+ del values['password']
+ else:
+ self.raise_user_error(cursor, 'wrong_password',
+ context=context)
+ except:
+ pass
+ return super(User, self).set_preferences(cursor, user_id, values,
+ old_password=old_password, context=context)
+
+ def get_login(self, cursor, user, login, password, context=None):
+ connection_obj = self.pool.get('ldap.connection')
+ connection_ids = connection_obj.search(cursor, 0, [], limit=1,
+ context=context)
+ connection = connection_obj.browse(cursor, 0, connection_ids[0],
+ context=context)
+ try:
+ con = ldap.initialize(connection.uri)
+ if connection.active_directory:
+ con.set_option(ldap.OPT_REFERRALS, 0)
+ if connection.secure == 'tls':
+ con.start_tls_s()
+ if connection.bind_dn:
+ con.simple_bind_s(connection.bind_dn, connection.bind_pass)
+ [(dn, attrs)] = self.ldap_search_user(cursor, user, login,
+ con, connection, attrs=[str(connection.auth_uid)],
+ context=context)
+ if con.simple_bind_s(dn, password):
+ user_id, _, _ = self._get_login(cursor, user, login,
+ context=context)
+ if user_id:
+ return user_id
+ elif connection.auth_create_user:
+ user_id = self.create(cursor, 0, {
+ 'name': attrs.get(str(connection.auth_uid), [login])[0],
+ 'login': login,
+ }, context=context)
+ return user_id
+ except:
+ pass
+ return super(User, self).get_login(cursor, user, login, password,
+ context=context)
+
+User()
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..2ca9712
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,58 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from setuptools import setup, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = ['python-ldap']
+for dep in info.get('depends', []):
+ if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ requires.append('trytond_' + dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+
+setup(name='trytond_ldap_authentication',
+ version=info.get('version', '0.0.1'),
+ description=info.get('description', ''),
+ author=info.get('author', ''),
+ author_email=info.get('email', ''),
+ url=info.get('website', ''),
+ download_url="http://downloads.tryton.org/" + \
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ package_dir={'trytond.modules.ldap_authentication': '.'},
+ packages=[
+ 'trytond.modules.ldap_authentication',
+ ],
+ package_data={
+ 'trytond.modules.ldap_authentication': info.get('xml', []) \
+ + info.get('translation', []),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Financial and Insurance Industry',
+ 'Intended Audience :: Legal Industry',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: English',
+ 'Natural Language :: French',
+ 'Natural Language :: German',
+ 'Natural Language :: Spanish',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Office/Business',
+ 'Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP',
+ ],
+ license='GPL-3',
+ install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ ldap_authentication = trytond.modules.ldap_authentication
+ """,
+)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..2c8dbdf
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from test_ldap_authentication import *
diff --git a/tests/test_ldap_authentication.py b/tests/test_ldap_authentication.py
new file mode 100644
index 0000000..2e50308
--- /dev/null
+++ b/tests/test_ldap_authentication.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+import sys, os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+ '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+
+
+class LDAPAuthenticationTestCase(unittest.TestCase):
+ '''
+ Test LDAPAuthentication module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('ldap_authentication')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view('ldap_authentication'))
+
+def suite():
+ return unittest.TestLoader().loadTestsFromTestCase(LDAPAuthenticationTestCase)
+
+if __name__ == '__main__':
+ suiteTrytond = trytond.tests.test_tryton.suite()
+ suiteLDAPAuthentication = suite()
+ alltests = unittest.TestSuite([suiteTrytond, suiteLDAPAuthentication])
+ unittest.TextTestRunner(verbosity=2).run(alltests)
+ SOCK.disconnect()
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
new file mode 100644
index 0000000..b2805c2
--- /dev/null
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond-ldap-authentication
+Version: 1.4.0
+Summary: Authenticate users with LDAP server.
+Home-page: http://www.tryton.org/
+Author: B2CK, Josh Dukes & Udo Spallek
+Author-email: info at b2ck.com
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.4/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
+Classifier: Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP
diff --git a/trytond_ldap_authentication.egg-info/SOURCES.txt b/trytond_ldap_authentication.egg-info/SOURCES.txt
new file mode 100644
index 0000000..99e98d8
--- /dev/null
+++ b/trytond_ldap_authentication.egg-info/SOURCES.txt
@@ -0,0 +1,25 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+connection.xml
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+setup.py
+./__init__.py
+./__tryton__.py
+./connection.py
+./res.py
+tests/__init__.py
+tests/test_ldap_authentication.py
+trytond_ldap_authentication.egg-info/PKG-INFO
+trytond_ldap_authentication.egg-info/SOURCES.txt
+trytond_ldap_authentication.egg-info/dependency_links.txt
+trytond_ldap_authentication.egg-info/entry_points.txt
+trytond_ldap_authentication.egg-info/not-zip-safe
+trytond_ldap_authentication.egg-info/requires.txt
+trytond_ldap_authentication.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_ldap_authentication.egg-info/dependency_links.txt b/trytond_ldap_authentication.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_ldap_authentication.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_ldap_authentication.egg-info/entry_points.txt b/trytond_ldap_authentication.egg-info/entry_points.txt
new file mode 100644
index 0000000..44ec3fb
--- /dev/null
+++ b/trytond_ldap_authentication.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ ldap_authentication = trytond.modules.ldap_authentication
+
\ No newline at end of file
diff --git a/trytond_ldap_authentication.egg-info/not-zip-safe b/trytond_ldap_authentication.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_ldap_authentication.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
new file mode 100644
index 0000000..41b44ec
--- /dev/null
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -0,0 +1,4 @@
+python-ldap
+trytond_ldap_connection
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
diff --git a/trytond_ldap_authentication.egg-info/top_level.txt b/trytond_ldap_authentication.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_ldap_authentication.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
--
tryton-modules-ldap-authentication
More information about the tryton-debian-vcs
mailing list