fix revproxy client scheme (textileio#581)

jsign · web-flow · commit 0b127870dca0 · 2020-08-31T16:46:39.000-03:00
- Fix using `--ipfsrevproxy` with HTTPS DNS endpoint.
diff --git a/api/client/ffs.go b/api/client/ffs.go
@@ -804,17 +804,18 @@ func newDecoratedIPFSAPI(proxyAddr, ffsToken string) (*httpapi.HttpApi, error) {
 	if len(ipport) != 2 {
 		return nil, fmt.Errorf("ipfs addr is invalid")
 	}
-	cm, err := multiaddr.NewComponent("ip4", ipport[0])
+	cm, err := multiaddr.NewComponent("dns4", ipport[0])
 	if err != nil {
 		return nil, err
 	}
 	cp, err := multiaddr.NewComponent("tcp", ipport[1])
 	if err != nil {
 		return nil, err
 	}
+	useHTTPS := ipport[1] == "443"
 	ipfsMaddr := cm.Encapsulate(cp)
 	customClient := http.DefaultClient
-	customClient.Transport = newFFSHeaderDecorator(ffsToken)
+	customClient.Transport = newFFSHeaderDecorator(ffsToken, useHTTPS)
 	ipfs, err := httpapi.NewApiWithClient(ipfsMaddr, customClient)
 	if err != nil {
 		return nil, err
@@ -824,16 +825,21 @@ func newDecoratedIPFSAPI(proxyAddr, ffsToken string) (*httpapi.HttpApi, error) {
 
 type ffsHeaderDecorator struct {
 	ffsToken string
+	useHTTPS bool
 }
 
-func newFFSHeaderDecorator(ffsToken string) *ffsHeaderDecorator {
+func newFFSHeaderDecorator(ffsToken string, useHTTPS bool) *ffsHeaderDecorator {
 	return &ffsHeaderDecorator{
 		ffsToken: ffsToken,
+		useHTTPS: useHTTPS,
 	}
 }
 
 func (fhd ffsHeaderDecorator) RoundTrip(req *http.Request) (*http.Response, error) {
 	req.Header["x-ipfs-ffs-auth"] = []string{fhd.ffsToken}
+	if fhd.useHTTPS {
+		req.URL.Scheme = "https"
+	}
 
 	return http.DefaultTransport.RoundTrip(req)
 }
diff --git a/cli-docs/pow/pow_ffs_get.md b/cli-docs/pow/pow_ffs_get.md
@@ -15,7 +15,7 @@ pow ffs get [cid] [output file path] [flags]
 ```
   -f, --folder                Indicates that the retrieved Cid is a folder
   -h, --help                  help for get
-      --ipfsrevproxy string   Powergate IPFS reverse proxy multiaddr (default "127.0.0.1:6002")
+      --ipfsrevproxy string   Powergate IPFS reverse proxy DNS address. If port 443, is assumed is a HTTPS endpoint. (default "localhost:6002")
   -t, --token string          token of the request
 ```
 
diff --git a/cmd/pow/cmd/ffs_get.go b/cmd/pow/cmd/ffs_get.go
@@ -15,7 +15,7 @@ import (
 
 func init() {
 	ffsGetCmd.Flags().StringP("token", "t", "", "token of the request")
-	ffsGetCmd.Flags().String("ipfsrevproxy", "127.0.0.1:6002", "Powergate IPFS reverse proxy multiaddr")
+	ffsGetCmd.Flags().String("ipfsrevproxy", "localhost:6002", "Powergate IPFS reverse proxy DNS address. If port 443, is assumed is a HTTPS endpoint.")
 	ffsGetCmd.Flags().BoolP("folder", "f", false, "Indicates that the retrieved Cid is a folder")
 	ffsCmd.AddCommand(ffsGetCmd)
 }

Original file line number	Diff line number	Diff line change
`@@ -804,17 +804,18 @@ func newDecoratedIPFSAPI(proxyAddr, ffsToken string) (*httpapi.HttpApi, error) {`
`804`	`804`	`if len(ipport) != 2 {`
`805`	`805`	`return nil, fmt.Errorf("ipfs addr is invalid")`
`806`	`806`	`}`
`807`		`- cm, err := multiaddr.NewComponent("ip4", ipport[0])`
	`807`	`+ cm, err := multiaddr.NewComponent("dns4", ipport[0])`
`808`	`808`	`if err != nil {`
`809`	`809`	`return nil, err`
`810`	`810`	`}`
`811`	`811`	`cp, err := multiaddr.NewComponent("tcp", ipport[1])`
`812`	`812`	`if err != nil {`
`813`	`813`	`return nil, err`
`814`	`814`	`}`
	`815`	`+ useHTTPS := ipport[1] == "443"`
`815`	`816`	`ipfsMaddr := cm.Encapsulate(cp)`
`816`	`817`	`customClient := http.DefaultClient`
`817`		`- customClient.Transport = newFFSHeaderDecorator(ffsToken)`
	`818`	`+ customClient.Transport = newFFSHeaderDecorator(ffsToken, useHTTPS)`
`818`	`819`	`ipfs, err := httpapi.NewApiWithClient(ipfsMaddr, customClient)`
`819`	`820`	`if err != nil {`
`820`	`821`	`return nil, err`
`@@ -824,16 +825,21 @@ func newDecoratedIPFSAPI(proxyAddr, ffsToken string) (*httpapi.HttpApi, error) {`
`824`	`825`
`825`	`826`	`type ffsHeaderDecorator struct {`
`826`	`827`	`ffsToken string`
	`828`	`+ useHTTPS bool`
`827`	`829`	`}`
`828`	`830`
`829`		`-func newFFSHeaderDecorator(ffsToken string) *ffsHeaderDecorator {`
	`831`	`+func newFFSHeaderDecorator(ffsToken string, useHTTPS bool) *ffsHeaderDecorator {`
`830`	`832`	`return &ffsHeaderDecorator{`
`831`	`833`	`ffsToken: ffsToken,`
	`834`	`+ useHTTPS: useHTTPS,`
`832`	`835`	`}`
`833`	`836`	`}`
`834`	`837`
`835`	`838`	`func (fhd ffsHeaderDecorator) RoundTrip(req http.Request) (http.Response, error) {`
`836`	`839`	`req.Header["x-ipfs-ffs-auth"] = []string{fhd.ffsToken}`
	`840`	`+ if fhd.useHTTPS {`
	`841`	`+ req.URL.Scheme = "https"`
	`842`	`+ }`
`837`	`843`
`838`	`844`	`return http.DefaultTransport.RoundTrip(req)`
`839`	`845`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`
`16`	`16`	`func init() {`
`17`	`17`	`ffsGetCmd.Flags().StringP("token", "t", "", "token of the request")`
`18`		`- ffsGetCmd.Flags().String("ipfsrevproxy", "127.0.0.1:6002", "Powergate IPFS reverse proxy multiaddr")`
	`18`	`+ ffsGetCmd.Flags().String("ipfsrevproxy", "localhost:6002", "Powergate IPFS reverse proxy DNS address. If port 443, is assumed is a HTTPS endpoint.")`
`19`	`19`	`ffsGetCmd.Flags().BoolP("folder", "f", false, "Indicates that the retrieved Cid is a folder")`
`20`	`20`	`ffsCmd.AddCommand(ffsGetCmd)`
`21`	`21`	`}`