fix: whitespace at start of path can result in invalid restore target

garethgeorge · garethgeorge · commit 47a4b5226363 · 2025-01-22T19:07:03.000-08:00
diff --git a/internal/api/backresthandler.go b/internal/api/backresthandler.go
@@ -531,6 +531,9 @@ func (s BackrestHandler) DoRepoTask(ctx context.Context, req *connect.Request[v1
 }
 
 func (s *BackrestHandler) Restore(ctx context.Context, req *connect.Request[v1.RestoreSnapshotRequest]) (*connect.Response[emptypb.Empty], error) {
+	req.Msg.Target = strings.TrimSpace(req.Msg.Target)
+	req.Msg.Path = strings.TrimSpace(req.Msg.Path)
+
 	if req.Msg.Target == "" {
 		req.Msg.Target = path.Join(os.Getenv("HOME"), "Downloads", fmt.Sprintf("restic-restore-%v", time.Now().Format("2006-01-02T15-04-05")))
 	}

Original file line number	Diff line number	Diff line change
`@@ -531,6 +531,9 @@ func (s BackrestHandler) DoRepoTask(ctx context.Context, req *connect.Request[v1`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`func (s BackrestHandler) Restore(ctx context.Context, req connect.Request[v1.RestoreSnapshotRequest]) (*connect.Response[emptypb.Empty], error) {`
	`534`	`+ req.Msg.Target = strings.TrimSpace(req.Msg.Target)`
	`535`	`+ req.Msg.Path = strings.TrimSpace(req.Msg.Path)`
	`536`	`+`
`534`	`537`	`if req.Msg.Target == "" {`
`535`	`538`	`req.Msg.Target = path.Join(os.Getenv("HOME"), "Downloads", fmt.Sprintf("restic-restore-%v", time.Now().Format("2006-01-02T15-04-05")))`
`536`	`539`	`}`