From b0aaece6eb1f7c31a2eaa7870aa990151df84c04 Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Wed, 18 Oct 2023 13:22:07 +0330 Subject: [PATCH] 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" }