From b4cd94f2d9d10bc0bdb20f03798ec688fc1431c3 Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Wed, 6 Oct 2021 16:38:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=90=8D=E7=A7=B0=E6=AD=A3=E5=88=99=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/services/env.ts        | 14 +++++++++-----
 src/pages/crontab/modal.tsx |  6 +++++-
 src/pages/env/modal.tsx     | 12 ++++++++++--
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/back/services/env.ts b/back/services/env.ts
index be06976e..9df3a070 100644
--- a/back/services/env.ts
+++ b/back/services/env.ts
@@ -222,11 +222,15 @@ export default class EnvService {
     for (const key in groups) {
       if (Object.prototype.hasOwnProperty.call(groups, key)) {
         const group = groups[key];
-        env_string += `export ${key}="${_(group)
-          .filter((x) => x.status !== EnvStatus.disabled)
-          .map('value')
-          .join('&')
-          .replace(/ /g, '')}"\n`;
+
+        // 忽略不符合bash要求的环境变量名称
+        if (/^[a-zA-Z_][0-9a-zA-Z_]+$/.test(key)) {
+          env_string += `export ${key}="${_(group)
+            .filter((x) => x.status !== EnvStatus.disabled)
+            .map('value')
+            .join('&')
+            .replace(/ /g, '')}"\n`;
+        }
       }
     }
     fs.writeFileSync(config.envFile, env_string);
diff --git a/src/pages/crontab/modal.tsx b/src/pages/crontab/modal.tsx
index 06951dff..7940c1da 100644
--- a/src/pages/crontab/modal.tsx
+++ b/src/pages/crontab/modal.tsx
@@ -66,7 +66,11 @@ const CronModal = ({
         <Form.Item name="name" label="名称">
           <Input placeholder="请输入任务名称" />
         </Form.Item>
-        <Form.Item name="command" label="命令" rules={[{ required: true }]}>
+        <Form.Item
+          name="command"
+          label="命令"
+          rules={[{ required: true, whitespace: true }]}
+        >
           <Input.TextArea
             rows={4}
             autoSize={true}
diff --git a/src/pages/env/modal.tsx b/src/pages/env/modal.tsx
index 56d48d7f..25a04a51 100644
--- a/src/pages/env/modal.tsx
+++ b/src/pages/env/modal.tsx
@@ -74,7 +74,13 @@ const EnvModal = ({
         <Form.Item
           name="name"
           label="名称"
-          rules={[{ required: true, message: '请输入环境变量名称' }]}
+          rules={[
+            { required: true, message: '请输入环境变量名称', whitespace: true },
+            {
+              pattern: /^[a-zA-Z_][0-9a-zA-Z_]+$/,
+              message: '只能输入字母数字下划线，且不能以数字开头',
+            },
+          ]}
         >
           <Input placeholder="请输入环境变量名称" />
         </Form.Item>
@@ -89,7 +95,9 @@ const EnvModal = ({
         <Form.Item
           name="value"
           label="值"
-          rules={[{ required: true, message: '请输入环境变量值' }]}
+          rules={[
+            { required: true, message: '请输入环境变量值', whitespace: true },
+          ]}
         >
           <Input.TextArea
             rows={4}