From b0aaece6eb1f7c31a2eaa7870aa990151df84c04 Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Wed, 18 Oct 2023 13:22:07 +0330 Subject: [PATCH 1/7] remove iran.dat so after this you need to click on "reset to default configuration" --- .github/workflows/release.yml | 7 ++- DockerInit.sh | 7 ++- .../traffic+block-ads+ipv4-google.json | 4 +- media/configs/traffic+block-ads+warp.json | 4 +- media/configs/traffic+block-iran-domains.json | 6 +-- media/configs/traffic+block-iran-ip.json | 3 +- media/configs/traffic.json | 1 - web/html/xui/settings.html | 10 ++-- web/service/config.json | 1 - web/service/server.go | 51 ++++--------------- x-ui.sh | 9 ++-- xray/process.go | 4 -- 12 files changed, 29 insertions(+), 78 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7eb93dec..1446f787 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -55,12 +55,11 @@ jobs: unzip Xray-linux-arm64-v8a.zip rm -f Xray-linux-arm64-v8a.zip fi - rm -f geoip.dat geosite.dat iran.dat + rm -f geoip.dat geosite.dat geoip_IR.dat geosite_IR.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 - wget -O geoip_ch.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat - wget -O geosite_ch.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat - wget https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat + wget -O geoip_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat + wget -O geosite_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat mv xray xray-linux-${{ matrix.platform }} cd ../.. diff --git a/DockerInit.sh b/DockerInit.sh index 3cc31a3d..1de867af 100755 --- a/DockerInit.sh +++ b/DockerInit.sh @@ -20,11 +20,10 @@ cd build/bin wget "https://github.com/XTLS/Xray-core/releases/download/v1.8.4/Xray-linux-${ARCH}.zip" unzip "Xray-linux-${ARCH}.zip" -rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat iran.dat +rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat geoip_IR.dat geosite_IR.dat mv xray "xray-linux-${FNAME}" 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 -wget -O geoip_ch.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat -wget -O geosite_ch.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat -wget "https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat" +wget -O geoip_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat +wget -O geosite_IR.dat https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat diff --git a/media/configs/traffic+block-ads+ipv4-google.json b/media/configs/traffic+block-ads+ipv4-google.json index ced64340..a06813e3 100644 --- a/media/configs/traffic+block-ads+ipv4-google.json +++ b/media/configs/traffic+block-ads+ipv4-google.json @@ -1,7 +1,6 @@ { "log": { "loglevel": "warning", - "access": "./access.log", "error": "./error.log" }, "api": { @@ -81,8 +80,7 @@ "type": "field", "outboundTag": "blocked", "domain": [ - "geosite:category-ads-all", - "ext:iran.dat:ads" + "ext:geosite_IR.dat:category-ads-all" ] }, { diff --git a/media/configs/traffic+block-ads+warp.json b/media/configs/traffic+block-ads+warp.json index a4d8c234..1d3fdaf8 100644 --- a/media/configs/traffic+block-ads+warp.json +++ b/media/configs/traffic+block-ads+warp.json @@ -1,7 +1,6 @@ { "log": { "loglevel": "warning", - "access": "./access.log", "error": "./error.log" }, "api": { @@ -86,8 +85,7 @@ "type": "field", "outboundTag": "blocked", "domain": [ - "geosite:category-ads-all", - "ext:iran.dat:ads" + "ext:geosite_IR.dat:category-ads-all" ] }, { diff --git a/media/configs/traffic+block-iran-domains.json b/media/configs/traffic+block-iran-domains.json index 063f343b..96de15fd 100644 --- a/media/configs/traffic+block-iran-domains.json +++ b/media/configs/traffic+block-iran-domains.json @@ -1,7 +1,6 @@ { "log": { "loglevel": "warning", - "access": "./access.log", "error": "./error.log" }, "api": { @@ -75,9 +74,8 @@ "outboundTag": "blocked", "domain": [ "regexp:.*\\.ir$", - "ext:iran.dat:ir", - "ext:iran.dat:other", - "geosite:category-ir" + "regexp:.*\\.xn--mgba3a4f16a$", + "ext:geosite_IR.dat:ir" ] } ] diff --git a/media/configs/traffic+block-iran-ip.json b/media/configs/traffic+block-iran-ip.json index f994931e..5e7d3f29 100644 --- a/media/configs/traffic+block-iran-ip.json +++ b/media/configs/traffic+block-iran-ip.json @@ -1,7 +1,6 @@ { "log": { "loglevel": "warning", - "access": "./access.log", "error": "./error.log" }, "api": { @@ -61,7 +60,7 @@ "outboundTag": "blocked", "ip": [ "geoip:private", - "geoip:ir" + "ext:geoip_IR.dat:ir" ] }, { diff --git a/media/configs/traffic.json b/media/configs/traffic.json index 9d8d2d9f..63c3537e 100644 --- a/media/configs/traffic.json +++ b/media/configs/traffic.json @@ -1,7 +1,6 @@ { "log": { "loglevel": "warning", - "access": "./access.log", "error": "./error.log" }, "api": { diff --git a/web/html/xui/settings.html b/web/html/xui/settings.html index 47e3405d..97b91bf9 100644 --- a/web/html/xui/settings.html +++ b/web/html/xui/settings.html @@ -472,14 +472,12 @@ ips: { local: ["geoip:private"], cn: ["geoip:cn"], - ir: ["geoip:ir","ext:geoip_ch.dat:arvancloud","ext:geoip_ch.dat:derakcloud","ext:geoip_ch.dat:iranserver"], + ir: ["ext:geoip_IR.dat:ir","ext:geoip_IR.dat:arvancloud","ext:geoip_IR.dat:derakcloud","ext:geoip_IR.dat:iranserver"], ru: ["geoip:ru"], }, domains: { ads: [ - "geosite:category-ads-all", - "ext:iran.dat:ads", - "ext:geosite_ch.dat:ads" + "ext:geosite_IR.dat:category-ads-all" ], speedtest: ["geosite:speedtest"], openai: ["geosite:openai"], @@ -497,9 +495,7 @@ ir: [ "regexp:.*\\.ir$", "regexp:.*\\.xn--mgba3a4f16a$", // .ایران - "ext:iran.dat:ir", - "ext:iran.dat:other", - "geosite:category-ir" + "ext:geosite_IR.dat:ir" // have rules to bypass all .ir domains. ] }, familyProtectDNS: { diff --git a/web/service/config.json b/web/service/config.json index 57dfa323..c846d590 100644 --- a/web/service/config.json +++ b/web/service/config.json @@ -1,7 +1,6 @@ { "log": { "loglevel": "warning", - "access": "./access.log", "error": "./error.log" }, "api": { diff --git a/web/service/server.go b/web/service/server.go index a56be10d..d88fa098 100644 --- a/web/service/server.go +++ b/web/service/server.go @@ -376,50 +376,21 @@ func (s *ServerService) UpdateXray(version string) error { return err } - downloadFile := func(fileName string, url string) error { - os.Remove(fileName) - file, err := os.OpenFile(fileName, os.O_CREATE|os.O_RDWR|os.O_TRUNC, fs.ModePerm) - if err != nil { - return err - } - defer file.Close() - resp, err := http.Get(url) - if err != nil { - return err - } - defer resp.Body.Close() - if resp.StatusCode != http.StatusOK { - return fmt.Errorf("download file failed: %s", resp.Status) - } - _, err = io.Copy(file, resp.Body) + err = copyZipFile("xray", xray.GetBinaryPath()) + if err != nil { + return err + } + err = copyZipFile("geosite.dat", xray.GetGeositePath()) + if err != nil { + return err + } + err = copyZipFile("geoip.dat", xray.GetGeoipPath()) + if err != nil { return err } - copyFiles := map[string]string{ - "xray": xray.GetBinaryPath(), - "geosite.dat": xray.GetGeositePath(), - "geoip.dat": xray.GetGeoipPath(), - } - - downloadFiles := map[string]string{ - xray.GetIranPath(): "https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat", - } - - for fileName, filePath := range copyFiles { - err := copyZipFile(fileName, filePath) - if err != nil { - return err - } - } - - for fileName, filePath := range downloadFiles { - err := downloadFile(fileName, filePath) - if err != nil { - return err - } - } - return nil + } func (s *ServerService) GetLogs(count string, level string, syslog string) []string { diff --git a/x-ui.sh b/x-ui.sh index 58351c78..51c79cc1 100644 --- a/x-ui.sh +++ b/x-ui.sh @@ -519,14 +519,13 @@ update_geo() { systemctl stop x-ui cd ${binFolder} - rm -f geoip.dat geosite.dat iran.dat + rm -f geoip.dat geosite.dat geoip_IR.dat geosite_IR.dat wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat - wget -O geoip_ch.dat -N https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat - wget -O geosite_ch.dat -N https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat - wget -N https://github.com/MasterKia/iran-hosted-domains/releases/latest/download/iran.dat + wget -O geoip_IR.dat -N https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geoip.dat + wget -O geosite_IR.dat -N https://github.com/chocolate4u/Iran-v2ray-rules/releases/latest/download/geosite.dat systemctl start x-ui - echo -e "${green}Geosite.dat + Geoip.dat + Iran.dat have been updated successfully in bin folder '${binfolder}'!${plain}" + echo -e "${green}Geosite.dat + Geoip.dat + geoip_IR.dat + geosite_IR.dat have been updated successfully in bin folder '${binfolder}'!${plain}" before_show_menu } diff --git a/xray/process.go b/xray/process.go index 315d3ed0..2e545fba 100644 --- a/xray/process.go +++ b/xray/process.go @@ -42,10 +42,6 @@ func GetGeoipPath() string { return config.GetBinFolderPath() + "/geoip.dat" } -func GetIranPath() string { - return config.GetBinFolderPath() + "/iran.dat" -} - func GetIPLimitLogPath() string { return config.GetLogFolder() + "/3xipl.log" } From 44970e79b4947270889b0c829f81316fb96c7478 Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Wed, 18 Oct 2023 13:27:30 +0330 Subject: [PATCH 2/7] update dependencies --- go.mod | 16 ++++++++-------- go.sum | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index 39816c1b..076b1e95 100644 --- a/go.mod +++ b/go.mod @@ -18,27 +18,27 @@ require ( github.com/xtls/xray-core v1.8.4 go.uber.org/atomic v1.11.0 golang.org/x/text v0.13.0 - google.golang.org/grpc v1.58.3 + google.golang.org/grpc v1.59.0 gorm.io/driver/sqlite v1.5.4 gorm.io/gorm v1.25.5 ) require ( github.com/BurntSushi/toml v1.3.2 // indirect - github.com/andybalholm/brotli v1.0.5 // indirect - github.com/bytedance/sonic v1.10.1 // indirect + github.com/andybalholm/brotli v1.0.6 // indirect + github.com/bytedance/sonic v1.10.2 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.0 // indirect github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect github.com/fasthttp/router v1.4.20 // indirect github.com/francoispqt/gojay v1.2.13 // indirect - github.com/gabriel-vasile/mimetype v1.4.2 // indirect + github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gaukas/godicttls v0.0.4 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.15.4 // indirect + github.com/go-playground/validator/v10 v10.15.5 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect @@ -51,7 +51,7 @@ require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.16.7 // indirect + github.com/klauspost/compress v1.17.1 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/kr/text v0.2.0 // indirect github.com/leodido/go-urn v1.2.4 // indirect @@ -81,7 +81,7 @@ require ( github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.50.0 // indirect - github.com/xtls/reality v0.0.0-20230828171259-e426190d57f6 // indirect + github.com/xtls/reality v0.0.0-20231010003020-da6c695a34db // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go4.org/netipx v0.0.0-20230824141953-6213f710f925 // indirect golang.org/x/arch v0.4.0 // indirect @@ -92,7 +92,7 @@ require ( golang.org/x/sys v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.12.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gvisor.dev/gvisor v0.0.0-20230822212503-5bf4e5f98744 // indirect diff --git a/go.sum b/go.sum index a369641d..c91e2ee8 100644 --- a/go.sum +++ b/go.sum @@ -15,16 +15,16 @@ github.com/Calidity/gin-sessions v1.3.1 h1:nF3dCBWa7TZ4j26iYLwGRmzZy9YODhWoOS3fm github.com/Calidity/gin-sessions v1.3.1/go.mod h1:I0+QE6qkO50TeN/n6If6novvxHk4Isvr23U8EdvPdns= github.com/Workiva/go-datastructures v1.1.1 h1:9G5u1UqKt6ABseAffHGNfbNQd7omRlWE5QaxNruzhE0= github.com/Workiva/go-datastructures v1.1.1/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= -github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= -github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= +github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= -github.com/bytedance/sonic v1.10.1 h1:7a1wuFXL1cMy7a3f7/VFcEtriuXQnUBhtoVfOZiaysc= -github.com/bytedance/sonic v1.10.1/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= +github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE= +github.com/bytedance/sonic v1.10.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0= @@ -47,8 +47,8 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk= github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= -github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= +github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= +github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk= github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -71,8 +71,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.15.4 h1:zMXza4EpOdooxPel5xDqXEdXG5r+WggpvnAKMsalBjs= -github.com/go-playground/validator/v10 v10.15.4/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/go-playground/validator/v10 v10.15.5 h1:LEBecTWb/1j5TNY1YYG2RcOUN3R7NLylN+x8TTueE24= +github.com/go-playground/validator/v10 v10.15.5/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= @@ -127,8 +127,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.1 h1:NE3C767s2ak2bweCZo3+rdP4U/HoyVXLv/X9f2gPS5g= +github.com/klauspost/compress v1.17.1/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -278,8 +278,8 @@ github.com/valyala/fasthttp v1.50.0 h1:H7fweIlBm0rXLs2q0XbalvJ6r0CUPFWK3/bB4N13e github.com/valyala/fasthttp v1.50.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= -github.com/xtls/reality v0.0.0-20230828171259-e426190d57f6 h1:T+YCYGfFdzyaKTDCdZn/hEiKvsw6yUfd+e4hze0rCUw= -github.com/xtls/reality v0.0.0-20230828171259-e426190d57f6/go.mod h1:rkuAY1S9F8eI8gDiPDYvACE8e2uwkyg8qoOTuwWov7Y= +github.com/xtls/reality v0.0.0-20231010003020-da6c695a34db h1:RhSYAydV4Y52dMVSIj30aIWetFampMaXdIqUe1ow/9o= +github.com/xtls/reality v0.0.0-20231010003020-da6c695a34db/go.mod h1:rkuAY1S9F8eI8gDiPDYvACE8e2uwkyg8qoOTuwWov7Y= github.com/xtls/xray-core v1.8.4 h1:YEoY3iLx/5zoNbt5HORG5LtPyzwICInFfoS+oPkYDIw= github.com/xtls/xray-core v1.8.4/go.mod h1:GGD9elFSHa4IqOArW8gzMsEksPIqK/jdNLo8RcSMfnI= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -412,14 +412,14 @@ google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoA google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb h1:Isk1sSH7bovx8Rti2wZK0UZF6oraBDK74uoyLEEVFN0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b h1:ZlWIi1wSK56/8hn4QcBp/j9M7Gt3U/3hZw3mC7vDICo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= -google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= 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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= From 7c1ecef58986fcb6b08537abeebdf671b70c7367 Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Wed, 18 Oct 2023 13:27:50 +0330 Subject: [PATCH 3/7] add chocolate4u to readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1174977a..07a83c51 100644 --- a/README.md +++ b/README.md @@ -338,6 +338,7 @@ XUI_BIN_FOLDER="bin" XUI_DB_FOLDER="/etc/x-ui" go build main.go # Acknowledgment +- [Iran v2ray rules](https://github.com/chocolate4u/Iran-v2ray-ruless) (License: **GPL-3.0**): _Enhanced v2ray/xray and v2ray/xray-clients routing rules with built-in Iranian domains and a focus on security and adblocking._ - [Iran Hosted Domains](https://github.com/bootmortis/iran-hosted-domains) (License: **MIT**): _A comprehensive list of Iranian domains and services that are hosted within the country._ - [PersianBlocker](https://github.com/MasterKia/PersianBlocker) (License: **AGPLv3**): _An optimal and extensive list to block ads and trackers on Persian websites._ From 9f3efff88cf19cc5bb75724ee882d72578b96d49 Mon Sep 17 00:00:00 2001 From: emirjorge <117597846+emirjorge@users.noreply.github.com> Date: Wed, 18 Oct 2023 05:00:37 -0500 Subject: [PATCH 4/7] Corrected Tittle Spanish :D (#1136) --- web/assets/js/langs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/assets/js/langs.js b/web/assets/js/langs.js index f590991e..59f0696f 100644 --- a/web/assets/js/langs.js +++ b/web/assets/js/langs.js @@ -25,7 +25,7 @@ const supportLangs = [ icon: '🇻🇳', }, { - name: 'española', + name: 'Español', value: 'es-ES', icon: '🇪🇸', }, From 1d4b5975b3fccc16801608dfe25c399b9a31079d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 13:31:05 +0330 Subject: [PATCH 5/7] Bump actions/checkout from 4.1.0 to 4.1.1 (#1137) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/docker.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8a73c6a6..caf55ec9 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Check out the code - uses: actions/checkout@v4.1.0 + uses: actions/checkout@v4.1.1 - name: Set up QEMU uses: docker/setup-qemu-action@v3.0.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1446f787..75d2aa78 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout repository - uses: actions/checkout@v4.1.0 + uses: actions/checkout@v4.1.1 - name: Setup Go uses: actions/setup-go@v4.1.0 From 6e6424a0852ddc8cb92bb744c63859a2093fbe54 Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Wed, 18 Oct 2023 13:39:37 +0330 Subject: [PATCH 6/7] v1.7.9 --- README.md | 4 ++-- config/version | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 07a83c51..613e0afd 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install. # Install custom version -To install your desired version you can add the version to the end of install command. Example for ver `v1.7.8`: +To install your desired version you can add the version to the end of install command. Example for ver `v1.7.9`: ``` -bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v1.7.8 +bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v1.7.9 ``` # SSL diff --git a/config/version b/config/version index 25a6ced8..cb1ad9b4 100644 --- a/config/version +++ b/config/version @@ -1 +1 @@ -1.7.8 \ No newline at end of file +1.7.9 \ No newline at end of file From 8e21d36bdcdab96f1a3207a56edac8954118b067 Mon Sep 17 00:00:00 2001 From: Ho3ein Date: Wed, 18 Oct 2023 14:01:38 +0330 Subject: [PATCH 7/7] Update README.md --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 613e0afd..761d9701 100644 --- a/README.md +++ b/README.md @@ -209,6 +209,16 @@ If you want to use routing to WARP follow steps as below: 1. Use the `x-ui` command inside the shell. 2. Select `IP Limit Management`. 3. Choose the appropriate options based on your needs. + + - make sure you have access.log on your Xray Configuration + + ```sh + "log": { + "loglevel": "warning", + "access": "./access.log", + "error": "./error.log" + }, + ``` @@ -338,7 +348,7 @@ XUI_BIN_FOLDER="bin" XUI_DB_FOLDER="/etc/x-ui" go build main.go # Acknowledgment -- [Iran v2ray rules](https://github.com/chocolate4u/Iran-v2ray-ruless) (License: **GPL-3.0**): _Enhanced v2ray/xray and v2ray/xray-clients routing rules with built-in Iranian domains and a focus on security and adblocking._ +- [Iran v2ray rules](https://github.com/chocolate4u/Iran-v2ray-rules) (License: **GPL-3.0**): _Enhanced v2ray/xray and v2ray/xray-clients routing rules with built-in Iranian domains and a focus on security and adblocking._ - [Iran Hosted Domains](https://github.com/bootmortis/iran-hosted-domains) (License: **MIT**): _A comprehensive list of Iranian domains and services that are hosted within the country._ - [PersianBlocker](https://github.com/MasterKia/PersianBlocker) (License: **AGPLv3**): _An optimal and extensive list to block ads and trackers on Persian websites._