Merge pull request #26 from filecoin-project/feat/tls-uploads

feat: tls uploads

Author: travisperson

Dockerfile

@@ -1,5 +1,7 @@
 FROM golang:buster as builder
 
+RUN apt-get update && apt-get install -y ca-certificates
+
 ENV GO111MODULE=on \
     CGO_ENABLED=1  \
     GOOS=linux     \
@@ -17,6 +19,7 @@ RUN go build -o filecoin-chain-archiver ./cmd/filecoin-chain-archiver
 
 FROM debian:buster
 
+COPY --from=builder /etc/ssl/certs                 /etc/ssl/certs
 COPY --from=builder /build/filecoin-chain-archiver /usr/local/bin
 
 ENTRYPOINT ["/usr/local/bin/filecoin-chain-archiver"]

cmd/filecoin-chain-archiver/cmds/create.go

@@ -7,17 +7,18 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"net/url"
 	"strings"
 	"syscall"
 	"time"
 
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/minio/minio-go/v7"
-	"github.com/minio/minio-go/v7/pkg/credentials"
 	"github.com/filecoin-project/filecoin-chain-archiver/pkg/config"
 	"github.com/filecoin-project/filecoin-chain-archiver/pkg/consensus"
 	"github.com/filecoin-project/filecoin-chain-archiver/pkg/export"
 	"github.com/filecoin-project/filecoin-chain-archiver/pkg/nodelocker/client"
+	"github.com/filecoin-project/go-state-types/abi"
+	"github.com/minio/minio-go/v7"
+	"github.com/minio/minio-go/v7/pkg/credentials"
 	"github.com/urfave/cli/v2"
 	"golang.org/x/xerrors"
 
@@ -140,6 +141,11 @@ var cmdCreate = &cli.Command{
 		flagAfter := cctx.Int("after")
 		flagStaterootCount := cctx.Int("stateroot-count")
 
+		u, err := url.Parse(flagBucketEndpoint)
+		if err != nil {
+			return err
+		}
+
 		icfg, err := config.FromFile(flagConfigPath, &config.Config{})
 		if err != nil {
 			return err
@@ -298,9 +304,20 @@ var cmdCreate = &cli.Command{
 			logger.Infow("discarding output")
 			io.Copy(ioutil.Discard, r)
 		} else {
-			minioClient, err := minio.New(flagBucketEndpoint, &minio.Options{
+			host := u.Host
+			port := u.Port()
+			if port == "" {
+				port = "80"
+				if u.Scheme == "https" {
+					port = "443"
+				}
+			}
+
+			logger.Infow("upload endpoint", "host", host, "port", port, "tls", u.Scheme == "https")
+
+			minioClient, err := minio.New(fmt.Sprintf("%s:%s", host, port), &minio.Options{
 				Creds:  credentials.NewStaticV4(flagBucketAccessKey, flagBucketSecretKey, ""),
-				Secure: false,
+				Secure: u.Scheme == "https",
 			})
 
 			info, err := minioClient.PutObject(ctx, flagBucket, fmt.Sprintf("%d.car", height), tr, -1, minio.PutObjectOptions{})