Commit Graph

139 Commits (a7a2575cab8b916e33d4b85fda4bac41f2124eec)
 

Author SHA1 Message Date
Yawning Angel a7a2575cab The obfs4 `iat-mode` parameter is now properly configurable.
It used to be that all of the bridge side parameters needed to be
manually specified together.  This was somewhat nonsensical, and the IAT
mode can now be set as the only obfs4 option in a `ServerTransportOptions`
torrc directive.

Thanks to dcf for reporting the issue.
9 years ago
Yawning Angel 1df5c8ffe8 Bump the version to 0.0.7-dev, signifying development towards 0.0.7. 9 years ago
Yawning Angel 896a98c427 Do the release ritual for obfs4proxy-0.0.6. 9 years ago
Yawning Angel 2cbefcfcd2 Fix other instances of attempting to close `nil` on handshake failure.
Bug introduced in e52258edac, not in any
released version of obfs4proxy.
9 years ago
pminmax945 c0e8866c13 fix incorrect connection close
when obfs4 connection create failed,conn variable is
set to nil already.
9 years ago
Yawning Angel 672e70000a meek-lite: Don't send a "User-Agent" header. 9 years ago
Yawning Angel 43cdc20e7e meek-lite: combine small writes at request dispatch time.
This dramatically improves bulk upload performance, from totally shit
to just shit.
9 years ago
Yawning Angel 611205be68 Add the "meek_lite" transport, which does what one would expect.
This is a meek client only implementation, with the following
differences with dcf's `meek-client`:

 - It is named `meek_lite` to differentiate it from the real thing.
 - It does not support using an external helper to normalize TLS
   signatures, so adversaries can look for someone using the Go
   TLS library to do HTTP.
 - It does the right thing with TOR_PT_PROXY, even when a helper is
   not present.

Most of the credit goes to dcf, who's code I librerally cribbed and
stole.  It is intended primarily as a "better than nothina" option
for enviornments that do not or can not presently use an external
Firefox helper.
9 years ago
Yawning Angel e52258edac Make establishing outgoing connections the transport's responsibility.
ClientFactories now have a Dial() method instead of a WrapConn()
method, so that it is possible to write something like meek-client
using the obfs4proxy framework.

