root
/
telebit
mirror of https://github.com/therootcompany/telebit.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

log cleanup

This commit is contained in:
AJ ONeal 2020-07-20 16:32:07 -06:00
parent 242051395e
commit 4a812770d0
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/telebit/admin.go
View File

@ -6,10 +6,12 @@ import (
"fmt" "fmt"
"log" "log"
"net/http" "net/http"
"os"
"sync" "sync"
telebit "git.rootprojects.org/root/telebit" telebit "git.rootprojects.org/root/telebit"
"git.rootprojects.org/root/telebit/admin" "git.rootprojects.org/root/telebit/admin"
"git.rootprojects.org/root/telebit/dbg"
"git.rootprojects.org/root/telebit/table" "git.rootprojects.org/root/telebit/table"
"github.com/go-chi/chi" "github.com/go-chi/chi"
@ -23,7 +25,6 @@ func init() {
r.Use(func(next http.Handler) http.Handler { r.Use(func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
fmt.Println("[debug] should be handled by API or websocket upgrade")
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
}) })
}) })
@ -31,7 +32,9 @@ func init() {
r.Mount("/ws", http.HandlerFunc(upgradeWebsocket)) r.Mount("/ws", http.HandlerFunc(upgradeWebsocket))
r.HandleFunc("/api/ping", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { r.HandleFunc("/api/ping", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
fmt.Printf("[debug] hit /api/ping and replying\n") if dbg.Debug {
fmt.Fprintf(os.Stderr, "[debug] hit /api/ping and replying\n")
}
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
w.Write(apiPingContent) w.Write(apiPingContent)
})) }))
@ -157,25 +160,23 @@ func upgradeWebsocket(w http.ResponseWriter, r *http.Request) {
w.Write(apiNotAuthorizedContent) w.Write(apiNotAuthorizedContent)
return return
} }
upgrader := websocket.Upgrader{ upgrader := websocket.Upgrader{
ReadBufferSize: 1024, ReadBufferSize: 1024,
WriteBufferSize: 1024, WriteBufferSize: 1024,
} }
fmt.Println("[debug] grants", grants)
conn, err := upgrader.Upgrade(w, r, nil) conn, err := upgrader.Upgrade(w, r, nil)
if err != nil { if err != nil {
log.Println("WebSocket upgrade failed", err) log.Println("WebSocket upgrade failed", err)
return return
} }
//fmt.Printf("LocalAddr: %#v\n", r.LocalAddr)
wsTun := telebit.NewWebsocketTunnel(conn) wsTun := telebit.NewWebsocketTunnel(conn)
fmt.Printf("[debug] http.req.RemoteAddr: %+v\n", r.RemoteAddr) fmt.Printf("New Authenticated WebSocket Remote Server\n")
fmt.Printf("[debug] conn.RemoteAddr(): %+v\n", conn.RemoteAddr()) fmt.Printf("\thttp.req.RemoteAddr: %+v\n", r.RemoteAddr)
fmt.Printf("[debug] conn.LocalAddr(): %+v\n", conn.LocalAddr()) fmt.Printf("\tconn.RemoteAddr(): %+v\n", conn.RemoteAddr())
//fmt.Printf("wsTun.RemoteAddr(): %+v\n", wsTun.RemoteAddr()) fmt.Printf("\tconn.LocalAddr(): %+v\n", conn.LocalAddr())
//fmt.Printf("wsTun.LocalAddr(): %#v\n", wsTun.LocalAddr()) fmt.Printf("\tgrants: %v\n", grants)
// The remote address of the server is useful for identification. // The remote address of the server is useful for identification.
// The local address of the server (port to which it connected) is not very meaningful. // The local address of the server (port to which it connected) is not very meaningful.