Sfoglia il codice sorgente

Merge pull request #7928 from kkthxbye-code/fix-7751

Fix #7751: LDAP: Only get API user from ldap when FIND_GROUP_PERMS is on
Jeremy Stretch 4 anni fa
parent
commit
d5f308d9c9
1 ha cambiato i file con 7 aggiunte e 4 eliminazioni
  1. 7 4
      netbox/netbox/api/authentication.py

+ 7 - 4
netbox/netbox/api/authentication.py

@@ -29,10 +29,13 @@ class TokenAuthentication(authentication.TokenAuthentication):
         if settings.REMOTE_AUTH_BACKEND == 'netbox.authentication.LDAPBackend':
         if settings.REMOTE_AUTH_BACKEND == 'netbox.authentication.LDAPBackend':
             from netbox.authentication import LDAPBackend
             from netbox.authentication import LDAPBackend
             ldap_backend = LDAPBackend()
             ldap_backend = LDAPBackend()
-            user = ldap_backend.populate_user(token.user.username)
-            # If the user is found in the LDAP directory use it, if not fallback to the local user
-            if user:
-                return user, token
+
+            # Load from LDAP if FIND_GROUP_PERMS is active
+            if ldap_backend.settings.FIND_GROUP_PERMS:
+                user = ldap_backend.populate_user(token.user.username)
+                # If the user is found in the LDAP directory use it, if not fallback to the local user
+                if user:
+                    return user, token
 
 
         return token.user, token
         return token.user, token