feat: add support for insecure skip verify on cli http clients

influxdata · Nov 14, 2019 · 039ceca · 039ceca
1 parent 1a28a32
commit 039ceca
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 53 deletions.
diff --git a/cmd/influx/authorization.go b/cmd/influx/authorization.go
@@ -374,8 +374,9 @@ func newAuthorizationService(f Flags) (platform.AuthorizationService, error) {
 		return newLocalKVService()
 	}
 	return &http.AuthorizationService{
-		Addr:  flags.host,
-		Token: flags.token,
+		Addr:               flags.host,
+		Token:              flags.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}, nil
 }
 

diff --git a/cmd/influx/bucket.go b/cmd/influx/bucket.go
@@ -52,8 +52,9 @@ func newBucketService(f Flags) (platform.BucketService, error) {
 		return newLocalKVService()
 	}
 	return &http.BucketService{
-		Addr:  f.host,
-		Token: f.token,
+		Addr:               f.host,
+		Token:              f.token,
+		InsecureSkipVerify: f.skipVerify,
 	}, nil
 }
 

diff --git a/cmd/influx/delete.go b/cmd/influx/delete.go
@@ -66,8 +66,9 @@ func fluxDeleteF(cmd *cobra.Command, args []string) error {
 	}
 
 	s := &http.DeleteService{
-		Addr:  flags.host,
-		Token: flags.token,
+		Addr:               flags.host,
+		Token:              flags.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}
 
 	ctx = signals.WithStandardSignals(ctx)

diff --git a/cmd/influx/main.go b/cmd/influx/main.go
@@ -64,6 +64,8 @@ func init() {
 
 	influxCmd.PersistentFlags().BoolVar(&flags.local, "local", false, "Run commands locally against the filesystem")
 
+	influxCmd.PersistentFlags().BoolVar(&flags.skipVerify, "skip-verify", false, "SkipVerify controls whether a client verifies the server's certificate chain and host name.")
+
 	// Override help on all the commands tree
 	walk(influxCmd, func(c *cobra.Command) {
 		c.Flags().BoolP("help", "h", false, fmt.Sprintf("Help for the %s command ", c.Name()))
@@ -78,9 +80,10 @@ func main() {
 
 // Flags contains all the CLI flag values for influx.
 type Flags struct {
-	token string
-	host  string
-	local bool
+	token      string
+	host       string
+	local      bool
+	skipVerify bool
 }
 
 var flags Flags

diff --git a/cmd/influx/organization.go b/cmd/influx/organization.go
@@ -48,8 +48,9 @@ func newOrganizationService(f Flags) (platform.OrganizationService, error) {
 		return newLocalKVService()
 	}
 	return &http.OrganizationService{
-		Addr:  flags.host,
-		Token: flags.token,
+		Addr:               flags.host,
+		Token:              flags.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}, nil
 }
 

diff --git a/cmd/influx/pkg.go b/cmd/influx/pkg.go
@@ -125,8 +125,9 @@ func newDashboardService(f Flags) (influxdb.DashboardService, error) {
 		return newLocalKVService()
 	}
 	return &http.DashboardService{
-		Addr:  f.host,
-		Token: f.token,
+		Addr:               f.host,
+		Token:              f.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}, nil
 }
 
@@ -135,8 +136,9 @@ func newLabelService(f Flags) (influxdb.LabelService, error) {
 		return newLocalKVService()
 	}
 	return &http.LabelService{
-		Addr:  f.host,
-		Token: f.token,
+		Addr:               f.host,
+		Token:              f.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}, nil
 }
 
@@ -145,8 +147,9 @@ func newVariableService(f Flags) (influxdb.VariableService, error) {
 		return newLocalKVService()
 	}
 	return &http.VariableService{
-		Addr:  f.host,
-		Token: f.token,
+		Addr:               f.host,
+		Token:              f.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}, nil
 }
 

