public/atlantis
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/atlantis.git synced 2026-08-05 01:58:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78 from runatlantis/workspace-validation

Browse Source 
Validate workspace the same way as Terraform.
This commit is contained in:
Luke Kysow
2018-03-20 12:55:22 -07:00
committed by GitHub
parent 9b80b0f66f 85ab7475f8
commit 9ce2704cd8
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/events/comment_parser.go
View File

@@ -16,6 +16,7 @@ package events
import (
"fmt"
"io/ioutil"
"net/url"
"path/filepath"
"strings"
@@ -189,10 +190,11 @@ func (e *CommentParser) Parse(comment string, vcsHost vcs.Host) CommentParseResu
return CommentParseResult{CommentResponse: e.errMarkdown(err.Error(), command, flagSet)}
}
// Because we use the workspace name as a file, need to make sure it's
// not doing something weird like being a relative dir.
if strings.Contains(workspace, "..") {
return CommentParseResult{CommentResponse: e.errMarkdown(fmt.Sprintf("value for -%s/--%s can't contain '..'", WorkspaceFlagShort, WorkspaceFlagLong), command, flagSet)}
// Use the same validation that Terraform uses: https://git.io/vxGhU. Plus
// we also don't allow '..'. We don't want the workspace to contain a path
// since we create files based on the name.
if workspace != url.PathEscape(workspace) || strings.Contains(workspace, "..") {
return CommentParseResult{CommentResponse: e.errMarkdown(fmt.Sprintf("invalid workspace: %q", workspace), command, flagSet)}
}
return CommentParseResult{

6
server/events/comment_parser_test.go
View File

@@ -240,10 +240,12 @@ func TestParse_RelativeDirPath(t *testing.T) {
}
func TestParse_InvalidWorkspace(t *testing.T) {
t.Log("if -w is used with '..', should return an error")
t.Log("if -w is used with '..' or '/', should return an error")
comments := []string{
"atlantis plan -w ..",
"atlantis apply -w ..",
"atlantis plan -w /",
"atlantis apply -w /",
"atlantis plan -w ..abc",
"atlantis apply -w abc..",
"atlantis plan -w abc..abc",
@@ -251,7 +253,7 @@ func TestParse_InvalidWorkspace(t *testing.T) {
}
for _, c := range comments {
r := commentParser.Parse(c, vcs.Github)
exp := "Error: value for -w/--workspace can't contain '..'"
exp := "Error: invalid workspace"
Assert(t, strings.Contains(r.CommentResponse, exp),
"For comment %q expected CommentResponse %q to contain %q", c, r.CommentResponse, exp)
}