Merge lp:~rvb/usso/cleanup into lp:usso

[Raphaël Badin]

Refactor Sign method to make it more readable and extract utility methods.

- refactor how the timestamp and the nonce are generated to use strconv.Itoa everywhere (instead of using "strconv.Itoa" plus "strconv.FormatInt(..., 10)")
- using 100000000 as the bound given to rand.Intn is not inclusive.

[Jeroen T. Vermeulen (jtv)]

Nice!

review: Approve

[Vincenzo Di Somma (vds)]

review: Approve

[Raphaël Badin (rvb)]

Vincenzo merged this in one of his branches. Marking it as merged.

=== modified file 'usso.go'
--- usso.go	2013-01-17 14:08:33 +0000
+++ usso.go	2013-01-21 12:15:25 +0000
@@ -5,6 +5,7 @@
 
 import (
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"log"
 	"math/rand"
@@ -66,17 +67,33 @@
 	return &ssodata, nil
 }
 
+func generateNonce() string {
+	return strconv.Itoa(rand.Intn(100000000))
+}
+
+func generateTimestamp() string {
+	return strconv.Itoa(int(time.Now().Unix()))
+}
+
 func (oauth *SSOData) Sign(req *http.Request) error {
-	// Sign the provided request.
-	auth := `OAuth realm="API", ` +
-		`oauth_consumer_key="` + url.QueryEscape(oauth.ConsumerKey) + `", ` +
-		`oauth_token="` + url.QueryEscape(oauth.TokenKey) + `", ` +
-		`oauth_signature_method="PLAINTEXT", ` +
-		`oauth_signature="` + url.QueryEscape(
-		oauth.ConsumerSecret+`&`+oauth.TokenSecret) + `", ` +
-		`oauth_timestamp="` + strconv.FormatInt(time.Now().Unix(), 10) + `", ` +
-		`oauth_nonce="` + strconv.Itoa(int(rand.Intn(99999999))) + `", ` +
-		`oauth_version="1.0"`
-	req.Header.Add("Authorization", auth)
+	// Sign the provided request using the OAuth PLAINTEXT method:
+	// http://oauth.net/core/1.0/#anchor22.
+	signature := oauth.ConsumerSecret + `&` + oauth.TokenSecret
+	authData := map[string]string{
+		"realm":                  "API",
+		"oauth_consumer_key":     oauth.ConsumerKey,
+		"oauth_token":            oauth.TokenKey,
+		"oauth_signature_method": "PLAINTEXT",
+		"oauth_signature":        signature,
+		"oauth_timestamp":        generateTimestamp(),
+		"oauth_nonce":            generateNonce(),
+		"oauth_version":          "1.0",
+	}
+	// Build OAuth header.
+	authHeader := []string{"OAuth"}
+	for key, value := range authData {
+		authHeader = append(authHeader, fmt.Sprintf(` %s="%s"`, key, url.QueryEscape(value)))
+	}
+	req.Header.Add("Authorization", strings.Join(authHeader, ""))
 	return nil
 }

=== modified file 'usso_test.go'
--- usso_test.go	2013-01-18 16:12:41 +0000
+++ usso_test.go	2013-01-21 12:15:25 +0000
@@ -97,7 +97,8 @@
 
 	c.Assert(err, IsNil)
 	authHeader := request.Header["Authorization"][0]
-	c.Assert(authHeader, Matches, `.*OAuth realm="API".*`)
+	c.Assert(authHeader, Matches, `^OAuth.*`)
+	c.Assert(authHeader, Matches, `.*realm="API".*`)
 	c.Assert(authHeader, Matches, `.*oauth_consumer_key="`+url.QueryEscape(ssoData.ConsumerKey)+`".*`)
 	c.Assert(authHeader, Matches, `.*oauth_token="`+url.QueryEscape(ssoData.TokenKey)+`".*`)
 	c.Assert(authHeader, Matches, `.*oauth_signature="`+url.QueryEscape(ssoData.ConsumerSecret+`&`+ssoData.TokenSecret)+`.*`)