mirrors/XTLS_Xray-core
0
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-08-22 14:38:34 +00:00
Code Activity
1,485 Commits 32 Branches 95 Tags 26 MiB
main
Commit Graph

357 Commits

Author SHA1 Message Date
Artur Melanchyk
ae327eb7e6
Chore: Make some Maps into real Sets (#4362) 2025-02-07 13:48:33 +00:00
RPRX
117de1fd3c
MITM freedom RAW TLS: Report website with unexpected Negotiated Protocol / invalid Domain Fronting certificate 
https://github.com/XTLS/Xray-core/issues/4348#issuecomment-2639965524

Needs `"alpn": ["fromMitm"]` / `"verifyPeerCertInNames": ["fromMitm", ...]`.
 2025-02-07 08:15:40 +00:00
RPRX
c6a31f457c
MITM: Allow using local received SNI in the outgoing serverName & verifyPeerCertInNames 
https://github.com/XTLS/Xray-core/issues/4348#issuecomment-2637370175

Local received SNI was sent by browser/app.

In freedom RAW's `tlsSettings`, set `"serverName": "fromMitm"` to forward it to the real website.

In freedom RAW's `tlsSettings`, set `"verifyPeerCertInNames": ["fromMitm"]` to use all possible names to verify the certificate.
 2025-02-06 07:37:30 +00:00
RPRX
9b7841178a
MITM: Allow forwarding local negotiated ALPN http/1.1 to the real website 
https://github.com/XTLS/Xray-core/issues/4348#issuecomment-2633656408

https://github.com/XTLS/Xray-core/issues/4348#issuecomment-2633865039

Local negotiated ALPN http/1.1 was sent by browser/app or is written in dokodemo-door RAW's `tlsSettings`.

Set `"alpn": ["fromMitm"]` in freedom RAW's `tlsSettings` to forward it to the real website.
 2025-02-04 15:10:08 +00:00
RPRX
efdc70fbf7
XHTTP client: Add back minimal path padding for compatibility 
It should be reverted in the future.
 2025-01-30 10:45:12 +00:00
RPRX
a7a83624c5
Upgrade quic-go to official v0.49.0 
https://github.com/quic-go/quic-go/releases/tag/v0.49.0
https://github.com/quic-go/quic-go/pull/4749
https://github.com/quic-go/quic-go/pull/4798
 2025-01-26 11:47:30 +00:00
RPRX
740a6b0dcd
RAW: Allow setting ALPN http/1.1 for non-REALITY uTLS 
https://github.com/XTLS/Xray-core/issues/4313#issuecomment-2611889517
 2025-01-25 11:15:42 +00:00
RPRX
2522cfd7be
DNS DoH: Add h2c Remote mode (with TLS serverNameToVerify) 
https://github.com/XTLS/Xray-core/issues/4313#issuecomment-2609339864

Applies https://github.com/refraction-networking/utls/pull/161

Closes https://github.com/XTLS/Xray-core/issues/4313
 2025-01-25 10:51:44 +00:00
RPRX
ca9a902213
XHTTP server: Add scStreamUpServerSecs, enabled by default (#4306) 
Fixes https://github.com/XTLS/Xray-core/discussions/4113#discussioncomment-11682833
 2025-01-19 13:32:07 +00:00
rPDmYQ
14a6636a41
XHTTP client: Move x_padding into Referer header (#4298) 
""Breaking"": Update the server side first, then client
 2025-01-18 12:05:19 +00:00
RPRX
ce6c0dc690
XHTTP XMUX: Abandon client if client.Do(req) failed (#4253) 
51769fdde1
 2025-01-06 14:06:11 +00:00
RPRX
369d8944cf
Sockopt config: Add penetrate for XHTTP U-D-S, Remove tcpNoDelay 
Now `sockopt` can be shared via `extra`, and be replaced with upload's forcibly.

Closes https://github.com/XTLS/Xray-core/issues/4227
 2024-12-31 11:10:17 +00:00
RPRX
4ce65fc74c
XHTTP XMUX: cMaxLifetimeMs -> hMaxReusableSecs, Refactor default values 
"xmux": {
    "maxConcurrency": "16-32",
    "maxConnections": 0,
    "cMaxReuseTimes": 0,
    "hMaxRequestTimes": "600-900",
    "hMaxReusableSecs": "1800-3000",
    "hKeepAlivePeriod": 0
}

Fixes https://github.com/XTLS/Xray-core/discussions/4113#discussioncomment-11685057
 2024-12-31 10:00:19 +00:00
RPRX
db934f0832 XHTTP client: Merge Open* into OpenStream(), and more 
https://github.com/XTLS/Xray-core/issues/4148#issuecomment-2557066988
 2024-12-20 14:35:33 +00:00
RPRX
53b04d560b
XHTTP client: Make H3 httptrace work on v2rayNG 
Introduced in https://github.com/XTLS/Xray-core/pull/4150
 2024-12-20 07:19:41 +00:00
RPRX
1410b6335b
XHTTP XMUX: Fix OpenUsage never gets reduced 
Introduced in https://github.com/XTLS/Xray-core/pull/4163
 2024-12-20 06:19:10 +00:00
RPRX
ff8b66aacb
XHTTP client: scMaxEachPostBytes should be bigger than buf.Size (8192) 
To avoid no size limit.
 2024-12-18 13:25:34 +00:00
RPRX
9dbdf92c27
XHTTP downloadSettings: Inherit sockopt if its own doesn't exist (e.g., in extra) 
If you want `downloadSettings` to use its own `sockopt`, make sure that `extra` doesn't exist.
 2024-12-18 11:22:29 +00:00
RPRX
96fb680d45
REALITY, TLS config: Set "chrome" as the default fingerprint 
Other VLESS implementations should follow this change.
 2024-12-17 11:02:51 +00:00
RPRX
73e0d4a666
XHTTP XMUX: Add hMaxRequestTimes and hKeepAlivePeriod (#4163) 
Fixes https://github.com/XTLS/Xray-core/discussions/4113#discussioncomment-11492833
 2024-12-15 05:43:10 +00:00
RPRX
7463561856
XHTTP client: Add decideHTTPVersion() and more logs 
https://github.com/XTLS/Xray-core/pull/4150#issuecomment-2537981368
 2024-12-12 12:19:18 +00:00
RPRX
8cd9a74376
XHTTP client: Refactor "packet-up" mode, chasing "stream-up" (#4150) 
* Add wroteRequest (waiting for new quic-go)

* Use XTLS/quic-go instead

* Client doesn't need `scMaxConcurrentPosts` anymore

* GotConn is available in H3

* `scMaxConcurrentPosts` -> `scMaxBufferedPosts` (server only, 30 by default)

Fixes https://github.com/XTLS/Xray-core/issues/4100
 2024-12-11 14:05:39 +00:00
Andi
6be3c35db8 Chore: "io/ioutil" -> "io" (#4143) 
Signed-off-by: ChengenH <hce19970702@gmail.com>
 2024-12-11 02:02:23 +00:00
yuhan6665
0e2304c403
Core: Fix memory leaks with RequireFeatures() (#4095) 
Fixes https://github.com/XTLS/Xray-core/issues/4054
Fixes https://github.com/XTLS/Xray-core/issues/3338
Fixes https://github.com/XTLS/Xray-core/issues/3221
 2024-12-11 01:07:52 +00:00
RPRX
a2b773135a
XHTTP, WS, HU: Forbid "host" in headers, read serverName instead (#4142) 
WebSocket's config files should be updated ASAP.
 2024-12-11 00:58:14 +00:00
RPRX
ae62a0fb52 Transport: Remove HTTP 
Migrated to XHTTP "stream-one" mode.
 2024-12-02 09:56:16 +00:00
RPRX
98a72b6fb4
v24.11.30 
REALITY NFT: https://opensea.io/assets/ethereum/0x5ee362866001613093361eb8569d59c4141b76d1/2
 2024-11-30 04:16:35 +00:00
hr567
4f6f12616c
WebSocket config: Add heartbeatPeriod for client & server (#4065) 
https://github.com/XTLS/Xray-core/pull/4065#issuecomment-2502627154

---------

Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
 2024-11-29 02:08:08 +00:00
风扇滑翔翼
c87cf8ff52 XHTTP config: Add keepAlivePeriod for client (#4075) 
Closes https://github.com/XTLS/Xray-core/issues/4053

---------

Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
 2024-11-29 02:05:11 +00:00
RPRX
f7bd98b13c
XHTTP: Add "stream-one" mode for client & server (#4071) 
""Breaking"": Client uses "stream-one" mode by default when using **REALITY** ("stream-up" if "downloadSettings" exists)
 2024-11-27 20:19:18 +00:00
RPRX
817fa72874
XHTTP client: Add gRPC header to "stream-up" mode by default (#4042) 
""Breaking"": Client uses "stream-up" mode by default when using **TLS H2** or REALITY
 2024-11-21 05:45:49 +00:00
风扇滑翔翼
0a252ac15d
HTTP transport: Use dest as Host if not set (#4038) 2024-11-21 05:42:19 +00:00
RPRX
1f570d9cef
XHTTP test: Fix Test_maxUpload 
https://github.com/XTLS/Xray-core/pull/3260#issuecomment-2481946715
 2024-11-18 04:53:21 +00:00
RPRX
2d7b0e8cd4
XHTTP client: Fix upload issue in "packet-up" mode inherited from SplitHTTP 
Fixes https://github.com/XTLS/Xray-core/issues/3972
 2024-11-17 06:03:25 +00:00
pinglanlu
7b4a686b74
Chore: Use a more direct and less error-prone return value (#4008) 
Signed-off-by: pinglanlu <pinglanlu@outlook.com>
 2024-11-12 10:44:41 -05:00
RPRX
1a238cbb7d
REALITY client: Log invalid connections at warning level 
Closes https://github.com/XTLS/Xray-core/issues/4001
 2024-11-12 06:42:52 +00:00
风扇滑翔翼
571777483b
TLS: Add CurvePreferences (to enable kyber768) (#3991) 
Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
 2024-11-11 04:21:28 +00:00
zonescape
83bab5dd90
Chore: Run gofmt (#3990) 2024-11-09 11:16:11 +00:00
RPRX
bc4bf3d38f
XHTTP: Add "stream-up" mode for client & server (#3994) 2024-11-09 11:05:41 +00:00
zonescape
b98f29bf3e
Chore: Fix some comments (#3979) 2024-11-07 11:00:04 -05:00
RPRX
6877ca5201
XHTTP client: Allow different paths in U-D-S (#3977) 2024-11-07 03:50:28 +00:00
zonescape
71cfea8aae Chore: Fix some spelling errors (#3976) 2024-11-06 10:42:43 -05:00
RPRX
9fbb6fbb3b
XHTTP client: Move dest2 into MemoryStreamConfig as well 2024-11-04 05:00:18 +00:00
RPRX
e3276df725
XHTTP client: Enable XMUX for download in U-D-S (#3965) 2024-11-03 07:25:41 +00:00
RPRX
b30e05d1bc
XHTTP: The real upload / download splitting (#3955) 
* SplitHTTP client: Add real upload / download splitting

* Transport: Add XHTTP as an alias of SplitHTTP

* XHTTP config: Use `downloadSettings` instead
 2024-10-31 07:31:19 +00:00
mmmray
e733148c0b
REALITY: Unblock SplitHTTP transport (#3816) 
https://github.com/XTLS/Xray-core/pull/3816#issuecomment-2445694775
 2024-10-30 02:31:05 +00:00
RPRX
47fad1fbfd Chore: Generate *.pb.go files with protoc v5.28.2 
Download https://github.com/protocolbuffers/protobuf/releases/tag/v28.2
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.35.1
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.5.1
(Xray-core/) go run ./infra/vprotogen
 2024-10-16 04:06:21 +00:00
yuhan6665
6a70ae6408
HTTP transport: Fix an issue when HTTP client start fail with 403 (#3910) 
Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
 2024-10-15 02:55:48 +00:00
mmmray
8c180b9cfd
Browser Dialer: Revert changes to event listeners (#3906) 
https://github.com/XTLS/Xray-core/issues/3882#issuecomment-2396167708

This does not fix the linked issue, just a random bug I found.
 2024-10-13 05:22:15 +00:00
yuhan6665
3632e83faa
Transport: Add HTTP3 to HTTP (#3819) 2024-09-26 01:29:41 +00:00
Kobe Arthur Scofield
7086d286be
Remove legacy code (#3838) 
* Add feature migration notice

* Remove legacy code of transport processing

* Clear legacy proto field

* Fix missing

* Unify protocolname

* Test remove

* Supressor

* Weird code

* Remove errorgen related comments
 2024-09-23 11:28:19 -04:00
Lumière Élevé
acbf36e21b
SplitHTTP server: Add global CORS headers for browser dialer (#3830) 2024-09-20 09:55:54 +02:00
Lumière Élevé
7677ac980d
Browser Dialer: Change from ES5 to ES6+ for performance (#3832) 2024-09-19 10:57:43 +02:00
Kobe Arthur Scofield
57a41f3b4b
Config: Remove more legacy fields (#3817) 2024-09-19 01:05:59 +00:00
mmmray
f406b2dee0
SplitHTTP client: Fix xmux config deserialization (#3827) 2024-09-19 00:45:39 +00:00
ll11l1lIllIl1lll
b1c6471eeb
SplitHTTP client: Add xmux (multiplex controller) for H3 & H2 (#3613) 
https://github.com/XTLS/Xray-core/pull/3613#issuecomment-2351954957

Closes https://github.com/XTLS/Xray-core/issues/3560#issuecomment-2247495778

---------

Co-authored-by: mmmray <142015632+mmmray@users.noreply.github.com>
 2024-09-16 12:42:01 +00:00
Dmitry Anderson
a931507dd6
SplitHTTP: Read and validate HTTP/1.1 responses (#3797) 2024-09-16 12:33:03 +00:00
Kobe Arthur Scofield
7496413e5c
Remove remnants of global transport (#3792) 
* Remove remenants

* Generate pb.go

* Remove function
 2024-09-11 14:06:11 -04:00
风扇滑翔翼
3d0feae462
Transport: Add REALITY TLS1.3 support warning (#3774) 2024-09-09 11:37:39 -04:00
mmmray
c0a98f74fc
Transport: Remove DomainSocket (#3757) 
https://github.com/XTLS/Xray-core/pull/3755#issuecomment-2325533003
 2024-09-03 11:36:11 +00:00
mmmray
9a953c070f
Transport: Remove QUIC (#3754) 
https://github.com/XTLS/Xray-core/pull/3554#issuecomment-2236171077
 2024-09-03 02:39:44 +00:00
mmmray
ab3c00e96b
SplitHTTP: Remove ok compatibility logic (#3753) 
Remove some code that was added to maintain compatibility with older
Xray versions. This breaks compatibility with Xray-core v1.8.23 or older.
 2024-09-03 02:25:15 +00:00
mmmray
83eef6bc1f
SplitHTTP: Fix connection leaks and crashes (#3710) 2024-08-22 17:07:57 +02:00
mmmray
2be03c56cb
Pin protobuf packages (#3715) 
* Pin protobuf packages

It happened in the past that I ran with the wrong protobuf version
installed locally, and apparently there is even still some file wrong in
splithttp. Fix this issue once and for all.

* bump protobuf packages

* Revert "bump protobuf packages"

This reverts commit 7a3509346a.

* Revert "Revert "bump protobuf packages""

This reverts commit bb79707d15.

* fix deprecated grpc usage
 2024-08-22 10:18:36 -04:00
mmmray
160316d53c
SplitHTTP: Do not produce too large upload (#3691) 2024-08-17 13:01:58 +02:00
mmmray
498d8eb3cc
DialerProxy: Fix SplitHTTP H3 dialerProxy (#3570) 
* wip

* wip

* formatting

* cnc connection no longer needs to be a Packetconn

* dialerProxy: do not cancel connection when Dial context is cancelled
 2024-08-11 12:58:52 -04:00
Lumière Élevé
0c7303960a
SplitHTTP server: Add "Cache-Control: no-store" to GET response (#3652) 
https://github.com/XTLS/Xray-core/pull/3652#issuecomment-2282308407
 2024-08-10 23:59:42 +00:00
mmmray
513182adf3
SplitHTTP server: Only "ok" to older clients (#3671) 
https://github.com/XTLS/Xray-core/pull/3643#issuecomment-2282304185
 2024-08-10 23:56:25 +00:00
mmmray
a3b306aaa4
SplitHTTP: Replace responseOkPadding with xPaddingBytes (#3643) 2024-08-10 21:47:42 +00:00
mmmray
85e2ebc6f7
SplitHTTP client: Raise idle timeout to 5 minutes, Add h*KeepalivePeriod (#3624) 2024-08-10 05:40:48 +00:00
mmmray
4b7947cca9
SplitHTTP server: add ok padding (#3614) 2024-08-02 03:16:19 +02:00
mmmray
30af792777
SplitHTTP: Rename three options & Reduce server defaults (#3611) 
* maxUploadSize -> scMaxEachPostBytes, default is 1MB on both sides (was 2MB on the server)
* minUploadIntervalMs -> scMinPostsIntervalMs, default is 30ms on the client (no server support for now)
* maxConcurrentUploads -> scMaxConcurrentPosts, default is 100 on both sides (was 200 on the server)
 2024-07-29 10:10:29 +00:00
mmmray
33daa0c94b
SplitHTTP: Fix wrong config deserialization (#3610) 
Testing was conducted only using explicit parameters, and using
testsuite. However, when the parameters are not explicitly set in JSON
config, it seems that `c.MaxUploadSize` will contain `RandRangeConfig {
From: 0, To: 0 }` instead of `nil`, which breaks upload entirely.
 2024-07-29 08:50:59 +00:00
lelemka0
4531a7e228
CertificateObject: Enable auto-reload for cacert & Add buildChain & Fixes (#3607) 2024-07-29 06:58:58 +00:00
RPRX
60553a6c26
SplitHTTP server: Add noSSEHeader 
https://github.com/XTLS/Xray-core/pull/3603#issuecomment-2254968219
 2024-07-29 06:32:04 +00:00
mmmray
59f6685774
SplitHTTP: More range options, change defaults, enforce maxUploadSize, fix querystring behavior (#3603) 
* maxUploadSize and maxConcurrentUploads can now be ranges on the client
* maxUploadSize is now enforced on the server
* the default of maxUploadSize is 2MB on the server, and 1MB on the client
* the default of maxConcurrentUploads is 200 on the server, and 100 on the client
* ranges on the server are treated as a single number. if server is configured as `"1-2"`, server will enforce `2`
* querystrings in `path` are now handled correctly
 2024-07-29 04:35:17 +00:00
mmmray
8a4217fdf5
SplitHTTP client: Add minUploadInterval (#3592) 2024-07-27 12:52:36 +00:00
mmmray
7cf5ee8afd
WS, HU: Remove unnecessary sleep from test (#3600) 2024-07-27 12:38:54 +00:00
mmmray
2becdd6414
SplitHTTP server: Fix panic during concurrent Close and Push (#3593) 
When Close and Push are called concurrently, it may happen that Push attempts to write to an already-closed channel, and trigger a panic.

From a user perspective, it results in logs like this:

    http: panic serving 172.19.0.6:50476: send on closed channel

It's probably triggered when download is closed at the same time an upload packet is submitted.

These panics don't crash the server and the inbound is still usable.
 2024-07-26 04:36:55 +02:00
hellokindle
edae38c620
Fix SplitHTTP Unix domain socket (#3577) 
Co-authored-by: mmmray <142015632+mmmray@users.noreply.github.com>
 2024-07-22 22:19:31 +02:00
RPRX
0f65aa8ed8
Fix SplitHTTP H3 waited for downResponse before uploading 
https://github.com/XTLS/Xray-core/issues/3560#issuecomment-2241750579
 2024-07-21 20:45:05 +00:00
RPRX
22535d8643
Fix SplitHTTP H3 didn't always reuse QUIC connection 
https://github.com/XTLS/Xray-core/issues/3560#issuecomment-2241531502
 2024-07-21 08:55:03 +00:00
mmmray
529f206d33 Fix serverside TLS support of SplitHTTP H1/H2 (#3567) 
Fix #3566

Also update testsuite so that all tests read and write some data. Opening a connection is not enough to trigger connection errors, because the connection is so lazy.
 2024-07-20 19:35:24 -05:00
チセ
964859b4bc SplitHTTP: Remove unnecessary keepalives (#3565) 
Remove keep alive since quic-go/http3 doesn't support stream reuse
Discussion see https://t.me/projectXray/3782492

Co-authored-by: Fangliding <Fangliding.fshxy@outlook.com>
Co-authored-by: xqzr <34030394+xqzr@users.noreply.github.com>
Co-authored-by: ll11l1lIllIl1lll <88377095+ll11l1lIllIl1lll@users.noreply.github.com>
 2024-07-20 19:34:57 -05:00
ll11l1lIllIl1lll
a0040f13dd
SplitHTTP: Server supports HTTP/3 (#3554) 
Co-authored-by: mmmray <142015632+mmmray@users.noreply.github.com>
 2024-07-19 17:53:47 +00:00
ll11l1lIllIl1lll
d8994b7603
Fix SplitHTTP H3 crash on v2rayNG (#3559) 
Fixes https://github.com/XTLS/Xray-core/issues/3556
 2024-07-19 17:52:34 +00:00
ll11l1lIllIl1lll
c40fc44a34 SplitHTTP: Client supports HTTP/3 (#3543) 
Closes https://github.com/XTLS/Xray-core/issues/3456

Co-authored-by: Fangliding <Fangliding.fshxy@outlook.com>
Co-authored-by: mmmray <142015632+mmmray@users.noreply.github.com>
 2024-07-17 07:55:28 -05:00
yuhan6665
02cd3b8c74
Fix SplitHTTP race condition when creating new sessions (#3533) 
Co-authored-by: nobody <nobody@nowhere.mars>
Co-authored-by: mmmray <142015632+mmmray@users.noreply.github.com>
 2024-07-17 11:41:17 +00:00
风扇滑翔翼
a7e198e1e2
Fix WS reading X-Forwarded-For & Add tests (#3546) 
Fixes https://github.com/XTLS/Xray-core/issues/3545

---------

Co-authored-by: mmmray <142015632+mmmray@users.noreply.github.com>
 2024-07-17 10:40:25 +00:00
MHSanaei
16de0937a8
Fix typos (#3527) 2024-07-12 00:20:06 +02:00
mmmray
c8f6ba9ff0
Add SplitHTTP Browser Dialer support (#3484) 2024-07-11 07:56:20 +00:00
风扇滑翔翼
308f0c64c3
Add custom Sockopt support (#3517) 
* Add custom sockopt

* Add custom level

* Change field

* Sth left
 2024-07-09 12:19:31 -04:00
yuhan6665
b8c0768b16 Properly parse HTTP host for verification 
Also fix H2 transport to not verify if host is not defined
 2024-07-07 22:35:11 -04:00
yuhan6665
4c51636788 Relax server HTTP host check 2024-07-06 15:06:58 -04:00
yuhan6665
60b2c349d2 Try to fix infinite conn read in tests 2024-07-01 23:55:30 -04:00
mmmray
c6a57b2cc1
Fix connection reuse in splithttp HTTP/1.1 (#3485) 2024-07-01 05:30:34 +02:00
yuhan6665
079d0bd8a9
Refactor log (#3446) 
* Refactor log

* Add new log methods

* Fix logger test

* Change all logging code

* Clean up pathObj

* Rebase to latest main

* Remove invoking method name after the dot
 2024-06-29 14:32:57 -04:00
RPRX
8320732743
SplitHTTP: ok -> ooooooooook (parser in client) 
https://github.com/XTLS/Xray-core/pull/3479#issuecomment-2196370334
 2024-06-28 16:53:18 +08:00
mmmray
c0f3bf66fd
Add new header to disable HTTP middle box buffer 
Co-Authored-By: 风扇滑翔翼 <Fangliding.fshxy@outlook.com>
 2024-06-28 16:14:59 +08:00
maskedeken
e4f9d03bef
splithttp Read() using blocking mode (#3473) 
* blocking splithttp read

* Add testcase

* simplify conditions

---------

Co-authored-by: mmmray <142015632+mmmray@users.noreply.github.com>
 2024-06-24 11:09:24 -04:00