镜像站点 · 本页由第三方 GitHub 只读镜像提供,非 GitHub 官方站点,不接受任何登录或凭据输入。前往 github.com
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions platform/base/change/git/change_id.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,25 @@ func ParseChangeID(raw string) (ChangeID, error) {
return ChangeID{}, fmt.Errorf("invalid change ID %q: empty repo (expected format: %s)", raw, changeIDFormat)
}

return ChangeID{
for _, seg := range segments[:len(segments)-2] {
if seg == "" {
return ChangeID{}, fmt.Errorf("invalid change ID %q: repo path contains an empty segment (expected format: %s)", raw, changeIDFormat)
}
}

id := ChangeID{
Scheme: u.Scheme,
Remote: u.Host,
Repo: repo,
Ref: ref,
CommitSHA: sha,
}, nil
}

if canonical := id.String(); canonical != raw {
return ChangeID{}, fmt.Errorf("invalid change ID %q: not in canonical form %q (expected format: %s)", raw, canonical, changeIDFormat)
}

return id, nil
}

// String returns the string representation of the change ID.
Expand Down
40 changes: 40 additions & 0 deletions platform/base/change/git/change_id_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,46 @@ func TestParseChangeID(t *testing.T) {
raw: "git://git.example.com//refs%2Fheads%2Fmain/" + sha,
wantErr: true,
},
{
name: "uppercase scheme",
raw: "GIT://git.example.com/uber/monorepo/refs%2Fheads%2Fmain/" + sha,
wantErr: true,
},
{
name: "userinfo",
raw: "git://user@git.example.com/uber/monorepo/refs%2Fheads%2Fmain/" + sha,
wantErr: true,
},
{
name: "query",
raw: "git://git.example.com/uber/monorepo/refs%2Fheads%2Fmain/" + sha + "?x=1",
wantErr: true,
},
{
name: "fragment",
raw: "git://git.example.com/uber/monorepo/refs%2Fheads%2Fmain/" + sha + "#frag",
wantErr: true,
},
{
name: "lowercase percent-encoding",
raw: "git://git.example.com/uber/monorepo/refs%2fheads%2fmain/" + sha,
wantErr: true,
},
{
name: "unnecessarily encoded ref character",
raw: "git://git.example.com/uber/monorepo/%72efs%2Fheads%2Fmain/" + sha,
wantErr: true,
},
{
name: "empty interior repo segment",
raw: "git://git.example.com/uber//monorepo/refs%2Fheads%2Fmain/" + sha,
wantErr: true,
},
{
name: "leading empty repo segment",
raw: "git://git.example.com//uber/monorepo/refs%2Fheads%2Fmain/" + sha,
wantErr: true,
},
}

for _, tt := range tests {
Expand Down
Loading