This breaks the external interface if anyone is using obfs4proxy as
a library, but the new way of doing things is a trivial modification,
to a single routine that shouldn't have been very large to begin with.
9 years ago
Yawning Angel 69ffcc39c6 Delay transport initialization till after logging has been setup. 9 years ago
David Fifield cf4dd074fa Fix doc comment for log.Debugf. 9 years ago
Yawning Angel 37a709d8b4 Bump the version to 0.0.6-dev, signifying development towards 0.0.6. 10 years ago
Yawning Angel 3540313e53 Do the release ritual for obfs4proxy-0.0.5. 10 years ago
Yawning Angel a8d7134f10 Use a built in SOCKS 5 server instead of goptlibs.
Differences from my goptlib branch:
 * Instead of exposing a net.Listener, just expose a Handshake() routine
   that takes an existing net.Conn. (#14135 is irrelevant to this socks
   server.
 * There's an extra routine for sending back sensible errors on Dial
   failure instead of "General failure".
 * The code is slightly cleaner (IMO).

Gotchas:
 * If the goptlib pt.Args datatype or external interface changes,
   args.go will need to be updated.

Tested with obfs3 and obfs4, including IPv6.
10 years ago
Yawning Angel 8996cb2646 Add routines for querying the log module state.
Unless you have very good reason to do so, there should be no reason to
actually call these ever, since the log messages are only generated if
they will result in output being written to a log file.
10 years ago
Yawning Angel df42657079 Move logging wrappers into common/log, and add a DEBUG log level.
Implements feature #15576.
10 years ago
Yawning Angel 402fe97d85 Add support for tor feature #15435.
If the relevant enviornment variable is set, treat read errors from
Stdin as a SIGTERM.
10 years ago
Yawning Angel 657c8e4f02 Clean up/refactor the shutdown/termination handling code.
This combines the old signal processing code with the parent monitor,
into a new termination monitor structure, which also now handles keeping
track of outstanding sessions.
10 years ago
Yawning Angel b670a07923 Fix comments. (No functional changes) 10 years ago
Yawning Angel 4e4c9052f4 Attempt to detect if the parent crashed without killing obfs4proxy.
The ideal solution here would be to implement #15435, but till then
use one of several kludges:
 * Linux - prctl() so that the kernel SIGTERMs on parent exit.
 * Other U*ix - Poll the parent process id once a second, and SIGTERM
   ourself/exit if it changes.  Former is better since all the normal
   cleanup if any gets done.
 * Windows - Log a warning.
10 years ago
Yawning Angel aed4b72389 Change the import path for go.net.
The Go developers decided to move the go.net repository to
golang.org/x/net, and also to transition from hg to git.  This wasn't
changed when the go.crypto imports were since the 'proxy' component
doesn't have imports that break, so the old code still works.

While the change here is simple (just update the import location), this
affects packagers as it now expects the updated package.  Sorry for the
inconveneince, I blame the Go people, and myself for not just doing
this along with the go.crypto changes.
10 years ago
Yawning Angel 594d45be02 Update the ChangeLog (No functional changes). 10 years ago
Daniel Martí 398b795c87 Simplify some err and return logic 10 years ago
Daniel Martí ced244c09f Reduce some if err != nil logic lines 10 years ago
Yawning Angel 6d1b69d299 Update the ChangeLog (No functional changes). 10 years ago
Daniel Martí 19dcb424be Fix all go vet issues 10 years ago
Daniel Martí 08647ec580 Run go fmt 10 years ago
Yawning Angel 714581df51 Do the release ritual for obfs4proxy-0.0.4. 10 years ago
Yawning Angel 0066cfc393 Add support for acting as a ScrambleSuit client.
This allows obfs4proxy to be used as a ScrambleSuit client that is wire
compatible with the obfs4proxy implementation, including session ticket
support, and length obfuscation.

The current implementation has the following limitations:
 * IAT obfuscation is not supported (and is disabled in all other
   ScrambleSuit implementations by default).
 * The length distribution and probabilites are different from those
   generated by obfsproxy and obfsclient due to a different DRBG.
 * Server support is missing and is unlikely to be implemented.
10 years ago
Yawning Angel 0f038ca4fa Document the obfs4 NaCl secretbox nonce generation.
Forgot to include this in the spec, though it was documented as a
comment in the framing code.
10 years ago
Yawning Angel cdeda57241 Change the import path for go.crypto.
The Go developers decided to move the go.crypto repository to
golang.org/x/crypto, and also to transition from hg to git.  The tip of
tree code.google.com copy of the code is broken due to the import paths
pointing at the new repository.

While the change here is simple (just update the import location), this
affects packagers as it now expects the updated package.  Sorry for the
inconveneince, I blame the Go people.
10 years ago
Yawning Angel 6ba5b4921f Fix minor issues pointed out by "go vet". 10 years ago
Yawning Angel 4932821bda Improve the performance of the obfs4 handshake test.
Exhaustively testing padding combinations is really slow, and was
causing timeouts during the Debian ARM package build process.  Attempt
to improve the situation by:

 * Reusing the client and server keypair for all of the tests, to cut
   runtime down by  ~50%.
 * Splitting the client side and server side tests up, as it appears
   the timeout is per-test case.

If this doesn't fix things, the next thing to try would be to reduce
the actual number of padding lengths tested, but that is a last resort
at the moment.
10 years ago
Yawning Angel fc00015ee2 Do the release ritual for obfs4proxy-0.0.3. 10 years ago
Yawning Angel 6cd81ec42f Change the bridge line format to be more compact.
Instead of "node-id" and "public-key" that are Base16 encoded, use
"cert" which contains the "node-id" and "public-key" in Base64 encoded
form.  This is more compact and cuts the length down by 49 characters.
10 years ago
Yawning Angel 213495d3b9 Do the release ritual for obfs4proxy-0.0.2. 10 years ago
Yawning Angel 514c3c6053 Write an example obfs4 bridge line to "obfs4_bridgeline.txt".
Write an example client bridge line suitable for use with the running
obfs4 server instance to "obfs4_bridgeline.txt" for the convenience of
bridge operators.
10 years ago
Yawning Angel c4378cc0d3 Fix spelling error in man page, no functional changes. 10 years ago
Yawning Angel 1436720b12 Minor documentation cleanups, no functional changes. 10 years ago
Yawning Angel 09633500b3 Add a man page for obfs4proxy. 10 years ago
Yawning Angel cedd6a5fa9 Do the release ritual for obfs4proxy-0.0.1. 10 years ago
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.
10 years ago
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.
10 years ago
Yawning Angel 79e94103d6 Update the README.md (No functional changes). 10 years ago
Yawning Angel d5f59458fe Change the version command line arg from `-v` to `-version`.
For consistency with the rest of the arguments.
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
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).
10 years ago
Yawning Angel 468cd4bde8 Display a more useful error on JSON Unmarshall failure. 10 years ago