refactor: convert task script line endings (ccfos#1717)

0x76long · Oct 9, 2023 · d099e6b · d099e6b
1 parent 320401e
commit d099e6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/center/router/router_task.go b/center/router/router_task.go
@@ -92,6 +92,7 @@ func (f *taskForm) Verify() error {
 	if f.Script == "" {
 		return fmt.Errorf("arg(script) is required")
 	}
+	f.Script = strings.Replace(f.Script, "\r\n", "\n", -1)
 
 	if str.Dangerous(f.Args) {
 		return fmt.Errorf("arg(args) is dangerous")

diff --git a/models/task_tpl.go b/models/task_tpl.go
@@ -140,6 +140,7 @@ func (t *TaskTpl) CleanFields() error {
 	if t.Script == "" {
 		return errors.New("arg(script) is required")
 	}
+	t.Script = strings.Replace(t.Script, "\r\n", "\n", -1)
 
 	if str.Dangerous(t.Args) {
 		return errors.New("arg(args) is dangerous")