Merge pull request #1121 from haiwen/2fa

support two factor authentication

seahub/views/sysadmin.py

@@ -67,6 +67,7 @@ try:
     from seahub.settings import MULTI_TENANCY
 except ImportError:
     MULTI_TENANCY = False
+from seahub.utils.two_factor_auth import HAS_TWO_FACTOR_AUTH
 
 logger = logging.getLogger(__name__)
 
@@ -1871,7 +1872,7 @@ def sys_settings(request):
     if not dj_settings.ENABLE_SETTINGS_VIA_WEB:
         raise Http404
 
-    DIGIT_WEB_SETTINGS = (
+    DIGIT_WEB_SETTINGS = [
         'DISABLE_SYNC_WITH_ANY_FOLDER', 'ENABLE_SIGNUP',
         'ACTIVATE_AFTER_REGISTRATION', 'REGISTRATION_SEND_MAIL',
         'LOGIN_REMEMBER_DAYS', 'REPO_PASSWORD_MIN_LENGTH',
@@ -1880,7 +1881,10 @@ def sys_settings(request):
         'USER_PASSWORD_STRENGTH_LEVEL', 'SHARE_LINK_PASSWORD_MIN_LENGTH',
         'ENABLE_USER_CREATE_ORG_REPO', 'FORCE_PASSWORD_CHANGE',
         'LOGIN_ATTEMPT_LIMIT', 'FREEZE_USER_ON_LOGIN_FAILED',
-    )
+    ]
+
+    if HAS_TWO_FACTOR_AUTH:
+        DIGIT_WEB_SETTINGS.append('ENABLE_TWO_FACTOR_AUTH')
 
     STRING_WEB_SETTINGS = ('SERVICE_URL', 'FILE_SERVER_ROOT',)
 
@@ -1927,6 +1931,7 @@ def sys_settings(request):
 
     return render_to_response('sysadmin/settings.html', {
         'config_dict': config_dict,
+        'has_two_factor_auth': HAS_TWO_FACTOR_AUTH,
     }, context_instance=RequestContext(request))
 
 @login_required_ajax