81b1e4f6348 chore: Release v0.2.21-rc.1 9303e2e49a1 chore: Update the pkgsrc versions in the update-versions tool 71ec4b3b1e9 chore: Update the version-sync script to work in a post-tox.api.h world 66da842f753 chore: Add version update script compatible with ci-tools. 199878f7660 chore: Use new bazel script for circle ci. 8278e9cda46 chore: Add release issue template and workflow. a9bb3a1c4d1 chore: Fix alpine-s390x build. 6e0a641272e chore: Add a source tarball deploy workflow. 4adebe4d8b1 chore: Don't upload ios/macos variants in deploy workflows. 18f1d858ccb chore: Move one of the 3 freebsd builds to post-submit. 432ab60c002 feat: Add a Makefile for the single file deploy build. a86c0011fd5 chore: Add deploy job for single C file library. 2e7495e8f2a docs: Update changelog format to use the new clog-compatible way. a682da99e84 chore: Export wasmExports from the wasm binary. 12f34cdff27 chore: Add wasm to the nightly binary deploys. 1451029613f chore: Add strict-abi support for macOS/iOS. c53c30e09d9 chore: Add time option to manual fuzz trigger. 2ccecdc2a1a chore: Add remaining fuzz tests to cflite. 4626c2e230e test: Add a Net_Crypto fuzz test. b4a0e617c48 refactor: Use IP string length from ip_ntoa instead of strlen. b85b91f22f6 cleanup: rename getnodes/sendnodes to nodes request/response This change alignes the naming to be closer to the spec and make it less ambiguous. This change also changes the naming of some private/experimental marked APIs. - tox_callback_dht_nodes_response() - tox_dht_nodes_request() - Tox_Event_Dht_Get_Nodes_Response f1991aaa029 perf: Use stack allocation for strerror rendering. 3984211ccbf cleanup: remove kicked peers from saved peers list 26a991ed2be fix: ip to string function not accepting tcp families 712861f2e6d cleanup: Make websockify output qtox-compatible logging. 01932ea2f73 chore: Add opus and vpx to the toxcore wasm build. d29c42ef631 refactor: don't fully discard received DHT nodes. This is mostly forward thinking, where we might introduce other ip families, in addition to ipv4, ipv6, tcp_ipv4 etc. 21e2325934f chore: Fix xcframework tarball creation. b10c8b766ba chore: Fix xcframework checksum creation. 93787a9322e chore: Add ios/macos framework build. 9f723f891d3 fix: run do_gca also in bootstrap nodes 496cc703556 chore: Support arm64 iphone simulator. aa0e2a8e928 chore: Add support for more iOS architectures. 13ad8e81cbf chore: Add binary deploy workflows. c8344726378 refactor: Move tox_log_level out into its own file. 8799bea76c3 cleanup: Mark events/dispatch headers as experimental. d4164edb548 refactor: Remove tox_types.h; use `struct` tags instead. d408c982090 refactor: Move `Tox_Options` to `tox_options.h`. 5ab42d41209 chore: Move most cirrus jobs to circleci. 463eeae1144 cleanup: Avoid clashing with global define `DEBUG`. 92cc1e91747 refactor: Make Tox_Options own the passed proxy host and savedata. f276b397226 test: Add some more asserts for I/O and alloc to succeed. edb4dfc4869 fix: Don't crash on malloc failures in bin_unpack. be457d5d0b2 cleanup: Use tox memory for bin_unpack and net_strerror. git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 81b1e4f6348124784088591c4fe9ab41e273031d
167 lines
4.0 KiB
Go
167 lines
4.0 KiB
Go
// A Go version WebSocket to TCP socket proxy
|
|
//
|
|
// This is a heavily modified version of this file:
|
|
// https://github.com/novnc/websockify-other/blob/master/golang/websockify.go
|
|
//
|
|
// Changes include:
|
|
// - Fix infinite loop on error.
|
|
// - Proper logging.
|
|
// - Proper error handling in general.
|
|
// - Support both websocket and regular GET requests on /.
|
|
// - Write logs in the standard Tox format.
|
|
//
|
|
// Copyright 2022-2025 The TokTok team.
|
|
// Copyright 2021 Michael.liu.
|
|
// See LICENSE for licensing conditions.
|
|
|
|
package main
|
|
|
|
import (
|
|
"encoding/hex"
|
|
"flag"
|
|
"fmt"
|
|
"log"
|
|
"net"
|
|
"net/http"
|
|
"os"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/gorilla/websocket"
|
|
)
|
|
|
|
var (
|
|
sourceAddr = flag.String("l", "127.0.0.1:8080", "http service address")
|
|
targetAddr = flag.String("t", "127.0.0.1:5900", "tcp service address")
|
|
)
|
|
|
|
// Should be enough to fit any Tox TCP packets.
|
|
const bufferSize = 2048
|
|
|
|
var upgrader = websocket.Upgrader{
|
|
ReadBufferSize: bufferSize,
|
|
WriteBufferSize: bufferSize,
|
|
Subprotocols: []string{"binary"},
|
|
CheckOrigin: func(r *http.Request) bool {
|
|
return true
|
|
},
|
|
}
|
|
|
|
func forwardTCP(wsconn *websocket.Conn, conn net.Conn) {
|
|
var tcpbuffer [bufferSize]byte
|
|
defer wsconn.Close()
|
|
defer conn.Close()
|
|
for {
|
|
n, err := conn.Read(tcpbuffer[0:])
|
|
if err != nil {
|
|
log.Println("TCP READ :", err)
|
|
break
|
|
}
|
|
log.Println("TCP READ :", n, hex.EncodeToString(tcpbuffer[0:n]))
|
|
|
|
if err := wsconn.WriteMessage(websocket.BinaryMessage, tcpbuffer[0:n]); err != nil {
|
|
log.Println("WS WRITE :", err)
|
|
break
|
|
}
|
|
log.Println("WS WRITE :", n)
|
|
}
|
|
}
|
|
|
|
func forwardWeb(wsconn *websocket.Conn, conn net.Conn) {
|
|
defer wsconn.Close()
|
|
defer conn.Close()
|
|
for {
|
|
_, buffer, err := wsconn.ReadMessage()
|
|
if err != nil {
|
|
log.Println("WS READ :", err)
|
|
break
|
|
}
|
|
log.Println("WS READ :", len(buffer), hex.EncodeToString(buffer))
|
|
|
|
m, err := conn.Write(buffer)
|
|
if err != nil {
|
|
log.Println("TCP WRITE:", err)
|
|
break
|
|
}
|
|
log.Println("TCP WRITE:", m)
|
|
}
|
|
}
|
|
|
|
func serveWs(w http.ResponseWriter, r *http.Request) {
|
|
ws, err := upgrader.Upgrade(w, r, nil)
|
|
if err != nil {
|
|
log.Println("upgrade:", err)
|
|
return
|
|
}
|
|
vnc, err := net.Dial("tcp", *targetAddr)
|
|
if err != nil {
|
|
log.Println("dial:", err)
|
|
return
|
|
}
|
|
go forwardTCP(ws, vnc)
|
|
go forwardWeb(ws, vnc)
|
|
|
|
}
|
|
|
|
type logEntry struct {
|
|
time string
|
|
file string
|
|
line string
|
|
message string
|
|
}
|
|
|
|
type logWriter struct{}
|
|
|
|
// Write implements the io.Writer interface.
|
|
//
|
|
// This parses the Go log format and outputs it as the standard Tox format.
|
|
//
|
|
// Go format:
|
|
// "15:02:46.433968 websockify.go:106: Starting up websockify endpoint\n"
|
|
//
|
|
// Standard Tox format:
|
|
// "[15:02:46.433 UTC] (websockify) websockify.go:106 : Debug: Starting up websockify endpoint"
|
|
func (writer *logWriter) Write(bytes []byte) (int, error) {
|
|
// Parse the Go log format (skipping the last 3 digits of the microseconds).
|
|
re := regexp.MustCompile(`^(\d{2}:\d{2}:\d{2}\.\d{3})\d{3} ([^:]+):(\d+): (.*)$`)
|
|
matches := re.FindStringSubmatch(strings.TrimSuffix(string(bytes), "\n"))
|
|
if len(matches) != 5 {
|
|
// If the log format doesn't match, just print it as is.
|
|
fmt.Fprintf(os.Stderr, "%s (unparsed)", string(bytes))
|
|
return len(bytes), nil
|
|
}
|
|
|
|
// Extract the log fields.
|
|
entry := logEntry{
|
|
time: matches[1],
|
|
file: matches[2],
|
|
line: matches[3],
|
|
message: matches[4],
|
|
}
|
|
|
|
// Print the Go log format in the standard Tox format to stderr.
|
|
fmt.Fprintf(os.Stderr, "[%s UTC] (websockify) %s:%s : Debug: %s\n", entry.time, entry.file, entry.line, entry.message)
|
|
|
|
return len(bytes), nil
|
|
}
|
|
|
|
func main() {
|
|
log.SetFlags(log.Ltime | log.Lshortfile | log.LUTC | log.Lmicroseconds)
|
|
log.SetOutput(new(logWriter))
|
|
|
|
flag.Parse()
|
|
log.Println("Starting up websockify endpoint")
|
|
|
|
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
|
if r.Header.Get("Upgrade") == "websocket" {
|
|
serveWs(w, r)
|
|
} else {
|
|
w.Header().Set("Content-Type", "text/plain")
|
|
w.WriteHeader(http.StatusNotFound)
|
|
|
|
fmt.Fprintf(w, "404 Not Found")
|
|
}
|
|
})
|
|
log.Fatal(http.ListenAndServe(*sourceAddr, nil))
|
|
}
|