Commit Graph

181 Commits

Author SHA1 Message Date
Yawning Angel
2d8f3c8bbf common: Replace the extra25519 import with an internal package
I really didn't want to do this, but this should make `go get` work
again, and maybe people will leave me alone.
2020-04-10 11:36:29 +00:00
Yawning Angel
c357dd56df Bump the version to 0.0.12-dev 2019-06-21 00:24:04 +00:00
Yawning Angel
b5a9f3c5d2 Do the release ritual for obfs4proxy-0.0.11 2019-06-21 00:12:41 +00:00
Yawning Angel
81886128f2 transports/meek_lite: Bump the version of the utls fork 2019-06-21 00:11:20 +00:00
Yawning Angel
1a6129b66f obfs4: Alter tear down behavior to be less distinctive
The old behavior closed the connection on handshake failure after:
 * The first N bytes (random on a per-server basis).
 * The first M seconds (random on a per-server basis).

Whichever came first.  As Sergey Frolov kindly points out, depending on
which conditions cause termination, the server will send either a FIN or
a RST.  This change will remove the "amount read" based termination
threshold, so that connections that cause failed handshakes will discard
all data received until the teardown time is reached.

Thanks to Sergey Frolov for bringing this issue to my attention.
2019-06-21 00:02:37 +00:00
Yawning Angel
a8288437e3 Update my e-mail address (no functional changes) 2019-05-20 04:53:24 +00:00
Yawning Angel
9a12019f5a Bump the version to 0.0.11-dev 2019-05-20 04:43:46 +00:00
Yawning Angel
f58291912a Do the release ritual for obfs4proxy-0.0.10 2019-04-12 05:19:00 +00:00
Yawning Angel
dba633c7dc transports/meek_lite: More utls related changes
* Bump the module import to a new tag
 * Bump the rest of the dependencies while I'm here
 * Add some new fingerprints from upstream
 * Disable my fork's AES timing sidechannel defenses
2019-03-30 11:02:11 +00:00
Yawning Angel
ca6765e3e3 transports/meeklite: Tweak the TLS configuration 2019-03-18 01:48:32 +00:00
Yawning Angel
2ff57980e2 Bump the version to 0.0.10-dev 2019-02-05 14:31:39 +00:00
Yawning Angel
8a19b4fcb1 Do the release ritual for obfs4proxy-0.0.9 2019-02-05 14:29:08 +00:00
Yawning Angel
8abd3aa95f transports/meeklite: Bump the tag for the utls fork
Upstream fixed a bug, so use a tag that has the important parts
cherry-picked.
2019-02-05 14:27:04 +00:00
Yawning Angel
fd44ad42fd transports/meeklite: Enable the utls fork's vartime group feature 2019-02-05 07:39:20 +00:00
Yawning Angel
abf0435e18 fixup! transports/meek_lite: Switch to pinning MS's CA intermediary certs 2019-02-04 04:27:13 +00:00
Yawning Angel
0c371bcf8e transports/meek_lite: Switch to pinning MS's CA intermediary certs
This should give me more time before I need to update this.
2019-02-04 04:20:15 +00:00
Yawning Angel
3bd6beb8b2 transports/meek_lite: Add an expiry date for HPKP entries
Mostly since the built-in pins will likely become invalid once the
certificates I used to generate them start to expire.
2019-02-04 03:48:32 +00:00
Yawning Angel
c65aaf6407 transports/meeklite: Add a lightweight HPKP implementation
HPKP is effectively dead as far as a standard goes, but the idea has
merit in certain use cases, this being one of them.

As a TLS MITM essentially will strip whatever obfuscation that the
transport may provide, the digests of the SubjectPublicKeyInfo fields
of the Tor Browser Azure meek host are now hardcoded.

The behavior can be disabled by passing `disableHPKP=true` on the bridge
line, for cases where comaptibility is prefered over security.
2019-02-04 03:29:36 +00:00
Yawning Angel
bde8b7ff56 transports/meeklite: Use a modified version of utls
Changes:
 * Use a fork of utls with some compatibility improvements.
 * Switch the default ClientHello profile to `HelloFirefox_Auto`.
 * Add the `HelloChrome_71` profile.

The existing `HelloFirefox_Auto` profile that points to
`HelloFirefox_63` also matches the (common) behavior of Firefox 65,
assuming that 3DES ciphersuites are not disabled.
2019-02-03 17:36:52 +00:00
Yawning Angel
da058cb180 fixup! Bug 24793: Send the correct authorization HTTP header for basic auth. 2019-02-01 09:48:49 +00:00
Yawning Angel
f01e92dde7 fixup! transports/meeklite: uTLS for ClientHello camouflage
Fix `getDialTLSAddr` to always return a integer port.  Thanks to dcf for
reporting the issue.
2019-02-01 09:44:16 +00:00
Yawning Angel
5d41c674f0 transports/meeklite: Apply http.DefaultTransport timeouts etc 2019-01-26 15:13:06 +00:00
Yawning Angel
e4020b18f7 transports/meeklite: Add utls argument to configure behavior
Per dcf:
> As for the TODO, my plan was was to expose a "utls" SOCKS arg
> to make it configurable per bridge, and just reuse the utls
> Client Hello ID names:
>	utls=HelloChrome_Auto

This adds support for all currently supported utls ClientHello IDs
with the following caveats/differences:

 * `none` - Disables using utls entirely, forces `crypto/tls`.
 * `HelloGolang` - Alias of `none`, since using utls is pointless.
 * `HelloCustom` - Omitted as pointless.
