Adding changes to reflect changes to Cloudstack that enforce POST and timestamps

Author: Kevin Li

cmd/network.go

@@ -204,6 +204,10 @@ func NewAPIRequest(r *Request, api string, args []string, isAsync bool) (map[str
 		}
 	}
 	params.Add("response", "json")
+	params.Add("signatureversion", "3")
+	expirationTime := time.Now().UTC().Add(15 * time.Minute)
+	expirationStr := expirationTime.Format("2006-01-02T15:04:05Z")
+	params.Add("expires", expirationStr)
 
 	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 {

config/config.go

@@ -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
 	}