Commit Graph

100 Commits

Author SHA1 Message Date
Yawning Angel
09633500b3 Add a man page for obfs4proxy. 2014-09-06 16:40:37 +00:00
Yawning Angel
cedd6a5fa9 Do the release ritual for obfs4proxy-0.0.1. 2014-09-03 17:12:53 +00:00
Yawning Angel
ce86fa4348 Change the default logLevel to ERROR, upgrade some client warnings.
Client side logs are less spammy than server side in general, so more
messages should be visible at the default logLevel when running as a
client.

Server side logging will be spammy basically no matter what unless
obfs4proxy gets into the (arguably dangerous) business of figuring out
which errors are people being evil vs which ones are transient network
issues, so most logging is suppressed by default, unless the admin
choses to open the floodgates.
2014-09-03 12:50:43 +00:00
Yawning Angel
fb13cf1241 Add a prolog/epilog to the logging that always gets logged.
The prolog prints the version as soon as logging is enabled, but before
the pluggable transport configuration is done.  The epilog is printed as
the code returns from main, as long as either client or server pt
configuration succeded.
2014-09-03 11:55:16 +00:00
Yawning Angel
79e94103d6 Update the README.md (No functional changes). 2014-09-03 09:44:18 +00:00
Yawning Angel
d5f59458fe Change the version command line arg from -v to -version.
For consistency with the rest of the arguments.
2014-09-03 09:09:13 +00:00
Yawning Angel
25178c6a95 Add support for "logLevel" to reduce log spam.
By default logging will be done at the "WARN" level.  Fatal
initialization errors will always be logged as long as logging
is enabled regardless of logLevel.
2014-09-03 09:05:18 +00:00
Yawning Angel
ce39988b11 Add elideError(error) that knows how to sanitize net.Errors.
Instead of omitting errors entirely when running with the log scrubber,
filter common network errors through elideError() that can scrub the
common net.Error types and remove sensitive information.
2014-08-31 14:30:14 +00:00
Yawning Angel
bfca92cf16 Various IAT related changes.
* Unbreak inbound TYPE_PRNG_SEED processing.

 * IAT obfuscation is now a per-bridge argument (iat-mode).
   * 0 (default) = Disabled.
   * 1 = Enabled, ScrambleSuit-style with bulk throughput optimizations.
   * 2 = Paranoid, Each IAT write will send a length sampled from the
     length distribution. (EXPENSIVE).

The "iat-mode" argument is mandatory on the Bridge lines, and as a
ServerTransportOption.  Old statefiles will continue to load and use
the default value, edit it if your hat is made of tin foil.
2014-08-27 12:30:11 +00:00
Yawning Angel
94d3fe9a08 Change the TYPE_PRNG_SEED length to 24.
This matches what the code actually sends.  It's shorter than the
ScrambleSuit PRNG seed, but that's because the SipHash-2-4 based
Hash_DRBG has 24 bytes of internal state (key + initial output).
2014-08-27 12:26:09 +00:00
Yawning Angel
468cd4bde8 Display a more useful error on JSON Unmarshall failure. 2014-08-27 03:52:22 +00:00
Yawning Angel
83c9e3b9a0 Add a ChangeLog and dump the version when invoked with "-v". 2014-08-27 03:46:23 +00:00
Yawning Angel
1e574942d5 Change all the arguments to use base16 from base64.
WARNING: THIS BREAKS BACKWARD COMPATIBILITY.

This is primarily to work around bug #12930.  Base16 was chosen over
unpadded Base64 because the go runtime Base64 decoder does not handle
omitting the padding.

