diff --git a/socketserver/server/backend_test.go b/socketserver/server/backend_test.go
index 266aea8e..89cdbf39 100644
--- a/socketserver/server/backend_test.go
+++ b/socketserver/server/backend_test.go
@@ -6,7 +6,7 @@ import (
)
func TestSealRequest(t *testing.T) {
- SetupRandomKeys(t)
+ TSetup(0, nil)
values := url.Values{
"QuickBrownFox": []string{"LazyDog"},
@@ -28,3 +28,7 @@ func TestSealRequest(t *testing.T) {
t.Errorf("Failed to round-trip, got back %v", unsealedValues)
}
}
+
+func TestSendRemoteCommand(t *testing.T) {
+
+}
diff --git a/socketserver/server/testinfra_test.go b/socketserver/server/testinfra_test.go
index d0326847..4639d9f8 100644
--- a/socketserver/server/testinfra_test.go
+++ b/socketserver/server/testinfra_test.go
@@ -1,11 +1,9 @@
package server
import (
- "crypto/rand"
"encoding/json"
"fmt"
"github.com/gorilla/websocket"
- "golang.org/x/crypto/nacl/box"
"io/ioutil"
"net/http"
"net/http/httptest"
@@ -15,18 +13,57 @@ import (
"time"
)
-func SetupRandomKeys(t testing.TB) {
- _, senderPrivate, err := box.GenerateKey(rand.Reader)
- if err != nil {
- t.Fatal(err)
- }
- receiverPublic, _, err := box.GenerateKey(rand.Reader)
- if err != nil {
- t.Fatal(err)
+const (
+ SetupWantSocketServer = 1 << iota
+ SetupWantBackendServer
+ SetupWantURLs
+)
+
+func TSetup(flags int, backendChecker *TBackendRequestChecker) (socketserver *httptest.Server, backend *httptest.Server, urls TURLs) {
+ DumpBacklogData()
+
+ ioutil.WriteFile("index.html", []byte(`
+
+CatBag
+
+`), 0600)
+
+ conf := &ConfigFile{
+ ServerID: 20,
+ UseSSL: false,
+ OurPublicKey: []byte{176, 149, 72, 209, 35, 42, 110, 220, 22, 236, 212, 129, 213, 199, 1, 227, 185, 167, 150, 159, 117, 202, 164, 100, 9, 107, 45, 141, 122, 221, 155, 73},
+ OurPrivateKey: []byte{247, 133, 147, 194, 70, 240, 211, 216, 223, 16, 241, 253, 120, 14, 198, 74, 237, 180, 89, 33, 146, 146, 140, 58, 88, 160, 2, 246, 112, 35, 239, 87},
+ BackendPublicKey: []byte{19, 163, 37, 157, 50, 139, 193, 85, 229, 47, 166, 21, 153, 231, 31, 133, 41, 158, 8, 53, 73, 0, 113, 91, 13, 181, 131, 248, 176, 18, 1, 107},
}
- box.Precompute(&backendSharedKey, receiverPublic, senderPrivate)
- messageBufferPool.New = New4KByteBuffer
+ if flags&SetupWantBackendServer != 0 {
+ backend = httptest.NewServer(backendChecker)
+ conf.BackendURL = fmt.Sprintf("http://%s", backend.Listener.Addr().String())
+ }
+
+ Configuration = conf
+ setupBackend(conf)
+
+ if flags&SetupWantSocketServer != 0 {
+ serveMux := http.NewServeMux()
+ SetupServerAndHandle(conf, serveMux)
+
+ socketserver = httptest.NewServer(serveMux)
+ }
+
+ if flags&SetupWantURLs != 0 {
+ urls = TGetUrls(socketserver, backend)
+ }
+ return
}
const MethodIsPost = "POST"
@@ -276,56 +313,3 @@ func TGetUrls(socketserver *httptest.Server, backend *httptest.Server) TURLs {
SavePubMsg: fmt.Sprintf("http://%s/cached_pub", addr),
}
}
-
-const (
- SetupWantSocketServer = 1 << iota
- SetupWantBackendServer
- SetupWantURLs
-)
-
-func TSetup(flags int, backendChecker *TBackendRequestChecker) (socketserver *httptest.Server, backend *httptest.Server, urls TURLs) {
- DumpBacklogData()
-
- ioutil.WriteFile("index.html", []byte(`
-
-CatBag
-
-`), 0600)
-
- conf := &ConfigFile{
- ServerID: 20,
- UseSSL: false,
- OurPublicKey: []byte{176, 149, 72, 209, 35, 42, 110, 220, 22, 236, 212, 129, 213, 199, 1, 227, 185, 167, 150, 159, 117, 202, 164, 100, 9, 107, 45, 141, 122, 221, 155, 73},
- OurPrivateKey: []byte{247, 133, 147, 194, 70, 240, 211, 216, 223, 16, 241, 253, 120, 14, 198, 74, 237, 180, 89, 33, 146, 146, 140, 58, 88, 160, 2, 246, 112, 35, 239, 87},
- BackendPublicKey: []byte{19, 163, 37, 157, 50, 139, 193, 85, 229, 47, 166, 21, 153, 231, 31, 133, 41, 158, 8, 53, 73, 0, 113, 91, 13, 181, 131, 248, 176, 18, 1, 107},
- }
-
- if flags&SetupWantBackendServer != 0 {
- backend = httptest.NewServer(backendChecker)
- conf.BackendURL = fmt.Sprintf("http://%s", backend.Listener.Addr().String())
- }
-
- Configuration = conf
- setupBackend(conf)
-
- if flags&SetupWantSocketServer != 0 {
- serveMux := http.NewServeMux()
- SetupServerAndHandle(conf, serveMux)
-
- socketserver = httptest.NewServer(serveMux)
- }
-
- if flags&SetupWantURLs != 0 {
- urls = TGetUrls(socketserver, backend)
- }
- return
-}