From c7658973c3da15c3a527b25686ff1ab8457f1f93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 13:50:02 +0330 Subject: [PATCH 1/5] Bump github.com/mymmrac/telego from 0.24.0 to 0.25.0 (#588) Bumps [github.com/mymmrac/telego](https://github.com/mymmrac/telego) from 0.24.0 to 0.25.0. - [Release notes](https://github.com/mymmrac/telego/releases) - [Commits](https://github.com/mymmrac/telego/compare/v0.24.0...v0.25.0) --- updated-dependencies: - dependency-name: github.com/mymmrac/telego dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index ae6ea7d7..6103982a 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/gin-gonic/gin v1.9.1 github.com/go-cmd/cmd v1.4.1 github.com/goccy/go-json v0.10.2 - github.com/mymmrac/telego v0.24.0 + github.com/mymmrac/telego v0.25.0 github.com/nicksnyder/go-i18n/v2 v2.2.1 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 github.com/pelletier/go-toml/v2 v2.0.8 diff --git a/go.sum b/go.sum index 9adea1cb..38f0759d 100644 --- a/go.sum +++ b/go.sum @@ -111,8 +111,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mymmrac/telego v0.24.0 h1:0fd+v2/dToL6/DtsnWr+2saK7ZxIgLY+LI9kqJQbPEo= -github.com/mymmrac/telego v0.24.0/go.mod h1:y557P/iMHSaOVDi5Nmy1gNelqrw+jaBMvP9guPaNJsQ= +github.com/mymmrac/telego v0.25.0 h1:ANI4irLey+bQC8UEDB/d7JZrGmxWmcuhMMrtyLEEzI4= +github.com/mymmrac/telego v0.25.0/go.mod h1:UGyuLaO49ZgiWLiHuB5rotF6Ms7Tv9tu2R3LTxnTmSc= github.com/nicksnyder/go-i18n/v2 v2.2.1 h1:aOzRCdwsJuoExfZhoiXHy4bjruwCMdt5otbYojM/PaA= github.com/nicksnyder/go-i18n/v2 v2.2.1/go.mod h1:fF2++lPHlo+/kPaj3nB0uxtPwzlPm+BlgwGX7MkeGj0= github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU= @@ -164,8 +164,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= From 0fe35fde4946a42b0e966223c37970c2d68c0741 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 13:50:16 +0330 Subject: [PATCH 2/5] Bump docker/build-push-action from 4.0.0 to 4.1.0 (#589) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v4.0.0...v4.1.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 350e85f8..bacb6382 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -32,7 +32,7 @@ jobs: images: ghcr.io/${{ github.repository }} - name: Build and push Docker image - uses: docker/build-push-action@v4.0.0 + uses: docker/build-push-action@v4.1.0 with: context: . push: ${{ github.event_name != 'pull_request' }} From 2c7ec3dc8a97889f5f875f79e07045da5dba9d85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 15:36:21 +0330 Subject: [PATCH 3/5] Bump docker/setup-buildx-action from 2.6.0 to 2.7.0 (#594) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.6.0 to 2.7.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2.6.0...v2.7.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index bacb6382..46006f5b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,7 +16,7 @@ jobs: uses: docker/setup-qemu-action@v2.2.0 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2.6.0 + uses: docker/setup-buildx-action@v2.7.0 - name: Log in to GitHub Container Registry uses: docker/login-action@v2.2.0 From b5657ab87d902a6b82fdbe0bbd82c17e3aee4a4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 15:36:33 +0330 Subject: [PATCH 4/5] Bump golang.org/x/text from 0.9.0 to 0.10.0 (#595) Bumps [golang.org/x/text](https://github.com/golang/text) from 0.9.0 to 0.10.0. - [Release notes](https://github.com/golang/text/releases) - [Commits](https://github.com/golang/text/compare/v0.9.0...v0.10.0) --- updated-dependencies: - dependency-name: golang.org/x/text dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6103982a..b5aa572c 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/shirou/gopsutil/v3 v3.23.5 github.com/xtls/xray-core v1.8.1 go.uber.org/atomic v1.11.0 - golang.org/x/text v0.9.0 + golang.org/x/text v0.10.0 google.golang.org/grpc v1.55.0 gorm.io/driver/sqlite v1.5.2 gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55 diff --git a/go.sum b/go.sum index 38f0759d..a380d5e0 100644 --- a/go.sum +++ b/go.sum @@ -242,8 +242,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= +golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= From ad9134bc1add038cf65e1e94def94bddceca989e Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Tue, 13 Jun 2023 17:26:50 +0330 Subject: [PATCH 5/5] removed - alterId https://github.com/XTLS/Xray-core/pull/2199 https://github.com/XTLS/Xray-core/commit/9112cfd39c2105d5b513275f9659b26e92fa7b67 --- database/model/model.go | 1 - sub/subService.go | 1 - web/assets/js/model/xray.js | 5 +---- web/html/xui/form/client.html | 3 --- web/html/xui/form/protocol/vmess.html | 4 ---- web/service/inbound.go | 3 --- web/service/xray.go | 2 +- xray/api.go | 3 +-- 8 files changed, 3 insertions(+), 19 deletions(-) diff --git a/database/model/model.go b/database/model/model.go index d1498b06..087e8b07 100644 --- a/database/model/model.go +++ b/database/model/model.go @@ -76,7 +76,6 @@ type Client struct { ID string `json:"id"` Password string `json:"password"` Flow string `json:"flow"` - AlterIds uint16 `json:"alterId"` Email string `json:"email"` LimitIP int `json:"limitIp"` TotalGB int64 `json:"totalGB" form:"totalGB"` diff --git a/sub/subService.go b/sub/subService.go index 7f8dbc46..1cd340aa 100644 --- a/sub/subService.go +++ b/sub/subService.go @@ -236,7 +236,6 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string { } } obj["id"] = clients[clientIndex].ID - obj["aid"] = clients[clientIndex].AlterIds if len(domains) > 0 { links := "" diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js index 0e737bb0..12857d64 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -1222,7 +1222,6 @@ class Inbound extends XrayCommonClass { add: address, port: this.port, id: this.settings.vmesses[clientIndex].id, - aid: this.settings.vmesses[clientIndex].alterId, net: this.stream.network, type: 'none', tls: this.stream.security, @@ -1668,10 +1667,9 @@ Inbound.VmessSettings = class extends Inbound.Settings { } }; Inbound.VmessSettings.Vmess = class extends XrayCommonClass { - constructor(id=RandomUtil.randomUUID(), alterId=0, email=RandomUtil.randomLowerAndNum(8),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId='', subId=RandomUtil.randomLowerAndNum(16)) { + constructor(id=RandomUtil.randomUUID(), email=RandomUtil.randomLowerAndNum(8),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId='', subId=RandomUtil.randomLowerAndNum(16)) { super(); this.id = id; - this.alterId = alterId; this.email = email; this.limitIp = limitIp; this.totalGB = totalGB; @@ -1684,7 +1682,6 @@ Inbound.VmessSettings.Vmess = class extends XrayCommonClass { static fromJson(json={}) { return new Inbound.VmessSettings.Vmess( json.id, - json.alterId, json.email, json.limitIp, json.totalGB, diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html index bd6b08af..4fd5b8e3 100644 --- a/web/html/xui/form/client.html +++ b/web/html/xui/form/client.html @@ -27,9 +27,6 @@
- - - diff --git a/web/html/xui/form/protocol/vmess.html b/web/html/xui/form/protocol/vmess.html index 6dd31307..b58ecaee 100644 --- a/web/html/xui/form/protocol/vmess.html +++ b/web/html/xui/form/protocol/vmess.html @@ -15,10 +15,6 @@
- - - -
diff --git a/web/service/inbound.go b/web/service/inbound.go index 57384128..802e753d 100644 --- a/web/service/inbound.go +++ b/web/service/inbound.go @@ -396,7 +396,6 @@ func (s *InboundService) AddInboundClient(data *model.Inbound) (bool, error) { err1 := s.xrayApi.AddUser(string(oldInbound.Protocol), oldInbound.Tag, map[string]interface{}{ "email": client.Email, "id": client.ID, - "alterId": client.AlterIds, "flow": client.Flow, "password": client.Password, }) @@ -589,7 +588,6 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin err1 := s.xrayApi.AddUser(string(oldInbound.Protocol), oldInbound.Tag, map[string]interface{}{ "email": clients[0].Email, "id": clients[0].ID, - "alterId": clients[0].AlterIds, "flow": clients[0].Flow, "password": clients[0].Password, }) @@ -1169,7 +1167,6 @@ func (s *InboundService) ResetClientTraffic(id int, clientEmail string) (bool, e err1 := s.xrayApi.AddUser(string(inbound.Protocol), inbound.Tag, map[string]interface{}{ "email": client.Email, "id": client.ID, - "alterId": client.AlterIds, "flow": client.Flow, "password": client.Password, }) diff --git a/web/service/xray.go b/web/service/xray.go index 5475891f..668d6952 100644 --- a/web/service/xray.go +++ b/web/service/xray.go @@ -116,7 +116,7 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) { } } for key := range c { - if key != "email" && key != "id" && key != "password" && key != "flow" && key != "alterId" { + if key != "email" && key != "id" && key != "password" && key != "flow" { delete(c, key) } if c["flow"] == "xtls-rprx-vision-udp443" { diff --git a/xray/api.go b/xray/api.go index a84435f9..c2e2b4ca 100644 --- a/xray/api.go +++ b/xray/api.go @@ -57,8 +57,7 @@ func (x *XrayAPI) AddUser(Protocol string, inboundTag string, user map[string]in switch Protocol { case "vmess": account = serial.ToTypedMessage(&vmess.Account{ - Id: user["id"].(string), - AlterId: uint32(user["alterId"].(uint16)), + Id: user["id"].(string), }) case "vless": account = serial.ToTypedMessage(&vless.Account{