2019-01-21 18:47:42 +00:00
Yawning Angel
4d453dab21 transports/meeklite: uTLS for ClientHello camouflage
There's still some interesting oddities depending on remote server and
what fingerprint is chosen, but I can watch videos online with the
chosen settings and the TBB Azure bridge.

Note: Despite what people are claiming in the Tor Browser bug tracker
it isn't all that hard to use the built in http client with utls.  And
yes, the `transport.go` code does negotiate correctly in a standalone
test case (apart from compatibility related oddities).
2019-01-21 04:55:05 +00:00
Yawning Angel
816cff15f4 transports/meeklite: Cleanups, bugfixes and improvements
* Properly close the response body on HTTP error.
 * Cleanup close signaling.
 * Write() should return faster on closed connections.
2019-01-20 16:45:10 +00:00
Yawning Angel
f8bf80479f Bump the version to 0.0.9-dev 2019-01-20 09:40:16 +00:00
Yawning Angel
98730f287c Do the release ritual for obfs4proxy 0.0.8. 2019-01-20 09:20:37 +00:00
Yawning Angel
c0898c2d3b Fix missing field size in obfs4-spec.txt
Thanks to @SudoHenk on github for pointing out the issue long ago.
2019-01-20 08:19:36 +00:00
Yawning Angel
06cd8af9e6 Update README.md (No functional changes) 2019-01-20 08:15:13 +00:00
Yawning Angel
5b4397bff8 Clean up static analysis warnings
Mostly but not entirely discarding error return values of things that
can not possibly fail despite the API returning errors.
2019-01-19 11:42:24 +00:00
Yawning Angel
a83ca3c9fe Annotate use of deprecated net/http/httputil package
This is to silence some of the static analysis tools used in
development.  Despite `http.Client` and `http.Transport` being
suggested as an alternative, there is no way to accomplish current
functionality with either suggested replacement.

See: https://github.com/golang/go/issues/8285
2019-01-19 11:19:02 +00:00
Yawning Angel
70d0e90c86 Change the canonical upstream repo location to gitlab
This commit changes the upstream repo location to:
  https://gitlab.com/yawning/obfs4.git

Additionally all the non-`main` sub-packages now have an import
comment annotation.  As a matter of courtesy, I will continue to
push to both the existing github.com and git.torproject.org repos
for the foreseeable future, though I reserve the right to stop
doing so at any time.
2019-01-16 07:36:18 +00:00
Daniel Martí
08f4d47018 port to a Go module
The biggest win is that we now declare what versions of each dependency
we require to build. This way, building a certain version of obfs4 will
always use the same source code, independent of the master branch of
each dependency.

This is necessary for reproducible builds. On top of that, go.sum
contains checksums of all the transitive dependencies and their modules,
so the build system will also recognise when the source code has been
changed.

Updated the build instructions accordingly. We don't drop support for
earlier Go versions, but those won't get the benefit of reproducible
builds unless we start vendoring the dependencies too.
2018-11-03 13:31:20 +00:00
Yawning Angel
89c21805c2 (meek_lite) Explicitly set Content-Length to zero when there is no data to send.
https://gitweb.torproject.org/pluggable-transports/meek.git/commit/?h=0.28&id=0ea861efe5873b517fbd08c4bc48027e4db16a95
2018-04-21 03:11:26 +00:00
Yawning Angel
e3d4c5308d fixup! Bug 24793: Send the correct authorization HTTP header for basic auth. 2018-04-21 03:10:33 +00:00
Yawning Angel
af4824cb0b Bug 24793: Send the correct authorization HTTP header for basic auth.
Apparently I didn't test the "connect via HTTP(s)" proxy with
authentication at all when I added that functionality, so it has been
broken for years.

This should fix it now.
2018-01-10 15:11:44 +00:00
Yawning Angel
97a875ec3c Bump the version to 0.0.8-dev, signifying development towards 0.0.8. 2016-11-15 19:21:38 +00:00
Yawning Angel
8256fac93c Do the release ritual for obfs4proxy 0.0.7. 2016-11-15 19:18:24 +00:00
Yawning Angel
a9e8a62f9b Merge branch 'getlantern-memreduce' 2016-10-20 01:36:53 +00:00
Yawning Angel
64e5920c84 Add a ChgangeLog entry for the read buffer fix (No functional changes). 2016-10-20 01:36:21 +00:00
Ox Cart
df6aeeca8c Reusing read buffer for readPackets 2016-10-19 20:18:07 -05:00
Yawning Angel
62057625ea Use the correct epoch hour when crafting the obfs4 server ntor response.
It's supposed to use the one derived from the client's handshake
(assuming the clock skew is within acceptable limits), but it was using
the one based off the current system time.
2016-07-11 00:51:28 +00:00
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.
2016-04-13 03:02:32 +00:00
Yawning Angel
1df5c8ffe8 Bump the version to 0.0.7-dev, signifying development towards 0.0.7. 2016-01-25 14:40:14 +00:00
Yawning Angel
896a98c427 Do the release ritual for obfs4proxy-0.0.6. 2016-01-25 14:14:30 +00:00
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.
2016-01-25 12:16:15 +00:00
pminmax945
c0e8866c13 fix incorrect connection close
when obfs4 connection create failed,conn variable is
set to nil already.
2016-01-17 12:23:53 +00:00
Yawning Angel
672e70000a meek-lite: Don't send a "User-Agent" header. 2015-10-30 09:51:03 +00:00
Yawning Angel
43cdc20e7e meek-lite: combine small writes at request dispatch time.
This dramatically improves bulk upload performance, from totally shit
to just shit.
2015-10-30 09:45:26 +00:00
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.
2015-10-29 17:29:21 +00:00