feat: OneDrive 授权码增加格式校验 (#2614)

Refs #2610

backend/app/service/container.go

@@ -867,6 +867,10 @@ func loadConfigInfo(isCreate bool, req dto.ContainerOperate, oldContainer *types
 	config.Tty = req.Tty
 
 	if len(req.Network) != 0 {
+		switch req.Network {
+		case "host", "none", "bridge":
+			hostConf.NetworkMode = container.NetworkMode(req.Network)
+		}
 		networkConf.EndpointsConfig = map[string]*network.EndpointSettings{req.Network: {}}
 	} else {
 		networkConf = network.NetworkingConfig{}
@@ -881,6 +885,7 @@ func loadConfigInfo(isCreate bool, req dto.ContainerOperate, oldContainer *types
 	}
 	hostConf.NanoCPUs = int64(req.NanoCPUs * 1000000000)
 	hostConf.Memory = int64(req.Memory * 1024 * 1024)
+	hostConf.MemorySwap = 0
 	hostConf.PortBindings = portMap
 	hostConf.Binds = []string{}
 	config.Volumes = make(map[string]struct{})

backend/app/service/ssh.go

@@ -287,9 +287,9 @@ func (u *SSHService) LoadLog(req dto.SearchSSHLog) (*dto.SSHLog, error) {
 			case constant.StatusSuccess:
 				commandItem = fmt.Sprintf("cat %s | grep -a Accepted %s", file.Name, command)
 			case constant.StatusFailed:
-				commandItem = fmt.Sprintf("cat %s | grep -a 'Connection closed by authenticating user' | grep -a 'preauth' %s", file.Name, command)
+				commandItem = fmt.Sprintf("cat %s | grep -aE 'Failed password for|Connection closed by authenticating user' | grep -a 'preauth' %s", file.Name, command)
 			default:
-				commandItem = fmt.Sprintf("cat %s | grep -aE \"(Connection closed by authenticating user|Accepted)\" | grep -v 'invalid' %s", file.Name, command)
+				commandItem = fmt.Sprintf("cat %s | grep -aE \"(Failed password for|Connection closed by authenticating user|Accepted)\" | grep -v 'invalid' %s", file.Name, command)
 			}
 		}
 		dataItem, successCount, failedCount := loadSSHData(commandItem, showCountFrom, showCountTo, file.Year, qqWry, nyc)
@@ -466,7 +466,7 @@ func loadSSHData(command string, showCountFrom, showCountTo, currentYear int, qq
 			if len(itemData.Address) != 0 {
 				if successCount+failedCount >= showCountFrom && successCount+failedCount < showCountTo {
 					itemData.Area = qqWry.Find(itemData.Address).Area
-					itemData.Date, _ = time.ParseInLocation("2006 Jan 2 15:04:05", fmt.Sprintf("%d %s", currentYear, itemData.DateStr), nyc)
+					itemData.Date = loadDate(currentYear, itemData.DateStr, nyc)
 					datas = append(datas, itemData)
 				}
 				failedCount++
@@ -476,7 +476,7 @@ func loadSSHData(command string, showCountFrom, showCountTo, currentYear int, qq
 			if len(itemData.Address) != 0 {
 				if successCount+failedCount >= showCountFrom && successCount+failedCount < showCountTo {
 					itemData.Area = qqWry.Find(itemData.Address).Area
-					itemData.Date, _ = time.ParseInLocation("2006 Jan 2 15:04:05", fmt.Sprintf("%d %s", currentYear, itemData.DateStr), nyc)
+					itemData.Date = loadDate(currentYear, itemData.DateStr, nyc)
 					datas = append(datas, itemData)
 				}
 				failedCount++
@@ -486,7 +486,7 @@ func loadSSHData(command string, showCountFrom, showCountTo, currentYear int, qq
 			if len(itemData.Address) != 0 {
 				if successCount+failedCount >= showCountFrom && successCount+failedCount < showCountTo {
 					itemData.Area = qqWry.Find(itemData.Address).Area
-					itemData.Date, _ = time.ParseInLocation("2006 Jan 2 15:04:05", fmt.Sprintf("%d %s", currentYear, itemData.DateStr), nyc)
+					itemData.Date = loadDate(currentYear, itemData.DateStr, nyc)
 					datas = append(datas, itemData)
 				}
 				successCount++
@@ -540,16 +540,31 @@ func loadSSHDataForAnalysis(analysisMap map[string]dto.SSHLogAnalysis, commandIt
 func loadSuccessDatas(line string) dto.SSHHistory {
 	var data dto.SSHHistory
 	parts := strings.Fields(line)
-	if len(parts) < 14 {
-		return data
-	}
-	data = dto.SSHHistory{
-		DateStr:  fmt.Sprintf("%s %s %s", parts[0], parts[1], parts[2]),
-		AuthMode: parts[6],
-		User:     parts[8],
-		Address:  parts[10],
-		Port:     parts[12],
-		Status:   constant.StatusSuccess,
+	t, err := time.Parse("2006-01-02T15:04:05.999999-07:00", parts[0])
+	if err != nil {
+		if len(parts) < 14 {
+			return data
+		}
+		data = dto.SSHHistory{
+			DateStr:  fmt.Sprintf("%s %s %s", parts[0], parts[1], parts[2]),
+			AuthMode: parts[6],
+			User:     parts[8],
+			Address:  parts[10],
+			Port:     parts[12],
+			Status:   constant.StatusSuccess,
+		}
+	} else {
+		if len(parts) < 12 {
+			return data
+		}
+		data = dto.SSHHistory{
+			DateStr:  t.Format("2006 Jan 2 15:04:05"),
+			AuthMode: parts[4],
+			User:     parts[6],
+			Address:  parts[8],
+			Port:     parts[10],
+			Status:   constant.StatusSuccess,
+		}
 	}
 	return data
 }
@@ -557,16 +572,31 @@ func loadSuccessDatas(line string) dto.SSHHistory {
 func loadFailedAuthDatas(line string) dto.SSHHistory {
 	var data dto.SSHHistory
 	parts := strings.Fields(line)
-	if len(parts) < 14 {
-		return data
-	}
-	data = dto.SSHHistory{
-		DateStr:  fmt.Sprintf("%s %s %s", parts[0], parts[1], parts[2]),
-		AuthMode: parts[8],
-		User:     parts[10],
-		Address:  parts[11],
-		Port:     parts[13],
-		Status:   constant.StatusFailed,
+	t, err := time.Parse("2006-01-02T15:04:05.999999-07:00", parts[0])
+	if err != nil {
+		if len(parts) < 14 {
+			return data
+		}
+		data = dto.SSHHistory{
+			DateStr:  fmt.Sprintf("%s %s %s", parts[0], parts[1], parts[2]),
+			AuthMode: parts[8],
+			User:     parts[10],
+			Address:  parts[11],
+			Port:     parts[13],
+			Status:   constant.StatusFailed,
+		}
+	} else {
+		if len(parts) < 12 {
+			return data
+		}
+		data = dto.SSHHistory{
+			DateStr:  t.Format("2006 Jan 2 15:04:05"),
+			AuthMode: parts[6],
+			User:     parts[7],
+			Address:  parts[9],
+			Port:     parts[11],
+			Status:   constant.StatusFailed,
+		}
 	}
 	if strings.Contains(line, ": ") {
 		data.Message = strings.Split(line, ": ")[1]
@@ -577,21 +607,39 @@ func loadFailedAuthDatas(line string) dto.SSHHistory {
 func loadFailedSecureDatas(line string) dto.SSHHistory {
 	var data dto.SSHHistory
 	parts := strings.Fields(line)
-	if len(parts) < 14 {
-		return data
-	}
-	data = dto.SSHHistory{
-		DateStr:  fmt.Sprintf("%s %s %s", parts[0], parts[1], parts[2]),
-		AuthMode: parts[6],
-		User:     parts[8],
-		Address:  parts[10],
-		Port:     parts[12],
-		Status:   constant.StatusFailed,
+	t, err := time.Parse("2006-01-02T15:04:05.999999-07:00", parts[0])
+	if err != nil {
+		if len(parts) < 14 {
+			return data
+		}
+		data = dto.SSHHistory{
+			DateStr:  fmt.Sprintf("%s %s %s", parts[0], parts[1], parts[2]),
+			AuthMode: parts[6],
+			User:     parts[8],
+			Address:  parts[10],
+			Port:     parts[12],
+			Status:   constant.StatusFailed,
+		}
+	} else {
+		if len(parts) < 12 {
+			return data
+		}
+		index := 0
+		if strings.Contains("line", " invalid user") {
+			index = 2
+		}
+		data = dto.SSHHistory{
+			DateStr:  t.Format("2006 Jan 2 15:04:05"),
+			AuthMode: parts[4],
+			User:     parts[index+6],
+			Address:  parts[index+8],
+			Port:     parts[index+10],
+			Status:   constant.StatusFailed,
+		}
 	}
 	if strings.Contains(line, ": ") {
 		data.Message = strings.Split(line, ": ")[1]
 	}
-
 	return data
 }
 
@@ -610,3 +658,11 @@ func loadServiceName() (string, error) {
 	}
 	return "", errors.New("The ssh or sshd service is unavailable")
 }
+
+func loadDate(currentYear int, DateStr string, nyc *time.Location) time.Time {
+	itemDate, err := time.ParseInLocation("2006 Jan 2 15:04:05", fmt.Sprintf("%d %s", currentYear, DateStr), nyc)
+	if err != nil {
+		itemDate, _ = time.ParseInLocation("2006 Jan 2 15:04:05", DateStr, nyc)
+	}
+	return itemDate
+}

backend/utils/mysql/client/local.go

@@ -269,7 +269,7 @@ func (r *Local) SyncDB(version string) ([]SyncDBInfo, error) {
 		if len(parts) != 2 {
 			continue
 		}
-		if parts[0] == "SCHEMA_NAME" || parts[0] == "information_schema" || parts[0] == "mysql" || parts[0] == "performance_schema" || parts[0] == "sys" {
+		if parts[0] == "SCHEMA_NAME" || parts[0] == "information_schema" || parts[0] == "mysql" || parts[0] == "performance_schema" || parts[0] == "sys" || parts[0] == "recycle_bin" {
 			continue
 		}
 		dataItem := SyncDBInfo{

backend/utils/mysql/client/remote.go

@@ -279,7 +279,7 @@ func (r *Remote) SyncDB(version string) ([]SyncDBInfo, error) {
 		if err = rows.Scan(&dbName, &charsetName); err != nil {
 			return datas, err
 		}
-		if dbName == "information_schema" || dbName == "mysql" || dbName == "performance_schema" || dbName == "sys" {
+		if dbName == "information_schema" || dbName == "mysql" || dbName == "performance_schema" || dbName == "sys" || dbName == "recycle_bin" {
 			continue
 		}
 		dataItem := SyncDBInfo{

frontend/src/global/form-rules.ts

@@ -1,6 +1,13 @@
 import i18n from '@/lang';
 import { FormItemRule } from 'element-plus';
 
+const checkNoSpace = (rule: any, value: any, callback: any) => {
+    if (value.indexOf(' ') !== -1) {
+        return callback(new Error(i18n.global.t('setting.noSpace')));
+    }
+    callback();
+};
+
 const checkIp = (rule: any, value: any, callback: any) => {
     if (value === '' || typeof value === 'undefined' || value == null) {
         callback(new Error(i18n.global.t('commons.rule.requiredInput')));
@@ -431,6 +438,7 @@ interface CommonRule {
     requiredInput: FormItemRule;
     requiredSelect: FormItemRule;
     requiredSelectBusiness: FormItemRule;
+    noSpace: FormItemRule;
     name: FormItemRule;
     userName: FormItemRule;
     simpleName: FormItemRule;
@@ -484,6 +492,11 @@ export const Rules: CommonRule = {
         message: i18n.global.t('commons.rule.requiredSelect'),
         trigger: 'change',
     },
+    noSpace: {
+        required: true,
+        validator: checkNoSpace,
+        trigger: 'blur',
+    },
     simpleName: {
         required: true,
         validator: checkSimpleName,

frontend/src/lang/modules/en.ts

@@ -1050,6 +1050,7 @@ const message = {
         oldPassword: 'Original password',
         newPassword: 'New password',
         retryPassword: 'Confirm password',
+        noSpace: 'Input information cannot include space characters',
         duplicatePassword: 'The new password cannot be the same as the original password, please re-enter!',
         diskClean: 'Cache Clean',
 
@@ -1064,6 +1065,7 @@ const message = {
         SFTP: 'SFTP',
         OneDrive: 'Microsoft OneDrive',
         backupDir: 'Backup dir',
+        codeWarning: 'The current authorization code format is incorrect, please confirm again!',
         isCN: 'Domestic version',
         code: 'Auth code',
         codeHelper:

frontend/src/lang/modules/tw.ts

@@ -1006,6 +1006,7 @@ const message = {
         oldPassword: '原密碼',
         newPassword: '新密碼',
         retryPassword: '確認密碼',
+        noSpace: '輸入信息不能包括空格符號',
         duplicatePassword: '新密碼不能與原始密碼一致，請重新輸入！',
         diskClean: '缓存清理',
 
@@ -1019,6 +1020,7 @@ const message = {
         MINIO: 'MINIO',
         SFTP: 'SFTP',
         OneDrive: '微軟 OneDrive',
+        codeWarning: '當前授權碼格式錯誤，請重新確認！',
         backupDir: '備份路徑',
         isCN: '國內版',
         code: '授權碼',

frontend/src/lang/modules/zh.ts

@@ -1006,6 +1006,7 @@ const message = {
         oldPassword: '原密码',
         newPassword: '新密码',
         retryPassword: '确认密码',
+        noSpace: '输入信息不能包含空格符',
         duplicatePassword: '新密码不能与原始密码一致，请重新输入！',
         diskClean: '缓存清理',
 
@@ -1019,6 +1020,7 @@ const message = {
         MINIO: 'MINIO',
         SFTP: 'SFTP',
         OneDrive: '微软 OneDrive',
+        codeWarning: '当前授权码格式错误，请重新确认！',
         backupDir: '备份路径',
         isCN: '国内版',
         code: '授权码',

frontend/src/views/setting/backup-account/operate/index.vue

@@ -52,7 +52,7 @@
                             v-if="dialogData.rowData!.type === 'OneDrive'"
                             :label="$t('setting.code')"
                             prop="varsJson.code"
-                            :rules="Rules.requiredInput"
+                            :rules="rules.driveCode"
                         >
                             <el-input clearable v-model.trim="dialogData.rowData!.varsJson['code']">
                                 <template #append>
@@ -247,7 +247,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { Rules } from '@/global/form-rules';
 import FileList from '@/components/file-list/index.vue';
 import i18n from '@/lang';
@@ -265,6 +265,16 @@ const buckets = ref();
 const errBuckets = ref();
 
 const endpoints = ref('http');
+const rules = reactive({
+    driveCode: [{ validator: checkDriveCode, required: true, trigger: 'blur' }],
+});
+function checkDriveCode(rule: any, value: any, callback: any) {
+    const reg = /^[A-Za-z0-9_.-]{32,60}$/;
+    if (!reg.test(value)) {
+        return callback(new Error(i18n.global.t('setting.codeWarning')));
+    }
+    callback();
+}
 
 const emit = defineEmits<{ (e: 'search'): void }>();
 

frontend/src/views/setting/expired.vue

@@ -16,30 +16,22 @@
                         label-position="left"
                         label-width="160px"
                     >
-                        <el-form-item :label="$t('setting.oldPassword')" prop="oldPassword">
-                            <el-input type="password" show-password clearable v-model="passForm.oldPassword" />
+                        <el-form-item :label="$t('setting.oldPassword')" prop="oldPass">
+                            <el-input type="password" show-password clearable v-model.trim="passForm.oldPass" />
                         </el-form-item>
-                        <el-form-item
-                            v-if="settingForm?.complexityVerification === 'disable'"
-                            :label="$t('setting.newPassword')"
-                            prop="newPassword"
-                        >
-                            <el-input type="password" show-password clearable v-model="passForm.newPassword" />
+                        <el-form-item v-if="!isComplexity" :label="$t('setting.newPassword')" prop="newPass">
+                            <el-input type="password" show-password clearable v-model.trim="passForm.newPass" />
                         </el-form-item>
-                        <el-form-item
-                            v-if="settingForm?.complexityVerification === 'enable'"
-                            :label="$t('setting.newPassword')"
-                            prop="newPasswordComplexity"
-                        >
+                        <el-form-item v-if="isComplexity" :label="$t('setting.newPassword')" prop="newPassComplexity">
                             <el-input
                                 type="password"
                                 show-password
                                 clearable
-                                v-model="passForm.newPasswordComplexity"
+                                v-model.trim="passForm.newPassComplexity"
                             />
                         </el-form-item>
-                        <el-form-item :label="$t('setting.retryPassword')" prop="retryPassword">
-                            <el-input type="password" show-password clearable v-model="passForm.retryPassword" />
+                        <el-form-item :label="$t('setting.retryPassword')" prop="rePass">
+                            <el-input type="password" show-password clearable v-model.trim="passForm.rePass" />
                         </el-form-item>
                         <el-form-item>
                             <el-button type="primary" @click="submitChangePassword(passFormRef)">
@@ -61,30 +53,31 @@ import i18n from '@/lang';
 import { Rules } from '@/global/form-rules';
 import router from '@/routers';
 import { MsgError, MsgSuccess } from '@/utils/message';
-let settingForm = ref();
+
+let isComplexity = ref(false);
 
 type FormInstance = InstanceType<typeof ElForm>;
 const passFormRef = ref<FormInstance>();
 const passRules = reactive({
-    oldPassword: [Rules.requiredInput],
-    newPassword: [
+    oldPass: [Rules.noSpace, Rules.requiredInput],
+    newPass: [
         Rules.requiredInput,
+        Rules.noSpace,
         { min: 6, message: i18n.global.t('commons.rule.commonPassword'), trigger: 'blur' },
     ],
-    newPasswordComplexity: [Rules.requiredInput, Rules.password],
-    retryPassword: [Rules.requiredInput, { validator: checkPassword, trigger: 'blur' }],
+    newPassComplexity: [Rules.requiredInput, Rules.noSpace, Rules.password],
+    rePass: [Rules.requiredInput, Rules.noSpace, { validator: checkPasswordSame, trigger: 'blur' }],
 });
 const passForm = reactive({
-    oldPassword: '',
-    newPassword: '',
-    newPasswordComplexity: '',
-    retryPassword: '',
+    oldPass: '',
+    newPass: '',
+    newPassComplexity: '',
+    rePass: '',
 });
 
-function checkPassword(rule: any, value: any, callback: any) {
-    let password =
-        settingForm.value.complexityVerification === 'disable' ? passForm.newPassword : passForm.newPasswordComplexity;
-    if (password !== passForm.retryPassword) {
+function checkPasswordSame(rule: any, value: any, callback: any) {
+    let password = !isComplexity.value ? passForm.newPass : passForm.newPassComplexity;
+    if (password !== passForm.rePass) {
         return callback(new Error(i18n.global.t('commons.rule.rePassword')));
     }
     callback();
@@ -94,22 +87,20 @@ const submitChangePassword = async (formEl: FormInstance | undefined) => {
     if (!formEl) return;
     formEl.validate(async (valid) => {
         if (!valid) return;
-        let password =
-            settingForm.value.complexityVerification === 'disable'
-                ? passForm.newPassword
-                : passForm.newPasswordComplexity;
-        if (password === passForm.oldPassword) {
+        let password = !isComplexity.value ? passForm.newPass : passForm.newPassComplexity;
+        if (password === passForm.oldPass) {
             MsgError(i18n.global.t('setting.duplicatePassword'));
             return;
         }
-        await handleExpired({ oldPassword: passForm.oldPassword, newPassword: password });
+        await handleExpired({ oldPassword: passForm.oldPass, newPassword: password });
         MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
         router.push({ name: 'home' });
     });
 };
 const search = async () => {
     const res = await getSettingInfo();
-    settingForm.value = res.data;
+    let settingForm = res.data;
+    isComplexity.value = settingForm?.complexityVerification === 'enable';
 };
 
 onMounted(() => {

frontend/src/views/setting/panel/password/index.vue

@@ -8,14 +8,14 @@
                 <el-row type="flex" justify="center">
                     <el-col :span="22">
                         <el-form-item :label="$t('setting.oldPassword')" prop="oldPassword">
-                            <el-input type="password" show-password clearable v-model="passForm.oldPassword" />
+                            <el-input type="password" show-password clearable v-model.trim="passForm.oldPassword" />
                         </el-form-item>
                         <el-form-item
                             v-if="complexityVerification === 'disable'"
                             :label="$t('setting.newPassword')"
                             prop="newPassword"
                         >
-                            <el-input type="password" show-password clearable v-model="passForm.newPassword" />
+                            <el-input type="password" show-password clearable v-model.trim="passForm.newPassword" />
                         </el-form-item>
                         <el-form-item
                             v-if="complexityVerification === 'enable'"
@@ -26,11 +26,11 @@
                                 type="password"
                                 show-password
                                 clearable
-                                v-model="passForm.newPasswordComplexity"
+                                v-model.trim="passForm.newPasswordComplexity"
                             />
                         </el-form-item>
                         <el-form-item :label="$t('setting.retryPassword')" prop="retryPassword">
-                            <el-input type="password" show-password clearable v-model="passForm.retryPassword" />
+                            <el-input type="password" show-password clearable v-model.trim="passForm.retryPassword" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -64,14 +64,16 @@ import { logOutApi } from '@/api/modules/auth';
 const globalStore = GlobalStore();
 const passFormRef = ref<FormInstance>();
 const passRules = reactive({
-    oldPassword: [Rules.requiredInput],
+    oldPassword: [Rules.noSpace, Rules.requiredInput],
     newPassword: [
         Rules.requiredInput,
+        Rules.noSpace,
         { min: 6, message: i18n.global.t('commons.rule.commonPassword'), trigger: 'blur' },
     ],
-    newPasswordComplexity: [Rules.requiredInput, Rules.password],
-    retryPassword: [Rules.requiredInput, { validator: checkPassword, trigger: 'blur' }],
+    newPasswordComplexity: [Rules.requiredInput, Rules.noSpace, Rules.password],
+    retryPassword: [Rules.requiredInput, Rules.noSpace, { validator: checkPassword, trigger: 'blur' }],
 });
+
 const loading = ref(false);
 const passwordVisible = ref<boolean>(false);
 const passForm = reactive({

frontend/src/views/setting/panel/username/index.vue

@@ -4,11 +4,18 @@
             <template #header>
                 <DrawerHeader :header="$t('commons.login.username')" :back="handleClose" />
             </template>
-            <el-form ref="formRef" label-position="top" :model="form" @submit.prevent v-loading="loading">
+            <el-form
+                ref="formRef"
+                label-position="top"
+                :model="form"
+                @submit.prevent
+                v-loading="loading"
+                :rules="rules"
+            >
                 <el-row type="flex" justify="center">
                     <el-col :span="22">
-                        <el-form-item :label="$t('commons.login.username')" prop="userName" :rules="Rules.userName">
-                            <el-input clearable v-model="form.userName" />
+                        <el-form-item :label="$t('commons.login.username')" prop="userName">
+                            <el-input clearable v-model.trim="form.userName" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -46,7 +53,9 @@ const loading = ref();
 const form = reactive({
     userName: '',
 });
-
+const rules = reactive({
+    userName: [Rules.userName, Rules.noSpace],
+});
 const formRef = ref<FormInstance>();
 
 const acceptParams = (params: DialogProps): void => {