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
5 changes: 5 additions & 0 deletions managedplugin/version_checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
"strings"

"github.com/Masterminds/semver"
cloudquery_api "github.com/cloudquery/cloudquery-api-go"
Expand Down Expand Up @@ -31,6 +32,10 @@ func (p *PluginVersionWarner) getLatestVersion(ctx context.Context, org string,
p.logger.Debug().Str("plugin", name).Str("kind", kind).Msg("invalid kind")
return nil, fmt.Errorf("invalid kind: %s", kind)
}
if org == "" || name == "" || strings.ContainsRune(org, '/') || strings.ContainsRune(name, '/') {
p.logger.Debug().Str("org", org).Str("plugin", name).Msg("invalid org or plugin name")
return nil, fmt.Errorf("invalid plugin reference: %q/%q", org, name)
}
resp, err := p.hubClient.GetPluginWithResponse(ctx, org, cloudquery_api.PluginKind(kind), name)
if err != nil {
p.logger.Debug().Str("plugin", name).Err(err).Msg("failed to get plugin info from hub")
Expand Down
15 changes: 15 additions & 0 deletions managedplugin/version_checker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,21 @@ func TestPluginVersionWarnerUnknownPluginFails(t *testing.T) {
assert.False(t, warned)
}

func TestPluginVersionWarnerInvalidOrgOrNameFails(t *testing.T) {
versionWarner, err := NewPluginVersionWarner(zerolog.Nop(), "")
require.NoError(t, err)
for _, tc := range []struct{ org, name string }{
{org: "", name: ".cq"},
{org: "cloudquery", name: ""},
{org: "", name: ""},
{org: "cloudquery/aws", name: "plugin"},
} {
warned, err := versionWarner.WarnIfOutdated(context.Background(), tc.org, tc.name, "source", "1.0.0")
assert.Error(t, err, "%q/%q", tc.org, tc.name)
assert.False(t, warned)
}
}

// Note: this is an integration test that requires Internet access and the hub to be running
func TestPluginLatestVersionDoesNotWarn(t *testing.T) {
versionWarner, err := NewPluginVersionWarner(zerolog.Nop(), "")
Expand Down