-
-
Notifications
You must be signed in to change notification settings - Fork 123
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Replace obfs4proxy with Lyrebird #63
base: master
Are you sure you want to change the base?
Conversation
📝 WalkthroughWalkthroughThe changes include modifications to the Dockerfile and the README.md file. In the Dockerfile, the package installation command has been updated to replace Changes
Poem
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 2
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
📒 Files selected for processing (2)
- Dockerfile (1 hunks)
- README.md (1 hunks)
🧰 Additional context used
🪛 Markdownlint
README.md
72-72: null
Fenced code blocks should have a language specified(MD040, fenced-code-language)
🔇 Additional comments (1)
Dockerfile (1)
10-10
: Verify Lyrebird compatibility and performanceThe change from
obfs4proxy@edge
tolyrebird@edge
aligns with the PR objective. However, consider the following points:
- Ensure that Lyrebird is fully compatible with your current Tor setup and usage scenarios.
- Lyrebird is a newer pluggable transport compared to obfs4proxy. While it may offer improvements, it's also less battle-tested, which could have security implications.
- Consider documenting the reason for this change and any expected benefits in the PR description or README.
To ensure the change doesn't introduce any issues, please run the following verification steps:
This script will build the image, run a container, check if Tor and Lyrebird are running, and verify Tor connectivity.
### Using bridges | ||
|
||
Edit `/etc/tor/torrc` and the following: | ||
|
||
``` | ||
Bridge obfs4 ... | ||
Bridge obfs4 ... | ||
Bridge obfs4 ... | ||
Bridge obfs4 ... | ||
|
||
ClientTransportPlugin obfs4 exec /usr/bin/lyrebird | ||
UseBridges 1 | ||
``` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Enhance the "Using bridges" section for clarity and completeness.
The new section on using bridges is a valuable addition to the documentation. However, consider the following improvements to make it more informative and user-friendly:
- Add a brief explanation of what bridges are and why users might want to use them.
- Provide complete example Bridge lines or explain that users need to replace the ellipsis (...) with actual bridge information.
- Mention Lyrebird explicitly, as it's part of the PR objective to replace obfs4proxy with Lyrebird.
- Consider adding a note about where users can obtain bridge information.
Here's a suggested revision:
### Using bridges
Bridges are Tor relays that aren't listed in the main Tor directory, making them harder for censors to block. To use bridges with this Tor proxy:
1. Edit `/etc/tor/torrc` and add the following:
Bridge obfs4 X.X.X.X:YYYY FINGERPRINT CERT=ZZZZ
Bridge obfs4 X.X.X.X:YYYY FINGERPRINT CERT=ZZZZ
Add more Bridge lines as needed
ClientTransportPlugin obfs4 exec /usr/bin/lyrebird
UseBridges 1
Replace X.X.X.X:YYYY, FINGERPRINT, and CERT=ZZZZ with actual bridge information.
2. Restart the Tor service to apply the changes.
Note: This configuration uses Lyrebird as the obfuscation proxy. You can obtain bridge information from https://bridges.torproject.org/ or by emailing [email protected].
Consider adding a language specifier to the fenced code block (e.g., ```plaintext) to address the Markdownlint warning.
🧰 Tools
🪛 Markdownlint
72-72: null
Fenced code blocks should have a language specified(MD040, fenced-code-language)
### Using bridges | ||
|
||
Edit `/etc/tor/torrc` and the following: | ||
|
||
``` | ||
Bridge obfs4 ... | ||
Bridge obfs4 ... | ||
Bridge obfs4 ... | ||
Bridge obfs4 ... | ||
|
||
ClientTransportPlugin obfs4 exec /usr/bin/lyrebird | ||
UseBridges 1 | ||
``` | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Consider restructuring the document for better flow.
The new "Using bridges" section is well-placed at the end of the usage instructions. However, to improve the overall structure and readability of the document, consider the following suggestions:
- Add a table of contents at the beginning of the README to help users navigate the document easily.
- Group related sections under higher-level headings. For example:
- Setup and Basic Usage
- Advanced Configuration
- Using bridges
- DNS over Tor
- Maintenance
- IP Renewal
- Checking Proxy Status and Logs
This restructuring would make it easier for users to find the information they need and understand the relationship between different sections.
Here's a suggested outline for the restructured document:
# Tor-socks-proxy
[existing introduction and badges]
## Table of Contents
- [Docker Image Repository](#docker-image-repository)
- [Setup and Basic Usage](#setup-and-basic-usage)
- [First-Time Setup](#first-time-setup)
- [Start or Stop an Existing Instance](#start-or-stop-an-existing-instance)
- [Configuring a Client](#configuring-a-client)
- [Advanced Configuration](#advanced-configuration)
- [Using Bridges](#using-bridges)
- [DNS over Tor](#dns-over-tor)
- [Maintenance](#maintenance)
- [IP Renewal](#ip-renewal)
- [Checking Proxy Status and Logs](#checking-proxy-status-and-logs)
- [Support Tor Project](#support-tor-project)
[existing content, reorganized under the new headings]
This structure would help users quickly find the information they need, whether they're setting up the proxy for the first time, looking for advanced configuration options, or performing maintenance tasks.
🧰 Tools
🪛 Markdownlint
72-72: null
Fenced code blocks should have a language specified(MD040, fenced-code-language)
obfs4proxy was replaced with Lyrebird. Also updated the readme on how to use it
cc #34
Summary by CodeRabbit
New Features
Chores
obfs4proxy
withlyrebird
.