Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-04-19 21:42:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

remove iran.dat

Browse source 
so after this you need to click on "reset to default configuration"
This commit is contained in:
MHSanaei 2023-10-18 13:22:07 +03:30
parent c0ef791f01
commit b0aaece6eb
12 changed files with 29 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/release.yml vendored
View file

@ -55,12 +55,11 @@ jobs:
unzip Xray-linux-arm64-v8a.zip unzip Xray-linux-arm64-v8a.zip
rm -f Xray-linux-arm64-v8a.zip rm -f Xray-linux-arm64-v8a.zip
fi 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/geoip.dat
wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.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 geoip_IR.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 -O geosite_IR.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
mv xray xray-linux-${{ matrix.platform }} mv xray xray-linux-${{ matrix.platform }}
cd ../.. cd ../..

7
DockerInit.sh
View file

@ -20,11 +20,10 @@ cd build/bin
wget "https://github.com/XTLS/Xray-core/releases/download/v1.8.4/Xray-linux-${ARCH}.zip" wget "https://github.com/XTLS/Xray-core/releases/download/v1.8.4/Xray-linux-${ARCH}.zip"
unzip "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}" 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/geoip.dat
wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.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 geoip_IR.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 -O geosite_IR.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"

4
media/configs/traffic+block-ads+ipv4-google.json
View file

@ -1,7 +1,6 @@
{ {
"log": { "log": {
"loglevel": "warning", "loglevel": "warning",
"access": "./access.log",
"error": "./error.log" "error": "./error.log"
}, },
"api": { "api": {
@ -81,8 +80,7 @@
"type": "field", "type": "field",
"outboundTag": "blocked", "outboundTag": "blocked",
"domain": [ "domain": [
"geosite:category-ads-all", "ext:geosite_IR.dat:category-ads-all"
"ext:iran.dat:ads"
] ]
}, },
{ {

4
media/configs/traffic+block-ads+warp.json
View file

@ -1,7 +1,6 @@
{ {
"log": { "log": {
"loglevel": "warning", "loglevel": "warning",
"access": "./access.log",
"error": "./error.log" "error": "./error.log"
}, },
"api": { "api": {
@ -86,8 +85,7 @@
"type": "field", "type": "field",
"outboundTag": "blocked", "outboundTag": "blocked",
"domain": [ "domain": [
"geosite:category-ads-all", "ext:geosite_IR.dat:category-ads-all"
"ext:iran.dat:ads"
] ]
}, },
{ {

6
media/configs/traffic+block-iran-domains.json
View file

@ -1,7 +1,6 @@
{ {
"log": { "log": {
"loglevel": "warning", "loglevel": "warning",
"access": "./access.log",
"error": "./error.log" "error": "./error.log"
}, },
"api": { "api": {
@ -75,9 +74,8 @@
"outboundTag": "blocked", "outboundTag": "blocked",
"domain": [ "domain": [
"regexp:.*\\.ir$", "regexp:.*\\.ir$",
"ext:iran.dat:ir", "regexp:.*\\.xn--mgba3a4f16a$",
"ext:iran.dat:other", "ext:geosite_IR.dat:ir"
"geosite:category-ir"
] ]
} }
] ]

3
media/configs/traffic+block-iran-ip.json
View file

@ -1,7 +1,6 @@
{ {
"log": { "log": {
"loglevel": "warning", "loglevel": "warning",
"access": "./access.log",
"error": "./error.log" "error": "./error.log"
}, },
"api": { "api": {
@ -61,7 +60,7 @@
"outboundTag": "blocked", "outboundTag": "blocked",
"ip": [ "ip": [
"geoip:private", "geoip:private",
"geoip:ir" "ext:geoip_IR.dat:ir"
] ]
}, },
{ {

1
media/configs/traffic.json
View file

@ -1,7 +1,6 @@
{ {
"log": { "log": {
"loglevel": "warning", "loglevel": "warning",
"access": "./access.log",
"error": "./error.log" "error": "./error.log"
}, },
"api": { "api": {

10
web/html/xui/settings.html
View file

@ -472,14 +472,12 @@
ips: { ips: {
local: ["geoip:private"], local: ["geoip:private"],
cn: ["geoip:cn"], 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"], ru: ["geoip:ru"],
}, },
domains: { domains: {
ads: [ ads: [
"geosite:category-ads-all", "ext:geosite_IR.dat:category-ads-all"
"ext:iran.dat:ads",
"ext:geosite_ch.dat:ads"
], ],
speedtest: ["geosite:speedtest"], speedtest: ["geosite:speedtest"],
openai: ["geosite:openai"], openai: ["geosite:openai"],
@ -497,9 +495,7 @@
ir: [ ir: [
"regexp:.*\\.ir$", "regexp:.*\\.ir$",
"regexp:.*\\.xn--mgba3a4f16a$", // .ایران "regexp:.*\\.xn--mgba3a4f16a$", // .ایران
"ext:iran.dat:ir", "ext:geosite_IR.dat:ir" // have rules to bypass all .ir domains.
"ext:iran.dat:other",
"geosite:category-ir"
] ]
}, },
familyProtectDNS: { familyProtectDNS: {

1
web/service/config.json
View file

@ -1,7 +1,6 @@
{ {
"log": { "log": {
"loglevel": "warning", "loglevel": "warning",
"access": "./access.log",
"error": "./error.log" "error": "./error.log"
}, },
"api": { "api": {

37
web/service/server.go
View file

@ -376,50 +376,21 @@ func (s *ServerService) UpdateXray(version string) error {
return err return err
} }
downloadFile := func(fileName string, url string) error { err = copyZipFile("xray", xray.GetBinaryPath())
os.Remove(fileName)
file, err := os.OpenFile(fileName, os.O_CREATE|os.O_RDWR|os.O_TRUNC, fs.ModePerm)
if err != nil { if err != nil {
return err return err
} }
defer file.Close() err = copyZipFile("geosite.dat", xray.GetGeositePath())
resp, err := http.Get(url)
if err != nil { if err != nil {
return err return err
} }
defer resp.Body.Close() err = copyZipFile("geoip.dat", xray.GetGeoipPath())
if resp.StatusCode != http.StatusOK {
return fmt.Errorf("download file failed: %s", resp.Status)
}
_, err = io.Copy(file, resp.Body)
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 { if err != nil {
return err return err
} }
}
for fileName, filePath := range downloadFiles {
err := downloadFile(fileName, filePath)
if err != nil {
return err
}
}
return nil return nil
} }
func (s *ServerService) GetLogs(count string, level string, syslog string) []string { func (s *ServerService) GetLogs(count string, level string, syslog string) []string {

9
x-ui.sh
View file

@ -519,14 +519,13 @@ update_geo() {
systemctl stop x-ui systemctl stop x-ui
cd ${binFolder} 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/geoip.dat
wget -N https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.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 geoip_IR.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 -O geosite_IR.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
systemctl start x-ui 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 before_show_menu
} }

4
xray/process.go
View file

@ -42,10 +42,6 @@ func GetGeoipPath() string {
return config.GetBinFolderPath() + "/geoip.dat" return config.GetBinFolderPath() + "/geoip.dat"
} }
func GetIranPath() string {
return config.GetBinFolderPath() + "/iran.dat"
}
func GetIPLimitLogPath() string { func GetIPLimitLogPath() string {
return config.GetLogFolder() + "/3xipl.log" return config.GetLogFolder() + "/3xipl.log"
} }