[Update] Merge

apps/authentication/backends/ldap.py

@@ -16,6 +16,8 @@ class LDAPAuthorizationBackend(LDAPBackend):
     """
 
     def authenticate(self, request=None, username=None, password=None, **kwargs):
+        if not username:
+            return None
         ldap_user = LDAPUser(self, username=username.strip(), request=request)
         user = self.authenticate_ldap_user(ldap_user, password)
         return user

apps/authentication/backends/openid/models.py

@@ -39,10 +39,6 @@ class Client(object):
         self.openid_connect_client = self.new_openid_connect_client()
 
     def new_realm(self):
-        """
-        :param authentication.openid.models.Realm realm:
-        :return keycloak.realm.Realm:
-        """
         return KeycloakRealm(
             server_url=self.server_url,
             realm_name=self.realm_name,
@@ -77,7 +73,7 @@ class Client(object):
 
         :param str username: authentication username
         :param str password: authentication password
-        :return: authentication.models.OpenIDTokenProfile
+        :return: OpenIDTokenProfile
         """
         token_response = self.openid_client.token(
             username=username, password=password
@@ -94,7 +90,7 @@ class Client(object):
 
         :param str code: authentication code
         :param str redirect_uri:
-        :rtype: authentication.models.OpenIDTokenProfile
+        :rtype: OpenIDTokenProfile
         """
 
         token_response = self.openid_connect_client.authorization_code(
@@ -115,7 +111,7 @@ class Client(object):
          - refresh_expires_in
 
         :param dict token_response:
-        :rtype: authentication.openid.models.OpenIDTokenProfile
+        :rtype: OpenIDTokenProfile
         """
 
         userinfo = self.openid_connect_client.userinfo(

apps/authentication/backends/openid/views.py

@@ -26,7 +26,7 @@ __all__ = ['OpenIDLoginView', 'OpenIDLoginCompleteView']
 class OpenIDLoginView(RedirectView):
 
     def get_redirect_url(self, *args, **kwargs):
-        redirect_uri = settings.BASE_SITE_URL + settings.LOGIN_COMPLETE_URL
+        redirect_uri = settings.BASE_SITE_URL + str(settings.LOGIN_COMPLETE_URL)
         nonce = Nonce(
             redirect_uri=redirect_uri,
             next_path=self.request.GET.get('next')

apps/authentication/urls/api_urls.py

@@ -1,5 +1,6 @@
 # coding:utf-8
 #
+
 from __future__ import absolute_import
 
 from django.urls import path

apps/authentication/urls/view_urls.py

@@ -1,6 +1,8 @@
 # coding:utf-8
 #
 
+from __future__ import absolute_import
+
 from django.urls import path, include
 
 from .. import views

apps/jumpserver/settings.py

@@ -395,7 +395,7 @@ AUTH_LDAP_CONNECTION_OPTIONS = {
 }
 AUTH_LDAP_GROUP_CACHE_TIMEOUT = 1
 AUTH_LDAP_ALWAYS_UPDATE_USER = True
-AUTH_LDAP_BACKEND = 'authentication.ldap.backends.LDAPAuthorizationBackend'
+AUTH_LDAP_BACKEND = 'authentication.backends.ldap.LDAPAuthorizationBackend'
 
 if AUTH_LDAP:
     AUTHENTICATION_BACKENDS.insert(0, AUTH_LDAP_BACKEND)
@@ -421,7 +421,7 @@ if AUTH_OPENID:
 
 # Radius Auth
 AUTH_RADIUS = CONFIG.AUTH_RADIUS
-AUTH_RADIUS_BACKEND = 'authentication.radius.backends.RadiusBackend'
+AUTH_RADIUS_BACKEND = 'authentication.backends.radius.RadiusBackend'
 RADIUS_SERVER = CONFIG.RADIUS_SERVER
 RADIUS_PORT = CONFIG.RADIUS_PORT
 RADIUS_SECRET = CONFIG.RADIUS_SECRET

apps/users/templates/users/login.html

@@ -88,7 +88,7 @@
                         <div class="hr-line-dashed"></div>
                         <p class="text-muted text-center">{% trans "More login options" %}</p>
                         <div>
-                            <button type="button" class="btn btn-default btn-sm btn-block" onclick="location.href='{% url 'authentication:openid-login' %}'">
+                            <button type="button" class="btn btn-default btn-sm btn-block" onclick="location.href='{% url 'authentication:openid:openid-login' %}'">
                                 <i class="fa fa-openid"></i>
                                 {% trans 'Keycloak' %}
                             </button>