diff --git a/cmd/influx/query.go b/cmd/influx/query.go
@@ -80,7 +80,7 @@ func fluxQueryF(cmd *cobra.Command, args []string) error {
 
 	flux.FinalizeBuiltIns()
 
-	r, err := getFluxREPL(flags.host, flags.token, orgID)
+	r, err := getFluxREPL(flags.host, flags.token, flags.skipVerify, orgID)
 	if err != nil {
 		return fmt.Errorf("failed to get the flux REPL: %v", err)
 	}

diff --git a/cmd/influx/repl.go b/cmd/influx/repl.go
@@ -73,7 +73,7 @@ func replF(cmd *cobra.Command, args []string) error {
 
 	flux.FinalizeBuiltIns()
 
-	r, err := getFluxREPL(flags.host, flags.token, orgID)
+	r, err := getFluxREPL(flags.host, flags.token, flags.skipVerify, orgID)
 	if err != nil {
 		return err
 	}
@@ -84,8 +84,9 @@ func replF(cmd *cobra.Command, args []string) error {
 
 func findOrgID(ctx context.Context, org string) (platform.ID, error) {
 	svc := &http.OrganizationService{
-		Addr:  flags.host,
-		Token: flags.token,
+		Addr:               flags.host,
+		Token:              flags.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}
 
 	o, err := svc.FindOrganization(ctx, platform.OrganizationFilter{
@@ -98,10 +99,11 @@ func findOrgID(ctx context.Context, org string) (platform.ID, error) {
 	return o.ID, nil
 }
 
-func getFluxREPL(addr, token string, orgID platform.ID) (*repl.REPL, error) {
+func getFluxREPL(addr, token string, skipVerify bool, orgID platform.ID) (*repl.REPL, error) {
 	qs := &http.FluxQueryService{
-		Addr:  addr,
-		Token: token,
+		Addr:               addr,
+		Token:              token,
+		InsecureSkipVerify: skipVerify,
 	}
 	q := &query.REPLQuerier{
 		OrganizationID: orgID,

diff --git a/cmd/influx/task.go b/cmd/influx/task.go
@@ -83,8 +83,9 @@ func taskCreateF(cmd *cobra.Command, args []string) error {
 	}
 
 	s := &http.TaskService{
-		Addr:  flags.host,
-		Token: flags.token,
+		Addr:               flags.host,
+		Token:              flags.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}
 
 	flux, err := repl.LoadQuery(args[0])
@@ -163,8 +164,9 @@ func init() {
 
 func taskFindF(cmd *cobra.Command, args []string) error {
 	s := &http.TaskService{
-		Addr:  flags.host,
-		Token: flags.token,
+		Addr:               flags.host,
+		Token:              flags.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}
 
 	filter := platform.TaskFilter{}
@@ -265,8 +267,9 @@ func init() {
 
 func taskUpdateF(cmd *cobra.Command, args []string) error {
 	s := &http.TaskService{
-		Addr:  flags.host,
-		Token: flags.token,
+		Addr:               flags.host,
+		Token:              flags.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}
 
 	var id platform.ID
@@ -339,8 +342,9 @@ func init() {
 
 func taskDeleteF(cmd *cobra.Command, args []string) error {
 	s := &http.TaskService{
-		Addr:  flags.host,
-		Token: flags.token,
+		Addr:               flags.host,
+		Token:              flags.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}
 
 	var id platform.ID
@@ -408,8 +412,9 @@ func init() {
 
 func taskLogFindF(cmd *cobra.Command, args []string) error {
 	s := &http.TaskService{
-		Addr:  flags.host,
-		Token: flags.token,
+		Addr:               flags.host,
+		Token:              flags.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}
 
 	var filter platform.LogFilter
@@ -482,8 +487,9 @@ func init() {
 
 func taskRunFindF(cmd *cobra.Command, args []string) error {
 	s := &http.TaskService{
-		Addr:  flags.host,
-		Token: flags.token,
+		Addr:               flags.host,
+		Token:              flags.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}
 
 	filter := platform.RunFilter{
@@ -570,8 +576,9 @@ func init() {
 
 func runRetryF(cmd *cobra.Command, args []string) error {
 	s := &http.TaskService{
-		Addr:  flags.host,
-		Token: flags.token,
+		Addr:               flags.host,
+		Token:              flags.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}
 
 	var taskID, runID platform.ID

diff --git a/cmd/influx/user.go b/cmd/influx/user.go
@@ -40,28 +40,30 @@ func init() {
 	userCmd.AddCommand(userUpdateCmd)
 }
 
-func newUserService(f Flags) (platform.UserService, error) {
+func newUserService() (platform.UserService, error) {
 	if flags.local {
 		return newLocalKVService()
 	}
 	return &http.UserService{
-		Addr:  flags.host,
-		Token: flags.token,
+		Addr:               flags.host,
+		Token:              flags.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}, nil
 }
 
-func newUserResourceMappingService(f Flags) (platform.UserResourceMappingService, error) {
+func newUserResourceMappingService() (platform.UserResourceMappingService, error) {
 	if flags.local {
 		return newLocalKVService()
 	}
 	return &http.UserResourceMappingService{
-		Addr:  flags.host,
-		Token: flags.token,
+		Addr:               flags.host,
+		Token:              flags.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}, nil
 }
 
 func userUpdateF(cmd *cobra.Command, args []string) error {
-	s, err := newUserService(flags)
+	s, err := newUserService()
 	if err != nil {
 		return err
 	}
@@ -116,7 +118,7 @@ func init() {
 }
 
 func userCreateF(cmd *cobra.Command, args []string) error {
-	s, err := newUserService(flags)
+	s, err := newUserService()
 	if err != nil {
 		return err
 	}
@@ -165,7 +167,7 @@ func init() {
 }
 
 func userFindF(cmd *cobra.Command, args []string) error {
-	s, err := newUserService(flags)
+	s, err := newUserService()
 	if err != nil {
 		return err
 	}
@@ -224,7 +226,7 @@ func init() {
 }
 
 func userDeleteF(cmd *cobra.Command, args []string) error {
-	s, err := newUserService(flags)
+	s, err := newUserService()
 	if err != nil {
 		return err
 	}

diff --git a/cmd/influx/write.go b/cmd/influx/write.go
@@ -84,8 +84,9 @@ func fluxWriteF(cmd *cobra.Command, args []string) error {
 	}
 
 	bs := &http.BucketService{
-		Addr:  flags.host,
-		Token: flags.token,
+		Addr:               flags.host,
+		Token:              flags.token,
+		InsecureSkipVerify: flags.skipVerify,
 	}
 
 	var err error
@@ -144,9 +145,10 @@ func fluxWriteF(cmd *cobra.Command, args []string) error {
 
 	s := write.Batcher{
 		Service: &http.WriteService{
-			Addr:      flags.host,
-			Token:     flags.token,
-			Precision: writeFlags.Precision,
+			Addr:               flags.host,
+			Token:              flags.token,
+			Precision:          writeFlags.Precision,
+			InsecureSkipVerify: flags.skipVerify,
 		},
 	}