Skip to content

Commit

Permalink
移除对 Inception 的审核支持，仅作为脱敏语句解析使用
Browse files Browse the repository at this point in the history
  • Loading branch information
@hhyo
hhyo committed Nov 29, 2020
1 parent e45f1ce commit dd143e4
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 116 deletions.
22 changes: 1 addition & 21 deletions common/check.py
View file
Expand Up @@ -20,11 +20,6 @@ def inception(request):
result = {'status': 0, 'msg': 'ok', 'data': []}
inception_host = request.POST.get('inception_host', '')
inception_port = request.POST.get('inception_port', '')
inception_remote_backup_host = request.POST.get('inception_remote_backup_host', '')
inception_remote_backup_port = request.POST.get('inception_remote_backup_port', '')
inception_remote_backup_user = request.POST.get('inception_remote_backup_user', '')
inception_remote_backup_password = request.POST.get('inception_remote_backup_password', '')

try:
conn = MySQLdb.connect(host=inception_host, port=int(inception_port), charset='utf8mb4',
connect_timeout=5)
Expand All @@ -38,22 +33,6 @@ def inception(request):
cur.close()
conn.close()

try:
conn = MySQLdb.connect(host=inception_remote_backup_host,
port=int(inception_remote_backup_port),
user=inception_remote_backup_user,
password=inception_remote_backup_password,
charset='utf8mb4',
connect_timeout=5)
cur = conn.cursor()
except Exception as e:
logger.error(traceback.format_exc())
result['status'] = 1
result['msg'] = '无法连接Inception备份库\n{}'.format(str(e))
else:
cur.close()
conn.close()

# 返回结果
return HttpResponse(json.dumps(result), content_type='application/json')

Expand Down Expand Up @@ -150,6 +129,7 @@ def instance(request):
try:
engine = get_engine(instance=instance)
engine.get_connection()
engine.get_all_databases()
except Exception as e:
result['status'] = 1
result['msg'] = '无法连接实例,\n{}'.format(str(e))
Expand Down
178 changes: 83 additions & 95 deletions common/templates/config.html
View file
Expand Up @@ -55,27 +55,10 @@ <h5 class="control-label text-bold">组：</h5>
</div>
<div class="panel-body">
<div id="div-system-config" class="form-group" style="display: none">
<h4 style="color: darkgrey; display: inline;"><b>Inception配置</b></h4>&nbsp;&nbsp;&nbsp;
<h6 style="color:red">注1：默认使用goInception进行MySQL的审核执行，Inception作为脱敏解析工具使用</h6>
<h6 style="color:red">注2：备份库的信息仅用于平台获取回滚语句，需要和审核工具自身的配置保持一致，此处配置变更不会修改审核工具自身的配置</h6>
<h4 style="color: darkgrey; display: inline;"><b>goInception配置</b></h4>&nbsp;&nbsp;&nbsp;
<h6 style="color:red">注1：备份库的信息仅用于平台获取回滚语句，需要和审核工具自身的配置保持一致，此处配置变更不会修改审核工具自身的配置</h6>
<hr/>
<div class="form-horizontal">
<div class="form-group">
<label for="inception"
class="col-sm-4 control-label">INCEPTION</label>
<div class="col-sm-8">
<div class="switch switch-small">
<label>
<input id="inception"
key="inception"
value="{{ config.inception }}"
type="checkbox">
是否切换为Inception审核
</label>
</div>
</div>
</div>

