diff --git a/socketserver/server/backend.go b/socketserver/server/backend.go index 98d281a8..e8d827fa 100644 --- a/socketserver/server/backend.go +++ b/socketserver/server/backend.go @@ -82,9 +82,8 @@ func getCacheKey(remoteCommand, data string) string { // The POST arguments are `cmd`, `args`, `channel`, and `scope`. // The `scope` argument is required because no attempt is made to infer the scope from the command, unlike /cached_pub. func HTTPBackendUncachedPublish(w http.ResponseWriter, r *http.Request) { - b := Backend r.ParseForm() - formData, err := b.UnsealRequest(r.Form) + formData, err := Backend.UnsealRequest(r.Form) if err != nil { w.WriteHeader(403) fmt.Fprintf(w, "Error: %v", err) diff --git a/socketserver/server/backend_test.go b/socketserver/server/backend_test.go index 754c44f8..d1c85adb 100644 --- a/socketserver/server/backend_test.go +++ b/socketserver/server/backend_test.go @@ -12,19 +12,20 @@ func Test(t *testing.T) { TestingT(t) } func TestSealRequest(t *testing.T) { TSetup(SetupNoServers, nil) + b := Backend values := url.Values{ "QuickBrownFox": []string{"LazyDog"}, } - sealedValues, err := SealRequest(values) + sealedValues, err := b.SealRequest(values) if err != nil { t.Fatal(err) } // sealedValues.Encode() // id=0&msg=KKtbng49dOLLyjeuX5AnXiEe6P0uZwgeP_7mMB5vhP-wMAAPZw%3D%3D&nonce=-wRbUnifscisWUvhm3gBEXHN5QzrfzgV - unsealedValues, err := UnsealRequest(sealedValues) + unsealedValues, err := b.UnsealRequest(sealedValues) if err != nil { t.Fatal(err) } diff --git a/socketserver/server/testinfra_test.go b/socketserver/server/testinfra_test.go index 998ccffd..e52b7a22 100644 --- a/socketserver/server/testinfra_test.go +++ b/socketserver/server/testinfra_test.go @@ -123,7 +123,7 @@ func (backend *TBackendRequestChecker) ServeHTTP(w http.ResponseWriter, r *http. r.ParseForm() - unsealedForm, err := UnsealRequest(r.PostForm) + unsealedForm, err := Backend.UnsealRequest(r.PostForm) if err != nil { backend.tb.Errorf("Failed to unseal backend request: %v", err) } @@ -276,7 +276,7 @@ func TSealForSavePubMsg(tb testing.TB, cmd Command, channel string, arguments in } form.Set("time", strconv.FormatInt(time.Now().Unix(), 10)) - sealed, err := SealRequest(form) + sealed, err := Backend.SealRequest(form) if err != nil { tb.Error(err) return nil, err @@ -300,7 +300,7 @@ func TSealForUncachedPubMsg(tb testing.TB, cmd Command, channel string, argument form.Set("time", time.Now().Format(time.UnixDate)) form.Set("scope", scope.String()) - sealed, err := SealRequest(form) + sealed, err := Backend.SealRequest(form) if err != nil { tb.Error(err) return nil, err