Merge pull request #10642 from hashicorp/wilken_init_no_magic_host

github/getter: Adds a hostname check to Get function
This commit is contained in:
Megan Marsh 2021-02-16 11:27:11 -08:00 committed by GitHub
commit 2065de0b4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 1 deletions

View File

@ -291,6 +291,32 @@ func TestInitCommand_Run(t *testing.T) {
testBuild{want: 1}.fn, testBuild{want: 1}.fn,
}, },
}, },
{
"unsupported-non-github-source-address",
[]func(t *testing.T, tc testCaseInit){
skipInitTestUnlessEnVar(acctest.TestEnvVar).fn,
},
testMetaFile(t),
nil,
"h1:47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=",
map[string]string{
`cfg.pkr.hcl`: `
packer {
required_plugins {
comment = {
source = "example.com/sylviamoss/comment"
version = "v0.2.19"
}
}
}`,
},
cfg.dir("6_pkr_config"),
cfg.dir("6_pkr_user_folder"),
1,
nil,
"h1:47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=",
nil,
},
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {

View File

@ -23,6 +23,7 @@ import (
const ( const (
ghTokenAccessor = "PACKER_GITHUB_API_TOKEN" ghTokenAccessor = "PACKER_GITHUB_API_TOKEN"
defaultUserAgent = "packer-plugin-getter" defaultUserAgent = "packer-plugin-getter"
defaultHostname = "github.com"
) )
type Getter struct { type Getter struct {
@ -154,6 +155,11 @@ func (t *HostSpecificTokenAuthTransport) base() http.RoundTripper {
} }
func (g *Getter) Get(what string, opts plugingetter.GetOptions) (io.ReadCloser, error) { func (g *Getter) Get(what string, opts plugingetter.GetOptions) (io.ReadCloser, error) {
if opts.PluginRequirement.Identifier.Hostname != defaultHostname {
s := opts.PluginRequirement.Identifier.String() + " doesn't appear to be a valid " + defaultHostname + " source address; check source and try again."
return nil, errors.New(s)
}
ctx := context.TODO() ctx := context.TODO()
if g.Client == nil { if g.Client == nil {
var tc *http.Client var tc *http.Client

View File

@ -345,7 +345,7 @@ func (pr *Requirement) InstallLatest(opts InstallOptions) (*Installation, error)
getters := opts.Getters getters := opts.Getters
fail := fmt.Errorf("could not find a local nor a remote checksum for plugin %q %q", pr.Identifier, pr.VersionConstraints) fail := fmt.Errorf("could not find a local nor a remote checksum for plugin %q %q", pr.Identifier, pr.VersionConstraints)
log.Printf("[TRACE] getting available versions for the the %s plugin", pr.Identifier) log.Printf("[TRACE] getting available versions for the %s plugin", pr.Identifier)
versions := version.Collection{} versions := version.Collection{}
for _, getter := range getters { for _, getter := range getters {