7x31/anylink
1
0
Fork 0
mirror of https://github.com/bjdgyc/anylink.git synced 2025-08-08 22:44:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43 from bjdgyc/dev

Browse Source 
Dev
This commit is contained in:
bjdgyc
2021-07-06 09:35:13 +08:00
committed by GitHub
parent 5bb44385b1 6daf9cbfa3
commit 7e95b1261a
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@@ -15,7 +15,7 @@ cpath=$(pwd)
echo "编译前端项目" echo "编译前端项目"
cd $cpath/web cd $cpath/web
#国内可替换源加快速度 #国内可替换源加快速度
npx browserslist@latest --update-db #npx browserslist@latest --update-db
npm install --registry=https://registry.npm.taobao.org npm install --registry=https://registry.npm.taobao.org
#npm install #npm install
npm run build npm run build

12
server/conf/server-sample.toml
View File

@@ -1,16 +1,16 @@
#服务配置信息 #服务配置信息
#其他配置文件,可以使用绝对路径 #其他配置文件,可以使用绝对路径
#或者相对于server.toml的路径 #或者相对于 anylink 二进制文件的路径
#数据文件 #数据文件
db_file = "./data.db" db_file = "./conf/data.db"
#证书文件 #证书文件
cert_file = "./vpn_cert.pem" cert_file = "./conf/vpn_cert.pem"
cert_key = "./vpn_cert.key" cert_key = "./conf/vpn_cert.key"
files_path = "./files" files_path = "./conf/files"
#日志目录,为空写入标准输出 #日志目录,为空写入标准输出
#log_path = "../log" #log_path = "./log"
log_path = "" log_path = ""
log_level = "debug" log_level = "debug"
pprof = false pprof = false

4
server/handler/payload.go
View File

@@ -82,6 +82,7 @@ func checkLinkAcl(group *dbdata.Group, payload *sessdata.Payload) bool {
ip_dst := waterutil.IPv4Destination(payload.Data) ip_dst := waterutil.IPv4Destination(payload.Data)
ip_port := waterutil.IPv4DestinationPort(payload.Data) ip_port := waterutil.IPv4DestinationPort(payload.Data)
ip_proto := waterutil.IPv4Protocol(payload.Data)
// fmt.Println("sent:", ip_dst, ip_port) // fmt.Println("sent:", ip_dst, ip_port)
// 优先放行dns端口 // 优先放行dns端口
@@ -94,7 +95,8 @@ func checkLinkAcl(group *dbdata.Group, payload *sessdata.Payload) bool {
for _, v := range group.LinkAcl { for _, v := range group.LinkAcl {
// 循环判断ip和端口 // 循环判断ip和端口
if v.IpNet.Contains(ip_dst) { if v.IpNet.Contains(ip_dst) {
if v.Port == ip_port || v.Port == 0 { // 放行允许ip的ping
if v.Port == ip_port || v.Port == 0 || ip_proto == waterutil.ICMP {
if v.Action == dbdata.Allow { if v.Action == dbdata.Allow {
return true return true
} else { } else {

15
web/package-lock.json generated
View File

@@ -9,6 +9,7 @@
"version": "0.1.0", "version": "0.1.0",
"dependencies": { "dependencies": {
"axios": "^0.20.0", "axios": "^0.20.0",
"caniuse-lite": "^1.0.30001242",
"chokidar": "^3.5.2", "chokidar": "^3.5.2",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"echarts": "^4.9.0", "echarts": "^4.9.0",
@@ -3419,10 +3420,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001240", "version": "1.0.30001242",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001240.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001242.tgz",
"integrity": "sha512-nb8mDzfMdxBDN7ZKx8chWafAdBp5DAAlpWvNyUGe5tcDWd838zpzDN3Rah9cjCqhfOKkrvx40G2SDtP0qiWX/w==", "integrity": "sha512-KvNuZ/duufelMB3w2xtf9gEWCSxJwUgoxOx5b6ScLXC4kPc9xsczUVCPrQU26j5kOsHM4pSUL54tAZt5THQKug==",
"dev": true,
"funding": { "funding": {
"type": "opencollective", "type": "opencollective",
"url": "https://opencollective.com/browserslist" "url": "https://opencollective.com/browserslist"
@@ -17191,10 +17191,9 @@
} }
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30001240", "version": "1.0.30001242",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001240.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001242.tgz",
"integrity": "sha512-nb8mDzfMdxBDN7ZKx8chWafAdBp5DAAlpWvNyUGe5tcDWd838zpzDN3Rah9cjCqhfOKkrvx40G2SDtP0qiWX/w==", "integrity": "sha512-KvNuZ/duufelMB3w2xtf9gEWCSxJwUgoxOx5b6ScLXC4kPc9xsczUVCPrQU26j5kOsHM4pSUL54tAZt5THQKug=="
"dev": true
}, },
"case-sensitive-paths-webpack-plugin": { "case-sensitive-paths-webpack-plugin": {
"version": "2.3.0", "version": "2.3.0",

1
web/package.json
View File

@@ -9,6 +9,7 @@
}, },
"dependencies": { "dependencies": {
"axios": "^0.20.0", "axios": "^0.20.0",
"caniuse-lite": "^1.0.30001242",
"chokidar": "^3.5.2", "chokidar": "^3.5.2",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"echarts": "^4.9.0", "echarts": "^4.9.0",