Merge branch 'main' of github.com:drycc/passport into main

lijianguo · lijianguo · commit 55165aae4fdc · 2021-09-06T15:14:15.000+08:00
diff --git a/charts/passport/values.yaml b/charts/passport/values.yaml
@@ -12,6 +12,10 @@ database_url: ""
 # can be specified as key-value pairs under environment
 # this is usually a non required setting.
 environment:
+## General settings
+#  DRYCC_DEBUG: False
+#  ADMIN_ENABLED: False
+#  REGISTRATION_ENABLED: False
 ## LDAP setting
 #  LDAP_ENDPOINT: ""
 #  LDAP_BIND_DN: ""
@@ -37,7 +41,6 @@ environment:
 #  EMAIL_HOST_PASSWORD: ""
 #  EMAIL_USE_TLS: ""
 #  EMAIL_USE_SSL: ""
-#  DEFAULT_FROM_EMAIL: ""
 # Used to create Django admin users
 admin_username: "admin"
 admin_password: "admin"
diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile
@@ -6,7 +6,6 @@ WORKDIR /app
 RUN npm install \
   && yarn build
 
-
 FROM docker.io/library/python:3.9-alpine
 
 COPY requirements.txt /app/requirements.txt
@@ -20,12 +19,14 @@ RUN apk add --update --virtual .build-deps \
     openssl-dev \
     cargo \
     rust \
+  && python3 -m venv /app/.venv \
+  && source /app/.venv/bin/activate \
   && pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \
   && runDeps="$( \
-    scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
+    scanelf --needed --nobanner --format '%n#p' --recursive /app/.venv \
     | tr ',' '\n' \
     | sort -u \
-    | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+    | awk 'system("[ -e /app/.venv/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
     )" \
   && apk add --update --virtual .passport-rundeps \
     $runDeps \
@@ -38,6 +39,7 @@ RUN apk add --update --virtual .build-deps \
 COPY . /app
 COPY --from=build-app /app/dist /app/web/dist
 
+ENV PATH /app/.venv/bin:/app/bin:$PATH
 WORKDIR /app
 CMD ["/app/bin/boot"]
 EXPOSE 8000
diff --git a/rootfs/Dockerfile.test b/rootfs/Dockerfile.test
@@ -4,6 +4,9 @@ COPY requirements.txt /app/requirements.txt
 COPY dev_requirements.txt /app/dev_requirements.txt
 
 ENV PGDATA /var/lib/postgresql/12
+
+ENV PATH="/app/.venv/bin:${PATH}"
+
 RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories \
   && apk add --update --virtual .build-deps \
     postgresql-dev \
@@ -14,13 +17,15 @@ RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositor
     openssl-dev \
     cargo \
     rust \
+  && python3 -m venv /app/.venv \
+  && source /app/.venv/bin/activate \
   && pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \
   && pip3 install --disable-pip-version-check --no-cache-dir -r /app/dev_requirements.txt \
   && runDeps="$( \
-    scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
+    scanelf --needed --nobanner --format '%n#p' --recursive /app/.venv \
     | tr ',' '\n' \
     | sort -u \
-    | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
+    | awk 'system("[ -e /app/.venv/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
     )" \
   && apk add --update --virtual .passport-rundeps \
     $runDeps \
@@ -39,6 +44,7 @@ RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositor
 
 COPY . /app
 
+ENV PATH /app/.venv/bin:/app/bin:$PATH
 WORKDIR /app
 CMD ["/app/bin/boot"]
 EXPOSE 8000
diff --git a/rootfs/api/serializers.py b/rootfs/api/serializers.py
@@ -17,7 +17,7 @@
 logger = logging.getLogger(__name__)
 
 
-class RegisterForm(UserCreationForm):
+class RegistrationForm(UserCreationForm):
     class Meta(UserCreationForm.Meta):
         model = User
         fields = ('username', 'email', 'password1', 'password2')
diff --git a/rootfs/api/settings/production.py b/rootfs/api/settings/production.py
@@ -14,14 +14,17 @@
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = bool(os.environ.get('DRYCC_DEBUG', True))
+DEBUG = bool(os.environ.get('DRYCC_DEBUG', False))
 
 # If set to True, Django's normal exception handling of view functions
 # will be suppressed, and exceptions will propagate upwards
 # https://docs.djangoproject.com/en/2.2/ref/settings/#debug-propagate-exceptions
 DEBUG_PROPAGATE_EXCEPTIONS = True
 # Enable Django admin
 ADMIN_ENABLED = bool(os.environ.get('ADMIN_ENABLED', False))
