globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

Renamed LDAPObjectHelper into LDAPObject

Browse source
This commit is contained in:
Éloi Rivard 2020-09-24 15:16:25 +02:00
parent e9070c305e
commit 7877998818
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
oidc_ldap_bridge/__init__.py
View file

@ -20,7 +20,7 @@ from flask import Flask, g, request, render_template
from flask_babel import Babel from flask_babel import Babel
from .flaskutils import current_user from .flaskutils import current_user
from .ldaputils import LDAPObjectHelper from .ldaputils import LDAPObject
from .oauth2utils import config_oauth from .oauth2utils import config_oauth
from .models import User, Token, AuthorizationCode, Client, Consent from .models import User, Token, AuthorizationCode, Client, Consent
@ -111,7 +111,7 @@ def setup_app(app):
sentry_sdk.init(dsn=app.config["SENTRY_DSN"], integrations=[FlaskIntegration()]) sentry_sdk.init(dsn=app.config["SENTRY_DSN"], integrations=[FlaskIntegration()])
try: try:
LDAPObjectHelper.root_dn = app.config["LDAP"]["ROOT_DN"] LDAPObject.root_dn = app.config["LDAP"]["ROOT_DN"]
base = app.config["LDAP"]["USER_BASE"] base = app.config["LDAP"]["USER_BASE"]
if base.endswith(app.config["LDAP"]["ROOT_DN"]): if base.endswith(app.config["LDAP"]["ROOT_DN"]):
base = base[: -len(app.config["LDAP"]["ROOT_DN"]) - 1] base = base[: -len(app.config["LDAP"]["ROOT_DN"]) - 1]

2
oidc_ldap_bridge/ldaputils.py
View file

@ -2,7 +2,7 @@ import ldap
from flask import g from flask import g
class LDAPObjectHelper: class LDAPObject:
_object_class_by_name = None _object_class_by_name = None
_attribute_type_by_name = None _attribute_type_by_name = None
may = None may = None

12
oidc_ldap_bridge/models.py
View file

@ -9,10 +9,10 @@ from authlib.oauth2.rfc6749 import (
util, util,
) )
from flask import current_app, session from flask import current_app, session
from .ldaputils import LDAPObjectHelper from .ldaputils import LDAPObject
class User(LDAPObjectHelper): class User(LDAPObject):
id = "cn" id = "cn"
admin = False admin = False
@ -68,7 +68,7 @@ class User(LDAPObjectHelper):
return self.cn[0] return self.cn[0]
class Client(LDAPObjectHelper, ClientMixin): class Client(LDAPObject, ClientMixin):
objectClass = ["oauthClient"] objectClass = ["oauthClient"]
base = "ou=clients,ou=oauth" base = "ou=clients,ou=oauth"
id = "oauthClientID" id = "oauthClientID"
@ -137,7 +137,7 @@ class Client(LDAPObjectHelper, ClientMixin):
) )
class AuthorizationCode(LDAPObjectHelper, AuthorizationCodeMixin): class AuthorizationCode(LDAPObject, AuthorizationCodeMixin):
objectClass = ["oauthAuthorizationCode"] objectClass = ["oauthAuthorizationCode"]
base = "ou=authorizations,ou=oauth" base = "ou=authorizations,ou=oauth"
id = "oauthCode" id = "oauthCode"
@ -173,7 +173,7 @@ class AuthorizationCode(LDAPObjectHelper, AuthorizationCodeMixin):
return self.oauthCodeChallenge return self.oauthCodeChallenge
class Token(LDAPObjectHelper, TokenMixin): class Token(LDAPObject, TokenMixin):
objectClass = ["oauthToken"] objectClass = ["oauthToken"]
base = "ou=tokens,ou=oauth" base = "ou=tokens,ou=oauth"
id = "oauthAccessToken" id = "oauthAccessToken"
@ -217,7 +217,7 @@ class Token(LDAPObjectHelper, TokenMixin):
return self.expire_date >= datetime.datetime.now() return self.expire_date >= datetime.datetime.now()
class Consent(LDAPObjectHelper): class Consent(LDAPObject):
objectClass = ["oauthConsent"] objectClass = ["oauthConsent"]
base = "ou=consents,ou=oauth" base = "ou=consents,ou=oauth"
id = "cn" id = "cn"

4
tests/conftest.py
View file

@ -10,7 +10,7 @@ from flask_webtest import TestApp
from werkzeug.security import gen_salt from werkzeug.security import gen_salt
from oidc_ldap_bridge import create_app from oidc_ldap_bridge import create_app
from oidc_ldap_bridge.models import User, Client, Token, AuthorizationCode, Consent from oidc_ldap_bridge.models import User, Client, Token, AuthorizationCode, Consent
from oidc_ldap_bridge.ldaputils import LDAPObjectHelper from oidc_ldap_bridge.ldaputils import LDAPObject
class CustomSlapdObject(slapdtest.SlapdObject): class CustomSlapdObject(slapdtest.SlapdObject):
@ -85,7 +85,7 @@ def slapd_server():
+ "\n" + "\n"
) )
LDAPObjectHelper.root_dn = slapd.suffix LDAPObject.root_dn = slapd.suffix
User.base = "ou=users" User.base = "ou=users"
conn = ldap.ldapobject.SimpleLDAPObject(slapd.ldap_uri) conn = ldap.ldapobject.SimpleLDAPObject(slapd.ldap_uri)
conn.simple_bind_s(slapd.root_dn, slapd.root_pw) conn.simple_bind_s(slapd.root_dn, slapd.root_pw)