fix: replace tcs.sibcem.ru with sibcem.ru in AD user lookup
This commit is contained in:
+10
-5
@@ -24,23 +24,28 @@ router = Router()
|
|||||||
def _get_user_cn(user_id: str) -> str:
|
def _get_user_cn(user_id: str) -> str:
|
||||||
"""
|
"""
|
||||||
Получить CN пользователя из AD по его user_id (email или логин).
|
Получить CN пользователя из AD по его user_id (email или логин).
|
||||||
user_id из TrueConf — это обычно email, например 'ds.krivochenko@sibcem.ru'
|
user_id из TrueConf — это обычно email, например 'ds.krivochenko@tcs.sibcem.ru'
|
||||||
|
Заменяет tcs.sibcem.ru на sibcem.ru для поиска в AD.
|
||||||
"""
|
"""
|
||||||
from ldap3 import Server, Connection, ALL
|
from ldap3 import Server, Connection, ALL
|
||||||
from config.config import AD_SERVER, AD_USER, AD_PASSWORD, AD_BASE
|
from config.config import AD_SERVER, AD_USER, AD_PASSWORD, AD_BASE
|
||||||
from ldap3.utils.conv import escape_filter_chars
|
from ldap3.utils.conv import escape_filter_chars
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
# Заменяем tcs.sibcem.ru на sibcem.ru
|
||||||
|
search_id = user_id.replace("@tcs.sibcem.ru", "@sibcem.ru")
|
||||||
|
short_username = search_id.split("@")[0] if "@" in search_id else search_id
|
||||||
|
safe_id = escape_filter_chars(search_id)
|
||||||
|
safe_short = escape_filter_chars(short_username)
|
||||||
|
|
||||||
server = Server(AD_SERVER, get_info=ALL)
|
server = Server(AD_SERVER, get_info=ALL)
|
||||||
conn = Connection(server, user=AD_USER, password=AD_PASSWORD, auto_bind=True)
|
conn = Connection(server, user=AD_USER, password=AD_PASSWORD, auto_bind=True)
|
||||||
safe_id = escape_filter_chars(user_id)
|
|
||||||
short_username = user_id.split('@')[0] if '@' in user_id else user_id
|
|
||||||
search_filter = (
|
search_filter = (
|
||||||
f"(&(objectClass=user)(|"
|
f"(&(objectClass=user)(|"
|
||||||
f"(mail={safe_id})"
|
f"(mail={safe_id})"
|
||||||
f"(userPrincipalName={safe_id})"
|
f"(userPrincipalName={safe_id})"
|
||||||
f"(userPrincipalName={escape_filter_chars(f'{short_username}@sibcem.ru')}))"
|
f"(sAMAccountName={safe_short}))"
|
||||||
f"(sAMAccountName={escape_filter_chars(short_username)})))"
|
f"))"
|
||||||
)
|
)
|
||||||
conn.search(AD_BASE, search_filter, attributes=["cn", "sAMAccountName"])
|
conn.search(AD_BASE, search_filter, attributes=["cn", "sAMAccountName"])
|
||||||
if conn.entries:
|
if conn.entries:
|
||||||
|
|||||||
Reference in New Issue
Block a user