mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-12-27 07:59:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,198 Commits 20 Branches 72 Tags 11 MiB
c9013c4f55
Commit Graph

239 Commits

Author SHA1 Message Date
mmmray
a3b306aaa4
SplitHTTP: Replace responseOkPadding with xPaddingBytes (#3643) 2024-08-10 21:47:42 +00:00
nobody
ac628a9427
API: Improve MarshalToJson() in common/reflect/marshal.go (#3655) 
* Serialize enum to string in MarshalToJson().

* MarshalToJson() respect json tags.

* Add insertTypeInfo parameter to MarshalToJson().

* Omit empty string in MarshalToJson().

* Serialize PortList to string in MarshalToJson().

---------

Co-authored-by: nobody <nobody@nowhere.mars>
 2024-08-08 10:35:46 -04: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
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
风扇滑翔翼
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
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
mmmray
c10bd28731
Add SplitHTTP Transport (#3412) 2024-06-18 05:36:36 +00:00
风扇滑翔翼
3654c0d710 HTTPUpgrade send headers with specified capitalization (#3430) 
* Fix HTTPUpgrade header capitalization

* Chore

* Remove excess host headers

Chore : change httpupgrade header "upgrade" to "Upgrade" #3435
 2024-06-07 12:53:27 +00:00
yuhan6665
075051a693 Add wireguard test 2024-06-01 19:34:31 -04:00
RPRX
ca07a705dc
Generate *.pb.go files with protoc v5.27.0 
Download https://github.com/protocolbuffers/protobuf/releases/tag/v27.0
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.1
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
(Xray-core/) go run ./infra/vprotogen
 2024-05-26 03:20:53 +00:00
yuhan6665
84eeb56ae4 Select alive only node when fallbackTag is given 
- Apply to random and roundrobin strategy
- Require observatory config

Co-authored-by: Mark Ma <38940419+mkmark@users.noreply.github.com>
 2024-05-05 10:11:29 -04:00
nobody
447a49d16a
Add configuration item api->listen. (#3317) 
* add api.listen configuration item

* add unit tests

* typo

---------

Co-authored-by: nobody <nobody@nowhere.mars>
 2024-05-01 21:23:55 -04:00
writegr
dd16dcec03 chore: fix some typos in comments 
Signed-off-by: writegr <wellweek@outlook.com>
 2024-04-18 12:24:56 +08:00
Allo
fbc56b88da chore: remove the usage of some deprecated tls properties 2024-04-13 17:56:35 -04:00
RPRX
685e66e96b
Fix TestXrayConfig in xray_test.go 2024-03-30 08:10:16 +00:00
yuhan6665
7e3a8d3a04 Add separate host config for websocket 2024-03-30 07:43:05 +00:00
yuhan6665
e2302b421c Update proto file for websocket and httpupgrade (breaking) 2024-03-30 07:42:41 +00:00
Hossin Asaadi
53e5814d19
API - Add | Remove Routing Rules (#3189) 
* add RuleTag to routing rules

* add router pb commands

* add and remove routing rules api

* cleanup

* fix

* improve error msg

* add append flag
apply balancer config
 2024-03-29 11:17:36 -04:00
风扇滑翔翼
8a439bf3f2 Fix host in headers field does not work XTLS#3191 2024-03-29 00:08:54 -04:00
lelemka0
e2439c0483 fix: config burstObservatory override 2024-03-25 05:50:08 -10:00
风扇滑翔翼
9a619f9e7c Add support for HTTPupgrade custom headers 2024-03-23 07:53:36 -10:00
风扇滑翔翼
70a5fe9a25 Allow to send through random IPv6 2024-03-23 07:23:19 -10:00
チセ
fe3a0cf954 Chore: Clean up legacy field usage 2024-03-20 12:13:21 -04:00
RPRX
18b823b4a6
HTTPUpgrade 0-RTT (#3152) 
* Add ed to enable HTTPUpgrade 0-RTT

https://github.com/XTLS/Xray-core/issues/3128#issuecomment-2002563369

* WebSocket hub.go MaxHeaderBytes: 4096 -> 8192
 2024-03-17 20:43:19 +00:00
Eken Chan
173b03448f transport: add httpupgrade 2024-03-03 10:45:36 -05:00
RPRX
7184a8165f
Add Authority to gRPC Transport (#3076) 
Why couldn't you have Host, for the last three years?
 2024-02-29 14:22:14 +00:00
yuhan6665
fa5d7a255b
Least load balancer (#2999) 
* v5: Health Check & LeastLoad Strategy (rebased from 2c5a71490368500a982018a74a6d519c7e121816)

Some changes will be necessary to integrate it into V2Ray

* Update proto

* parse duration conf with time.Parse()

* moving health ping to observatory as a standalone component

* moving health ping to observatory as a standalone component: auto generated file

* add initialization for health ping

* incorporate changes in router implementation

* support principle target output

* add v4 json support for BurstObservatory & fix balancer reference

* update API command

* remove cancelled API

* return zero length value when observer is not found

* remove duplicated targeted dispatch

* adjust test with updated structure

* bug fix for observer

* fix strategy selector

* fix strategy least load

* Fix ticker usage

ticker.Close does not close ticker.C

* feat: Replace default Health Ping URL to HTTPS (#1991)

* fix selectLeastLoad() returns wrong number of nodes (#2083)

* Test: fix leastload strategy unit test

* fix(router): panic caused by concurrent map read and write (#2678)

* Clean up code

---------

Co-authored-by: Jebbs <qjebbs@gmail.com>
Co-authored-by: Shelikhoo <xiaokangwang@outlook.com>
Co-authored-by: 世界 <i@sekai.icu>
Co-authored-by: Bernd Eichelberger <46166740+4-FLOSS-Free-Libre-Open-Source-Software@users.noreply.github.com>
Co-authored-by: 秋のかえで <autmaple@protonmail.com>
Co-authored-by: Rinka <kujourinka@gmail.com>
 2024-02-17 22:51:37 -05:00
Iain Lau
3a99520370 Add PROXY Protocol support for freedom outbound 2024-02-05 10:08:51 -05:00
Qi Lin
0ea2a50264 Add option realitySettings.masterKeyLog 2024-01-11 10:57:04 -05:00
nobody
44bb83033f
Add sub-command "-dump" to "run". (#2854) 
* Add MarshalToJson().

* Add cmd arg -dump for printing out merged multiple json configs.

---------

Co-authored-by: nobody <nobody@nowhere.mars>
 2023-12-29 11:16:48 -05:00
Allo
006cf491e5 fix(conf): add Windows support for Unix Domain Socket in the fallback settings 2023-12-29 11:07:41 -05:00
Allo
b0bf0d7fd5 fix(conf): add Windows support for Unix Domain Socket 2023-12-24 15:48:25 -05:00
Hossin Asaadi
01c14a5994
add Round-Robin Strategy to balancer (#2844) 
* add Round-Robin Strategy

* clean up
 2023-12-24 15:29:10 -05:00
风扇滑翔翼
9becf02316 allow empty route type 
default field
 2023-12-24 15:00:23 -05:00
yuhan6665
6f092bd212
Add "masterKeyLog" in TLS config (#2758) 
* Add "enableMasterKeyLog" in TLS config

Turn on the debug option for Wireshark to decrypt traffic

* Change to "masterKeyLog" to configure a path
 2023-11-27 10:08:34 -05:00
hax0r31337
0ac7da2fc8
WireGuard Inbound (User-space WireGuard server) (#2477) 
* feat: wireguard inbound

* feat(command): generate wireguard compatible keypair

* feat(wireguard): connection idle timeout

* fix(wireguard): close endpoint after connection closed

* fix(wireguard): resolve conflicts

* feat(wireguard): set cubic as default cc algorithm in gVisor TUN

* chore(wireguard): resolve conflict

* chore(wireguard): remove redurant code

* chore(wireguard): remove redurant code

* feat: rework server for gvisor tun

* feat: keep user-space tun as an option

* fix: exclude android from native tun build

* feat: auto kernel tun

* fix: build

* fix: regulate function name & fix test
 2023-11-17 22:27:17 -05:00
yuhan6665
7523f7f440
统一 domainStrategy 行为. (#2720) 
* 统一 `domainStrategy` 行为.

* Update proto

---------

Co-authored-by: rui0572 <125641819+rui0572@users.noreply.github.com>
 2023-11-12 16:37:02 -05:00
yuhan6665
d9fd3f8eb1
Freedom xdomain strategy (#2719) 
* 统一 `domainStrategy` 行为.

* aliases NG.

* 化简.

* 调整.

* Let it crash.

* Update proto

---------

Co-authored-by: rui0572 <125641819+rui0572@users.noreply.github.com>
 2023-11-12 16:27:39 -05:00
yuhan6665
a109389efb
Wireguard resolve strategy (#2717) 
* 增加 wireguard 出站选项 `resolveStrategy`.

* They become a part of you.

* 移除不必要的选项别名.

* aliases NG.

* 微调.

---------

Co-authored-by: rui0572 <125641819+rui0572@users.noreply.github.com>
 2023-11-12 15:52:09 -05:00
Ikko Eltociear Ashimine
1d89ae2847 Fix typo in xray.go 
overide -> override
 2023-11-06 17:54:40 -05:00
yuhan6665
4f05e0ac2b Unify environment var readers 2023-10-29 15:16:57 -04:00
Hossin Asaadi
67c66faaed
Override outbounds in multi config files (#2659) 
* fix override outbounds in multi config

* log outbounds override status

* fix prepend bug

* improve outbounds-prepend test

* fix prepend outbound

* fix outbounds-prepend test
 2023-10-23 21:34:58 -04:00
hossinasaadi
71fee07175 fix inbounds-replaceall test 2023-10-22 22:45:38 -04:00
hossinasaadi
42d586df09 log inbound override status 2023-10-22 22:45:38 -04:00
hossinasaadi
4f8b73bb1f fix override Inbounds in multi config 2023-10-22 22:45:38 -04:00
cty123
4f6042c69f feat(dns): Support DNS queryStrategy config per NameServer. 2023-09-22 10:34:36 -04:00
yylt
c00e56c0da
Add tcpMptcp to sockopt (#2520) 2023-09-07 17:32:27 +00:00
hax0r31337
f67167bb3b refactor(deps): replace github.com/golang/protobuf with google.golang.org/protobuf 2023-08-10 10:43:27 -04:00
RPRX
f0f3b417f7
Refactor: Fragmentation 
5f5ae37571
9122d0f056
 2023-07-06 16:30:39 +00:00
RPRX
6d4194415d
Clean unnecessary code in Trojan 2023-07-06 15:18:05 +00:00
RPRX
4f8f49024b
Fix xray_test.go 2023-06-19 01:07:19 +00:00
RPRX
a9ed1a03aa
Fix dns_proxy_test.go 2023-06-19 00:51:03 +00:00
RPRX
253a422467
Fix "nonIPQuery" 2023-06-19 00:33:59 +00:00
RPRX
ee21763928 Run "go fmt ./..." 2023-06-18 09:46:57 -04:00
RPRX
667279af57 Add "nonIPQuery" to DNS outbound ("drop" by default) 
And fixed a memory leak
And regenerated *.pb.go
 2023-06-18 09:45:32 -04:00
rrouzbeh
9122d0f056 Add TLS Hello Fragmentation for freedom outbound (#2131) 
* Replace TCP Segmentation with TLS Hello Fragmentation

* Update infra/conf/freedom.go

* Refine proxy/freedom/freedom.go

---------

Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
 2023-06-18 09:27:55 -04:00
yuhan6665
9112cfd39c
Clean legacy vmess (#2199) 
* Remove legacy Vmess

* validators

* protos
 2023-06-12 10:32:25 -04:00
yuhan6665
bf4b1fab3c Simplify http attrabute matching 
In the past, we use Starlark script, it is over engineered and barely used.
By switching to simple key value string contains logic we can reduce core size about 0.7MB
 2023-06-12 10:25:45 -04:00
yuhan6665
d11d72be6c Update proto file and fix protoc version parsing 
The new protoc cli return version v23.1,
so we parse the file version v4.23.1 without "4."
 2023-06-11 13:36:06 -04:00
yuhan6665
c9f517108c Remove mtproto 2023-06-06 23:38:34 -04:00
sambali9
5f5ae37571
Added tcp fragmentation for freedom outbound (#2021) 
* Added tcp fragmentation for freedom outbound

* Added TCP_NODELAY to outbound sockopt

* Changed fragment parameters to accept ranges and changed strategy to use length

* Changed packetNumber to packets, supporting range.

* Refactored the freedom fragment logic

* Refine Write()

---------

Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
 2023-05-22 02:59:58 +00:00
xqzr
dd81ad5342
Add tcpMaxSeg to sockopt (#2002) 2023-04-30 00:03:30 +00:00
yichya QC
90d915ea05 feat: add tcp_user_timeout 
```json
{"streamSettings":{"sockopt": {"tcpUserTimeout": 10000}}}
```

run `gofmt -w -s .` as well
 2023-04-22 20:41:43 -04:00
RPRX
06c9e50c52
Add "xudpProxyUDP443" to Mux config & XUDP rejects UDP/443 traffic by default (client side, excluding reverse proxy) 2023-04-14 22:51:18 +00:00
RPRX
24a2be43ef
Replace "only" with "xudpConcurrency" in Mux config 2023-04-10 10:36:07 +08:00
RPRX
29d7865d78
Refine "only" in Mux config 2023-04-10 10:15:16 +08:00
RPRX
be23d5d3b7
XUDP protocol: Add Global ID & UoT Migration 
The first UoT protocol that supports UoT Migration
Thank @yuhan6665 for testing
 2023-04-06 10:21:35 +00:00
RPRX
a0d06f3a97 Add env support to "address", "listen", etc. 
Usage: `"address": "env:ADDR"`, `"listen": "env:AUDS"`...
Just like existing `"port": "env:PORT"`
 2023-03-26 10:10:27 +00:00
Hirbod Behnam
6872be5cc3 Add user agent to gRPC (#1790) 2023-03-26 09:23:42 +03:30
世界
55efac7236
Reformat code 2023-03-17 13:17:08 +08:00
世界
f57ec13880
Update UoT protocol 2023-03-17 13:17:08 +08:00
xqzr
c3322294be
Add tcpWindowClamp to sockopt (#1757) 
Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
 2023-03-09 13:51:16 +00:00
RPRX
c04c333afc
They become a part of you 2023-03-04 15:39:27 +00:00
yuhan6665
9e5bc07bf2
Legends never die (#1725) 2023-03-04 10:39:26 +00:00
RPRX
ccba465590
Add reserved to WireGuard config 
Fixes https://github.com/XTLS/Xray-core/issues/1730
 2023-03-02 16:55:42 +00:00
RPRX
55dc26f228
Add REALITY support to gRPC client and server 
Now you are able to configure REALITY gRPC client and server
Duplicate of REALITY H2, perhaps, just for fun
 2023-02-27 19:52:01 +00:00
sduoduo233
336b2daeb9
DNS Header for KCP (#1672) 
* dns header

* fixed domain name encoding for dns header

---------

Co-authored-by: kerry <lvhaiyangkerry@gmail.com>
 2023-02-24 12:06:24 -05:00
xqzr
c8b4580869
add V6Only (#1677) 
* add `V6Only`

* add `V6Only`
 2023-02-24 11:54:40 -05:00
Yue Yin
03b8c094de Support SPKI Fingerprint Pinning 
Support SPKI Fingerprint Pinning for TLSObject
 2023-02-24 11:47:00 -05:00
RPRX
9d3de59d3f
Check "serverNames" and "shortIds" (client side) 
Prevents https://github.com/XTLS/Xray-core/issues/1675
 2023-02-21 13:43:13 +00:00
RPRX
c7358a32f5
Allow empty "spiderX" (client side) 2023-02-17 21:07:27 +08:00
RPRX
e1cd1fd33e
Allow empty "shortId" (client side) 2023-02-17 12:39:18 +00:00
RPRX
4d2e2b24d3
THE NEXT FUTURE becomes THE REALITY NOW 
Thank @yuhan6665 for testing
 2023-02-15 16:07:12 +00:00
RPRX
fa7300e910
Add warning on using old version of XTLS 
And checks param `fingerprint` also
 2023-02-03 23:29:46 +08:00
RPRX
dc72cf2c78
Refine fingerprints 
Fixes https://github.com/XTLS/Xray-core/issues/1577
 2023-02-01 12:58:17 +00:00
aeeq
620eb63c1b Add sockopt interface setting for binding outbound to a particular device like "eth0" (#1494) 
* Update sockopt_linux.go

add Interface Name

* Update config.pb.go

add Interface Name

* Update transport_internet.go

add Interface Name

* Update config.pb.go

* update config.proto add interface

* Update config.pb.go
 2023-01-09 09:45:30 -05:00
RPRX
ff5ce767df
Revert "add file soft link path resolve support (#1482)" (#1495) 
This reverts commit eaf401eda9.
 2023-01-07 15:11:23 +00:00
Nanyu
eaf401eda9
add file soft link path resolve support (#1482) 
* add file soft link path resolve

* add configuration file soft link path resolve support
 2023-01-03 10:52:11 -05:00
yuhan6665
c4fbdf1b78 Run core/format.go 2022-12-25 19:47:53 -05:00
PMExtra
c9b6fc0104 Add custom header support for HTTP proxy 2022-12-18 21:48:23 -05:00
yuhan6665
2e30093ffd Enforce specific none flow for xtls vision 
In the past, when user open xtls vision on the server side, plain vless+tls can connect.
Pure tls is known to have certain tls in tls characters.
Now  server need to specify "xtls-rprx-vision,none" for it be able usable on the same port.
 2022-12-04 23:15:36 -05:00
nanoda0523
e18b52a5df
Implement WireGuard protocol as outbound (client) (#1344) 
* implement WireGuard protocol for Outbound

* upload license

* fix build for openbsd & dragonfly os

* updated wireguard-go

* fix up

* switch to another wireguard fork

* fix

* switch to upstream

* open connection through internet.Dialer (#1)

* use internet.Dialer

* maybe better code

* fix

* real fix

Co-authored-by: nanoda0523 <nanoda0523@users.noreply.github.com>

* fix bugs & add ability to recover during connection reset on UDP over TCP parent protocols

* improve performance

improve performance

* dns lookup endpoint && remove unused code

* interface address fallback

* better code && add config test case

Co-authored-by: nanoda0523 <nanoda0523@users.noreply.github.com>
 2022-11-21 20:05:54 -05:00
yuhan6665
5e695327b1
Add XTLS RPRX's Vision (#1235) 
* Add XTLS RPRX's Vision

* Add helpful warning when security is wrong

* Add XTLS padding (draft)

* Fix  number of packet to filter

* Xtls padding version 1.0 and unpadding logic
 2022-10-29 00:51:59 -04:00
xqzr
8cf23f1947
add tcpcongestion (#1234) 
* add `tcpcongestion`

* Update sockopt_linux.go

* Update config.pb.go

* Update transport_internet.go

* Update config.pb.go

* Update transport_internet.go

* Update config.proto
 2022-10-10 13:13:50 -04:00
yuhan6665
debd2e3ba8 Remove compatibility code 
The minimum support go version is already 1.18
 2022-09-16 20:39:07 -04:00
Mocking
4140bcd11a Enhancement of "redirect" function, adding support for MacOS 
Added the function of "MacOS" FreeBSD firewall traffic forwarding and resolving destination address
example:
"inbounds": [
{
"listen": "127.0.0.1",
"port": 1122,
"protocol": "dokodemo-door",
"tag": "dokodemo",
"settings": {
"network": "tcp",
"followRedirect": true,
"userLevel": 0
},
"streamSettings": {
"sockopt": {
"tproxy": "Redirect"
}
}
}
]

还原#1189 提交
 2022-08-22 10:33:58 -04:00