proxy configuration on client side

bindings/bindings.go

@@ -13,6 +13,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/rs/zerolog"
 
+	"github.com/balazsgrill/potatodrive/bindings/proxy/client"
 	"github.com/balazsgrill/potatodrive/bindings/s3"
 	"github.com/balazsgrill/potatodrive/bindings/sftp"
 	"github.com/balazsgrill/potatodrive/core"
@@ -77,6 +78,8 @@ func CreateConfigByType(typestr string) BindingConfig {
 		return &s3.Config{}
 	case "afero-sftp":
 		return &sftp.Config{}
+	case "afero-http":
+		return &client.Config{}
 	}
 	return nil
 }

bindings/proxy/client/client.go

@@ -1,14 +1,15 @@
 package client
 
 import (
+	"net/http"
 	"time"
 
 	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/balazsgrill/potatodrive/bindings/proxy"
 	"github.com/spf13/afero"
 )
 
-func Connect(url string) (afero.Fs, error) {
+func Connect(url string, httpclient *http.Client) (afero.Fs, error) {
 	conf := &thrift.TConfiguration{
 		ConnectTimeout: time.Second,
 		SocketTimeout:  time.Second,
@@ -19,7 +20,9 @@ func Connect(url string) (afero.Fs, error) {
 		TBinaryStrictWrite: thrift.BoolPtr(true),
 	}
 	protocol := thrift.NewTCompactProtocolFactoryConf(conf)
-	clientfactory := thrift.NewTHttpClientTransportFactory(url)
+	clientfactory := thrift.NewTHttpClientTransportFactoryWithOptions(url, thrift.THttpClientOptions{
+		Client: httpclient,
+	})
 	transport, err := clientfactory.GetTransport(nil)
 	if err != nil {
 		return nil, err

bindings/proxy/client/config.go

@@ -0,0 +1,47 @@
+package client
+
+import (
+	"errors"
+	"net/http"
+
+	"github.com/spf13/afero"
+)
+
+type Config struct {
+	URL       string `flag:"url,Proxy URL" reg:"URL"`
+	KeyId     string `flag:"keyid,Access Key ID" reg:"KeyID"`
+	KeySecret string `flag:"secret,Access Key Secret" reg:"KeySecret"`
+}
+
+func (c *Config) Validate() error {
+	if c.URL == "" {
+		return errors.New("url is mandatory")
+	}
+	if c.KeyId == "" {
+		return errors.New("keyid is mandatory")
+	}
+	if c.KeySecret == "" {
+		return errors.New("secret is mandatory")
+	}
+	return nil
+}
+
+type authenticator struct {
+	*Config
+	delegate http.RoundTripper
+}
+
+func (a *authenticator) RoundTrip(r *http.Request) (*http.Response, error) {
+	r.Header.Add("X-Key-ID", a.KeyId)
+	r.Header.Add("X-Secret", a.KeySecret)
+	return a.delegate.RoundTrip(r)
+}
+
+func (c *Config) ToFileSystem() (afero.Fs, error) {
+	httpclient := &http.Client{}
+	httpclient.Transport = &authenticator{
+		Config:   c,
+		delegate: http.DefaultTransport,
+	}
+	return Connect(c.URL, httpclient)
+}

test/proxy/proxy_test.go

@@ -20,7 +20,12 @@ func TestProxyConnection(t *testing.T) {
 	go httpserver.ListenAndServe()
 	defer httpserver.Close()
 
-	fs2, err := client.Connect("http://localhost:18080")
+	clientconifg := &client.Config{
+		URL:       "http://localhost:18080",
+		KeyId:     "",
+		KeySecret: "",
+	}
+	fs2, err := clientconifg.ToFileSystem()
 	if err != nil {
 		t.Fatal(err)
 	}