Commit Graph

43 Commits

Author SHA1 Message Date
Yawning Angel
745d414645 Change the client connection timeout to 30 sec.
This is more common than 15 seconds (It's what Firefox uses for the
request timeout).
2014-05-17 07:19:27 +00:00
Yawning Angel
a60f92cf95 Update the spec with feedback from arma (No functional changes). 2014-05-17 07:15:24 +00:00
Yawning Angel
fc5e39a4ef Update README (No functional changes). 2014-05-16 05:06:38 +00:00
Yawning Angel
b4f445233c Add a protocol specification.
This fixes #4.
2014-05-16 04:58:47 +00:00
Yawning Angel
08439afd13 Treat the PrngSeed frame as part of the handshake.
Clients will now always add 87 bytes of padding to the clientRequest,
and Servers will always send the PRNG seed frame unpadded, and bundled
with the serverResponse.

Why 87 bytes?  The amount of data that the server sends is 87.

This fixes #5.
2014-05-16 03:56:08 +00:00
Yawning Angel
8a431a64cb Validate that the padding length is greater than the minimum. 2014-05-16 03:12:12 +00:00
Yawning Angel
1fee9678c6 Change the length field obfscation.
Instead of including the previous secretbox in the input when
calculating the  SipHash-2-4 digest used to generate the obfuscation
mask, use only the nonce.  This is significantly faster, and if someone
breaks obfs4 by exploiting the low amount of input entropy between each
invocation (a counter incrementing by 1), I hope they publish the
attack on the PRF.

This breaks wire protocol compatibility.
2014-05-16 02:54:17 +00:00
Yawning Angel
f4877920f8 Change the handshake wire format.
* HMAC-SHA256 -> HMAC-SHA256-128.
 * Mark/MAC are now both caluclated using Public Key | NodeID.

This breaks wire protocol compatibility.
2014-05-16 00:11:53 +00:00
Yawning Angel
7709069617 Send the DRBG seed as a packetTypePrngSeed post server handshake.
This fixes #3, and brings the code to be on par with the delopyed
versions of ScrambleSuit in terms of features.
2014-05-15 20:21:46 +00:00
Yawning Angel
6f875c99a9 Load the drbg-seed from the ServerTransportOptions args.
This also adds the drgb-seed option to the `-gen` obfs4proxy output.
2014-05-15 19:08:03 +00:00
Yawning Angel
f1b1dcdb10 Change hashDrbg to take a drbgSeed for initialization.
This paves the way for having servers use the same seed for all
incoming connections, across multiple startup/shutdown cycles.  As
opposed to the current situation where each Obfs4Listener will
randomly generate it's seed at creation time.

Additionally, use 256 bit seeds (128 bit SipHash-2-4 key + 16 bytes of
initial material).
2014-05-15 18:33:24 +00:00
Yawning Angel
b9e3aedfb1 Make the output from "-gen" be more useful. 2014-05-15 06:49:11 +00:00
Yawning Angel
50cc180084 Use os.MkdirAll() for creating the pt state directory. 2014-05-15 06:12:31 +00:00
Yawning Angel
013c3c7c4d Fix up how Read() errors were processed where appropriate. 2014-05-15 00:52:53 +00:00
Yawning Angel
79a7ad7f2b Changed the taglne to "The obfourscator", per dcf's suggestion. 2014-05-14 16:32:49 +00:00
Yawning Angel
8e552dbd48 Remove a newline to make godoc work (No functional changes). 2014-05-14 10:01:50 +00:00
Yawning Angel
48c6f06d04 Change the framing Encoder/Decoder to take the destination slice.
In theory this is easier on the garbage collector.  Probably could
reuse more of the intermediary buffers by stashing them in the
connection state, but that makes the code kind of messy.  This should
be an improvement.
2014-05-14 09:58:53 +00:00
Yawning Angel
89d5338eed Fix comment (No functional changes). 2014-05-14 08:13:42 +00:00
Yawning Angel
659efbc044 Update README (No functional changes). 2014-05-14 08:09:41 +00:00
Yawning Angel
ded3f6948c Kill Obfs4Conn.isOk with fire, and replace it with a state var. 2014-05-14 08:06:27 +00:00
Yawning Angel
557e746815 First pass at cleaning up the write code. 2014-05-14 07:07:11 +00:00
Yawning Angel
731a926172 Implement the io.WriterTo interface. 2014-05-14 06:27:41 +00:00
Yawning Angel
582aa3a366 First pass at cleaning up the read code. 2014-05-14 05:48:43 +00:00
Yawning Angel
ece57277db Minor stylistic fixes, no functional changes. 2014-05-14 04:46:24 +00:00
Yawning Angel
64212e1029 Add vim modelines to some files (No functional changes). 2014-05-13 09:56:25 +00:00
Yawning Angel
8daf42a13e Fix up import. 2014-05-13 07:01:25 +00:00
Yawning Angel
d2b2e383fd Fix copyLoop to break out the other goroutine on graceful exit.
This should fix sockets getting stuck in CLOSE_WAIT.
2014-05-13 03:19:55 +00:00
Yawning Angel
7a7b2af516 Fix e-mail address in the copyright notice. 2014-05-13 02:35:51 +00:00
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.
2014-05-13 02:31:37 +00:00
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.
2014-05-12 23:04:39 +00:00
Yawning Angel
c3acefb7e5 Log and propagate errors between the 2 goroutines in copyLoop.
This fixes #1.
2014-05-12 05:08:04 +00:00
Yawning Angel
433ff8027d Fix a comment (No functional changes). 2014-05-12 04:55:52 +00:00
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.
2014-05-12 04:51:06 +00:00
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.
2014-05-12 02:37:40 +00:00
Yawning Angel
cca49e01a3 Set a timeout on outgoing handshakes as well. 2014-05-12 01:30:21 +00:00
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.
2014-05-12 01:13:49 +00:00
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.
2014-05-12 00:58:27 +00:00
Yawning Angel
c2f1e8ecb7 Clean up the logging a bit. 2014-05-12 00:25:40 +00:00
Yawning Angel
68c48cb383 Run go fmt on obfs4proxy.go (No functional changes). 2014-05-12 00:06:52 +00:00
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.
2014-05-12 00:02:24 +00:00
Yawning Angel
f76f142340 Change documentation/comments to reflect reality (No functional changes). 2014-05-11 21:55:34 +00:00
Yawning Angel
e6a8d57a23 Remove a comment that I forgot to delete, no functional changes. 2014-05-09 10:34:38 +00:00
Yawning Angel
ef38b844f9 Initial import. 2014-05-09 10:23:58 +00:00