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

Make Snowflake-specific changes to the websocket server.

Browse source 
Change the transport name to "snowflake" and don't report the remote
client address to the ExtORPort.
This commit is contained in:
David Fifield 2016-03-26 12:34:47 -07:00
parent cfca47674e
commit a269053ac2
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
server/server.go
View file

@ -1,8 +1,10 @@
// Tor websocket server transport plugin. // Snowflake-specific websocket server plugin. This is the same as the websocket
// server used by flash proxy, except that it reports the transport name as
// "snowflake" and does not forward the remote address to the ExtORPort.
// //
// Usage in torrc: // Usage in torrc:
// ExtORPort 6669 // ExtORPort 6669
// ServerTransportPlugin websocket exec ./websocket-server --port 9901 // ServerTransportPlugin snowflake exec server --port 9901
package main package main
import ( import (
@ -24,7 +26,7 @@ import (
"git.torproject.org/pluggable-transports/websocket.git/websocket" "git.torproject.org/pluggable-transports/websocket.git/websocket"
) )
const ptMethodName = "websocket" const ptMethodName = "snowflake"
const requestTimeout = 10 * time.Second const requestTimeout = 10 * time.Second
// "4/3+1" accounts for possible base64 encoding. // "4/3+1" accounts for possible base64 encoding.
@ -166,7 +168,10 @@ func webSocketHandler(ws *websocket.WebSocket) {
handlerChan <- -1 handlerChan <- -1
}() }()
or, err := pt.DialOr(&ptInfo, ws.Conn.RemoteAddr().String(), ptMethodName) // Pass an empty string for the client address. The remote address on
// the incoming connection reflects that of the browser proxy, not of
// the client. See https://bugs.torproject.org/18628.
or, err := pt.DialOr(&ptInfo, "", ptMethodName)
if err != nil { if err != nil {
log.Printf("Failed to connect to ORPort: " + err.Error()) log.Printf("Failed to connect to ORPort: " + err.Error())
return return