Commit Graph

30 Commits (2001f0b698183b998dbf8e52f5d40a0d82aeef09)

Author SHA1 Message Date
Yawning Angel 2001f0b698 Generate client keypairs before connecting, instead of after.
Part of issue #9.
10 years ago
Yawning Angel 9fe9959c76 Change the weighted distribution algorithm be uniform.
The old way was biasted towards the earlier values.  Thanks to asn for
pointing this out and suggesting an alternative.

As an additional tweak, do not reuse the drbg seed when calculating the
IAT distribution, but instead run the seed through SHA256 first, for
extra tinfoil goodness.
10 years ago
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.
10 years ago
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.
11 years ago
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.
11 years ago
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.
11 years ago
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.
11 years ago
Yawning Angel b50a8bdf24 Finish adding godoc comments to all public interfaces. 11 years ago
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).
11 years ago
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.
11 years ago
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).
11 years ago
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.
11 years ago
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.
11 years ago
Yawning Angel 6f875c99a9 Load the drbg-seed from the ServerTransportOptions args.
This also adds the drgb-seed option to the `-gen` obfs4proxy output.
11 years ago
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).
11 years ago
Yawning Angel 013c3c7c4d Fix up how Read() errors were processed where appropriate. 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 64212e1029 Add vim modelines to some files (No functional changes). 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 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 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 ef38b844f9 Initial import. 11 years ago