Merge pull request #263 from yohamta/develop

fix specialchar parsing issue
dagu-org · Aug 15, 2022 · 6b60624 · 6b60624
2 parents 8d56890 + bfad9de
commit 6b60624
Show file tree

Hide file tree

Showing 10 changed files with 102 additions and 27 deletions.
diff --git a/admin/index.html b/admin/index.html
@@ -4,12 +4,6 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link
-      href="https://fonts.googleapis.com/css2?family=Antonio:wght@100;400&family=Noto+Sans+JP:wght@400;700&family=Roboto:wght@400;700&family=Work+Sans:wght@800&display=swap"
-      rel="stylesheet"
-    />
     <title>dagu Admin Web</title>
     <script>
       function getConfig() {

diff --git a/admin/src/Layout.tsx b/admin/src/Layout.tsx
@@ -65,11 +65,11 @@ const Drawer = styled(MuiDrawer, {
 const mdTheme = createTheme({
   typography: {
     fontFamily:
-      "'SF Pro Display','SF Compact Display',-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif,'Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol'",
+    "'SF Pro Display','SF Compact Display',-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif,'Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol'",
   },
   palette: {
     primary: {
-      main: '#6149d8',
+      main: '#485fc7',
     }
   },
 });
@@ -87,7 +87,7 @@ function Content({ title, navbarColor, children }: DashboardContentProps) {
   };
   const [scrolled, setScrolled] = React.useState(false);
   const containerRef = React.useRef<HTMLDivElement>(null);
-  const gradientColor = navbarColor || '#6149d8';
+  const gradientColor = navbarColor || '#485fc7';
 
   return (
     <ThemeProvider theme={mdTheme}>

diff --git a/admin/src/components/atoms/BorderedBox.tsx b/admin/src/components/atoms/BorderedBox.tsx
@@ -13,7 +13,7 @@ export default function BorderedBox({
     <Box
       sx={{
         border: 1,
-        borderColor: '#6149d8',
+        borderColor: '#485fc7',
         borderRadius: '6px',
         ...sx,
       }}

diff --git a/admin/src/components/molecules/DAGTable.tsx b/admin/src/components/molecules/DAGTable.tsx
@@ -530,7 +530,7 @@ function DAGTable({ DAGs = [], group = '', refreshFn }: Props) {
       </Stack>
       <Box
         sx={{
-          border: '1px solid #6149d8',
+          border: '1px solid #485fc7',
           borderRadius: '6px',
           mt: 2,
         }}

diff --git a/admin/src/components/molecules/Graph.tsx b/admin/src/components/molecules/Graph.tsx
@@ -67,12 +67,12 @@ function Graph({
     dat.push(
       'linkStyle default stroke:#ddeeff,stroke-width:2px,fill:none,color:#404040'
     );
-    dat.push('classDef none fill:#bbbbff,stroke-width:0px,color:#000');
-    dat.push('classDef running fill:#33ff33,stroke-width:0px,color:#000');
-    dat.push('classDef error fill:#ee0000,stroke-width:0px,color:#000');
-    dat.push('classDef cancel fill:#ffbbaa,stroke-width:0px,color:#000');
-    dat.push('classDef done fill:#00bb00,stroke-width:0px,color:#000');
-    dat.push('classDef skipped fill:#dfdfdf,stroke-width:0px,color:#000');
+    dat.push('classDef none fill:white,stroke:lightblue,stroke-width:2px');
+    dat.push('classDef running fill:white,stroke:lime,stroke-width:2px');
+    dat.push('classDef error fill:white,stroke:red,stroke-width:2px');
+    dat.push('classDef cancel fill:white,stroke:pink,stroke-width:2px');
+    dat.push('classDef done fill:white,stroke:green,stroke-width:2px');
+    dat.push('classDef skipped fill:white,stroke:gray,stroke-width:2px');
     return dat.join('\n');
   }, [steps, onClickNode, flowchart]);
   return <Mermaid style={mermaidStyle} def={graph} />;

diff --git a/admin/src/consts.ts b/admin/src/consts.ts
@@ -6,12 +6,12 @@ type statusColorMapping = {
   [key: number]: CSSProperties;
 };
 export const statusColorMapping: statusColorMapping = {
-  [SchedulerStatus.None]: { backgroundColor: '#bbbbff' },
-  [SchedulerStatus.Running]: { backgroundColor: '#33ff33' },
-  [SchedulerStatus.Error]: { backgroundColor: '#ee0000'},
-  [SchedulerStatus.Cancel]: { backgroundColor: '#ffbbaa' },
-  [SchedulerStatus.Success]: { backgroundColor: '#00bb00'},
-  [SchedulerStatus.Skipped_Unused]: { backgroundColor: '#dfdfdf'},
+  [SchedulerStatus.None]: { backgroundColor: 'lightblue' },
+  [SchedulerStatus.Running]: { backgroundColor: 'lime' },
+  [SchedulerStatus.Error]: { backgroundColor: 'red', color: 'white' },
+  [SchedulerStatus.Cancel]: { backgroundColor: 'pink' },
+  [SchedulerStatus.Success]: { backgroundColor: 'green', color: 'white' },
+  [SchedulerStatus.Skipped_Unused]: { backgroundColor: 'gray', color: 'white' },
 };
 
 export const nodeStatusColorMapping = {

diff --git a/admin/src/styles/styles.css b/admin/src/styles/styles.css
@@ -3,7 +3,7 @@
 }
 
 a {
-  color: #6149d8;
+  color: #485fc7;
   cursor: pointer;
   text-decoration: none;
 }
@@ -24,7 +24,7 @@ a {
 }
 
 .MuiTableRow-root th {
-  background-color: #6149d8;
+  background-color: #485fc7;
   color: #fff;
   font-weight: 600;
 }

diff --git a/examples/specialchar.yaml b/examples/specialchar.yaml
@@ -0,0 +1,5 @@
+steps:
+  - name: step1
+    command: echo s="\t" test
+  - name: step2
+    command: echo s=\t test
diff --git a/internal/scheduler/node_test.go b/internal/scheduler/node_test.go
@@ -187,6 +187,58 @@ func TestOutputJson(t *testing.T) {
 	}
 }
 
+func TestOutputSpecialchar(t *testing.T) {
+	for i, test := range []struct {
+		CmdWithArgs string
+		Want        string
+		WantArgs    int
+	}{
+		{
+			CmdWithArgs: `echo "hello\tworld"`,
+			Want:        `hello\tworld`,
+			WantArgs:    1,
+		},
+		{
+			CmdWithArgs: `echo hello"\t"world`,
+			Want:        `hello\tworld`,
+			WantArgs:    1,
+		},
+		{
+			CmdWithArgs: `echo hello\tworld`,
+			Want:        `hello\tworld`,
+			WantArgs:    1,
+		},
+		{
+			CmdWithArgs: `echo hello\nworld`,
+			Want:        `hello\nworld`,
+			WantArgs:    1,
+		},
+	} {
+		t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
+			n := &Node{
+				Step: &dag.Step{
+					CmdWithArgs:     test.CmdWithArgs,
+					Output:          "OUTPUT_SPECIALCHAR_TEST",
+					OutputVariables: &sync.Map{},
+				},
+			}
+			err := n.setup(os.Getenv("HOME"), fmt.Sprintf("test-output-specialchar-%d", i))
+			require.NoError(t, err)
+			defer func() {
+				_ = n.teardown()
+			}()
+
+			runTestNode(t, n)
+
+			require.Equal(t, test.WantArgs, len(n.Args))
+
+			v, _ := n.OutputVariables.Load("OUTPUT_SPECIALCHAR_TEST")
+			require.Equal(t, fmt.Sprintf("OUTPUT_SPECIALCHAR_TEST=%s", test.Want), v)
+			require.Equal(t, test.Want, os.ExpandEnv("$OUTPUT_SPECIALCHAR_TEST"))
+		})
+	}
+}
+
 func TestRunScript(t *testing.T) {
 	n := &Node{
 		Step: &dag.Step{

diff --git a/internal/utils/utils.go b/internal/utils/utils.go
@@ -72,18 +72,42 @@ func SplitCommand(cmd string, parse bool) (program string, args []string) {
 		program = vals[0]
 		parser := shellwords.NewParser()
 		parser.ParseBacktick = parse
-		args, err := parser.Parse(vals[1])
+		parser.ParseEnv = false
+		a := escapeSpecialchars(vals[1])
+		args, err := parser.Parse(a)
 		if err != nil {
 			log.Printf("failed to parse arguments: %s", err)
 			//if parse shell world error use all substing as args
 			return program, []string{vals[1]}
 		}
-		return program, args
+		ret := []string{}
+		for _, v := range args {
+			ret = append(ret, unescapeSpecialchars(v))
+		}
+		return program, ret
 
 	}
 	return vals[0], []string{}
 }
 
+func unescapeSpecialchars(str string) string {
+	repl := strings.NewReplacer(
+		`\\t`, `\t`,
+		`\\r`, `\r`,
+		`\\n`, `\n`,
+	)
+	return repl.Replace(str)
+}
+
+func escapeSpecialchars(str string) string {
+	repl := strings.NewReplacer(
+		`\t`, `\\t`,
+		`\r`, `\\r`,
+		`\n`, `\\n`,
+	)
+	return repl.Replace(str)
+}
+
 // FileExists returns true if file exists.
 func FileExists(file string) bool {
 	_, err := os.Stat(file)