<div id="div-go-inception-config">
<div class="form-group">
<label for="go_inception_host"
Expand All @@ -101,73 +84,48 @@ <h6 style="color:red">注2：备份库的信息仅用于平台获取回滚语句
</div>
</div>
</div>
<div id="div-inception-config">
<div class="form-group">
<label for="inception_host"
class="col-sm-4 control-label">INCEPTION_HOST</label>
<div class="col-sm-5">
<input type="text" class="form-control"
id="inception_host"
key="inception_host"
value="{{ config.inception_host }}"
placeholder="Inception地址">
</div>
<button id='check_incption' class='btn-sm btn-info'>测试连接</button>
</div>
<div class="form-group">
<label for="inception_port"
class="col-sm-4 control-label">INCEPTION_PORT</label>
<div class="col-sm-5">
<input type="number" class="form-control"
id="inception_port"
key="inception_port"
value="{{ config.inception_port }}"
placeholder="Inception端口">
</div>
</div>
<div class="form-group">
<label for="inception_remote_backup_host"
class="col-sm-4 control-label">REMOTE_BACKUP_HOST</label>
<div class="col-sm-5">
<input type="text" class="form-control"
id="inception_remote_backup_host"
key="inception_remote_backup_host"
value="{{ config.inception_remote_backup_host }}"
placeholder="备份库地址(Inception/goInception复用)">
</div>
<div class="form-group">
<label for="inception_remote_backup_host"
class="col-sm-4 control-label">BACKUP_HOST</label>
<div class="col-sm-5">
<input type="text" class="form-control"
id="inception_remote_backup_host"
key="inception_remote_backup_host"
value="{{ config.inception_remote_backup_host }}"
placeholder="备份库地址">
</div>
<div class="form-group">
<label for="inception_remote_backup_port"
class="col-sm-4 control-label">REMOTE_BACKUP_PORT</label>
<div class="col-sm-5">
<input type="number" class="form-control"
id="inception_remote_backup_port"
key="inception_remote_backup_port"
value="{{ config.inception_remote_backup_port }}"
placeholder="备份库端口(Inception/goInception复用)">
</div>
</div>
<div class="form-group">
<label for="inception_remote_backup_port"
class="col-sm-4 control-label">BACKUP_PORT</label>
<div class="col-sm-5">
<input type="number" class="form-control"
id="inception_remote_backup_port"
key="inception_remote_backup_port"
value="{{ config.inception_remote_backup_port }}"
placeholder="备份库端口">
</div>
<div class="form-group">
<label for="inception_remote_backup_user"
class="col-sm-4 control-label">REMOTE_BACKUP_USER</label>
<div class="col-sm-5">
<input type="text" autocomplete="new-password" class="form-control"
id="inception_remote_backup_user"
key="inception_remote_backup_user"
value="{{ config.inception_remote_backup_user }}"
placeholder="备份库用户(Inception/goInception复用)">
</div>
</div>
<div class="form-group">
<label for="inception_remote_backup_user"
class="col-sm-4 control-label">BACKUP_USER</label>
<div class="col-sm-5">
<input type="text" autocomplete="new-password" class="form-control"
id="inception_remote_backup_user"
key="inception_remote_backup_user"
value="{{ config.inception_remote_backup_user }}"
placeholder="备份库用户">
</div>
<div class="form-group">
<label for="inception_remote_backup_password"
class="col-sm-4 control-label">REMOTE_BACKUP_PASSWORD</label>
<div class="col-sm-5">
<input type="password" autocomplete="new-password" class="form-control"
id="inception_remote_backup_password"
key="inception_remote_backup_password"
value="{{ config.inception_remote_backup_password }}"
placeholder="备份库用户密码(Inception/goInception复用)">
</div>
</div>
<div class="form-group">
<label for="inception_remote_backup_password"
class="col-sm-4 control-label">BACKUP_PASSWORD</label>
<div class="col-sm-5">
<input type="password" autocomplete="new-password" class="form-control"
id="inception_remote_backup_password"
key="inception_remote_backup_password"
value="{{ config.inception_remote_backup_password }}"
placeholder="备份库用户密码">
</div>
</div>
</div>
Expand Down Expand Up @@ -298,6 +256,31 @@ <h6 style="color:red">注：开启脱敏功能必须要配置Inception信息，
</div>
</div>
</div>
<div id="div-inception-config" style="display: none">
<div class="form-group">
<label for="inception_host"
class="col-sm-4 control-label">INCEPTION_HOST</label>
<div class="col-sm-5">
<input type="text" class="form-control"
id="inception_host"
key="inception_host"
value="{{ config.inception_host }}"
placeholder="Inception地址">
</div>
<button id='check_incption' class='btn-sm btn-info'>测试连接</button>
</div>
<div class="form-group">
<label for="inception_port"
class="col-sm-4 control-label">INCEPTION_PORT</label>
<div class="col-sm-5">
<input type="number" class="form-control"
id="inception_port"
key="inception_port"
value="{{ config.inception_port }}"
placeholder="Inception端口">
</div>
</div>
</div>
<div class="form-group">
<label for="query_check"
class="col-sm-4 control-label">QUERY_CHECK</label>
Expand Down Expand Up @@ -327,7 +310,7 @@ <h6 style="color:red">注：开启脱敏功能必须要配置Inception信息，
</div>
</div>
<div class="form-group">
<label for="inception_remote_backup_port"
<label for="max_execution_time"
class="col-sm-4 control-label">MAX_EXECUTION_TIME</label>
<div class="col-sm-5">
<input type="number" class="form-control" id="max_execution_time"
Expand Down Expand Up @@ -851,32 +834,37 @@ <h5 class="control-label text-bold">当前审批流程：<b id="workflow_auditor

// 系统设置checkbox事件
$('input[type="checkbox"]').on('switchChange.bootstrapSwitch', function (event, state) {
let id = $(this).attr("id");
if (state) {
$(this).val(true);
if ($(this).attr("id") === 'mail') {
if (id === 'mail') {
$("#div-mail-config").show();
} else if ($(this).attr("id") === 'ding_to_person') {
} else if (id === 'ding_to_person') {
$("#div-ding-config").show();
} else if ($(this).attr("id") === 'auto_review') {
} else if (id === 'auto_review') {
$("#div-auto-review-config").show();
} else if ($(this).attr("id") === 'wx') {
} else if (id === 'wx') {
$("#div-wx-config").show();
} else if ($(this).attr("id") === 'feishu') {
} else if (id === 'feishu') {
$("#div-feishu-config").show();
} else if (id === 'data_masking') {
$("#div-inception-config").show();
}
} else {
$(this).val(false);
if ($(this).attr("id") === 'mail') {
if (id === 'mail') {
$("#mail_ssl").val(false);
$("#div-mail-config").hide();
} else if ($(this).attr("id") === 'ding_to_person') {
} else if (id === 'ding_to_person') {
$("#div-ding-config").hide();
} else if ($(this).attr("id") === 'auto_review') {
} else if (id === 'auto_review') {
$("#div-auto-review-config").hide();
} else if ($(this).attr("id") === 'wx') {
} else if (id === 'wx') {
$("#div-wx-config").hide();
} else if ($(this).attr("id") === 'feishu') {
} else if (id === 'feishu') {
$("#div-feishu-config").hide();
} else if (id === 'data_masking') {
$("#div-inception-config").hide();
}
}
});
Expand Down Expand Up @@ -1052,7 +1040,7 @@ <h5 class="control-label text-bold">当前审批流程：<b id="workflow_auditor
},
success: function (data) {
if (data.status === 0) {
alert('Inception和备份库测试连接成功，请点击页面下方的保存按钮生效！')
alert('Inception测试连接成功，请点击页面下方的保存按钮生效！')
} else {
alert(data.msg);
}
Expand Down

0 comments on commit dd143e4

Please sign in to comment.