瀏覽代碼

HUE-8737 [py3] Make liboauth modules optional

Romain 5 年之前
父節點
當前提交
b3414b1b7e
共有 2 個文件被更改,包括 10 次插入8 次删除
  1. 2 3
      apps/useradmin/src/useradmin/views.py
  2. 8 5
      desktop/libs/liboauth/src/liboauth/backend.py

+ 2 - 3
apps/useradmin/src/useradmin/views.py

@@ -24,6 +24,8 @@ import subprocess
 import sys
 import json
 
+LOG = logging.getLogger(__name__)
+
 from axes.decorators import FAILURE_LIMIT, LOCK_OUT_AT_FAILURE
 from axes.models import AccessAttempt
 from axes.utils import reset
@@ -65,9 +67,6 @@ else:
   from useradmin.forms import UserChangeForm, SuperUserChangeForm
 
 
-LOG = logging.getLogger(__name__)
-
-
 def is_ldap_setup():
   return bool(LDAP.LDAP_SERVERS.get()) or LDAP.LDAP_URL.get() is not None
 

+ 8 - 5
desktop/libs/liboauth/src/liboauth/backend.py

@@ -20,12 +20,13 @@ See desktop/auth/backend.py
 
 from future import standard_library
 standard_library.install_aliases()
-import httplib2
 import json
 import cgi
 import logging
 import sys
 
+LOG = logging.getLogger(__name__)
+
 from django.utils.translation import ugettext as _
 
 from desktop.auth.backend import force_username_case, DesktopBackendBase
@@ -35,9 +36,14 @@ from useradmin.models import get_profile, get_default_user_group, UserProfile, U
 import liboauth.conf
 import liboauth.metrics
 
+try:
+  import httplib2
+except ImportError:
+  LOG.warn('httplib2 module not found')
 try:
   import oauth2 as oauth
-except:
+except ImportError:
+  LOG.warn('oauth2 module not found')
   oauth = None
 
 if sys.version_info[0] > 2:
@@ -46,9 +52,6 @@ else:
   from urllib import urlencode as lib_urlencode
 
 
-LOG = logging.getLogger(__name__)
-
-
 class OAuthBackend(DesktopBackendBase):
 
   @liboauth.metrics.oauth_authentication_time