Commit Graph

26 Commits (89d5338eed93e9324d91ff498962c7dbe5b93f56)
 

Author SHA1 Message Date
Yawning Angel 89d5338eed Fix comment (No functional changes). 11 years ago
Yawning Angel 659efbc044 Update README (No functional changes). 11 years ago
Yawning Angel ded3f6948c Kill Obfs4Conn.isOk with fire, and replace it with a state var. 11 years ago
Yawning Angel 557e746815 First pass at cleaning up the write code. 11 years ago
Yawning Angel 731a926172 Implement the io.WriterTo interface. 11 years ago
Yawning Angel 582aa3a366 First pass at cleaning up the read code. 11 years ago
Yawning Angel ece57277db Minor stylistic fixes, no functional changes. 11 years ago
Yawning Angel 64212e1029 Add vim modelines to some files (No functional changes). 11 years ago
Yawning Angel 8daf42a13e Fix up import. 11 years ago
Yawning Angel d2b2e383fd Fix copyLoop to break out the other goroutine on graceful exit.
This should fix sockets getting stuck in CLOSE_WAIT.
11 years ago
Yawning Angel 7a7b2af516 Fix e-mail address in the copyright notice. 11 years ago
Yawning Angel 9bfdd77f72 Add preliminary support for packet length obfuscation.
The same algorithm as ScrambleSuit is used, except:
 * SipHash-2-4 in OFB mode is used to create the distribution.
 * The system CSPRNG is used when sampling the distribution.

This fixes most of #3, all that remains is generating and sending a
persistent distribution on the server side to the client.
11 years ago
Yawning Angel 51a8dd5a86 Fix logging again.
On second thought instead of using log.Panicf(), panic() and do the
logging with recover().  This somewhat centralizes logging in
obfs4proxy, which will be easier to change when I invariably decide to
do logging differently in the future.
11 years ago
Yawning Angel c3acefb7e5 Log and propagate errors between the 2 goroutines in copyLoop.
This fixes #1.
11 years ago
Yawning Angel 433ff8027d Fix a comment (No functional changes). 11 years ago
Yawning Angel 9712aec73b Preliminary support padding, log on panic.
This adds preliminary support for data padding by adding another layer
of encapsulation inside each AEAD frame containing a type and length.
For now, data is still sent unpadded, but the infrastructure for
supporting it is mostly there.

Additionally, use log.Panic[f]() instead of panic through out the code
so that some panics are logged.
11 years ago
Yawning Angel 8a1f58cd5a Remove support for Write deadlines since it wasn't working.
Write timeouts are obnoxious to handle as the frame encoder state
already is updated to cover the entire payload for the Write() call
that timed out.  In theory it is possible to buffer the pending data,
but that causes Write() to voilate the semantics of the interface.
11 years ago
Yawning Angel cca49e01a3 Set a timeout on outgoing handshakes as well. 11 years ago
Yawning Angel 9b6b3f825b Reject clients that do not authenticate quickly enough.
The current timeout value before the server fails the handshake is
15 s.  This may need to be increased for clients over slow links.
11 years ago
Yawning Angel 06a95ff1e0 Close connections that fail to authenticate after a while.
Like ScrambleSuit, a random interval between 1x and 5x of additional
data from the peer is read and immediately discarded before closing.

Additionally, obfs4 will close off invalid connections anywhere between
0 and 60 seconds after it determines that the incoming connection will
never complete the handshake successfully.
11 years ago
Yawning Angel c2f1e8ecb7 Clean up the logging a bit. 11 years ago
Yawning Angel 68c48cb383 Run go fmt on obfs4proxy.go (No functional changes). 11 years ago
Yawning Angel 8e14ed44ad Move to a unified client/server binary, and fix bugs.
* The old and the busted: obfs4-[client,server].
 * The new hotness: obfs4client.
 * Add obfs4.ServerHandshake() that servers need to call after a
   successful return from Accept().  This allows implementations to
   move the handshake into a goroutine or whatever.
11 years ago
Yawning Angel f76f142340 Change documentation/comments to reflect reality (No functional changes). 11 years ago
Yawning Angel e6a8d57a23 Remove a comment that I forgot to delete, no functional changes. 11 years ago
Yawning Angel ef38b844f9 Initial import. 11 years ago