mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	Earlier the behavior was to raise an exception thereby stopping the whole sync. Now we log an error message and skip the field. Also fixes the `query_ldap` command to report missing fields without error. Fixes: #11780.
		
			
				
	
	
		
			35 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			35 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
 | 
						|
from argparse import ArgumentParser
 | 
						|
from typing import Any
 | 
						|
 | 
						|
from django.conf import settings
 | 
						|
from django.contrib.auth import get_backends
 | 
						|
from django.core.management.base import BaseCommand
 | 
						|
from django_auth_ldap.backend import LDAPBackend, _LDAPUser
 | 
						|
 | 
						|
# Quick tool to test whether you're correctly authenticating to LDAP
 | 
						|
def query_ldap(**options: str) -> None:
 | 
						|
    email = options['email']
 | 
						|
    for backend in get_backends():
 | 
						|
        if isinstance(backend, LDAPBackend):
 | 
						|
            ldap_attrs = _LDAPUser(backend, backend.django_to_ldap_username(email)).attrs
 | 
						|
            if ldap_attrs is None:
 | 
						|
                print("No such user found")
 | 
						|
            else:
 | 
						|
                for django_field, ldap_field in settings.AUTH_LDAP_USER_ATTR_MAP.items():
 | 
						|
                    value = ldap_attrs.get(ldap_field, ["LDAP field not present", ])[0]
 | 
						|
                    if django_field == "avatar":
 | 
						|
                        if isinstance(value, bytes):
 | 
						|
                            value = "(An avatar image file)"
 | 
						|
                    print("%s: %s" % (django_field, value))
 | 
						|
                if settings.LDAP_EMAIL_ATTR is not None:
 | 
						|
                    print("%s: %s" % ('email', ldap_attrs[settings.LDAP_EMAIL_ATTR]))
 | 
						|
 | 
						|
class Command(BaseCommand):
 | 
						|
    def add_arguments(self, parser: ArgumentParser) -> None:
 | 
						|
        parser.add_argument('email', metavar='<email>', type=str,
 | 
						|
                            help="email of user to query")
 | 
						|
 | 
						|
    def handle(self, *args: Any, **options: str) -> None:
 | 
						|
        query_ldap(**options)
 |