Add option to specify proxy

Author: eikendev

cmd/pbcli/main.go

@@ -33,6 +33,7 @@ func main() {
 	s := &settings.Settings{
 		URL:      cmds.URL,
 		Username: cmds.Username,
+		Proxy:    cmds.Proxy,
 	}
 
 	password := ui.GetPassword("Current password of user " + s.Username + ": ")

internal/api/mod.go

@@ -25,8 +25,26 @@ func buildURL(baseStr string, endpoint string) *url.URL {
 }
 
 // Request sends a HTTP request to the server.
-func Request(base, endpoint, method, username, password string, hasBody bool, data interface{}) (interface{}, error) {
-	client := &http.Client{}
+func Request(base, endpoint, method, proxy, username, password string, hasBody bool, data interface{}) (interface{}, error) {
+	transport := http.DefaultTransport
+
+	if len(proxy) > 0 {
+		log.Printf("Using proxy '%s'", proxy)
+
+		proxyURL, err := url.Parse(proxy)
+		if err != nil {
+			return nil, err
+		}
+
+		transport = &http.Transport{
+			Proxy: http.ProxyURL(proxyURL),
+		}
+	}
+
+	client := &http.Client{
+		Transport: transport,
+	}
+
 	url := buildURL(base, endpoint)
 
 	var reqBodyReader io.Reader
@@ -77,21 +95,21 @@ func Request(base, endpoint, method, username, password string, hasBody bool, da
 }
 
 // Delete sends a HTTP DELETE request to the server.
-func Delete(base, endpoint, username, password string) (interface{}, error) {
-	return Request(base, endpoint, "DELETE", username, password, false, nil)
+func Delete(base, endpoint, proxy, username, password string) (interface{}, error) {
+	return Request(base, endpoint, "DELETE", proxy, username, password, false, nil)
 }
 
 // Get sends a HTTP GET request to the server.
-func Get(base, endpoint, username, password string) (interface{}, error) {
-	return Request(base, endpoint, "GET", username, password, false, nil)
+func Get(base, endpoint, proxy, username, password string) (interface{}, error) {
+	return Request(base, endpoint, "GET", proxy, username, password, false, nil)
 }
 
 // Post sends a HTTP POST request to the server.
-func Post(base, endpoint, username, password string, data interface{}) (interface{}, error) {
-	return Request(base, endpoint, "POST", username, password, true, data)
+func Post(base, endpoint, proxy, username, password string, data interface{}) (interface{}, error) {
+	return Request(base, endpoint, "POST", proxy, username, password, true, data)
 }
 
 // Put sends a HTTP PUT request to the server.
-func Put(base, endpoint, username, password string, data interface{}) (interface{}, error) {
-	return Request(base, endpoint, "PUT", username, password, true, data)
+func Put(base, endpoint, proxy, username, password string, data interface{}) (interface{}, error) {
+	return Request(base, endpoint, "PUT", proxy, username, password, true, data)
 }

internal/application/create.go

@@ -30,7 +30,7 @@ func (c *createCommand) Run(s *settings.Settings, password string) {
 		"strict_compatibility": c.StrictCompatibility,
 	}
 
-	resp, err := api.Post(s.URL, createEndpoint, s.Username, password, data)
+	resp, err := api.Post(s.URL, createEndpoint, s.Proxy, s.Username, password, data)
 	if err != nil {
 		log.Fatal(err)
 	}

internal/application/delete.go

@@ -27,7 +27,7 @@ func (c *deleteCommand) Execute(args []string) error {
 func (c *deleteCommand) Run(s *settings.Settings, password string) {
 	populatedEndpoint := fmt.Sprintf(deleteEndpoint, c.Arguments.ID)
 
-	resp, err := api.Delete(s.URL, populatedEndpoint, s.Username, password)
+	resp, err := api.Delete(s.URL, populatedEndpoint, s.Proxy, s.Username, password)
 	if err != nil {
 		log.Fatal(err)
 	}

internal/application/list.go

@@ -20,7 +20,7 @@ func (c *listCommand) Execute(args []string) error {
 }
 
 func (c *listCommand) Run(s *settings.Settings, password string) {
-	resp, err := api.Get(s.URL, listEndpoint, s.Username, password)
+	resp, err := api.Get(s.URL, listEndpoint, s.Proxy, s.Username, password)
 	if err != nil {
 		log.Fatal(err)
 	}

internal/application/show.go

@@ -27,7 +27,7 @@ func (c *showCommand) Execute(args []string) error {
 func (c *showCommand) Run(s *settings.Settings, password string) {
 	populatedEndpoint := fmt.Sprintf(showEndpoint, c.Arguments.ID)
 
-	resp, err := api.Get(s.URL, populatedEndpoint, s.Username, password)
+	resp, err := api.Get(s.URL, populatedEndpoint, s.Proxy, s.Username, password)
 	if err != nil {
 		log.Fatal(err)
 	}

internal/application/update.go

@@ -43,7 +43,7 @@ func (c *updateCommand) Run(s *settings.Settings, password string) {
 
 	populatedEndpoint := fmt.Sprintf(updateEndpoint, c.Arguments.ID)
 
-	resp, err := api.Put(s.URL, populatedEndpoint, s.Username, password, data)
+	resp, err := api.Put(s.URL, populatedEndpoint, s.Proxy, s.Username, password, data)
 	if err != nil {
 		log.Fatal(err)
 	}

internal/buildconfig/buildconfig.go

@@ -1,3 +1,3 @@
 package buildconfig
 
-var Version string
+var Version = "unknown"

internal/settings/mod.go

@@ -4,6 +4,7 @@ package settings
 type Settings struct {
 	URL      string `long:"url" description:"The URL where the server listens for requests" required:"true"`
 	Username string `long:"username" description:"The username for authenticating on the server" required:"true"`
+	Proxy    string `short:"x" long:"proxy" default:"" description:"The proxy to use for HTTP requests"`
 }
 
 // Runnable defines an interface for subcommands that take the global settings and a password.

internal/user/create.go

@@ -33,7 +33,7 @@ func (c *createCommand) Run(s *settings.Settings, password string) {
 		"matrix_id": c.Arguments.MatrixID,
 	}
 
-	resp, err := api.Post(s.URL, createEndpoint, s.Username, password, data)
+	resp, err := api.Post(s.URL, createEndpoint, s.Proxy, s.Username, password, data)
 	if err != nil {
 		log.Fatal(err)
 	}