From 6f98e535240ce269673b1d607728a7c859fbbcc7 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 13:48:33 +0330 Subject: [PATCH 01/20] Update server.go --- web/service/server.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/service/server.go b/web/service/server.go index f46d247..08b0c2c 100644 --- a/web/service/server.go +++ b/web/service/server.go @@ -171,7 +171,7 @@ func (s *ServerService) GetStatus(lastStatus *Status) *Status { } func (s *ServerService) GetXrayVersions() ([]string, error) { - url := "https://api.github.com/repos/hossinasaadi/Xray-core/releases" + url := "https://api.github.com/repos/XTLS/Xray-core/releases" resp, err := http.Get(url) if err != nil { return nil, err @@ -214,7 +214,7 @@ func (s *ServerService) downloadXRay(version string) (string, error) { } fileName := fmt.Sprintf("Xray-%s-%s.zip", osName, arch) - url := fmt.Sprintf("https://github.com/hossinasaadi/Xray-core/releases/download/%s/%s", version, fileName) + url := fmt.Sprintf("https://github.com/XTLS/Xray-core/releases/download/%s/%s", version, fileName) resp, err := http.Get(url) if err != nil { return "", err From cd69562033a60e21fa9c50a0cc35d8ff3d866811 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 14:50:48 +0330 Subject: [PATCH 02/20] Update go.mod --- go.mod | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index e9a2ca6..5d3a3bb 100644 --- a/go.mod +++ b/go.mod @@ -7,15 +7,16 @@ require ( github.com/Workiva/go-datastructures v1.0.53 github.com/gin-contrib/sessions v0.0.5 github.com/gin-gonic/gin v1.8.1 + github.com/go-cmd/cmd v1.4.1 github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 github.com/nicksnyder/go-i18n/v2 v2.2.0 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 github.com/robfig/cron/v3 v3.0.1 github.com/shirou/gopsutil v3.21.11+incompatible - github.com/xtls/xray-core v1.6.0 + github.com/xtls/xray-core v1.7.2 go.uber.org/atomic v1.10.0 - golang.org/x/text v0.3.7 - google.golang.org/grpc v1.49.0 + golang.org/x/text v0.6.0 + google.golang.org/grpc v1.51.0 gorm.io/driver/sqlite v1.3.6 gorm.io/gorm v1.23.10 ) @@ -45,11 +46,10 @@ require ( github.com/tklauser/numcpus v0.5.0 // indirect github.com/ugorji/go/codec v1.2.7 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect - golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect - golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41 // indirect - google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa // indirect + golang.org/x/crypto v0.5.0 // indirect + golang.org/x/net v0.5.0 // indirect + golang.org/x/sys v0.4.0 // indirect + google.golang.org/genproto v0.0.0-20230106154932-a12b697841d9 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - github.com/go-cmd/cmd v1.4.1 // indirect ) From fd36dad411f03af1b5949962abb83205d33e05a1 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 14:52:12 +0330 Subject: [PATCH 03/20] Update go.sum --- go.sum | 68 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/go.sum b/go.sum index 9e66719..d6e6738 100644 --- a/go.sum +++ b/go.sum @@ -10,7 +10,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 h1:y7y0Oa6UawqTFPCDw9JG6pdKt4F9pAhHv0B7FMGaGD0= github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk= -github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew= github.com/gin-contrib/sessions v0.0.5 h1:CATtfHmLMQrMNpJRgzjWXD7worTh7g7ritsQfmF+0jE= github.com/gin-contrib/sessions v0.0.5/go.mod h1:vYAuaUPqie3WUSsft6HUlCjlwwoJQs97miaG2+7neKY= @@ -33,15 +32,18 @@ github.com/go-playground/validator/v10 v10.11.0/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 h1:wG8n/XJQ07TmjbITcGiUaOtXxdrINDz1b0J1w0SzqDc= github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1/go.mod h1:A2S0CWkNylc2phvKXWBBdD3K0iGnDBGbzRpISP2zBl8= +github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M= github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/pprof v0.0.0-20221219190121-3cb0bae90811 h1:wORs2YN3R3ona/CXYuTvLM31QlgoNKHvlCNuArCDDCU= github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= @@ -56,21 +58,21 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/klauspost/compress v1.15.10 h1:Ai8UzuomSCDw90e1qNMtb15msBXsNpH6gzkkENQNcJo= -github.com/klauspost/cpuid/v2 v2.1.1 h1:t0wUqjowdm8ezddV5k0tLWVklVuvLJpoHeb4WBdydm0= +github.com/klauspost/compress v1.15.14 h1:i7WCKDToww0wA+9qrUZ1xOjp218vfFo3nTU6UHp+gOc= +github.com/klauspost/cpuid/v2 v2.2.3 h1:sxCkb+qR91z4vsqw4vGGZlDgPz3G7gjaLyK3V8y70BU= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= -github.com/lucas-clemente/quic-go v0.29.0 h1:Vw0mGTfmWqGzh4jx/kMymsIkFK6rErFVmg+t9RLrnZE= -github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM= -github.com/marten-seemann/qtls-go1-19 v0.1.0 h1:rLFKD/9mp/uq1SYGYuVZhm83wkmU95pK5df3GufyYYU= +github.com/lucas-clemente/quic-go v0.31.1 h1:O8Od7hfioqq0PMYHDyBkxU2aA7iZ2W9pjbrWuja2YR4= +github.com/marten-seemann/qtls-go1-18 v0.1.4 h1:ogomB+lWV3Vmwiu6RTwDVTMGx+9j7SEi98e8QB35Its= +github.com/marten-seemann/qtls-go1-19 v0.1.2 h1:ZevAEqKXH0bZmoOBPiqX2h5rhQ7cbZi+X+rlq2JUbCE= github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= @@ -83,8 +85,7 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/nicksnyder/go-i18n/v2 v2.2.0 h1:MNXbyPvd141JJqlU6gJKrczThxJy+kdCNivxZpBQFkw= github.com/nicksnyder/go-i18n/v2 v2.2.0/go.mod h1:4OtLfzqyAxsscyCb//3gfqSvBc81gImX91LrZzczN1o= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo/v2 v2.6.1 h1:1xQPCjcqYw/J5LchOcp4/2q/jzJFjiAOc25chhnDw+Q= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= @@ -96,15 +97,16 @@ github.com/pires/go-proxyproto v0.6.2/go.mod h1:Odh9VFOZJCf9G8cLW5o435Xf1J95Jw9G github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/refraction-networking/utls v1.1.2 h1:a7GQauRt72VG+wtNm0lnrAaCGlyX47gEi1++dSsDBpw= +github.com/refraction-networking/utls v1.2.0 h1:U5f8wkij2NVinfLuJdFP3gCMwIHs+EzvhxmYdXgiapo= github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= -github.com/sagernet/sing v0.0.0-20220801112236-1bb95f9661fc h1:x7H64IiqyrpxPWl/KrWkknzEK4GmpqgfZeVKFVw6E/M= -github.com/sagernet/sing-shadowsocks v0.0.0-20220801112336-a91eacdd01e1 h1:RYvOc69eSNMN0dwVugrDts41Nn7Ar/C/n/fvytvFcp4= +github.com/sagernet/sing v0.1.2 h1:rp5AqY23P0klk2IaLEI0/WJsD8FTVlv9TaI2QSL6TDA= +github.com/sagernet/sing-shadowsocks v0.1.0 h1:cDmmOkA11fzVdhyCZQEeI3ozQz+59rj8+rqPb91xux4= +github.com/sagernet/wireguard-go v0.0.0-20221116151939-c99467f53f2c h1:vK2wyt9aWYHHvNLWniwijBu/n4pySypiKRhN32u/JGo= github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb h1:XfLJSPIOUX+osiMraVgIrMR27uMXnRJWGm1+GL8/63U= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= @@ -114,8 +116,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= @@ -128,32 +130,32 @@ github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e h1:5QefA066A1tF8gHIiADmOVOV5LS43gt3ONnlEl3xkwI= github.com/xtls/go v0.0.0-20220914232946-0441cf4cf837 h1:AHhUwwFJGl27E46OpdJHplZkK09m7aETNBNzhT6t15M= -github.com/xtls/xray-core v1.6.0 h1:5kqFV/BbMb0vn3ymyRIxtnJbS7ctb0Fgb7P3slaYdzI= -github.com/xtls/xray-core v1.6.0/go.mod h1:wLbZAk/dz5JEnsMZ3QeGTeKyOB50ZqKYKPGRnv0MrWI= +github.com/xtls/xray-core v1.7.2 h1:AMSnj8uZRz1l41DZ3YOcDvezPfj5qjvuG3puwD+nAgQ= +github.com/xtls/xray-core v1.7.2/go.mod h1:7w8l7/L00gS8Zg38guikohw0bGkL4ge4VegeSiPjCmQ= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.starlark.net v0.0.0-20220817180228-f738f5508c12 h1:xOBJXWGEDwU5xSDxH6macxO11Us0AH2fTa9rmsbbF7g= +go.starlark.net v0.0.0-20230105143730-d7da88764354 h1:MqQRg4vlpVc7cQoQBgQGPyP3N4FAhKlMQ/y/Akv4/xM= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM= -golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/exp v0.0.0-20220916125017-b168a2c6b86b h1:SCE/18RnFsLrjydh/R/s5EVvHoZprqEQUuoxK8q2Pc4= +golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= +golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= +golang.org/x/exp v0.0.0-20230105202349-8879d0199aa3 h1:fJwx88sMf5RXwDwziL0/Mn9Wqs+efMSo/RYcL+37W9c= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= +golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI= -golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220907140024-f12130a52804 h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -165,26 +167,28 @@ golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41 h1:ohgcoMbSofXygzo6AD2I1kz3BFmW1QArPYTtwEM3UXc= -golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +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= golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= +golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa h1:VWkrxnAx2C2hirAP+W5ADU7e/+93Yhk//ioKd2XFyDI= -google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= -google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw= -google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/genproto v0.0.0-20230106154932-a12b697841d9 h1:3wPBShTLWQnEkZ9VW/HZZ8zT/9LLtleBtq7l8SKtJIA= +google.golang.org/genproto v0.0.0-20230106154932-a12b697841d9/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= +google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= @@ -194,7 +198,6 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= @@ -207,4 +210,5 @@ gorm.io/driver/sqlite v1.3.6/go.mod h1:Sg1/pvnKtbQ7jLXxfZa+jSHvoX8hoZA8cn4xllOMT gorm.io/gorm v1.23.4/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= gorm.io/gorm v1.23.10 h1:4Ne9ZbzID9GUxRkllxN4WjJKpsHx8YbKvekVdgyWh24= gorm.io/gorm v1.23.10/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA= +gvisor.dev/gvisor v0.0.0-20220901235040-6ca97ef2ce1c h1:m5lcgWnL3OElQNVyp3qcncItJ2c0sQlSGjYK2+nJTA4= lukechampine.com/blake3 v1.1.7 h1:GgRMhmdsuK8+ii6UZFDL8Nb+VyMwadAgcJyfYHxG6n0= From d1a94446bb247423b3eda5fbad9d418f29d3cc5e Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 15:04:05 +0330 Subject: [PATCH 04/20] Update release.yml --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 88d64c0..bbc18b3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,8 @@ on: tags: - "*" workflow_dispatch: + +permissions: read-all|write-all jobs: release: From 7d8e2b7d19bada01bfd1adf7474ee415487be158 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 15:05:30 +0330 Subject: [PATCH 05/20] Update release.yml --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bbc18b3..88d64c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,8 +4,6 @@ on: tags: - "*" workflow_dispatch: - -permissions: read-all|write-all jobs: release: From 4b076951bd1c4686b2612878a8baaea4173efc58 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 21:47:33 +0330 Subject: [PATCH 06/20] Update release.yml --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 88d64c0..c9d4078 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,7 @@ on: jobs: release: + permissions: write-all runs-on: ubuntu-18.04 outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} From 75a762cd6cc318a4976d1ceaf8833af915f78f75 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 21:56:38 +0330 Subject: [PATCH 07/20] Update release.yml --- .github/workflows/release.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c9d4078..3b80031 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,6 +25,7 @@ jobs: linuxamd64build: name: build x-ui amd64 version needs: release + permissions: write-all runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v3 @@ -43,7 +44,7 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/NidukaAkalanka/Xray-core/releases/latest/download/Xray-linux-amd64.zip + wget https://github.com/graymind123/Xray-core/releases/latest/download/Xray-linux-amd64.zip unzip Xray-linux-amd64.zip rm -f Xray-linux-amd64.zip mv xray xray-linux-amd64 @@ -66,6 +67,7 @@ jobs: linuxarm64build: name: build x-ui arm64 version needs: release + permissions: write-all runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v3 @@ -86,7 +88,7 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/NidukaAkalanka/Xray-core/releases/latest/download/Xray-linux-arm64.zip + wget https://github.com/graymind123/Xray-core/releases/latest/download/Xray-linux-arm64.zip unzip Xray-linux-arm64.zip rm -f Xray-linux-arm64.zip mv xray xray-linux-arm64 @@ -109,6 +111,7 @@ jobs: linuxs390xbuild: name: build x-ui s390x version needs: release + permissions: write-all runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v3 @@ -129,7 +132,7 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/NidukaAkalanka/Xray-core/releases/latest/download/Xray-linux-s390x.zip + wget https://github.com/graymind123/Xray-core/releases/latest/download/Xray-linux-s390x.zip unzip Xray-linux-s390x.zip rm -f Xray-linux-s390x.zip geoip.dat geosite.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat From 6a0ad8d6f924ac7d50efbf0daa10a1fc80b5f1b3 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 21:59:25 +0330 Subject: [PATCH 08/20] Update release.yml --- .github/workflows/release.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3b80031..6ff1fb4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,6 @@ jobs: linuxamd64build: name: build x-ui amd64 version needs: release - permissions: write-all runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v3 @@ -67,7 +66,6 @@ jobs: linuxarm64build: name: build x-ui arm64 version needs: release - permissions: write-all runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v3 @@ -111,7 +109,6 @@ jobs: linuxs390xbuild: name: build x-ui s390x version needs: release - permissions: write-all runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v3 From 1ecc2444f1cb6d51e6acff7c4937a069de832170 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 22:20:52 +0330 Subject: [PATCH 09/20] Update release.yml --- .github/workflows/release.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ff1fb4..3b044f4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,13 +43,12 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/graymind123/Xray-core/releases/latest/download/Xray-linux-amd64.zip - unzip Xray-linux-amd64.zip - rm -f Xray-linux-amd64.zip - mv xray xray-linux-amd64 - rm -f geoip.dat geosite.dat + wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-64.zip + unzip Xray-linux-64.zip + rm -f Xray-linux-64.zip geoip.dat geosite.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat + mv xray xray-linux-amd64 cd .. cd .. - name: package @@ -86,13 +85,12 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/graymind123/Xray-core/releases/latest/download/Xray-linux-arm64.zip - unzip Xray-linux-arm64.zip - rm -f Xray-linux-arm64.zip - mv xray xray-linux-arm64 - rm -f geoip.dat geosite.dat + wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-arm64-v8a.zip + unzip Xray-linux-arm64-v8a.zip + rm -f Xray-linux-arm64-v8a.zip geoip.dat geosite.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat + mv xray xray-linux-arm64 cd .. cd .. - name: package @@ -129,7 +127,7 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/graymind123/Xray-core/releases/latest/download/Xray-linux-s390x.zip + wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-s390x.zip unzip Xray-linux-s390x.zip rm -f Xray-linux-s390x.zip geoip.dat geosite.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat From 068b3482236bf4687b399394d5f4dc551d40ff4d Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 22:34:33 +0330 Subject: [PATCH 10/20] Update release.yml --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3b044f4..baf827c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,7 +56,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PAT }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-amd64.tar.gz @@ -98,7 +98,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PAT }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-arm64.tar.gz @@ -140,7 +140,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PAT}} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-s390x.tar.gz From 78c57bb962ca54909a462a4f415d0026d9e43759 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 22:38:05 +0330 Subject: [PATCH 11/20] Update release.yml --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index baf827c..055cf30 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,7 +56,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.PAT }} + GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-amd64.tar.gz @@ -98,7 +98,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.PAT }} + GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-arm64.tar.gz @@ -140,7 +140,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.PAT}} + GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-s390x.tar.gz From 80881ad8c627a7fd06ecaa563b9a98292cd53f86 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 22:57:32 +0330 Subject: [PATCH 12/20] Update release.yml --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 055cf30..3b044f4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,7 +56,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-amd64.tar.gz @@ -98,7 +98,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-arm64.tar.gz @@ -140,7 +140,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-s390x.tar.gz From d63d56b770c7d4b84577e0127997b1491496225d Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 23:07:48 +0330 Subject: [PATCH 13/20] Update release.yml --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3b044f4..3eace16 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,7 +56,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PAT }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-amd64.tar.gz @@ -98,7 +98,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PAT }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-arm64.tar.gz @@ -140,7 +140,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PAT }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-s390x.tar.gz From 94738616fc1311134e9da32d1139ed15ffd28669 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 23:11:58 +0330 Subject: [PATCH 14/20] Update release.yml --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3eace16..dbcfb53 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,7 +56,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.PAT }} + GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-amd64.tar.gz @@ -98,7 +98,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.PAT }} + GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-arm64.tar.gz @@ -140,7 +140,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.PAT }} + GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-s390x.tar.gz From 2150d57e23160e4251afc4cd915f6fabc086f918 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 23:20:44 +0330 Subject: [PATCH 15/20] Update release.yml --- .github/workflows/release.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dbcfb53..88d64c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,6 @@ on: jobs: release: - permissions: write-all runs-on: ubuntu-18.04 outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} @@ -43,12 +42,13 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-64.zip - unzip Xray-linux-64.zip - rm -f Xray-linux-64.zip geoip.dat geosite.dat + wget https://github.com/NidukaAkalanka/Xray-core/releases/latest/download/Xray-linux-amd64.zip + unzip Xray-linux-amd64.zip + rm -f Xray-linux-amd64.zip + mv xray xray-linux-amd64 + rm -f geoip.dat geosite.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat - mv xray xray-linux-amd64 cd .. cd .. - name: package @@ -56,7 +56,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-amd64.tar.gz @@ -85,12 +85,13 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-arm64-v8a.zip - unzip Xray-linux-arm64-v8a.zip - rm -f Xray-linux-arm64-v8a.zip geoip.dat geosite.dat + wget https://github.com/NidukaAkalanka/Xray-core/releases/latest/download/Xray-linux-arm64.zip + unzip Xray-linux-arm64.zip + rm -f Xray-linux-arm64.zip + mv xray xray-linux-arm64 + rm -f geoip.dat geosite.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat - mv xray xray-linux-arm64 cd .. cd .. - name: package @@ -98,7 +99,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-arm64.tar.gz @@ -127,7 +128,7 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-s390x.zip + wget https://github.com/NidukaAkalanka/Xray-core/releases/latest/download/Xray-linux-s390x.zip unzip Xray-linux-s390x.zip rm -f Xray-linux-s390x.zip geoip.dat geosite.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat @@ -140,7 +141,7 @@ jobs: - name: Upload to release uses: actions/upload-release-asset@v1 env: - GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.release.outputs.upload_url }} asset_path: x-ui-linux-s390x.tar.gz From e77c8c0157f2be610933ad500a88396470045042 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Thu, 12 Jan 2023 23:25:00 +0330 Subject: [PATCH 16/20] Update release.yml --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 88d64c0..b43fec7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,7 @@ on: jobs: release: + permissions: write-all runs-on: ubuntu-18.04 outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} @@ -21,6 +22,7 @@ jobs: release_name: ${{ github.ref }} draft: false prerelease: false + allowUpdates: true linuxamd64build: name: build x-ui amd64 version needs: release From e4a54214f9e66c1beebd87294b8ca916b38f9a52 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Fri, 13 Jan 2023 09:54:24 +0330 Subject: [PATCH 17/20] Update web.go Run Telegram bot to begin receiving new updates --- web/web.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/web/web.go b/web/web.go index 0b37a81..aa101bd 100644 --- a/web/web.go +++ b/web/web.go @@ -394,6 +394,19 @@ func (s *Server) Start() (err error) { } s.listener = listener + isTgbotenabled, err := s.settingService.GetTgbotenabled() + if (err == nil) && (isTgbotenabled) { + isTelegramEnable = true + + go func() { + s.telegramService.StartRun() + time.Sleep(time.Second * 2) + }() + + } else { + isTelegramEnable = false + } + s.startTask() s.httpServer = &http.Server{ From 85eb30398f36373f58346a5006783506aceeada0 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Fri, 13 Jan 2023 10:25:27 +0330 Subject: [PATCH 18/20] Update release.yml --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b43fec7..88d64c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,6 @@ on: jobs: release: - permissions: write-all runs-on: ubuntu-18.04 outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} @@ -22,7 +21,6 @@ jobs: release_name: ${{ github.ref }} draft: false prerelease: false - allowUpdates: true linuxamd64build: name: build x-ui amd64 version needs: release From 0f9232fcd1955dfdb2cb3b1abb5548c3ac88f825 Mon Sep 17 00:00:00 2001 From: graymind123 <75488588+graymind123@users.noreply.github.com> Date: Fri, 13 Jan 2023 10:26:14 +0330 Subject: [PATCH 19/20] Update release.yml --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 88d64c0..c9d4078 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,7 @@ on: jobs: release: + permissions: write-all runs-on: ubuntu-18.04 outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} From ac0f252c3623b60bd13b676609b9386416078279 Mon Sep 17 00:00:00 2001 From: Hamed Ap <109583222+HamedAp@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:15:32 +0330 Subject: [PATCH 20/20] Update README-fa.md --- README-fa.md | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 135 insertions(+), 2 deletions(-) diff --git a/README-fa.md b/README-fa.md index 1b11dd7..bd69728 100644 --- a/README-fa.md +++ b/README-fa.md @@ -1,3 +1,136 @@ -پنل فارسی X-UI -به زودی توضیحات فارسی اضافه میشود. + +یکی دیگر از نسخه های ترجمه شده به انگلیسی و فارسی X-UI. همراه با تعدادی ویژگی های پیشرفته تر پیاده سازی شده است. + + +# امکانات + +- همه ی قسمت ها به صورت انگلیسی و فارسی (تنظیمات سمت سرور + رابط کاربری سمت سرور + رابط کاربری وب) +- نظارت بر وضعیت سیستم +- پشتیبانی از پروتکل چند کاربره، web page visualization operation +- چندین UUID را می توان به عنوان کاربر ها برای تنظیمات Vmess و Vless با QR codes مجزا اضافه کرد +- محدود کردن IP +- پروتکل های پشتیبانی شده: vmess, vless, trojan, shadowsocks, dokodemo-door, socks, http +- پشتیبانی برای تنظیم حالت های بیشتر انتقال +- آمار ترافیک، محدود کردن ترافیک، محدودیت با زمان انقضا +- قالب های پیکربندی xray قابل تنظیم +- پشتیبانی از پنل دسترسی https (نام دامنه + گواهی ssl خود را می توان استفاده کرد) +- ربات تلگرام برای توابع اولیه و اعلان ها +- پشتیبانی از برنامه گواهینامه SSL با یک کلیک و تمدید خودکار +- می توان به طور ایمن از v2-ui مهاجرت کرد +- می تواند به طور ایمن از نسخه قبلی X-UI (CH/EN) بدون از دست دادن خروجی به روزرسانی شود +- برای موارد پیکربندی پیشرفته تر، برای جزئیات به پنل مراجعه کنید + +# پیش نمایش پنل +![](media/Web.png) +![](media/PostInstallation.png) +# پیش نمایش بات تلگرام (در حال حاظر، فقط برای نسخه V0.2) +![](media/TGBot1.PNG)![](media/TGBot2.PNG) + +# نصب و ارتقاء تک دستوره + +``` +bash <(curl -Ls https://raw.githubusercontent.com/NidukaAkalanka/x-ui-english/master/install.sh) +```` +## نصب و ارتقاء دستی + +1. ابتدا سیستم خود را آپدیت کنید و دستورات زیر را اجرا کنید. (باید مجوزهای کاربر روت را داشته باشد) +```` +sudo su +cd +```` +2. سپس آخرین بسته فشرده را از https://github.com/NidukaAkalanka/x-ui-english/releases/latest دانلود کنید، به طور معمول معماری «amd64» را انتخاب کنید. + +در پایان دستورات زیر را به ترتیب اجرا کنید: + +> اگر معماری cpu سرور شما "amd64" نیست، "*" را در دستور با معماری دیگری جایگزین کنید درعیر اینصورت همان "amd64" را وارد کنید. +```` +rm x-ui/ /usr/local/x-ui/ /usr/bin/x-ui -rf +tar zxvf x-ui-linux-amd64.tar.gz +chmod +x x-ui/x-ui x-ui/bin/xray-linux-* x-ui/x-ui.sh +cp x-ui/x-ui.sh /usr/bin/x-ui +cp -f x-ui/x-ui.service /etc/systemd/system/ +mv x-ui/ /usr/local/ +systemctl daemon-reload +systemctl enable x-ui +systemctl restart x-ui +```` + +## نصب با استفاده از docker +1. ابتدا docker را نصب کنید +```shell +curl -fsSL https://get.docker.com | sh +```` +2. سپس x-ui را نصب کنید +```shell +mkdir x-ui && cd x-ui +docker run -itd --network=host \ + -v $PWD/db/:/etc/x-ui/ \ + -v $PWD/cert/:/root/cert/ \ + --name x-ui --restart=unless-stopped \ + enwaiax/x-ui:latest +```` + +> ایمیج خود را بسازید + ```shell +docker build -t x-ui . +```` + + +## برنامه گواهی SSL +این اسکریپت دارای 3 عملکرد داخلی گواهینامه SSL است. استفاده از یک زیر دامنه توصیه می شود. +- ### روش اول (توصیه می شود. تقریباً برای هر TLD از جمله TLD های رایگان Freenom کار می کن) +برای استفاده از این روش برای درخواست گواهی، تنها نیاز است که آدرس های IP سرور شما به درستی به دامنه یا زیر دامنه ای که متعلق به شماست اشاره شود. (گزینه سوم اسکریپت Acme.sh) + +- ### روش دوم و سوم (اگر روش بالا ناموفق بود استفاده کنید. برای TLD های رایگان Freenom کار نمی کند) +این به اندازه مورد اول برای مبتدیان نیست. برای استفاده از این روش، تمام پیش نیازهای زیر باید رعایت شود: +- دانستن آدرس ایمیل ثبت شده در Cloudflare +- دانستن کلید Cloudflare Global API +- داشتن یک نام دامنه که توسط Cloudflare به سرور فعلی شما حل می شود + +نحوه دریافت Cloudflare Global API Key: + +1- از پیوند https://dash.cloudflare.com/profile/api-tokens دیدن کنید +2- روی View Global API Key کلیک کنید (تصویر زیر را ببینید) + ![](media/APIKey1.PNG) + +3- ممکن است مجبور شوید حساب خود را مجدداً احراز هویت کنید. پس از آن، کلید API نشان داده می شود (تصویر زیر را ببینید) + ![](media/APIKey2.png) + +هنگام استفاده، فقط "نام دامنه"، "ایمیل"، "کلید API" را وارد کنید، نمودار به شرح زیر است: + ![](media/DetailEnter.png) +> موارد احتیاط: +- اسکریپت از DNS API برای درخواست گواهی استفاده می کند +- به طور پیش فرض از Let'sEncrypt به عنوان طرف CA استفاده کنید. می توانید بین Zerossl.com یا Buypass.com یکی را انتخاب کنید +- دایرکتوری نصب گواهی root/ directory/ است +- گواهینامه های درخواست شده توسط این اسکریپت همه گواهینامه های نام دامنه عمومی هستند + +## محدودیت IP و چند کاربر در همان پورت +تقریباً چیزی برای توضیح در مورد چند کاربر بودن وجود ندارد.شما QR codes جداگانه به همراه محاسبه ترافیک، تنظیم تاریخ انقضا و موارد دیگر خواهید داشت. + +**محدودیت IP به شرح زیر عمل می کند:** + +**مورد:** +- یک کلاینت وجود دارد که از پیکربندی v2ray با محدودیت IP = 1 استفاده می کند. +- او در حال حاضر از طریق رایانه شخصی خود با Wi-Fi (اینترنت ثابت) به سرور v2ray متصل است. +- سپس سعی می کند با استفاده از همان پیکربندی v2ray از تلفن همراه خود با اینترنت 4G **در همان زمان** به سرور متصل شود. + +**نتیجه:** +- هیچ تاثیری روی اتصال رایانه شخصی او وجود نخواهد داشت +- در موبایلش حدود 10 ثانیه با موفقیت وصل می شود +- سپس اتصال اینترنت موبایل وی از طریق v2ray قطع می شود. بازگشت **ERR_CONNECTION_CLOSED**. + + +**مورد:** +- پس از مدتی، همان کلاینت که در بالا ذکر شد، کامپیوتر خود را از v2ray قطع می کند +- اما موبایل خود را در تلاش برای اتصال نگه می دارد + +**نتیجه:** +- پس از گذشت حدود 10 ثانیه از قطع کردن رایانه شخصی، اتصال تلفن همراه خود را دوباره به دست می آورد. + +**اگر یک نصب جدیدی باشد، این توابع، به خصوص محدود کردن IP، بی عیب و نقص کار خواهد کرد. اما اگر نسخه شما یک ارتقا باشد، ممکن است آن ها کار نکنند در حالی که وضعیت XRAY: اجرا نمی شود، باشد. در چنین مواردی لطفاً [اینجا](https://github.com/NidukaAkalanka/x-ui-english/discussions/27) مراجعه کنید. + +## سیستم عامل های پیشنهادی +- CentOS 7+ +- Ubuntu 16+ +- Debian 8+