archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-14 14:11:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle generated errors in server

Browse source
This commit is contained in:
Shane Howearth 2019-10-01 10:30:29 +10:00 • committed by Cecylia Bocovich
parent 3ec9dd19fa
commit ed3d42e1ec
1 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

45
server/server.go
View file

@ -4,7 +4,6 @@ package main
import ( import (
"crypto/tls" "crypto/tls"
"errors"
"flag" "flag"
"fmt" "fmt"
"io" "io"
@ -75,7 +74,7 @@ func (conn *webSocketConn) Read(b []byte) (n int, err error) {
return return
} }
if m.Opcode != 2 { if m.Opcode != 2 {
err = errors.New(fmt.Sprintf("got non-binary opcode %d", m.Opcode)) err = fmt.Errorf("got non-binary opcode %d", m.Opcode)
return return
} }
conn.messageBuf = m.Payload conn.messageBuf = m.Payload
@ -113,20 +112,22 @@ func proxy(local *net.TCPConn, conn *webSocketConn) {
wg.Add(2) wg.Add(2)
go func() { go func() {
_, err := io.Copy(conn, local) if _, err := io.Copy(conn, local); err != nil {
if err != nil { log.Printf("error copying ORPort to WebSocket %v", err)
log.Printf("error copying ORPort to WebSocket") }
if err := local.CloseRead(); err != nil {
log.Printf("error closing read after copying ORPort to WebSocket %v", err)
} }
local.CloseRead()
conn.Close() conn.Close()
wg.Done() wg.Done()
}() }()
go func() { go func() {
_, err := io.Copy(local, conn) if _, err := io.Copy(local, conn); err != nil {
if err != nil {
log.Printf("error copying WebSocket to ORPort") log.Printf("error copying WebSocket to ORPort")
} }
local.CloseWrite() if err := local.CloseWrite(); err != nil {
log.Printf("error closing write after copying WebSocket to ORPort %v", err)
}
conn.Close() conn.Close()
wg.Done() wg.Done()
}() }()
@ -150,7 +151,9 @@ func clientAddr(clientIPParam string) string {
func webSocketHandler(ws *websocket.WebSocket) { func webSocketHandler(ws *websocket.WebSocket) {
// Undo timeouts on HTTP request handling. // Undo timeouts on HTTP request handling.
ws.Conn.SetDeadline(time.Time{}) if err := ws.Conn.SetDeadline(time.Time{}); err != nil {
log.Printf("unable to set deadlines with error: %v", err)
}
conn := newWebSocketConn(ws) conn := newWebSocketConn(ws)
defer conn.Close() defer conn.Close()
@ -307,7 +310,8 @@ func main() {
log.Printf("ACME hostnames: %q", acmeHostnames) log.Printf("ACME hostnames: %q", acmeHostnames)
var cache autocert.Cache var cache autocert.Cache
cacheDir, err := getCertificateCacheDir() var cacheDir string
cacheDir, err = getCertificateCacheDir()
if err == nil { if err == nil {
log.Printf("caching ACME certificates in directory %q", cacheDir) log.Printf("caching ACME certificates in directory %q", cacheDir)
cache = autocert.DirCache(cacheDir) cache = autocert.DirCache(cacheDir)
@ -332,7 +336,9 @@ func main() {
servers := make([]*http.Server, 0) servers := make([]*http.Server, 0)
for _, bindaddr := range ptInfo.Bindaddrs { for _, bindaddr := range ptInfo.Bindaddrs {
if bindaddr.MethodName != ptMethodName { if bindaddr.MethodName != ptMethodName {
pt.SmethodError(bindaddr.MethodName, "no such method") if err = pt.SmethodError(bindaddr.MethodName, "no such method"); err != nil {
log.Printf("pt.SmethodError returned error: %v", err)
}
continue continue
} }
@ -340,10 +346,13 @@ func main() {
addr := *bindaddr.Addr addr := *bindaddr.Addr
addr.Port = 80 addr.Port = 80
log.Printf("Starting HTTP-01 ACME listener") log.Printf("Starting HTTP-01 ACME listener")
lnHTTP01, err := net.ListenTCP("tcp", &addr) var lnHTTP01 *net.TCPListener
lnHTTP01, err = net.ListenTCP("tcp", &addr)
if err != nil { if err != nil {
log.Printf("error opening HTTP-01 ACME listener: %s", err) log.Printf("error opening HTTP-01 ACME listener: %s", err)
pt.SmethodError(bindaddr.MethodName, "HTTP-01 ACME listener: "+err.Error()) if inerr := pt.SmethodError(bindaddr.MethodName, "HTTP-01 ACME listener: "+err.Error()); inerr != nil {
log.Printf("pt.SmethodError returned error: %v", inerr)
}
continue continue
} }
server := &http.Server{ server := &http.Server{
@ -371,7 +380,9 @@ func main() {
} }
if err != nil { if err != nil {
log.Printf("error opening listener: %s", err) log.Printf("error opening listener: %s", err)
pt.SmethodError(bindaddr.MethodName, err.Error()) if inerr := pt.SmethodError(bindaddr.MethodName, err.Error()); inerr != nil {
log.Printf("pt.SmethodError returned error: %v", inerr)
}
continue continue
} }
pt.SmethodArgs(bindaddr.MethodName, bindaddr.Addr, args) pt.SmethodArgs(bindaddr.MethodName, bindaddr.Addr, args)
@ -388,7 +399,9 @@ func main() {
// This environment variable means we should treat EOF on stdin // This environment variable means we should treat EOF on stdin
// just like SIGTERM: https://bugs.torproject.org/15435. // just like SIGTERM: https://bugs.torproject.org/15435.
go func() { go func() {
io.Copy(ioutil.Discard, os.Stdin) if _, err := io.Copy(ioutil.Discard, os.Stdin); err != nil {
log.Printf("error copying os.Stdin to ioutil.Discard: %v", err)
}
log.Printf("synthesizing SIGTERM because of stdin close") log.Printf("synthesizing SIGTERM because of stdin close")
sigChan <- syscall.SIGTERM sigChan <- syscall.SIGTERM
}() }()