-
Notifications
You must be signed in to change notification settings - Fork 22
Add global --skip-tls-verify flag for self-signed certs #272
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jai-deepsource
wants to merge
1
commit into
master
Choose a base branch
from
tls-skip-server
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package cmdutil | ||
|
|
||
| import "github.com/spf13/cobra" | ||
|
|
||
| // ResolveSkipTLSVerify returns true if TLS verification should be skipped. | ||
| // Priority: --skip-tls-verify flag > config value (which includes env var). | ||
| func ResolveSkipTLSVerify(cmd *cobra.Command, cfgValue bool) bool { | ||
| if cmd != nil { | ||
| if f := cmd.Root().PersistentFlags().Lookup("skip-tls-verify"); f != nil && f.Changed { | ||
| return true | ||
| } | ||
| } | ||
| return cfgValue | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| package cmdutil | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| func TestResolveSkipTLSVerify(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| setupCmd func() *cobra.Command | ||
| cfgValue bool | ||
| want bool | ||
| }{ | ||
| { | ||
| name: "nil cmd, cfgValue false", | ||
| setupCmd: func() *cobra.Command { return nil }, | ||
| cfgValue: false, | ||
| want: false, | ||
| }, | ||
| { | ||
| name: "nil cmd, cfgValue true", | ||
| setupCmd: func() *cobra.Command { return nil }, | ||
| cfgValue: true, | ||
| want: true, | ||
| }, | ||
| { | ||
| name: "cmd without skip-tls-verify flag, cfgValue false", | ||
| setupCmd: func() *cobra.Command { | ||
| return &cobra.Command{Use: "test"} | ||
| }, | ||
| cfgValue: false, | ||
| want: false, | ||
| }, | ||
| { | ||
| name: "cmd without skip-tls-verify flag, cfgValue true", | ||
| setupCmd: func() *cobra.Command { | ||
| return &cobra.Command{Use: "test"} | ||
| }, | ||
| cfgValue: true, | ||
| want: true, | ||
| }, | ||
| { | ||
| name: "cmd with flag not set, cfgValue false", | ||
| setupCmd: func() *cobra.Command { | ||
| root := &cobra.Command{Use: "root"} | ||
| root.PersistentFlags().Bool("skip-tls-verify", false, "") | ||
| child := &cobra.Command{Use: "child"} | ||
| root.AddCommand(child) | ||
| return child | ||
| }, | ||
| cfgValue: false, | ||
| want: false, | ||
| }, | ||
| { | ||
| name: "cmd with flag not set, cfgValue true", | ||
| setupCmd: func() *cobra.Command { | ||
| root := &cobra.Command{Use: "root"} | ||
| root.PersistentFlags().Bool("skip-tls-verify", false, "") | ||
| child := &cobra.Command{Use: "child"} | ||
| root.AddCommand(child) | ||
| return child | ||
| }, | ||
| cfgValue: true, | ||
| want: true, | ||
| }, | ||
| { | ||
| name: "cmd with flag set, cfgValue false", | ||
| setupCmd: func() *cobra.Command { | ||
| root := &cobra.Command{Use: "root"} | ||
| root.PersistentFlags().Bool("skip-tls-verify", false, "") | ||
| child := &cobra.Command{Use: "child"} | ||
| root.AddCommand(child) | ||
| // Simulate the flag being set on the command line | ||
| root.PersistentFlags().Set("skip-tls-verify", "true") | ||
| return child | ||
| }, | ||
| cfgValue: false, | ||
| want: true, | ||
| }, | ||
| { | ||
| name: "cmd with flag set, cfgValue true", | ||
| setupCmd: func() *cobra.Command { | ||
| root := &cobra.Command{Use: "root"} | ||
| root.PersistentFlags().Bool("skip-tls-verify", false, "") | ||
| child := &cobra.Command{Use: "child"} | ||
| root.AddCommand(child) | ||
| root.PersistentFlags().Set("skip-tls-verify", "true") | ||
| return child | ||
| }, | ||
| cfgValue: true, | ||
| want: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| cmd := tt.setupCmd() | ||
| got := ResolveSkipTLSVerify(cmd, tt.cfgValue) | ||
| if got != tt.want { | ||
| t.Errorf("ResolveSkipTLSVerify() = %v, want %v", got, tt.want) | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -87,7 +87,7 @@ func NewCmdMetricsWithDeps(deps *cmddeps.Deps) *cobra.Command { | |
| Short: "View repository metrics", | ||
| Long: doc, | ||
| RunE: func(cmd *cobra.Command, _ []string) error { | ||
| return opts.Run(cmd.Context()) | ||
| return opts.Run(cmd, cmd.Context()) | ||
| }, | ||
| } | ||
|
|
||
|
|
@@ -116,7 +116,7 @@ func NewCmdMetricsWithDeps(deps *cmddeps.Deps) *cobra.Command { | |
| return cmd | ||
| } | ||
|
|
||
| func (opts *MetricsOptions) Run(ctx context.Context) error { | ||
| func (opts *MetricsOptions) Run(cmd *cobra.Command, ctx context.Context) error { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
| var cfgMgr *config.Manager | ||
| if opts.deps != nil && opts.deps.ConfigMgr != nil { | ||
| cfgMgr = opts.deps.ConfigMgr | ||
|
|
@@ -142,9 +142,10 @@ func (opts *MetricsOptions) Run(ctx context.Context) error { | |
| client = opts.deps.Client | ||
| } else { | ||
| client, err = deepsource.New(deepsource.ClientOpts{ | ||
| Token: cfg.Token, | ||
| HostName: cfg.Host, | ||
| OnTokenRefreshed: cfgMgr.TokenRefreshCallback(), | ||
| Token: cfg.Token, | ||
| HostName: cfg.Host, | ||
| InsecureSkipVerify: cmdutil.ResolveSkipTLSVerify(cmd, cfg.SkipTLSVerify), | ||
| OnTokenRefreshed: cfgMgr.TokenRefreshCallback(), | ||
| }) | ||
| if err != nil { | ||
| return err | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
context.Contextshould be the first parameter of a function.