Merge pull request #1206 from percona/PBM-1619-fix-sigsegv-for-minio-oss-storages

PBM-1619: Add guards in storage config for minio and oss

Author: boris-ilijic

pbm/storage/mio/config.go

@@ -92,6 +92,10 @@ func (cfg *Config) IsSameStorage(other *Config) bool {
 }
 
 func (cfg *Config) Cast() error {
+	if cfg == nil {
+		return errors.New("missing minio configuration with minio storage type")
+	}
+
 	if cfg.Endpoint == "" {
 		return errors.New("endpointURL cannot be empty")
 	}

pbm/storage/mio/config_test.go

@@ -69,14 +69,19 @@ func TestEqual(t *testing.T) {
 }
 
 func TestCast(t *testing.T) {
-	c := &Config{}
+	var c *Config
+	err := c.Cast()
+	if err == nil {
+		t.Fatal("sigsegv should have happened instead")
+	}
 
+	c = &Config{}
 	if err := c.Cast(); err == nil {
 		t.Fatal("want error when EndpointURL is not specified")
 	}
 
 	c.Endpoint = "url"
-	err := c.Cast()
+	err = c.Cast()
 	if err != nil {
 		t.Fatalf("got error during Cast: %v", err)
 	}

pbm/storage/oss/client.go

@@ -2,6 +2,7 @@ package oss
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
@@ -63,6 +64,9 @@ type Credentials struct {
 }
 
 func (cfg *Config) Cast() error {
+	if cfg == nil {
+		return errors.New("missing oss configuration with oss storage type")
+	}
 	if cfg.Region == "" {
 		cfg.Region = defaultOSSRegion
 	}