haveapi-go-client 0.27.3 → 0.28.0

data/template/action.go.erb

@@ -2,11 +2,12 @@ package <%= package %>
 
 import (
 <% if action.has_path_params? -%>
+	"net/url"
 	"strings"
 <% end -%>
 )
 
-// <%= action.go_type %> is a type for action <%= action.full_dot_name %>
+// <%= action.go_type %> is a type for action <%= go_comment_text(action.full_dot_name) %>
 type <%= action.go_type %> struct {
 	// Pointer to client
 	Client *Client
@@ -22,7 +23,7 @@ func New<%= action.go_type %>(client *Client) *<%= action.go_type %> {
 // <%= action.metadata.global.input.go_type %> is a type for action global meta input parameters
 type <%= action.metadata.global.input.go_type %> struct {
 <% action.metadata.global.input.parameters.each do |p| -%>
-	<%= p.go_name %> <%= p.go_in_type %> `json:"<%= p.name %>"`
+	<%= p.go_name %> <%= p.go_in_type %> <%= go_json_tag(p.name) %>
 <% end -%>
 	// Only selected parameters are sent to the API. Ignored if empty.
 	_selectedParameters map[string]interface{}
@@ -42,7 +43,7 @@ func (in *<%= action.metadata.global.input.go_type %>) Set<%= p.go_name %>(value
 <% if p.nillable? -%>
 	in.Set<%= p.go_name %>Nil(false)
 <% end -%>
-	in._selectedParameters["<%= p.go_name %>"] = nil
+	in._selectedParameters[<%= go_string_literal(p.go_name) %>] = nil
 	return in
 }
 <% if p.nillable? -%>
@@ -57,10 +58,10 @@ func (in *<%= action.metadata.global.input.go_type %>) Set<%= p.go_name %>Nil(se
 	}
 
 	if set {
-		in._nilParameters["<%= p.go_name %>"] = nil
-		in.SelectParameters("<%= p.go_name %>")
+		in._nilParameters[<%= go_string_literal(p.go_name) %>] = nil
+		in.SelectParameters(<%= go_string_literal(p.go_name) %>)
 	} else {
-		delete(in._nilParameters, "<%= p.go_name %>")
+		delete(in._nilParameters, <%= go_string_literal(p.go_name) %>)
 	}
 	return in
 }
@@ -95,7 +96,7 @@ func (in *<%= action.metadata.global.input.go_type %>) AnySelected() bool {
 // <%= action.input.go_type %> is a type for action input parameters
 type <%= action.input.go_type %> struct {
 <% action.input.parameters.each do |p| -%>
-	<%= p.go_name %> <%= p.go_in_type %> `json:"<%= p.name %>"`
+	<%= p.go_name %> <%= p.go_in_type %> <%= go_json_tag(p.name) %>
 <% end -%>
 	// Only selected parameters are sent to the API. Ignored if empty.
 	_selectedParameters map[string]interface{}
@@ -115,7 +116,7 @@ func (in *<%= action.input.go_type %>) Set<%= p.go_name %>(value <%= p.go_in_typ
 <% if p.nillable? -%>
 	in.Set<%= p.go_name %>Nil(false)
 <% end -%>
-	in._selectedParameters["<%= p.go_name %>"] = nil
+	in._selectedParameters[<%= go_string_literal(p.go_name) %>] = nil
 	return in
 }
 <% if p.nillable? -%>
@@ -130,10 +131,10 @@ func (in *<%= action.input.go_type %>) Set<%= p.go_name %>Nil(set bool) *<%= act
 	}
 
 	if set {
-		in._nilParameters["<%= p.go_name %>"] = nil
-		in.SelectParameters("<%= p.go_name %>")
+		in._nilParameters[<%= go_string_literal(p.go_name) %>] = nil
+		in.SelectParameters(<%= go_string_literal(p.go_name) %>)
 	} else {
-		delete(in._nilParameters, "<%= p.go_name %>")
+		delete(in._nilParameters, <%= go_string_literal(p.go_name) %>)
 	}
 	return in
 }
@@ -183,10 +184,10 @@ func (in *<%= action.input.go_type %>) AnySelected() bool {
 // <%= action.go_request_type %> is a type for the entire action request
 type <%= action.go_request_type %> struct {
 <% if action.has_input? -%>
-	<%= action.input.go_namespace %> map[string]interface{} `json:"<%= action.input.namespace %>"`
+	<%= action.input.go_namespace %> map[string]interface{} <%= go_json_tag(action.input.namespace) %>
 <% end -%>
 <% if action.metadata.has_global_input? -%>
-	Meta map[string]interface{} `json:"<%= action.resource.api_version.metadata_namespace %>"`
+	Meta map[string]interface{} <%= go_json_tag(action.resource.api_version.metadata_namespace) %>
 <% end -%>
 }
 <% end -%>
@@ -196,9 +197,9 @@ type <%= action.go_request_type %> struct {
 type <%= action.output.go_type %> struct {
 <% action.output.parameters.each do |p| -%>
 <% if p.respond_to?(:association) -%>
-	<%= p.go_name %> *<%= p.go_out_type %> `json:"<%= p.name %>"`
+	<%= p.go_name %> *<%= p.go_out_type %> <%= go_json_tag(p.name) %>
 <% else -%>
-	<%= p.go_name %> <%= p.go_out_type %> `json:"<%= p.name %>"`
+	<%= p.go_name %> <%= p.go_out_type %> <%= go_json_tag(p.name) %>
 <% end -%>
 <% end -%>
 }
@@ -208,23 +209,23 @@ type <%= action.output.go_type %> struct {
 // <%= action.metadata.global.output.go_type %> is a type for global output metadata parameters
 type <%= action.metadata.global.output.go_type %> struct {
 <% action.metadata.global.output.parameters.each do |p| -%>
-	<%= p.go_name %> <%= p.go_out_type %> `json:"<%= p.name %>"`
+	<%= p.go_name %> <%= p.go_out_type %> <%= go_json_tag(p.name) %>
 <% end -%>
 }
 <% end -%>
 
 // Type for action response, including envelope
 type <%= action.go_response_type %> struct {
-	Action *<%= action.go_type %> `json:"-"`
+	Action *<%= action.go_type %> <%= go_json_tag('-') %>
 	*Envelope
 <% if action.has_output? -%>
 <% if %w(hash object).include?(action.output.layout) -%>
 	// Action output encapsulated within a namespace
 	Response *struct {
-		<%= action.output.go_namespace %> *<%= action.output.go_type %> `json:"<%= action.output.namespace %>"`
+		<%= action.output.go_namespace %> *<%= action.output.go_type %> <%= go_json_tag(action.output.namespace) %>
 <% if action.blocking? -%>
 		// Global output metadata
-		Meta *<%= action.metadata.global.output.go_type %> `json:"<%= action.resource.api_version.metadata_namespace %>"`
+		Meta *<%= action.metadata.global.output.go_type %> <%= go_json_tag(action.resource.api_version.metadata_namespace) %>
 <% end -%>
 	}
 
@@ -233,10 +234,10 @@ type <%= action.go_response_type %> struct {
 <% elsif %w(hash_list object_list).include?(action.output.layout) -%>
 	// Action output encapsulated within a namespace
 	Response *struct {
-		<%= action.output.go_namespace %> []*<%= action.output.go_type %> `json:"<%= action.output.namespace %>"`
+		<%= action.output.go_namespace %> []*<%= action.output.go_type %> <%= go_json_tag(action.output.namespace) %>
 <% if action.blocking? -%>
 		// Global output metadata
-		Meta *<%= action.metadata.global.output.go_type %> `json:"<%= action.resource.api_version.metadata_namespace %>"`
+		Meta *<%= action.metadata.global.output.go_type %> <%= go_json_tag(action.resource.api_version.metadata_namespace) %>
 <% end -%>
 	}
 
@@ -247,7 +248,7 @@ type <%= action.go_response_type %> struct {
 	// Action output encapsulated within a namespace
 	Response *struct {
 		// Global output metadata
-		Meta *<%= action.metadata.global.output.go_type %> `json:"<%= action.resource.api_version.metadata_namespace %>"`
+		Meta *<%= action.metadata.global.output.go_type %> <%= go_json_tag(action.resource.api_version.metadata_namespace) %>
 	}
 <% end -%>
 }
@@ -263,7 +264,7 @@ func (action *<%= action.go_type %>) Call() (*<%= action.go_response_type %>, er
 func (action *<%= action.go_type %>) Prepare() *<%= action.go_invocation_type%> {
 	return &<%= action.go_invocation_type %>{
 		Action: action,
-		Path: "<%= action.path %>",
+		Path: <%= go_string_literal(action.path) %>,
 	}
 }
 
@@ -292,7 +293,7 @@ func (inv *<%= action.go_invocation_type %>) SetPathParamInt(param string, value
 
 // SetPathParamString sets string path parameter
 func (inv *<%= action.go_invocation_type %>) SetPathParamString(param string, value string) *<%= action.go_invocation_type %> {
-	inv.Path = strings.Replace(inv.Path, "{"+param+"}", value, 1)
+	inv.Path = strings.Replace(inv.Path, "{"+param+"}", url.PathEscape(value), 1)
 	return inv
 }
 <% end -%>
@@ -371,23 +372,23 @@ func (inv *<%= action.go_invocation_type %>) validate() error {
 	if inv.Input != nil {
 <% action.input.parameters.each do |p| -%>
 <% if %w(Float Datetime Resource).include?(p.type) -%>
-		if inv.IsParameterSelected("<%= p.go_name %>") {
-			if !inv.IsParameterNil("<%= p.go_name %>") {
+		if inv.IsParameterSelected(<%= go_string_literal(p.go_name) %>) {
+			if !inv.IsParameterNil(<%= go_string_literal(p.go_name) %>) {
 <% if p.type == 'Float' -%>
-				if !isFiniteFloat64(inv.Input.<%= p.go_name %>) {
-					verr.Add("<%= p.name %>", "not a valid float")
-				}
+			if !isFiniteFloat64(inv.Input.<%= p.go_name %>) {
+				verr.Add(<%= go_string_literal(p.name) %>, "not a valid float")
+			}
 <% elsif p.type == 'Datetime' -%>
-				normalized, ok := normalizeAndCheckDatetimeString(inv.Input.<%= p.go_name %>)
-				if !ok {
-					verr.Add("<%= p.name %>", "not a valid datetime")
-				} else {
-					inv.Input.<%= p.go_name %> = normalized
-				}
+			normalized, ok := normalizeAndCheckDatetimeString(inv.Input.<%= p.go_name %>)
+			if !ok {
+				verr.Add(<%= go_string_literal(p.name) %>, "not a valid datetime")
+			} else {
+				inv.Input.<%= p.go_name %> = normalized
+			}
 <% elsif p.type == 'Resource' -%>
-				if inv.Input.<%= p.go_name %> < 0 {
-					verr.Add("<%= p.name %>", "not a valid resource id")
-				}
+			if inv.Input.<%= p.go_name %> < 0 {
+				verr.Add(<%= go_string_literal(p.name) %>, "not a valid resource id")
+			}
 <% end -%>
 			}
 		}
@@ -399,23 +400,23 @@ func (inv *<%= action.go_invocation_type %>) validate() error {
 	if inv.MetaInput != nil {
 <% action.metadata.global.input.parameters.each do |p| -%>
 <% if %w(Float Datetime Resource).include?(p.type) -%>
-		if inv.IsMetaParameterSelected("<%= p.go_name %>") {
-			if !inv.IsMetaParameterNil("<%= p.go_name %>") {
+		if inv.IsMetaParameterSelected(<%= go_string_literal(p.go_name) %>) {
+			if !inv.IsMetaParameterNil(<%= go_string_literal(p.go_name) %>) {
 <% if p.type == 'Float' -%>
-				if !isFiniteFloat64(inv.MetaInput.<%= p.go_name %>) {
-					verr.Add("<%= p.name %>", "not a valid float")
-				}
+			if !isFiniteFloat64(inv.MetaInput.<%= p.go_name %>) {
+				verr.Add(<%= go_string_literal(p.name) %>, "not a valid float")
+			}
 <% elsif p.type == 'Datetime' -%>
-				normalized, ok := normalizeAndCheckDatetimeString(inv.MetaInput.<%= p.go_name %>)
-				if !ok {
-					verr.Add("<%= p.name %>", "not a valid datetime")
-				} else {
-					inv.MetaInput.<%= p.go_name %> = normalized
-				}
+			normalized, ok := normalizeAndCheckDatetimeString(inv.MetaInput.<%= p.go_name %>)
+			if !ok {
+				verr.Add(<%= go_string_literal(p.name) %>, "not a valid datetime")
+			} else {
+				inv.MetaInput.<%= p.go_name %> = normalized
+			}
 <% elsif p.type == 'Resource' -%>
-				if inv.MetaInput.<%= p.go_name %> < 0 {
-					verr.Add("<%= p.name %>", "not a valid resource id")
-				}
+			if inv.MetaInput.<%= p.go_name %> < 0 {
+				verr.Add(<%= go_string_literal(p.name) %>, "not a valid resource id")
+			}
 <% end -%>
 			}
 		}
@@ -471,7 +472,7 @@ func (inv *<%= action.go_invocation_type %>) callAsBody() (*<%= action.go_respon
 	input := make(map[string]interface{})
 <% end -%>
 	resp := &<%= action.go_response_type %>{Action: inv.Action}
-	err := inv.Action.Client.DoBodyRequest("<%= action.http_method %>", inv.Path, input, resp)
+	err := inv.Action.Client.DoBodyRequest(<%= go_string_literal(action.http_method) %>, inv.Path, input, resp)
 <% if action.has_output? -%>
 	if err == nil && resp.Status {
 		resp.Output = resp.Response.<%= action.output.go_namespace %>
@@ -563,15 +564,15 @@ func (resp *<%= action.go_response_type %>) CancelOperation() (*ActionActionStat
 func (inv *<%= action.go_invocation_type %>) convertInputToQueryParams(ret map[string]string) {
 	if inv.Input != nil {
 	<% action.input.parameters.each do |p| -%>
-		if inv.IsParameterSelected("<%= p.go_name %>") {
+		if inv.IsParameterSelected(<%= go_string_literal(p.go_name) %>) {
 	<% if p.nillable? -%>
-			if inv.IsParameterNil("<%= p.go_name %>") {
-				ret["<%= action.input.namespace %>[<%= p.name %>]"] = ""
+			if inv.IsParameterNil(<%= go_string_literal(p.go_name) %>) {
+				ret[<%= go_query_key(action.input.namespace, p.name) %>] = ""
 			} else {
-				ret["<%= action.input.namespace %>[<%= p.name %>]"] = <% if p.go_in_type == 'string' %>inv.Input.<%= p.go_name %><% else %>convert<%= p.go_in_type.capitalize %>ToString(inv.Input.<%= p.go_name %>)<% end %>
+				ret[<%= go_query_key(action.input.namespace, p.name) %>] = <% if p.go_in_type == 'string' %>inv.Input.<%= p.go_name %><% else %>convert<%= p.go_in_type.capitalize %>ToString(inv.Input.<%= p.go_name %>)<% end %>
 			}
 	<% else -%>
-			ret["<%= action.input.namespace %>[<%= p.name %>]"] = <% if p.go_in_type == 'string' %>inv.Input.<%= p.go_name %><% else %>convert<%= p.go_in_type.capitalize %>ToString(inv.Input.<%= p.go_name %>)<% end %>
+			ret[<%= go_query_key(action.input.namespace, p.name) %>] = <% if p.go_in_type == 'string' %>inv.Input.<%= p.go_name %><% else %>convert<%= p.go_in_type.capitalize %>ToString(inv.Input.<%= p.go_name %>)<% end %>
 	<% end -%>
 		}
 	<% end -%>
@@ -583,15 +584,15 @@ func (inv *<%= action.go_invocation_type %>) convertInputToQueryParams(ret map[s
 	func (inv *<%= action.go_invocation_type %>) convertMetaInputToQueryParams(ret map[string]string) {
 		if inv.MetaInput != nil {
 	<% action.metadata.global.input.parameters.each do |p| -%>
-			if inv.IsMetaParameterSelected("<%= p.go_name %>") {
+			if inv.IsMetaParameterSelected(<%= go_string_literal(p.go_name) %>) {
 	<% if p.nillable? -%>
-				if inv.IsMetaParameterNil("<%= p.go_name %>") {
-					ret["<%= action.resource.api_version.metadata_namespace %>[<%= p.name %>]"] = ""
+				if inv.IsMetaParameterNil(<%= go_string_literal(p.go_name) %>) {
+					ret[<%= go_query_key(action.resource.api_version.metadata_namespace, p.name) %>] = ""
 				} else {
-					ret["<%= action.resource.api_version.metadata_namespace %>[<%= p.name %>]"] = <% if p.go_in_type == 'string' %>inv.MetaInput.<%= p.go_name %><% else %>convert<%= p.go_in_type.capitalize %>ToString(inv.MetaInput.<%= p.go_name %>)<% end %>
+					ret[<%= go_query_key(action.resource.api_version.metadata_namespace, p.name) %>] = <% if p.go_in_type == 'string' %>inv.MetaInput.<%= p.go_name %><% else %>convert<%= p.go_in_type.capitalize %>ToString(inv.MetaInput.<%= p.go_name %>)<% end %>
 				}
 	<% else -%>
-				ret["<%= action.resource.api_version.metadata_namespace %>[<%= p.name %>]"] = <% if p.go_in_type == 'string' %>inv.MetaInput.<%= p.go_name %><% else %>convert<%= p.go_in_type.capitalize %>ToString(inv.MetaInput.<%= p.go_name %>)<% end %>
+				ret[<%= go_query_key(action.resource.api_version.metadata_namespace, p.name) %>] = <% if p.go_in_type == 'string' %>inv.MetaInput.<%= p.go_name %><% else %>convert<%= p.go_in_type.capitalize %>ToString(inv.MetaInput.<%= p.go_name %>)<% end %>
 	<% end -%>
 			}
 	<% end -%>
@@ -617,15 +618,15 @@ func (inv *<%= action.go_invocation_type %>) makeInputParams() map[string]interf
 
 	if inv.Input != nil {
 <% action.input.parameters.each do |p| -%>
-		if inv.IsParameterSelected("<%= p.go_name %>") {
+		if inv.IsParameterSelected(<%= go_string_literal(p.go_name) %>) {
 <% if p.nillable? -%>
-			if inv.IsParameterNil("<%= p.go_name %>") {
-				ret["<%= p.name %>"] = nil
+			if inv.IsParameterNil(<%= go_string_literal(p.go_name) %>) {
+				ret[<%= go_string_literal(p.name) %>] = nil
 			} else {
-				ret["<%= p.name %>"] = inv.Input.<%= p.go_name %>
+				ret[<%= go_string_literal(p.name) %>] = inv.Input.<%= p.go_name %>
 			}
 <% else -%>
-			ret["<%= p.name %>"] = inv.Input.<%= p.go_name %>
+			ret[<%= go_string_literal(p.name) %>] = inv.Input.<%= p.go_name %>
 <% end -%>
 		}
 <% end -%>
@@ -641,15 +642,15 @@ func (inv *<%= action.go_invocation_type %>) makeInputParams() map[string]interf
 
 		if inv.MetaInput != nil {
 	<% action.metadata.global.input.parameters.each do |p| -%>
-			if inv.IsMetaParameterSelected("<%= p.go_name %>") {
+			if inv.IsMetaParameterSelected(<%= go_string_literal(p.go_name) %>) {
 	<% if p.nillable? -%>
-				if inv.IsMetaParameterNil("<%= p.go_name %>") {
-					ret["<%= p.name %>"] = nil
+				if inv.IsMetaParameterNil(<%= go_string_literal(p.go_name) %>) {
+					ret[<%= go_string_literal(p.name) %>] = nil
 				} else {
-					ret["<%= p.name %>"] = inv.MetaInput.<%= p.go_name %>
+					ret[<%= go_string_literal(p.name) %>] = inv.MetaInput.<%= p.go_name %>
 				}
 	<% else -%>
-				ret["<%= p.name %>"] = inv.MetaInput.<%= p.go_name %>
+				ret[<%= go_string_literal(p.name) %>] = inv.MetaInput.<%= p.go_name %>
 	<% end -%>
 			}
 	<% end -%>

data/template/authentication/oauth2.go.erb

@@ -3,6 +3,8 @@ package <%= package %>
 import (
 	"fmt"
 	"net/http"
+	"net/url"
+	"strings"
 )
 
 type OAuth2Auth struct {
@@ -11,32 +13,42 @@ type OAuth2Auth struct {
 }
 
 func (auth *OAuth2Auth) Authenticate(request *http.Request) {
-	request.Header.Set("<%= auth.http_header %>", auth.AccessToken)
+	request.Header.Set(<%= go_string_literal(auth.http_header) %>, auth.AccessToken)
 }
 
-// SetExistingTokenAuth will use a previously acquired access token
+// SetExistingOAuth2Auth will use a previously acquired access token
 func (client *Client) SetExistingOAuth2Auth(accessToken string) {
 	client.Authentication = &OAuth2Auth{
 		AccessToken: accessToken,
 	}
 }
 
-// RevokeAuthToken will revoke the access token and remove authentication
+// RevokeAccessToken will revoke the access token and remove authentication
 // from the client
 func (client *Client) RevokeAccessToken() error {
-	httpClient := &http.Client{}
+	auth, ok := client.Authentication.(*OAuth2Auth)
+	if !ok {
+		return fmt.Errorf("OAuth2 authentication is not configured")
+	}
 
-	req, err := http.NewRequest("POST", "<%= auth.revoke_url %>", nil)
+	form := url.Values{}
+	form.Set("token", auth.AccessToken)
 
+	revokeURL, err := client.descriptionURL(<%= go_string_literal(auth.revoke_url) %>)
 	if err != nil {
 		return err
 	}
 
-	if client.Authentication != nil {
-		client.Authentication.Authenticate(req)
+	req, err := http.NewRequest("POST", revokeURL, strings.NewReader(form.Encode()))
+
+	if err != nil {
+		return err
 	}
 
-	resp, err := httpClient.Do(req)
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	auth.Authenticate(req)
+
+	resp, err := client.do(req)
 
 	if err != nil {
 		return err

data/template/authentication/token.go.erb

@@ -8,10 +8,10 @@ import (
 type Mode int
 
 const (
-	// Send the token via HTTP header <%= auth.http_header %>
+	// Send the token via HTTP header <%= go_comment_text(auth.http_header) %>
 	HttpHeader Mode = iota
 
-	// Send the token via query parameter <%= auth.query_parameter %>
+	// Send the token via query parameter <%= go_comment_text(auth.query_parameter) %>
 	QueryParameter = iota
 )
 
@@ -29,11 +29,11 @@ type TokenAuth struct {
 func (auth *TokenAuth) Authenticate(request *http.Request) {
 	switch auth.Mode {
 	case HttpHeader:
-		request.Header.Set("<%= auth.http_header %>", auth.Token)
+		request.Header.Set(<%= go_string_literal(auth.http_header) %>, auth.Token)
 
 	case QueryParameter:
 		q := request.URL.Query()
-		q.Add("<%= auth.query_parameter %>", auth.Token)
+		q.Add(<%= go_string_literal(auth.query_parameter) %>, auth.Token)
 		request.URL.RawQuery = q.Encode()
 	}
 }
@@ -95,20 +95,20 @@ func (auth *TokenAuth) setDefaultOptions(options *TokenAuthOptions) {
 // the authentication is completed
 func (auth *TokenAuth) nextAuthenticationStep(options *TokenAuthOptions, action string, token string) error {
 <% auth.custom_actions.each do |a| -%>
-	if action == "<%= a.name %>" {
-		action := auth.Resource.<%= a.go_name %>.Prepare()
-		input := action.NewInput()
+	if action == <%= go_string_literal(a.name) %> {
+		request := auth.Resource.<%= a.go_name %>.Prepare()
+		input := request.NewInput()
 		input.SetToken(token)
 
 		if options.<%= "#{a.go_name}Callback" %> == nil {
-			return fmt.Errorf("Implement callback <%= "#{a.go_name}Callback" %>")
+			return fmt.Errorf(<%= go_string_literal("Implement callback #{a.go_name}Callback") %>)
 		}
 
 		if err := options.<%= "#{a.go_name}Callback" %>(input); err != nil {
-			return fmt.Errorf("<%= "#{a.go_name}Callback" %> failed: %v", err)
+			return fmt.Errorf(<%= go_string_literal("#{a.go_name}Callback failed: %v") %>, err)
 		}
 
-		resp, err := action.Call()
+		resp, err := request.Call()
 
 		if err != nil {
 			return err

data/template/client.go.erb

@@ -1,5 +1,10 @@
 package <%= package %>
 
+import (
+	"net/http"
+	"time"
+)
+
 // Client represents a connection to an API server
 type Client struct {
 	// API URL
@@ -8,15 +13,20 @@ type Client struct {
 	// Options for authentication method
 	Authentication Authenticator
 
+	httpClient *http.Client
+
 <% api.resources.each do |r| -%>
-	// Resource <%= r.full_dot_name %>
+	// Resource <%= go_comment_text(r.full_dot_name) %>
 	<%= r.go_name %> *<%= r.go_type %>
 <% end -%>
 }
 
 // Create a new client for API at url
 func New(url string) *Client {
-	c := &Client{Url: url}
+	c := &Client{
+		Url:        url,
+		httpClient: http.DefaultClient,
+	}
 
 <% api.resources.each do |r| -%>
 	c.<%= r.go_name %> = New<%= r.go_type %>(c)
@@ -24,3 +34,32 @@ func New(url string) *Client {
 
 	return c
 }
+
+// SetHTTPClient configures the HTTP client used for all requests.
+func (client *Client) SetHTTPClient(httpClient *http.Client) {
+	if httpClient == nil {
+		client.httpClient = http.DefaultClient
+		return
+	}
+
+	client.httpClient = httpClient
+}
+
+// SetTimeout configures an overall timeout for all HTTP requests.
+func (client *Client) SetTimeout(timeout time.Duration) {
+	if client.httpClient == nil || client.httpClient == http.DefaultClient {
+		client.httpClient = &http.Client{Timeout: timeout}
+		return
+	}
+
+	client.httpClient.Timeout = timeout
+}
+
+func (client *Client) do(req *http.Request) (*http.Response, error) {
+	httpClient := client.httpClient
+	if httpClient == nil {
+		httpClient = http.DefaultClient
+	}
+
+	return httpClient.Do(req)
+}

data/template/request.go.erb

@@ -3,17 +3,116 @@ package <%= package %>
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
+	"net/url"
+	"strings"
 )
 
+func (client *Client) actionURL(path string) (string, error) {
+	if !strings.HasPrefix(path, "/") || strings.HasPrefix(path, "//") {
+		return "", fmt.Errorf("unsafe API action path %q", path)
+	}
+
+	ref, err := url.Parse(path)
+	if err != nil {
+		return "", err
+	}
+
+	if ref.IsAbs() || ref.Host != "" || ref.User != nil {
+		return "", fmt.Errorf("unsafe API action path %q", path)
+	}
+
+	return client.sameOriginURL(client.Url + path)
+}
+
+func (client *Client) descriptionURL(rawURL string) (string, error) {
+	base, err := client.parsedBaseURL()
+	if err != nil {
+		return "", err
+	}
+
+	ref, err := url.Parse(rawURL)
+	if err != nil {
+		return "", err
+	}
+
+	if ref.User != nil {
+		return "", fmt.Errorf("unsafe API description URL %q", rawURL)
+	}
+
+	resolved := base.ResolveReference(ref)
+	if !sameOrigin(base, resolved) {
+		return "", fmt.Errorf("API description URL %q is outside client origin", rawURL)
+	}
+
+	return resolved.String(), nil
+}
+
+func (client *Client) sameOriginURL(rawURL string) (string, error) {
+	base, err := client.parsedBaseURL()
+	if err != nil {
+		return "", err
+	}
+
+	resolved, err := url.Parse(rawURL)
+	if err != nil {
+		return "", err
+	}
+
+	if !sameOrigin(base, resolved) {
+		return "", fmt.Errorf("request URL %q is outside client origin", rawURL)
+	}
+
+	return resolved.String(), nil
+}
+
+func (client *Client) parsedBaseURL() (*url.URL, error) {
+	base, err := url.Parse(client.Url)
+	if err != nil {
+		return nil, err
+	}
+
+	if base.Scheme == "" || base.Host == "" {
+		return nil, fmt.Errorf("invalid client URL %q", client.Url)
+	}
+
+	return base, nil
+}
+
+func sameOrigin(a *url.URL, b *url.URL) bool {
+	return strings.EqualFold(a.Scheme, b.Scheme) &&
+		strings.EqualFold(a.Hostname(), b.Hostname()) &&
+		originPort(a) == originPort(b)
+}
+
+func originPort(u *url.URL) string {
+	port := u.Port()
+	if port != "" {
+		return port
+	}
+
+	switch strings.ToLower(u.Scheme) {
+	case "http":
+		return "80"
+	case "https":
+		return "443"
+	default:
+		return ""
+	}
+}
+
 // DoQueryStringRequests makes a HTTP requests in which input parameters are
 // sent as query parameters.
 func (client *Client) DoQueryStringRequest(path string, queryParams map[string]string, output interface{}) error {
-	httpClient := &http.Client{}
-	url := client.Url + path
+	requestURL, err := client.actionURL(path)
+
+	if err != nil {
+		return err
+	}
 
-	req, err := http.NewRequest("GET", url, nil)
+	req, err := http.NewRequest("GET", requestURL, nil)
 
 	if err != nil {
 		return err
@@ -31,7 +130,7 @@ func (client *Client) DoQueryStringRequest(path string, queryParams map[string]s
 
 	req.URL.RawQuery = q.Encode()
 
-	resp, err := httpClient.Do(req)
+	resp, err := client.do(req)
 
 	if err != nil {
 		return err
@@ -54,8 +153,7 @@ func (client *Client) DoQueryStringRequest(path string, queryParams map[string]s
 // DoBodyRequest makes a HTTP requests in which the input parameters are sent
 // within the request body, encoded in JSON.
 func (client *Client) DoBodyRequest(method string, path string, params interface{}, output interface{}) error {
-	httpClient := &http.Client{}
-	url := client.Url + path
+	requestURL, err := client.actionURL(path)
 
 	jsonData, err := json.Marshal(params)
 
@@ -63,7 +161,7 @@ func (client *Client) DoBodyRequest(method string, path string, params interface
 		return err
 	}
 
-	req, err := http.NewRequest(method, url, bytes.NewBuffer(jsonData))
+	req, err := http.NewRequest(method, requestURL, bytes.NewBuffer(jsonData))
 
 	if err != nil {
 		return err
@@ -75,7 +173,7 @@ func (client *Client) DoBodyRequest(method string, path string, params interface
 		client.Authentication.Authenticate(req)
 	}
 
-	resp, err := httpClient.Do(req)
+	resp, err := client.do(req)
 
 	if err != nil {
 		return err