From ea48891f784062a85523a00aedc45216c7b2f839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=B4=9D=E8=B4=9D?= <beibei.wang@ivydad.com>
Date: Wed, 1 Sep 2021 17:51:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E9=94=AE=E7=BB=95=E8=BF=87=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/static/ace/ace-init.js |  2 +-
 sql/templates/sqlquery.html   | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/common/static/ace/ace-init.js b/common/static/ace/ace-init.js
index 98fb43679c..4a1c495cf6 100644
--- a/common/static/ace/ace-init.js
+++ b/common/static/ace/ace-init.js
@@ -40,7 +40,7 @@ editor.commands.addCommand({
     exec: function (editor) {
         let pathname = window.location.pathname;
         if (pathname === "/sqlquery/") {
-            sqlquery();
+            dosqlquery()
         }
     }
 });
diff --git a/sql/templates/sqlquery.html b/sql/templates/sqlquery.html
index 24d94b5246..c3d8ed431d 100644
--- a/sql/templates/sqlquery.html
+++ b/sql/templates/sqlquery.html
@@ -622,11 +622,7 @@ <h4 class="modal-title text-danger">收藏语句</h4>
 
         //先做表单验证，验证成功再成功提交查询请求
         $("#btn-sqlquery").click(function () {
-                if (sqlquery_validate()) {
-                    $('input[type=button]').addClass('disabled');
-                    $('input[type=button]').prop('disabled', true);
-                    sqlquery();
-                }
+                dosqlquery();
             }
         );
 
@@ -913,6 +909,14 @@ <h4 class="modal-title text-danger">收藏语句</h4>
                 }
             });
         }
+
+        function dosqlquery() {
+            if (sqlquery_validate()) {
+                $('input[type=button]').addClass('disabled');
+                $('input[type=button]').prop('disabled', true);
+                sqlquery();
+            }
+        }
     </script>
     <!-- common -->
     <script>

From ae54ae6f9ff264c2c3f033892ec5bf1acf276ae7 Mon Sep 17 00:00:00 2001
From: GloomyNAN <GloomyNAN@163.com>
Date: Fri, 17 Sep 2021 07:38:43 +0800
Subject: [PATCH 2/2] fix sql.trx_view and MaskingColumns column_comment
 (#1175)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix sql.trx_view

* fix MaskingColumn column_comment

* add masking.sh

Co-authored-by: 小圈圈 <rtttte@qq.com>
---
 masking.sh           | 66 ++++++++++++++++++++++++++++++++++++++++++++
 sql/admin.py         |  2 +-
 sql/db_diagnostic.py |  2 +-
 3 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100755 masking.sh

diff --git a/masking.sh b/masking.sh
new file mode 100755
index 0000000000..ab5a422089
--- /dev/null
+++ b/masking.sh
@@ -0,0 +1,66 @@
+# 脱敏字段添加过于繁琐
+# 可参考下面的脚本，定时运行即可
+
+# 脱敏规则
+# (1, '手机号'), (2, '证件号码'), (3, '银行卡'), (4, '邮箱'), (5, '金额'), (6, '其他')
+masking_rule_phone='phone|mobile'
+masking_rule_idno='id_number|idcard'
+masking_rule_bankcardno='bank_no'
+masking_rule_mail='mail|email'
+masking_rule_amount='pay_money|amount'
+masking_rule_others='pwd|password|user_pass'
+masking_rules="$masking_rule_phone|$masking_rule_idno|$masking_rule_bankcardno|$masking_rule_mail|$masking_rule_amount|$masking_rule_others";
+
+DIR="$( cd "$( dirname "$0"  )" && pwd  )"
+cd $DIR
+archery_host=127.0.0.1
+archery_port=3306 
+archery_user=
+archery_db=archery
+archery_pw=
+
+# 获取archery所有slave实例信息
+mysql -h$archery_host -P$archery_port -u$archery_user -p$archery_pw $archery_db -N -e "select 
+id,instance_name,host,port 
+from sql_instance  where type='slave';">instances.list
+
+# 清空表
+mysql -h$archery_host -P$archery_port -u$archery_user -p$archery_pw $archery_db -N -e "truncate table data_masking_columns;"
+
+# 临时账号密码（因实例账号&密码为加密，写死使用）
+# 此方式只适用单个实例或多个实例账号密码一致
+user=
+pw=
+
+# 获取脱敏字段信息
+cat instances.list|while read instance_name host port 
+do 
+mysql -h$host -P$port -u$user -p$pw -N -e "
+SELECT CASE
+         WHEN COLUMN_NAME REGEXP '$masking_rule_phone'
+           THEN 1
+         WHEN COLUMN_NAME REGEXP '$masking_rule_idno'
+           THEN 2
+         WHEN COLUMN_NAME REGEXP '$masking_rule_bankcardno'
+           THEN 3
+         WHEN COLUMN_NAME REGEXP '$masking_rule_mail'
+           THEN 4
+         WHEN COLUMN_NAME REGEXP '$masking_rule_amount'
+           THEN 5
+         WHEN COLUMN_NAME REGEXP '$masking_rule_others'
+           THEN 6
+         END AS       rule_type,
+       1     AS       active,
+       '$instance_id' instance_id,
+       TABLE_SCHEMA   table_schema,
+       TABLE_NAME     table_name,
+       COLUMN_NAME    column_name,
+       COLUMN_COMMENT column_comment
+FROM information_schema.COLUMNS
+WHERE COLUMN_NAME REGEXP '$masking_rules'
+AND TABLE_SCHEMA != 'performance_schema'
+AND TABLE_SCHEMA != 'information_schema';">$instance_name.txt
+
+# 更新表数据
+mysql -h$archery_host -P$archery_port -u$archery_user -p$archery_pw $archery_db -N -e "load data local infile '$instance_name.txt' replace into table data_masking_columns fields terminated by '\t' ( rule_type,active,instance_id,table_schema,table_name,column_name,column_comment);"
+done
\ No newline at end of file
diff --git a/sql/admin.py b/sql/admin.py
index 33355722b8..c0d38df333 100755
--- a/sql/admin.py
+++ b/sql/admin.py
@@ -151,7 +151,7 @@ class QueryPrivilegesApplyAdmin(admin.ModelAdmin):
 @admin.register(DataMaskingColumns)
 class DataMaskingColumnsAdmin(admin.ModelAdmin):
     list_display = (
-        'column_id', 'rule_type', 'active', 'instance', 'table_schema', 'table_name', 'column_name',
+        'column_id', 'rule_type', 'active', 'instance', 'table_schema', 'table_name', 'column_name', 'column_comment',
         'create_time',)
     search_fields = ['table_name', 'column_name']
     list_filter = ('rule_type', 'active', 'instance__instance_name')
diff --git a/sql/db_diagnostic.py b/sql/db_diagnostic.py
index 578d881376..a09a617013 100644
--- a/sql/db_diagnostic.py
+++ b/sql/db_diagnostic.py
@@ -277,7 +277,7 @@ def innodb_trx(request):
     ON trx.trx_mysql_thread_id = p.id
     WHERE trx.trx_state = 'RUNNING'
     AND p.COMMAND = 'Sleep'
-    AND P.time > 3
+    AND p.time > 3
     ORDER BY trx.trx_started ASC;'''
 
     query_result = query_engine.query('information_schema', sql)