1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-11-09 11:10:34 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: Add import/export for WAF IP groups (#10008)

Browse source
This commit is contained in:
CityFun 2025-08-15 14:26:49 +08:00 • committed by GitHub
parent 6d4d53e2c7
commit 22c903f555
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
agent/i18n/lang/zh.yaml
View file

@ -273,6 +273,7 @@ deny: "禁止"
OpenrestyNotFound: "Openresty 未安装"
remoteIpIsNull: "IP 列表为空"
OpenrestyVersionErr: "Openresty 版本过低，请升级 Openresty 至 1.27.1.2-2-2-focal"
ErrFileTooLarge: "文件超过 1MB 无法上传"
#task
TaskStart: "{{ .name }} 任务开始 [START]"

2
core/go.mod
View file

@ -76,7 +76,6 @@ require (
github.com/goccy/go-json v0.10.3 // indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/h2non/filetype v1.1.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
@ -120,7 +119,6 @@ require (
golang.org/x/sync v0.15.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/tools v0.34.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gorm.io/driver/sqlite v1.4.4 // indirect

12
core/go.sum
View file

@ -172,10 +172,6 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@ -185,7 +181,6 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
@ -587,8 +582,6 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=
golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8=
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -664,7 +657,6 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
@ -752,8 +744,6 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@ -805,8 +795,6 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
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.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

2
frontend/src/lang/modules/en.ts
View file

@ -3169,6 +3169,8 @@ const message = {
notBelongToIpGroup: 'Does not belong to IP Group',
unknownWebsiteKey: 'Unknown Domain',
special: 'Special',
fileToLarge: 'File exceeds 1MB and cannot be uploaded',
uploadOverLimit: 'Uploaded file exceeds the quantity limit, maximum 1 file',
},
monitor: {
name: 'Website Monitoring',

2
frontend/src/lang/modules/ja.ts
View file

@ -3056,6 +3056,8 @@ const message = {
notBelongToIpGroup: 'IP グループに属していません',
unknownWebsiteKey: '未知のドメイン',
special: '特別な文字は使用できません',
fileToLarge: 'ファイルが1MBを超えており、アップロードできません',
uploadOverLimit: 'アップロードファイル数が制限を超えています、最大1ファイル',
},
monitor: {
name: 'ウェブサイトモニタリング',

2
frontend/src/lang/modules/ko.ts
View file

@ -3002,6 +3002,8 @@ const message = {
notBelongToIpGroup: 'IP 그룹에 속하지 않음',
unknownWebsiteKey: '알 수 없는 도메인',
special: '특수 문자',
fileToLarge: '파일이 1MB를 초과하여 업로드할 수 없습니다',
uploadOverLimit: '업로드된 파일 수가 제한을 초과했습니다, 최대 1개',
},
monitor: {
name: '웹사이트 모니터링',

2
frontend/src/lang/modules/ms.ts
View file

@ -3125,6 +3125,8 @@ const message = {
notBelongToIpGroup: 'Tidak tergolong dalam Kumpulan IP',
unknownWebsiteKey: 'Domain Tidak Diketahui',
special: 'Peraturan Khas',
fileToLarge: 'Fail melebihi 1MB dan tidak dapat dimuat naik',
uploadOverLimit: 'Fail yang dimuat naik melebihi had kuantiti, maksimum 1 fail',
},
monitor: {
name: 'Pemantauan Laman Web',

2
frontend/src/lang/modules/pt-br.ts
View file

@ -3130,6 +3130,8 @@ const message = {
notBelongToIpGroup: 'Não pertence ao Grupo de IP',
unknownWebsiteKey: 'Domínio Desconhecido',
special: 'Domínio Especial',
fileToLarge: 'O arquivo excede 1MB e não pode ser enviado',
uploadOverLimit: 'O arquivo enviado excede o limite de quantidade, máximo 1 arquivo',
},
monitor: {
name: 'Monitoramento de Websites',

2
frontend/src/lang/modules/ru.ts
View file

@ -3120,6 +3120,8 @@ const message = {
notBelongToIpGroup: 'Не принадлежит к группе IP',
unknownWebsiteKey: 'Неизвестный домен',
special: 'Специальный',
fileToLarge: 'Файл превышает 1MB и не может быть загружен',
uploadOverLimit: 'Загруженный файл превышает лимит количества, максимум 1 файл',
},
monitor: {
name: 'Мониторинг веб-сайта',

2
frontend/src/lang/modules/tr.ts
View file

@ -3203,6 +3203,8 @@ const message = {
notBelongToIpGroup: 'IP Grubuna Ait Değil',
unknownWebsiteKey: 'Bilinmeyen Alan',
special: 'Özel',
fileToLarge: "Dosya 1MB'yi aştığı için yüklenemez",
uploadOverLimit: 'Yüklenen dosya sayısı sınırı aşıyor, maksimum 1 dosya',
},
monitor: {
name: 'Web Sitesi İzleme',

2
frontend/src/lang/modules/zh-Hant.ts
View file

@ -2956,6 +2956,8 @@ const message = {
notBelongToIpGroup: '不屬於 IP 組',
unknownWebsiteKey: '未知域名',
special: '指定',
fileToLarge: '檔案超過 1MB 無法上傳',
uploadOverLimit: '上傳檔案超過數量限制，最大1個',
},
monitor: {
name: '網站監控',

2
frontend/src/lang/modules/zh.ts
View file

@ -2931,6 +2931,8 @@ const message = {
notBelongToIpGroup: '不属于 IP 组',
unknownWebsiteKey: '未知域名',
special: '指定',
fileToLarge: '文件超过 1MB 无法上传',
uploadOverLimit: '上传文件超过数量限制，最大1个',
},
monitor: {
name: '网站监控',