fix: 修复默认 gcm key padding

Dockerfile

@@ -17,6 +17,7 @@ ARG DEPENDENCIES="                    \
     libxmlsec1-dev                    \
     libxmlsec1-openssl                \
     libaio-dev                        \
+    openssh-client                    \
     sshpass"
 
 ARG TOOLS="                           \

apps/authentication/templates/authentication/login_wait_confirm.html

@@ -79,6 +79,9 @@ function doRequestAuth() {
      requestApi({
         url: url,
         method: "GET",
+        headers: {
+            "X-JMS-LOGIN-TYPE": "W"
+        },
         success: function (data) {
             if (!data.error && data.msg === 'ok') {
                 window.onbeforeunload = function(){};
@@ -98,9 +101,6 @@ function doRequestAuth() {
         },
         error: function (text, data) {
         },
-        beforeSend: function(request) {
-            request.setRequestHeader("X-JMS-LOGIN-TYPE", "W");
-        },
         flash_message: false, // 是否显示flash消息
     })
 }

apps/common/utils/crypto.py

@@ -4,6 +4,7 @@ import re
 from Cryptodome.Cipher import AES, PKCS1_v1_5
 from Cryptodome.Random import get_random_bytes
 from Cryptodome.PublicKey import RSA
+from Cryptodome.Util.Padding import pad
 from Cryptodome import Random
 from gmssl.sm4 import CryptSM4, SM4_ENCRYPT, SM4_DECRYPT
 
@@ -107,7 +108,15 @@ class AESCryptoGCM:
     """
 
     def __init__(self, key):
-        self.key = padding_key(key)
+        self.key = self.process_key(key)
+
+    @staticmethod
+    def process_key(key):
+        if not isinstance(key, bytes):
+            key = bytes(key, encoding='utf-8')
+        if len(key) >= 32:
+            return key[:32]
+        return pad(key, 32)
 
     def encrypt(self, text):
         """

apps/static/js/jumpserver.js

@@ -270,13 +270,13 @@ function requestApi(props) {
     if (typeof(dataBody) === "object") {
         dataBody = JSON.stringify(dataBody)
     }
-    var beforeSend = props.beforeSend || function (request) {}
+    var headers = props.headers || {}
 
     $.ajax({
         url: props.url,
         type: props.method || "PATCH",
+        headers: headers,
         data: dataBody,
-        beforeSend: beforeSend,
         contentType: props.content_type || "application/json; charset=utf-8",
         dataType: props.data_type || "json"
     }).done(function (data, textStatue, jqXHR) {

requirements/deb_pkg.sh

@@ -2,4 +2,4 @@
 apt install \
     g++ make iputils-ping default-libmysqlclient-dev libpq-dev \
     libffi-dev libldap2-dev libsasl2-dev sshpass pkg-config libxml2-dev \
-    libxmlsec1-dev libxmlsec1-openssl libaio-dev freetds-dev
+    libxmlsec1-dev libxmlsec1-openssl libaio-dev openssh-client freetds-dev

requirements/rpm_pkg.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 yum -y install \
-    gcc-c++ sshpass mariadb-devel openldap-devel libxml2-devel \
+    gcc-c++ sshpass mariadb-devel openldap-devel openssh-clients libxml2-devel \
     xmlsec1-devel xmlsec1-openssl-devel libtool-ltdl-devel \
     postgresql-devel