chore(passport): modify web stylesheet

Author: lijianguo

charts/passport/values.yaml

@@ -12,7 +12,6 @@ database_url: ""
 # can be specified as key-value pairs under environment
 # this is usually a non required setting.
 environment:
-  RESERVED_NAMES: "drycc, drycc-builder, drycc-monitor-grafana"
 ## LDAP setting
 #  LDAP_ENDPOINT: ""
 #  LDAP_BIND_DN: ""

rootfs/api/serializers.py

@@ -3,13 +3,14 @@
 """
 import logging
 
-from django.contrib.auth.models import User
 from django.contrib.admin.models import LogEntry
 from django.contrib.auth.forms import UserCreationForm
-from rest_framework import serializers
-from oauth2_provider.oauth2_validators import OAuth2Validator
+from django.contrib.auth.models import User
 from oauth2_provider.models import Grant, AccessToken
+from oauth2_provider.oauth2_validators import OAuth2Validator
+from rest_framework import serializers
 
+from api.exceptions import DryccException
 from api.utils import timestamp2datetime
 
 logger = logging.getLogger(__name__)
@@ -32,6 +33,10 @@ class Meta:
 
     def update(self, instance, validated_data):
         if validated_data.get('username'):
+            qs = User.objects.filter(username=validated_data.get('username')).\
+                exclude(username=instance.username)
+            if qs:
+                raise DryccException("new username already exists.")
             instance.username = validated_data.get('username')
         if validated_data.get('email'):
             instance.email = validated_data.get('email')

rootfs/api/settings/production.py

@@ -7,7 +7,6 @@
 https://docs.djangoproject.com/en/2.2/ref/settings/
 """
 import os.path
-import tempfile
 import ldap
 import dj_database_url
 
@@ -103,7 +102,6 @@
     'guardian',
     'gunicorn',
     'rest_framework',
-    'rest_framework.authtoken',
     'oauth2_provider',
     # passport apps
     'api'
@@ -149,13 +147,12 @@
 )
 
 X_FRAME_OPTIONS = 'DENY'
-# todo debug oauth2
-# CSRF_COOKIE_SECURE = True
 CSRF_COOKIE_HTTPONLY = False
 CSRF_COOKIE_SAMESITE = None
-# SESSION_COOKIE_SECURE = True
 SECURE_CONTENT_TYPE_NOSNIFF = True
 SECURE_BROWSER_XSS_FILTER = True
+CSRF_COOKIE_SECURE = bool(os.environ.get('CSRF_COOKIE_SECURE', False))
+SESSION_COOKIE_SECURE = bool(os.environ.get('SESSION_COOKIE_SECURE', False))
 
 # Honor HTTPS from a trusted proxy
 # see https://docs.djangoproject.com/en/2.2/ref/settings/#secure-proxy-ssl-header
@@ -249,16 +246,6 @@
         },
     }
 }
-# TEST_RUNNER = 'api.tests.SilentDjangoTestSuiteRunner'
-
-# default drycc passport settings
-LOG_LINES = 100
-TEMPDIR = tempfile.mkdtemp(prefix='drycc')
-
-# names which apps cannot reserve for routing
-DRYCC_RESERVED_NAMES = os.environ.get('RESERVED_NAMES', '').\
-    replace(' ', '').split(',')
-
 # security keys and auth tokens
 random_secret = ')u_jckp95wule8#wxd8sm!0tj2j&aveozu!nnpgl)2x&&16gfj'
 SECRET_KEY = os.environ.get('DRYCC_SECRET_KEY', random_secret)
@@ -270,23 +257,6 @@
                                       conn_max_age=600)
 }
 
-# Redis Configuration
-DRYCC_REDIS_ADDRS = os.environ.get('DRYCC_REDIS_ADDRS', '127.0.0.1:6379').split(
-    ",")
-DRYCC_REDIS_PASSWORD = os.environ.get('DRYCC_REDIS_PASSWORD', '')
-
-# Cache Configuration
-CACHES = {
-    "default": {
-        "BACKEND": "django_redis.cache.RedisCache",
-        "LOCATION": ['redis://:{}@{}'.format(DRYCC_REDIS_PASSWORD, DRYCC_REDIS_ADDR) \
-                     for DRYCC_REDIS_ADDR in DRYCC_REDIS_ADDRS],  # noqa
-        "OPTIONS": {
-            "CLIENT_CLASS": "django_redis.client.ShardClient",
-        }
-    }
-}
-
 # LDAP settings taken from environment variables.
 LDAP_ENDPOINT = os.environ.get('LDAP_ENDPOINT', '')
 LDAP_BIND_DN = os.environ.get('LDAP_BIND_DN', '')

rootfs/api/templates/user/password_change_done.html

@@ -32,12 +32,6 @@
     re_path(r'reset/done/?$',
             views.UserPasswordResetCompleteView.as_view(),
             name='user_password_reset_complete'),
-    re_path(r'password_change/?$', views.UserPasswordChangeView.as_view(),
-            name='user_password_change'),
-    re_path(r'password_change/done/?$',
-            views.UserPasswordchangeDoneView.as_view(),
-            name='user_password_change_done'),
-
     re_path(r'login/?$', views.UserLoginView.as_view(), name='user_login'),
     re_path(r'login/done/?$', LoginDoneView.as_view(), name='login_done'),
     re_path(r'logout/?$', views.UserLogoutView.as_view(), name='user_logout'),

rootfs/api/templates/user/password_change_form.html

@@ -182,15 +182,6 @@ class UserPasswordResetCompleteView(views.PasswordResetCompleteView):
     template_name = 'user/password_reset_complete.html'
 
 
-class UserPasswordChangeView(views.PasswordChangeView):
-    success_url = reverse_lazy('user_password_change_done')
-    template_name = 'user/password_change_form.html'
-
-
-class UserPasswordchangeDoneView(views.PasswordChangeDoneView):
-    template_name = 'user/password_change_done.html'
-
-
 class UserLogoutView(views.LogoutView):
     template_name = 'user/logout.html'