+# Enable Registration
+# If this function is enabled, please set Django email related parameters
+REGISTRATION_ENABLED = bool(os.environ.get('REGISTRATION_ENABLED', False))
 # Silence two security messages around SSL as router takes care of them
 # https://docs.djangoproject.com/en/2.2/ref/checks/#security
 SILENCED_SYSTEM_CHECKS = [
@@ -91,6 +94,7 @@
 
 INSTALLED_APPS = (
     'whitenoise.runserver_nostatic',
+    'django.contrib.staticfiles',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
diff --git a/rootfs/api/static/css/main.css b/rootfs/api/static/css/main.css
@@ -36,8 +36,6 @@ h1.logo a {
     height: 98px;
     width: 69px;
     overflow: hidden;
-    /*登录页logo图标*/
-    /*background: url(../logo-vertical.png);*/
     background-repeat: no-repeat
 }
 
diff --git a/rootfs/api/templates/oauth2_provider/authorize.html b/rootfs/api/templates/oauth2_provider/authorize.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% load static %}
-<link rel="stylesheet" href="{% static 'css/user.css' %}" type="text/css">
+<link rel="stylesheet" href="{% static 'css/main.css' %}" type="text/css">
 <head>
     <meta charset="UTF-8">
     <title>Change Password</title>
diff --git a/rootfs/api/templates/user/account_activation_fail.html b/rootfs/api/templates/user/account_activation_fail.html
@@ -1,5 +1,5 @@
 {% extends 'user/message.html' %}
 {% block title %}Account activite fail{% endblock %}
 {% block message %}
-The confirmation link was invalid, possibly it has already been used, go back <a href="/user/register/">register</a>
+The confirmation link was invalid, possibly it has already been used, go back <a href="/user/registration/">Sign Up</a>
 {% endblock %}
diff --git a/rootfs/api/templates/user/login.html b/rootfs/api/templates/user/login.html
@@ -1,6 +1,6 @@
 {% load static %}
 
-<link rel="stylesheet" href="{% static 'css/user.css' %}" type="text/css">
+<link rel="stylesheet" href="{% static 'css/main.css' %}" type="text/css">
 <head>
     <meta charset="UTF-8">
     <title>Login</title>
@@ -26,7 +26,7 @@ <h2 class="h3">Log in to your account</h2>
                 <button class="btn btn-primary btn-lg btn-block" name="commit" type="submit">Log In</button>
                 <input type="hidden" name="next" value={{ next }}>
             </form>
-            <a class="panel-footer" href="/user/register/"><span>Sign Up</span></a>
+            <a class="panel-footer" href="/user/registration/"><span>Sign Up</span></a>
         </div>
         <a href="/user/password_reset/" class="white-link">Forgot your password?</a>
     </div>
diff --git a/rootfs/api/templates/user/message.html b/rootfs/api/templates/user/message.html
@@ -1,6 +1,6 @@
 {% load static %}
 
-<link rel="stylesheet" href="{% static 'css/user.css' %}" type="text/css">
+<link rel="stylesheet" href="{% static 'css/main.css' %}" type="text/css">
 
 <head>
     <meta charset="UTF-8">
diff --git a/rootfs/api/templates/user/password_reset_confirm.html b/rootfs/api/templates/user/password_reset_confirm.html
@@ -1,6 +1,6 @@
 {% load static %}
 
-<link rel="stylesheet" href="{% static 'css/user.css' %}" type="text/css">
+<link rel="stylesheet" href="{% static 'css/main.css' %}" type="text/css">
 <head>
     <meta charset="UTF-8">
     <title>Reset Password</title>
diff --git a/rootfs/api/templates/user/password_reset_form.html b/rootfs/api/templates/user/password_reset_form.html
@@ -1,5 +1,5 @@
 {% load static %}
-<link rel="stylesheet" href="{% static 'css/user.css' %}" type="text/css">
+<link rel="stylesheet" href="{% static 'css/main.css' %}" type="text/css">
 <head>
     <meta charset="UTF-8">
     <title>Reset Password</title>
diff --git a/rootfs/api/templates/user/registration.html b/rootfs/api/templates/user/registration.html
@@ -1,6 +1,6 @@
 {% load static %}
 
-<link rel="stylesheet" href="{% static 'css/user.css' %}" type="text/css">
+<link rel="stylesheet" href="{% static 'css/main.css' %}" type="text/css">
 
 <head>
     <meta charset="UTF-8">
@@ -10,7 +10,7 @@
 <div class="page-wrap gradient-primary">
     <div class="container">
         <div class="panel">
-            <h2 class="h3">Register</h2>
+            <h2 class="h3">Registration</h2>
             <form method="post">
                 {% csrf_token %}
                 <div class="form-group">
diff --git a/rootfs/api/templates/user/registration_disable.html b/rootfs/api/templates/user/registration_disable.html
@@ -0,0 +1,5 @@
+{% extends 'user/message.html' %}
+{% block title %}Registration fail{% endblock %}
+{% block message %}
+The registration function of drycc passport is not enabled. Please contact the administrator to sign up.
+{% endblock %}
diff --git a/rootfs/api/templates/user/registration_done.html b/rootfs/api/templates/user/registration_done.html
@@ -1,5 +1,5 @@
 {% extends 'user/message.html' %}
-{% block title %}Register successful{% endblock %}
+{% block title %}Registration successful{% endblock %}
 {% block message %}
 We have sent an email to your mailbox, please log in the email to activate your account.
 {% endblock %}
diff --git a/rootfs/api/urls.py b/rootfs/api/urls.py
@@ -3,7 +3,7 @@
 from rest_framework.routers import DefaultRouter
 
 from api import views
-from api.views import RegisterView, ActivateAccount, RegisterDoneView, \
+from api.views import RegistrationView, ActivateAccount, RegistrationDoneView, \
     ActivateAccountDoneView, ActivateAccountFailView, LoginDoneView
 
 router = DefaultRouter(trailing_slash=False)
@@ -12,11 +12,11 @@
     re_path(r'^', include(router.urls)),
     re_path(r'^info/?$',
             views.UserDetailView.as_view({'get': 'retrieve', 'put': 'update'})),
-    re_path(r'register/?$', RegisterView.as_view(), name='register'),
+    re_path(r'registration/?$', RegistrationView.as_view(), name='registration'),
     re_path(r'activate/(?P<uidb64>.+)/(?P<token>.+)/?$',
             ActivateAccount.as_view(), name='user_activate_account'),
-    re_path(r'register/done/?$', RegisterDoneView.as_view(),
-            name='user_register_done'),
+    re_path(r'registration/done/?$', RegistrationDoneView.as_view(),
+            name='user_registration_done'),
     re_path(r'activate/done/?$', ActivateAccountDoneView.as_view(),
             name='user_activate_account_done'),
     re_path(r'activate/fail/?$', ActivateAccountFailView.as_view(),
diff --git a/rootfs/api/views.py b/rootfs/api/views.py
@@ -6,7 +6,7 @@
 from django.contrib.auth.models import User
 from django.contrib.auth import views
 from django.db.models import Q
-from django.shortcuts import redirect, get_object_or_404
+from django.shortcuts import redirect, get_object_or_404, render
 from django.template.loader import render_to_string
 from django.http import HttpResponse
 from django.utils.encoding import force_bytes, force_text
@@ -23,7 +23,7 @@
 
 from api import serializers
 from api.exceptions import ServiceUnavailable, DryccException
-from api.serializers import RegisterForm
+from api.serializers import RegistrationForm
 from api.utils import account_activation_token, get_local_host
 from api.viewset import NormalUserViewSet
 
@@ -60,15 +60,19 @@ def get(self, request):
     head = get
 
 
-class RegisterView(CreateView):
-    form_class = RegisterForm
-    template_name = 'user/register.html'
-    success_url = reverse_lazy('register_done')
+class RegistrationView(CreateView):
+    form_class = RegistrationForm
+    template_name = 'user/registration.html'
+    success_url = reverse_lazy('registration_done')
+
+    def get(self, request, *args, **kwargs):
+        if settings.LDAP_ENDPOINT or not settings.REGISTRATION_ENABLED:
+            return render(request, template_name='user/registration_disable.html')
+        return CreateView.get(self, request, *args, **kwargs)
 
     def post(self, request, *args, **kwargs):
-        if settings.LDAP_ENDPOINT:
-            raise DryccException(
-                "You cannot register user when ldap is enabled.")
+        if settings.LDAP_ENDPOINT or not settings.REGISTRATION_ENABLED:
+            return render(request, template_name='user/registration_disable.html')
         form = self.form_class(request.POST)
         self.object = None
         if form.is_valid():
@@ -93,8 +97,8 @@ def post(self, request, *args, **kwargs):
             return self.form_invalid(form)
 
 
-class RegisterDoneView(TemplateView):
-    template_name = 'user/register_done.html'
+class RegistrationDoneView(TemplateView):
+    template_name = 'user/registration_done.html'
     title = _('Activate email sent')
 
 
diff --git a/rootfs/bin/boot b/rootfs/bin/boot
@@ -27,6 +27,10 @@ echo ""
 echo "Database Migrations:"
 python /app/manage.py migrate --noinput
 
+echo ""
+echo "Collect static files in a single location:"
+python manage.py collectstatic --noinput
+
 echo ""
 if [ "${ADMIN_USERNAME}" ] && [ "${ADMIN_PASSWORD}" ] && [ "${ADMIN_EMAIL}" ]; then
   echo "Create administrator"

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ h1.logo a {`
`36`	`36`	`height: 98px;`
`37`	`37`	`width: 69px;`
`38`	`38`	`overflow: hidden;`
`39`		`- /登录页logo图标/`
`40`		`- /background: url(../logo-vertical.png);/`
`41`	`39`	`background-repeat: no-repeat`
`42`	`40`	`}`
`43`	`41`