Merge branch 'master' into try-gookikt-config

thumbnails/pkg/config/config.go

@@ -61,6 +61,7 @@ type Thumbnail struct {
 	Resolutions         []string          `mapstructure:"resolutions"`
 	FileSystemStorage   FileSystemStorage `mapstructure:"filesystem_storage"`
 	WebdavAllowInsecure bool              `mapstructure:"webdav_allow_insecure"`
+	CS3AllowInsecure    bool `mapstructure:"cs3_allow_insecure"`
 	RevaGateway         string            `mapstructure:"reva_gateway"`
 	WebdavNamespace     string            `mapstructure:"webdav_namespace"`
 }
@@ -99,6 +100,7 @@ func DefaultConfig() *Config {
 			WebdavAllowInsecure: true,
 			RevaGateway:         "127.0.0.1:9142",
 			WebdavNamespace:     "/home",
+			CS3AllowInsecure: false,
 		},
 	}
 }

thumbnails/pkg/server/grpc/server.go

@@ -42,7 +42,7 @@ func NewService(opts ...Option) grpc.Service {
 					options.Logger,
 				),
 			),
-			svc.CS3Source(imgsource.NewCS3Source(gc)),
+			svc.CS3Source(imgsource.NewCS3Source(tconf, gc)),
 			svc.CS3Client(gc),
 		)
 		thumbnail = svc.NewInstrument(thumbnail, options.Metrics)

thumbnails/pkg/thumbnail/imgsource/cs3.go

@@ -12,6 +12,7 @@ import (
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
 	revactx "github.com/cs3org/reva/pkg/ctx"
 	"github.com/cs3org/reva/pkg/rhttp"
+	"github.com/owncloud/ocis/thumbnails/pkg/config"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc/metadata"
 )
@@ -23,12 +24,14 @@ const (
 )
 
 type CS3 struct {
-	client gateway.GatewayAPIClient
+	client   gateway.GatewayAPIClient
+	insecure bool
 }
 
-func NewCS3Source(c gateway.GatewayAPIClient) CS3 {
+func NewCS3Source(cfg config.Thumbnail, c gateway.GatewayAPIClient) CS3 {
 	return CS3{
-		client: c,
+		client:   c,
+		insecure: cfg.CS3AllowInsecure,
 	}
 }
 
@@ -67,7 +70,9 @@ func (s CS3) Get(ctx context.Context, path string) (io.ReadCloser, error) {
 	httpReq.Header.Set(revactx.TokenHeader, auth)
 	httpReq.Header.Set(TokenTransportHeader, tk)
 
-	http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true} //nolint:gosec
+	http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{
+		InsecureSkipVerify: s.insecure, //nolint:gosec
+	}
 	client := &http.Client{}
 
 	resp, err := client.Do(httpReq) // nolint:bodyclose