May $deity have mercy on anyone who needs to hand-enter an obfs4 bridge
line because I will not.
2014-08-23 05:33:23 +00:00
Yawning Angel
596cc85073 Elide the error out from most logs unless unsafeLogging is set.
The Golang runtime will happily splatter the remote IP address and port
in the error's string representation for network related errors.  While
useful for debugging, this is unacceptable from a privacy standpoint.
2014-08-20 22:44:07 +00:00
Yawning Angel
dd9fdee55d Add a missing "continue" statement.
Caught by asn, thanks.
2014-08-20 13:43:43 +00:00
Yawning Angel
f32f01ba01 Change the drbg seed field in the state file.
Changing from "drbgSeed" to "drbg-seed" to be consistent with the
ServerTransportOptions to allow for easier copy/paste.
2014-08-18 11:54:39 +00:00
Yawning Angel
22c9dc3f48 Add support for enabling IAT obfuscation and biased WDist.
Golang's command line parser is slightly cumbersome to use with
subcommands, so the arguments are "obfs4-iatObufscation" and
"obfs-distBias" instead of obfsproxy style subcommands.
2014-08-18 11:53:22 +00:00
Yawning Angel
339c63f0c8 Massive cleanup/code reorg.
* Changed obfs4proxy to be more like obfsproxy in terms of design,
   including being an easy framework for developing new TCP/IP style
   pluggable transports.
 * Added support for also acting as an obfs2/obfs3 client or bridge
   as a transition measure (and because the code itself is trivial).
 * Massively cleaned up the obfs4 and related code to be easier to
   read, and more idiomatic Go-like in style.
 * To ease deployment, obfs4proxy will now autogenerate the node-id,
   curve25519 keypair, and drbg seed if none are specified, and save
   them to a JSON file in the pt_state directory (Fixes Tor bug #12605).
2014-08-17 17:11:03 +00:00
Yawning Angel
8a3eb4b309 Change the import paths to point to the tp.o repository. 2014-06-25 16:03:18 +00:00
Yawning Angel
0fa8adc752 Use delete to remove entries from the replay filter. 2014-06-20 08:42:36 +00:00
Yawning Angel
5abad1571c Use Vose's Alias Method to sample the weighted distribution.
The weight generation code also was cleaned up (and now can support
generating distributions that look like what ScrambleSuit does as
a compile time change).

Per: http://www.keithschwarz.com/darts-dice-coins/
2014-06-19 06:29:12 +00:00
Yawning Angel
6245391c93 Document dependencies, add LICENSE (No functional changes). 2014-06-07 20:03:29 +00:00
Yawning Angel
b19b6de31f Allow randomly generating node-ids instead of requiring the fingerprint.
To ease delopyment, "-genServerParams has changed".

 * "-genServerParams" is now a bool, and will by default generate a
   random node-id.
 * "-genServerParams -genServerParamsFP=<Base16 blob>" will convert the
   supplied bridge fingerprint to a node-id (the old behavior).

Either way of deriving node-id is belived to be secure.

 * https://lists.torproject.org/pipermail/tor-dev/2014-May/006929.html
 * https://lists.torproject.org/pipermail/tor-dev/2014-June/006936.html

The extra parameter was added because golang's flags library doesn't
support distinguishing between "set but used the default value" and
"not set, so you go the default value".
2014-06-07 00:26:36 +00:00
Yawning Angel
d9c6ecbf8f Use goptlib's MakeStateDir instead of the one in pt_extras.
This requires changes in goptlib from last night, people may need to
run "go get -u" to update dependencies before building.
2014-06-02 18:15:02 +00:00
Yawning Angel
5bdc376e2a Change how the length obfsucation mask is derived.
Instead of using the nonce for the secret box, just use SipHash-2-4 in
OFB mode instead.  The IV is generated as part of the KDF.  This
simplifies the code a decent amount and also is better on the off
chance that SipHash-2-4 does not avalanche as well as it is currently
assumed.

While here, also decouple the fact that *this implementation* of obfs4
uses a PRNG with 24 bytes of internal state for protocol polymorphism
instead of 32 bytes (that the spec requires).

THIS CHANGE BREAKS WIRE PROTCOL COMPATIBILITY.
2014-06-02 17:50:01 +00:00
Yawning Angel
5cb3369e20 Move the SipHash DRBG off into it's own package. 2014-06-02 16:47:30 +00:00
Yawning Angel
36228437c4 Move the server keypair generation to right after Accept().
Instead of threading the code, move the keypair generation to right
after Accept() is called.  This should mask the timing differential due
to the rejection sampling with the noise from the variablity in how
long it takes for the server to get around to pulling a connection out
of the backlog, and the time taken for the client to send it's portion
of the handshake.

The downside is that anyone connecting to the obfs4 port does force us
to do a bunch of math, but the obfs4 math is relatively cheap compared
to it's precursors.

Fixes #9.
2014-06-01 05:22:07 +00:00
Yawning Angel
2001f0b698 Generate client keypairs before connecting, instead of after.
Part of issue #9.
2014-06-01 04:51:33 +00:00
Yawning Angel
697b51b4bd Fix minor style issues pointed out by golint. 2014-05-28 04:25:47 +00:00
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.
2014-05-28 04:22:36 +00:00
Yawning Angel
bd2bef2ead Fix import lines so other people using go get works. 2014-05-26 16:20:33 +00:00
Yawning Angel
b579f6f4d4 Use io.ReadFull in places where it is appropriate. 2014-05-26 04:43:46 +00:00
Yawning Angel
49d3f6e8bb Run go fmt on proxy_http.go (No functional changes). 2014-05-25 12:42:07 +00:00
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