kirillius
/
Cloak
mirror of https://github.com/cbeuw/Cloak
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'add-cdn-http-host-config-setting' into notsure2

This commit is contained in:
notsure2 2020-12-11 05:10:49 +02:00
parent c87405377c cd20c62738
commit cdb7982c75
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -140,6 +140,14 @@ techniques).**
`ServerName` is the domain you want to make your ISP or firewall _think_ you are visiting. Ideally it should `ServerName` is the domain you want to make your ISP or firewall _think_ you are visiting. Ideally it should
match `RedirAddr` in the server's configuration, a major site the censor allows, but it doesn't have to. match `RedirAddr` in the server's configuration, a major site the censor allows, but it doesn't have to.
`CdnHttpHost` is a setting that only has an effect when `Transport` is set to `CDN`. In `CDN` mode, Cloak makes a full
SSL handshake and then initiates an HTTP websocket request. This setting allows overriding the HTTP `Host` header
address value in the inner HTTP request. Note: This needs to be only a domain, the port is taken from the remote port
that Cloak connects to. This can be useful for some cases such as shadowsocks-android which don't pass the remote
address domain name but rather its resolved IP address. This override also allows you to try to use domain fronting by
specifying a different Host header than the outer domain passed in the SSL handshake's SNI field. If this field is not
set, the passed remote address will be used.
`NumConn` is the amount of underlying TCP connections you want to use. The default of 4 should be appropriate for most `NumConn` is the amount of underlying TCP connections you want to use. The default of 4 should be appropriate for most
people. Setting it too high will hinder the performance. Setting it to 0 will disable connection multiplexing and each people. Setting it too high will hinder the performance. Setting it to 0 will disable connection multiplexing and each
TCP connection will spawn a separate short-lived session that will be closed after it is terminated. This makes it TCP connection will spawn a separate short-lived session that will be closed after it is terminated. This makes it

8
internal/client/state.go
View File

@ -35,6 +35,7 @@ type RawConfig struct {
UDP bool // nullable UDP bool // nullable
BrowserSig string // nullable BrowserSig string // nullable
Transport string // nullable Transport string // nullable
CdnHttpHost string // nullable
StreamTimeout int // nullable StreamTimeout int // nullable
KeepAlive int // nullable KeepAlive int // nullable
} }
@ -186,12 +187,17 @@ func (raw *RawConfig) ProcessRawConfig(worldState common.WorldState) (local Loca
remote.Singleplex = false remote.Singleplex = false
} }
if raw.CdnHttpHost == "" {
raw.CdnHttpHost = raw.RemoteHost
}
// Transport and (if TLS mode), browser // Transport and (if TLS mode), browser
switch strings.ToLower(raw.Transport) { switch strings.ToLower(raw.Transport) {
case "cdn": case "cdn":
cdnDomainPort := net.JoinHostPort(raw.CdnHttpHost, raw.RemotePort)
remote.TransportMaker = func() Transport { remote.TransportMaker = func() Transport {
return &WSOverTLS{ return &WSOverTLS{
cdnDomainPort: remote.RemoteAddr, cdnDomainPort: cdnDomainPort,
} }
} }
case "direct": case "direct":