加测试代码 (#23)

* 加测试代码 * 调试 * 调试 * 更新 * up
antlabs · Mar 11, 2024 · 96be249 · 96be249
1 parent 7b88b41
commit 96be249
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 7 deletions.
diff --git a/.github/workflows/autobahn.yml b/.github/workflows/autobahn.yml
@@ -28,7 +28,7 @@ jobs:
         env:
           CRYPTOGRAPHY_ALLOW_OPENSSL_102: yes
         run: |
-          chmod +x ./autobahn/script/run.sh & ./autobahn/script/run.sh
+          chmod +x ./autobahn/script/run.sh && ./autobahn/script/run.sh
       - name: Autobahn Report Artifact
         if: >-
           startsWith(matrix.os, 'ubuntu')

diff --git a/autobahn/autobahn-server.go b/autobahn/autobahn-server.go
@@ -22,7 +22,9 @@ var certPEMBlock []byte
 //go:embed privatekey.pem
 var keyPEMBlock []byte
 
-type echoHandler struct{}
+type echoHandler struct {
+	openWriteTimeout bool
+}
 
 func (e *echoHandler) OnOpen(c *quickws.Conn) {
 	fmt.Printf("OnOpen: %p\n", c)
@@ -33,6 +35,13 @@ func (e *echoHandler) OnMessage(c *quickws.Conn, op quickws.Opcode, msg []byte)
 	// if err := c.WriteTimeout(op, msg, 3*time.Second); err != nil {
 	// 	fmt.Println("write fail:", err)
 	// }
+
+	if e.openWriteTimeout {
+		if err := c.WriteTimeout(op, msg, 50*time.Second); err != nil {
+			fmt.Println("write fail:", err)
+		}
+		return
+	}
 	if err := c.WriteMessage(op, msg); err != nil {
 		fmt.Println("write fail:", err)
 	}
@@ -60,9 +69,27 @@ func echo(w http.ResponseWriter, r *http.Request) {
 	c.ReadLoop()
 }
 
+func echo2(w http.ResponseWriter, r *http.Request) {
+	c, err := quickws.Upgrade(w, r,
+		quickws.WithServerReplyPing(),
+		quickws.WithServerDecompression(),
+		quickws.WithServerIgnorePong(),
+		quickws.WithServerCallback(&echoHandler{openWriteTimeout: true}),
+		quickws.WithServerEnableUTF8Check(),
+		quickws.WithServerReadTimeout(5*time.Second),
+	)
+	if err != nil {
+		fmt.Println("Upgrade fail:", err)
+		return
+	}
+
+	c.ReadLoop()
+}
+
 func main() {
 	mux := &http.ServeMux{}
 	mux.HandleFunc("/autobahn", echo)
+	mux.HandleFunc("/autobahn-timeout", echo)
 
 	rawTCP, err := net.Listen("tcp", ":9001")
 	if err != nil {

diff --git a/autobahn/config/fuzzingclient.json b/autobahn/config/fuzzingclient.json
@@ -8,6 +8,13 @@
                                 "version": 18
                         }
                 },
+                {
+                        "agent": "non-tls-timeout",
+                        "url": "ws://localhost:9001/autobahn-timeout",
+                        "options": {
+                                "version": 18
+                        }
+                },
                 {
                         "agent": "tls",
                         "url": "wss://localhost:9002/autobahn",
@@ -23,5 +30,4 @@
                 ""
         ],
         "exclude-agent-cases": {}
-}  
-
+}
diff --git a/autobahn/run_server.sh b/autobahn/run_server.sh
@@ -0,0 +1 @@
+docker run -it --rm  --net=host -v ${PWD}/config:/config -v ${PWD}/report:/report crossbario/autobahn-testsuite wstest -m fuzzingclient -s /config/fuzzingclient.json 
diff --git a/autobahn/script/run.sh b/autobahn/script/run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 mkdir -p ./autobahn/bin
-go build -o ./autobahn/bin/autobahn_server ./autobahn/server/
-go build -o ./autobahn/bin/autobahn_reporter ./autobahn/reporter/
+go build -o ./autobahn/bin/autobahn_server ./autobahn/autobahn-server.go
+# go build -o ./autobahn/bin/autobahn_reporter ./autobahn/reporter/
 
 echo "pwd:" $(pwd)
 ./autobahn/bin/autobahn_server &
@@ -34,7 +34,8 @@ cleanup() {
 	killall autobahn_server
 }
 
-./autobahn/bin/autobahn_reporter ${PWD}/autobahn/report/index.json
+# TODO
+# ./autobahn/bin/autobahn_reporter ${PWD}/autobahn/report/index.json
 
 cleanup