Micah Lee
2b3c7d43da
Merge branch 'develop' into upgrade-flask
2022-03-28 19:34:18 -07:00
Micah Lee
ca5d173790
Merge branch 'develop' of github.com:onionshare/onionshare into windows-tweaks
2022-03-28 19:31:50 -07:00
Micah Lee
792ee59e93
Merge branch 'develop' of github.com:onionshare/onionshare into upgrade-flask
2022-03-28 19:31:39 -07:00
Micah Lee
15eda5ed04
Merge branch 'censorship_default_route' of https://github.com/mig5/onionshare into mig5-censorship_default_route
2022-03-28 19:23:45 -07:00
Micah Lee
fbcad47138
Merge pull request #1552 from mig5/better_meek_logs
...
More verbose and consistent Meek exception logging
2022-03-28 19:12:59 -07:00
Micah Lee
0d58475c34
Update socket.io.min.js to latest version
2022-03-28 18:21:18 -07:00
Micah Lee
4ff23fa9bd
Merge branch 'develop' into upgrade-flask
2022-03-28 18:18:57 -07:00
Miguel Jacq
9c4a598fc0
Support for Censorship Circumvention API's /default route.
...
Fall back to trying Censorship API's /default route if no other bridges found.
At time of writing, this returns a couple of built-in obfs4 bridges.
If even that request fails, we will still fall back to our own full list of
obfs4 bridges.
2022-03-28 12:31:07 +11:00
Micah Lee
52cb5cf71a
Merge pull request #1560 from mig5/fix_censorship_builtin_bridges_response
...
Remove meek workaround in Censorship Circumvention API's built-in bridges response
2022-03-27 17:27:03 -07:00
Miguel Jacq
5cbd9ae66d
Remove meek workaround in Censorship Circumvention API's built-in bridges response
2022-03-28 10:45:23 +11:00
Micah Lee
06e9b3d3fc
Fix built-in bridge detection, and update built-in bridges. Also update README after setting up Windows dev environment
2022-03-27 12:44:41 -07:00
Miguel Jacq
21243fd9bd
More verbose and consistent Meek exception logging
2022-03-22 14:29:02 +11:00
Micah Lee
782a9e1909
Merge branch 'develop' into censorship
2022-03-06 13:55:36 -08:00
Micah Lee
b068e83852
Update flask to 2.0.3, flask-socketio to 5.1.1, update socketio js, and the rest of the pip deps
2022-03-06 11:35:01 -08:00
Micah Lee
e168080b77
Merge branch 'develop' into censorship
2022-02-13 11:28:16 -08:00
Micah Lee
305abff13c
Remove cleanup_tempfiles altogether because they are not being used
2022-02-13 10:40:55 -08:00
Micah Lee
33fd639f2a
Use a TemporaryDirectory instead of NamedTemporaryFile to avoid opening an already open file in Windows
2022-02-09 18:19:50 -08:00
Micah Lee
cb49c30025
Update final locales for 2.5
2022-01-17 10:33:13 -08:00
Micah Lee
c8ea770223
Merge branch 'ros-fixes' into release-2.5
2022-01-17 09:51:25 -08:00
Micah Lee
4729af5598
Actually bump version to 2.5
2022-01-17 09:51:04 -08:00
Micah Lee
ababc2de46
Update copyright year to 2022
2022-01-16 16:15:49 -08:00
Micah Lee
a5f97b6c88
Version bump to 2.4.1
2022-01-16 16:06:29 -08:00
Micah Lee
9e99ad8b8d
Merge branch 'develop' of github.com:onionshare/onionshare into ros-fixes
2022-01-16 15:49:33 -08:00
Micah Lee
a47e25b45b
Merge branch 'cx_freeze-packaging' into develop
2022-01-16 13:50:56 -08:00
Micah Lee
c8745cd8dc
Also codesign libevent-2.1.7.dylib
2022-01-16 11:44:30 -08:00
Micah Lee
40b4d8f84c
Allow onionshare-cli binary made by cx_Freeze find tor binaries in macOS
2021-12-22 13:08:01 -08:00
Micah Lee
ec7fa4ef16
Solve obnoxious cx_Freeze issue that broke websockets by enforcing async_mode=gevent, and including the correct modules in the build
2021-12-21 16:55:59 -08:00
Micah Lee
3da0b7a3ea
Enable websocket logs in verbose mode
2021-12-21 15:01:35 -08:00
Micah Lee
7e55e8e816
Fix permission denied error in Windows, which was introduced using tempfile.NamedTemporaryFile, by using a TemporaryDirectory instead
2021-12-21 14:28:23 -08:00
Micah Lee
f4fb212dbc
Fix finding tor binary paths in Windows
2021-12-21 14:15:52 -08:00
Micah Lee
4ab5e0003c
Merge pull request #1489 from mig5/meek_stdout_cleanup_fix
...
Don't enqueue stdout from Meek subprocess in a Thread
2021-12-20 12:13:21 -08:00
Miguel Jacq
a385e1ffed
Add a CensorshipCircumventionError class that is raised if there's a requests exception connecting to the Tor API
2021-12-20 14:50:09 +11:00
Miguel Jacq
e6a17bc743
Force the MIME type for .js files to be text/javascript, to override silly OS databases/registries with incorrect settings, which Flask would otherwise depend on
2021-12-17 17:53:15 +11:00
Miguel Jacq
2689f35635
Don't enqueue stdout from Meek subprocess in a Thread, just read it as it comes. Solves infinite loop queue read issue on cleanup()
2021-12-15 18:28:55 +11:00
Miguel Jacq
4f40a9b501
Tweaks to CensorshipCircumvention and also Meek cleanup fixes that were causing a crazy read loop on the stdout queue
2021-12-15 18:22:18 +11:00
Miguel Jacq
12b725e821
Need to reconnect to Tor with the curr_settings Settings object after obtaining new bridges
2021-12-14 14:57:01 +11:00
Miguel Jacq
1aa67f8406
Fix the saving of bridges received from CensorshipCircumvention API - need to also save the bridges_enabled setting else TorSettingsTab doesn't show them
2021-12-14 14:32:00 +11:00
Miguel Jacq
3f4cb6a02e
Use the CensorshipCircumvention methods to fetch bridges for the country/autodetection
2021-12-14 10:48:47 +11:00
Miguel Jacq
be8a2a894f
Update our bridge templates with the latest built-in bridges in the get-tor scripts
2021-12-10 16:48:39 +11:00
Micah Lee
8416d089f4
Make automatic detection flip through country names while it's running meek
2021-12-06 20:54:03 -08:00
Micah Lee
feaecc9e4d
Merge branch 'mig5-censorship_automatically_attempt_and_reconnect' into 1422_autodetect_location
2021-12-06 20:11:41 -08:00
Micah Lee
09ac74a1be
Add country dropdown
2021-12-06 20:01:28 -08:00
Micah Lee
08ed7dab65
Oops, default connect_timeout should still be 120s
2021-12-06 19:42:43 -08:00
Micah Lee
339fc9338e
Start making UseBridgeWidget, and add json files that list country names for each enabled locale
2021-12-06 19:39:44 -08:00
Micah Lee
75d286386b
Merge branch 'censorship_automatically_attempt_and_reconnect' of https://github.com/mig5/onionshare into mig5-censorship_automatically_attempt_and_reconnect
2021-12-04 20:40:58 -08:00
Micah Lee
a71a4f9baa
Merge branch 'develop' of https://github.com/a1346054/onionshare into a1346054-develop
2021-12-04 20:34:07 -08:00
Micah Lee
27ee69a220
Merge pull request #1478 from mig5/fetch-builtin-bridges
...
Fetch the built-in bridges from Tor's Censorship Circumvention API, rather than hardcode them
2021-12-04 20:28:04 -08:00
Micah Lee
1dde6f6deb
Add temp file to cleanup list just once when its first created
2021-12-02 18:51:06 -08:00
Micah Lee
b3d53ca2f2
Fix CLI tests
2021-12-01 21:01:32 -08:00
Micah Lee
c8ba508d26
Merge branch 'develop' into 1470_tempfiles
2021-12-01 20:37:45 -08:00
