apache
diff --git a/Collapse file
‎cmd/network.go‎
Copy file name to clipboardExpand all lines: cmd/network.go
+12-3Lines changed: 12 additions & 3 deletions b/Collapse file
‎cmd/network.go‎
Copy file name to clipboardExpand all lines: cmd/network.go
+12-3Lines changed: 12 additions & 3 deletions
diff --git a/Collapse file
‎config/config.go‎
Copy file name to clipboardExpand all lines: config/config.go
+5Lines changed: 5 additions & 0 deletions b/Collapse file
‎config/config.go‎
Copy file name to clipboardExpand all lines: config/config.go
+5Lines changed: 5 additions & 0 deletions
@@ -203,7 +203,11 @@ func NewAPIRequest(r *Request, api string, args []string, isAsync bool) (map[str
 			params.Add(key, value)
 		}
 	}
+	signatureversion := "3"
+	expiresKey := "expires"
 	params.Add("response", "json")
+	params.Add("signatureversion", signatureversion)
+	params.Add(expiresKey, time.Now().UTC().Add(15 * time.Minute).Format(time.RFC3339))
 
 	var encodedParams string
 	var err error
@@ -220,8 +224,13 @@ func NewAPIRequest(r *Request, api string, args []string, isAsync bool) (map[str
 		mac := hmac.New(sha1.New, []byte(secretKey))
 		mac.Write([]byte(strings.ToLower(encodedParams)))
 		signature := base64.StdEncoding.EncodeToString(mac.Sum(nil))
-		encodedParams = encodedParams + fmt.Sprintf("&signature=%s", url.QueryEscape(signature))
-		params = nil
+		if r.Config.Core.PostRequest {
+			params.Add("signature", signature)
+		} else {
+			encodedParams = encodedParams + fmt.Sprintf("&signature=%s", url.QueryEscape(signature))
+			params = nil
+		}
+
 	} else if len(r.Config.ActiveProfile.Username) > 0 && len(r.Config.ActiveProfile.Password) > 0 {
 		sessionKey, err := Login(r)
 		if err != nil {
@@ -287,7 +296,7 @@ func NewAPIRequest(r *Request, api string, args []string, isAsync bool) (map[str
 // we can implement further conditions to do POST or GET (or other http commands) here
 func executeRequest(r *Request, requestURL string, params url.Values) (*http.Response, error) {
 	config.SetupContext(r.Config)
-	if params.Has("password") || params.Has("userdata") {
+	if params.Has("password") || params.Has("userdata") || r.Config.Core.PostRequest {
 		requestURL = fmt.Sprintf("%s", r.Config.ActiveProfile.URL)
 		return r.Client().PostForm(requestURL, params)
 	} else {
 
@@ -67,6 +67,7 @@ type Core struct {
 	VerifyCert   bool   `ini:"verifycert"`
 	ProfileName  string `ini:"profile"`
 	AutoComplete bool   `ini:"autocomplete"`
+	PostRequest  bool   `ini:postrequest`
 }
 
 // Config describes CLI config file and default options
@@ -151,6 +152,7 @@ func defaultCoreConfig() Core {
 		VerifyCert:   true,
 		ProfileName:  "localcloud",
 		AutoComplete: true,
+		PostRequest:  true,
 	}
 }
 
@@ -282,6 +284,9 @@ func saveConfig(cfg *Config) *Config {
 			core.AutoComplete = true
 			core.Output = JSON
 		}
+		if !conf.Section(ini.DEFAULT_SECTION).HasKey("postrequest") {
+			core.PostRequest = true
+		}
 		cfg.Core = core
 	}
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ type Core struct {`
`67`	`67`	VerifyCert bool `ini:"verifycert"`
`68`	`68`	ProfileName string `ini:"profile"`
`69`	`69`	AutoComplete bool `ini:"autocomplete"`
	`70`	+ PostRequest bool `ini:postrequest`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`// Config describes CLI config file and default options`
`@@ -151,6 +152,7 @@ func defaultCoreConfig() Core {`
`151`	`152`	`VerifyCert: true,`
`152`	`153`	`ProfileName: "localcloud",`
`153`	`154`	`AutoComplete: true,`
	`155`	`+ PostRequest: true,`
`154`	`156`	`}`
`155`	`157`	`}`
`156`	`158`
`@@ -282,6 +284,9 @@ func saveConfig(cfg Config) Config {`
`282`	`284`	`core.AutoComplete = true`
`283`	`285`	`core.Output = JSON`
`284`	`286`	`}`
	`287`	`+ if !conf.Section(ini.DEFAULT_SECTION).HasKey("postrequest") {`
	`288`	`+ core.PostRequest = true`
	`289`	`+ }`
`285`	`290`	`cfg.Core = core`
`286`	`291`	`}`
`287`	`292`