source/shadowsocks-rust
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-rust.git synced 2026-02-09 01:59:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(local): PingBalancer check firefox portal allow 200 status (#1560)

Browse Source
This commit is contained in:
zonyitoo
2024-06-20 23:00:30 +08:00
parent 5fb6944f76
commit 0675cfc451
4 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@@ -3273,6 +3273,7 @@ dependencies = [
"hickory-resolver",
"http 1.1.0",
"http-body-util",
"httparse",
"hyper",
"idna 1.0.0",
"ipnet",

3
crates/shadowsocks-service/Cargo.toml
View File

@@ -27,7 +27,7 @@ full = [
]
# Enable local server
local = []
local = ["httparse"]
# Enable remote server
server = []
# Enable manager server
@@ -170,6 +170,7 @@ libc = "0.2.141"
hyper = { version = "1.3", optional = true, features = ["full"] }
http-body-util = { version = "0.1", optional = true }
http = { version = "1.1", optional = true }
httparse = { version = "1.9", optional = true }
hickory-resolver = { version = "0.24", optional = true, features = [
"serde-config",

9
crates/shadowsocks-service/src/config.rs
View File

@@ -70,7 +70,14 @@ use serde::{Deserialize, Serialize};
use shadowsocks::relay::socks5::Address;
use shadowsocks::{
config::{
ManagerAddr, Mode, ReplayAttackPolicy, ServerAddr, ServerConfig, ServerSource, ServerUser, ServerUserManager,
ManagerAddr,
Mode,
ReplayAttackPolicy,
ServerAddr,
ServerConfig,
ServerSource,
ServerUser,
ServerUserManager,
ServerWeight,
},
crypto::CipherKind,

58
crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs
View File

@@ -841,6 +841,8 @@ impl PingChecker {
/// Detect TCP connectivity with Chromium [Network Portal Detection](https://www.chromium.org/chromium-os/chromiumos-design-docs/network-portal-detection)
#[allow(dead_code)]
async fn check_request_tcp_chromium(&self) -> io::Result<()> {
use std::io::{Error, ErrorKind};
static GET_BODY: &[u8] =
b"GET /generate_204 HTTP/1.1\r\nHost: clients3.google.com\r\nConnection: close\r\nAccept: */*\r\n\r\n";
@@ -860,27 +862,28 @@ impl PingChecker {
let mut buf = Vec::new();
reader.read_until(b'\n', &mut buf).await?;
static EXPECTED_HTTP_STATUS_LINE: &[u8] = b"HTTP/1.1 204 No Content\r\n";
if buf != EXPECTED_HTTP_STATUS_LINE {
use std::io::{Error, ErrorKind};
let mut headers = [httparse::EMPTY_HEADER; 1];
let mut response = httparse::Response::new(&mut headers);
debug!(
"unexpected response from http://clients3.google.com/generate_204, {:?}",
ByteStr::new(&buf)
);
let err = Error::new(
ErrorKind::InvalidData,
"unexpected response from http://clients3.google.com/generate_204",
);
return Err(err);
if let Ok(..) = response.parse(&buf) {
if matches!(response.code, Some(204)) {
return Ok(());
}
}
Ok(())
Err(Error::new(
ErrorKind::InvalidData,
format!(
"unexpected response from http://clients3.google.com/generate_204, {:?}",
ByteStr::new(&buf)
),
))
}
/// Detect TCP connectivity with Firefox's http://detectportal.firefox.com/success.txt
async fn check_request_tcp_firefox(&self) -> io::Result<()> {
use std::io::{Error, ErrorKind};
static GET_BODY: &[u8] =
b"GET /success.txt HTTP/1.1\r\nHost: detectportal.firefox.com\r\nConnection: close\r\nAccept: */*\r\n\r\n";
@@ -900,23 +903,22 @@ impl PingChecker {
let mut buf = Vec::new();
reader.read_until(b'\n', &mut buf).await?;
static EXPECTED_HTTP_STATUS_LINE: &[u8] = b"HTTP/1.1 200 OK\r\n";
if buf != EXPECTED_HTTP_STATUS_LINE {
use std::io::{Error, ErrorKind};
let mut headers = [httparse::EMPTY_HEADER; 1];
let mut response = httparse::Response::new(&mut headers);
debug!(
"unexpected response from http://detectportal.firefox.com/success.txt, {:?}",
ByteStr::new(&buf)
);
let err = Error::new(
ErrorKind::InvalidData,
"unexpected response from http://detectportal.firefox.com/success.txt",
);
return Err(err);
if let Ok(..) = response.parse(&buf) {
if matches!(response.code, Some(200) | Some(204)) {
return Ok(());
}
}
Ok(())
Err(Error::new(
ErrorKind::InvalidData,
format!(
"unexpected response from http://detectportal.firefox.com/success.txt, {:?}",
ByteStr::new(&buf)
),
))
}
async fn check_request_udp(&self) -> io::Result<()> {