Commit Graph

67 Commits

Author SHA1 Message Date
Yawning Angel
c05a7a2e34 Add support for HTTP CONNECT proxies.
Joining a SOCKS dialer on the list of things the Golang runtime really
should have is a HTTP CONNECT dialer.  There's a full fledged HTTP
client and server there, but not this.  Why?  Who knows.

This fixes issue #7.
2014-05-25 12:40:06 +00:00
Yawning Angel
f0d8923a9a Move the SOCKS4 code off into it's own little getto.
Part of issue #7.
2014-05-25 11:00:25 +00:00
Yawning Angel
3c64e04e02 Add support for SOCKS4.
Despite the unfortunate scheme name, this really is SOCKS4, and not 4a,
as the torrc Socks4Proxy option only supports addresses and not FQDNs.

Part of issue #7.
2014-05-25 10:28:32 +00:00
Yawning Angel
f0090b5127 Rename to be consistent. 2014-05-25 09:17:02 +00:00
Yawning Angel
92494597ce Wire in go.net/proxy, enabling SOCKS5 via TOR_PT_PROXY.
With tor patched to support 8402, obfs4 bootstraps via a SOCKSv5 proxy
now.  Other schemes will bail with a PROXY-ERROR, as the go.net/proxy
package does not support them, and I have not gotten around to writing
dialers for them yet (next on my TODO list).

Part of issue #7.
2014-05-25 09:14:14 +00:00
Yawning Angel
b3d17c327b Validate the host component of the proxy URI.
Part of issue #7.
2014-05-25 08:20:20 +00:00
Yawning Angel
d5c3a25dec Parse TOR_PT_PROXY and support sending DONE/PROXY-ERROR.
Currently obfs4proxy is hardcoded to always PROXY-ERROR, despite a
valid proxy uri being passed in the env var.  Once the dialer portion
of the code is done, this will be changed.

Part of issue #7.
2014-05-25 08:01:11 +00:00
Yawning Angel
f04fd166ac Move the supplemental pt config routines to pt_extra.go 2014-05-25 07:27:48 +00:00
Yawning Angel
3e3b07c4e8 Don't use math/big when generating random numbers. 2014-05-24 16:46:59 +00:00
Yawning Angel
8cd2e1f0f9 Randomize length when the decoder receives an out-of-bound value.
This makes the length error and MAC error indistinguishable to an
external attacker.
2014-05-24 05:06:34 +00:00
Yawning Angel
b3f0f51775 Move utils.go to csrand/csrand.go, and clean up the interface.
All of the obfs4 code except unit tests now uses the csrand wrapper
routines.
2014-05-24 04:47:10 +00:00
Yawning Angel
e77ddddf4d Add support for IAT obfuscation (disabled by default).
When enabled, inter-packet delay will be randomized between 0 and 10
ms in 100 usec intervals.  As experiences from ScrambleSuit (and back
of the envelope math based on how networks work) show, this is
extremely expensive and artificially limits the throughput of the link.

When enabled, bulk transfer throughput will be limited to an average of
278 KiB/s.
2014-05-23 05:23:36 +00:00
Yawning Angel
272fb852e7 Change the maximm handshake length to 8192 bytes.
* handhake_ntor_test now is considerably more comprehensive.
 * The padding related constants in the spec were clarified.

This breaks wireprotocol compatibility.
2014-05-23 04:04:31 +00:00
Yawning Angel
fd4e3c7c74 Add replay detection to handshakes.
This is done by maintaining a map keyed off the SipHash-2-4 digest of
the MAC_C component of the handshake.  Collisions, while possible are
unlikely in the extreme and are thus treated as replays.

In concept this is fairly similar to the ScrambleSuit `replay.py` code,
with a few modifications:

 * There is a upper bound on how large the replay filter can grow.
   Currently this is set to 102400 entries, though it is unlikely that
   this limit will be hit.

 * A doubly linked list is also maintained parallel to the map, so the
   filter compaction process does not need to iterate over the entire
   filter.
2014-05-22 18:42:16 +00:00
Yawning Angel
7dd875fe4c Revert "Use the new goptlib goodies."
This reverts commit 8d61c6bcc6.

On second thought, don't do this.  API not final, and some of the stuff
might not be a good idea after all.
2014-05-21 18:28:50 +00:00
Yawning Angel
f4b3821292 Fix constants in the spec to reflect the code. 2014-05-21 15:59:03 +00:00
Yawning Angel
8d61c6bcc6 Use the new goptlib goodies.
As of `15b960d55905877a840fe605a41a8139bffb5329` goptlib supports
IsClient, IsServer, and handling the StateLocation.

Yes this means you need to use goptlib out of git.
2014-05-21 09:38:37 +00:00
Yawning Angel
19f34317ba Change the MSS to 1448 bytes, because timestamps are a thing.
This breaks wireprotocol compatibility.
2014-05-21 01:45:17 +00:00
Yawning Angel
7c37109c48 Add support for a log scrubber and log a session id.
This fixes #6.
2014-05-21 00:47:54 +00:00
Yawning Angel
b50a8bdf24 Finish adding godoc comments to all public interfaces. 2014-05-21 00:26:25 +00:00
Yawning Angel
676e0428e7 Allow logging to be disabled (default).
Part of #6, still need to make logs nicer.
2014-05-20 17:12:19 +00:00
Yawning Angel
66edb786db Tweak the obfs4 handshake code.
* Fixed where the code wasn't ensuring that the MAC_[C,S] was present.
 * Optimized the server side to only look at the tail of the (possibly
   incomplete handshakeRequest).
2014-05-20 16:40:09 +00:00
Yawning Angel
a853a1f0aa Actually keep the delay/threshold in the listener struct.
This makes it consistent across all incoming connections, for real this
time (oops).
2014-05-18 04:06:02 +00:00
Yawning Angel
efb9d17c8c Change the server failure close delay/discard length to be consistent.
It will vary per bridge as it is based off the DRBG, but ever attempt
at poking at any given bridge will exhibit consistent behavior.
2014-05-18 03:37:22 +00:00
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