perf: add dbeaver-patch version

v4.4.0

Dockerfile

@@ -24,6 +24,7 @@ ENV LANG=en_US.UTF-8 \
     PATH=/opt/py3/bin:$PATH
 
 ARG DEPENDENCIES="                    \
+        libldap2-dev                  \
         libx11-dev"
 
 ARG TOOLS="                           \

apps/authentication/templates/authentication/face_capture.html

@@ -85,7 +85,7 @@
             }
 
             $('#retry_button').on('click', function () {
-                window.location.href = "{% url 'authentication:login-face-capture' %}";
+                window.location.href = "{{ request.get_full_path }}";
             });
         });
     </script>

apps/common/utils/common.py

@@ -158,7 +158,10 @@ def is_uuid(seq):
 def get_request_ip(request):
     x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR', '').split(',')
     if x_forwarded_for and x_forwarded_for[0]:
-        login_ip = x_forwarded_for[0].split(":")[0]
+        login_ip = x_forwarded_for[0]
+        if login_ip.count(':') == 1:
+            # format: ipv4:port (非标准格式的 X-Forwarded-For)
+            login_ip = login_ip.split(":")[0]
         return login_ip
 
     login_ip = request.META.get('REMOTE_ADDR', '')

apps/terminal/applets/dbeaver/patch.yml

@@ -1,5 +1,5 @@
 type: msi # exe, zip, manual, msi
-source: jms:///download/applets/dbeaver-patch.msi
+source: jms:///download/applets/dbeaver-patch-22.3.4-x86_64-setup.msi
 arguments:
   - /quiet
 destination:

apps/users/views/profile/face.py

@@ -27,24 +27,31 @@ class UserFaceCaptureView(AuthMixin, FormView):
         return super().form_valid(form)
 
     def get_context_data(self, **kwargs):
-        context = super().get_context_data()
+        context = super().get_context_data(**kwargs)
 
-        if not self.get_form().is_bound:
+        if 'form' not in kwargs:
+            form = self.get_form()
+            context['form'] = form
+
+        if not context['form'].is_bound:
             context.update({
                 "active": True,
             })
 
-        kwargs.update(context)
-        return kwargs
+        return context
 
 
-class UserFaceEnableView(UserFaceCaptureView, MFAFaceMixin):
+class UserFaceEnableView(MFAFaceMixin, UserFaceCaptureView):
     def form_valid(self, form):
-        code = self.get_face_code()
 
+        try:
+            code = self.get_face_code()
             user = self.get_user_from_session()
             user.face_vector = code
             user.save(update_fields=['face_vector'])
+        except Exception as e:
+            form.add_error("code", str(e))
+            return super().form_invalid(form)
 
         auth_logout(self.request)
         return super().form_valid(form)