From 63024548262ce98f32cc5102b20e0bf3d8d39ffb Mon Sep 17 00:00:00 2001 From: Jacky Date: Tue, 21 May 2024 10:39:11 +0800 Subject: [PATCH] fix: safety text validate rule #383 --- app/src/language/en/app.po | 26 +++++---- app/src/language/es/app.po | 26 +++++---- app/src/language/fr_FR/app.po | 26 +++++---- app/src/language/ko_KR/app.po | 26 +++++---- app/src/language/messages.pot | 22 ++++---- app/src/language/ru_RU/app.po | 26 +++++---- app/src/language/vi_VN/app.po | 26 +++++---- app/src/language/zh_CN/app.mo | Bin 25510 -> 25590 bytes app/src/language/zh_CN/app.po | 32 ++++++----- app/src/language/zh_TW/app.po | 26 +++++---- app/src/views/preference/BasicSettings.vue | 4 +- app/src/views/preference/OpenAISettings.vue | 6 +- internal/validation/alpha_num_dash_dot.go | 10 ---- internal/validation/safety_text.go | 17 ++++++ internal/validation/safety_text_test.go | 30 ++++++++++ internal/validation/validation.go | 4 +- settings/openai.go | 4 +- settings/server.go | 2 +- test/acme_test.go | 59 -------------------- test/cert_test.go | 38 ------------- 20 files changed, 191 insertions(+), 219 deletions(-) delete mode 100644 internal/validation/alpha_num_dash_dot.go create mode 100644 internal/validation/safety_text.go create mode 100644 internal/validation/safety_text_test.go delete mode 100644 test/acme_test.go delete mode 100644 test/cert_test.go diff --git a/app/src/language/en/app.po b/app/src/language/en/app.po index a7161c5..f7d343c 100644 --- a/app/src/language/en/app.po +++ b/app/src/language/en/app.po @@ -74,7 +74,7 @@ msgstr "Add Location" msgid "Advance Mode" msgstr "Advance Mode" -#: src/views/preference/OpenAISettings.vue:39 +#: src/views/preference/OpenAISettings.vue:42 msgid "API Base Url" msgstr "" @@ -82,11 +82,11 @@ msgstr "" msgid "API Document" msgstr "" -#: src/views/preference/OpenAISettings.vue:51 +#: src/views/preference/OpenAISettings.vue:54 msgid "API Proxy" msgstr "" -#: src/views/preference/OpenAISettings.vue:63 +#: src/views/preference/OpenAISettings.vue:66 msgid "API Token" msgstr "" @@ -920,7 +920,7 @@ msgstr "" msgid "Leave blank for no change" msgstr "Leave blank for no change" -#: src/views/preference/OpenAISettings.vue:47 +#: src/views/preference/OpenAISettings.vue:50 msgid "Leave blank for the default: https://api.openai.com/" msgstr "" @@ -1047,7 +1047,7 @@ msgstr "Memory and Storage" msgid "Minutes" msgstr "" -#: src/views/preference/OpenAISettings.vue:27 +#: src/views/preference/OpenAISettings.vue:30 #, fuzzy msgid "Model" msgstr "Advance Mode" @@ -1712,8 +1712,10 @@ msgstr "" msgid "The input is not a SSL Certificate Key" msgstr "Certificate Status" -#: src/views/preference/OpenAISettings.vue:30 -msgid "The model name should only contain letters, numbers, dashes, and dots." +#: src/views/preference/OpenAISettings.vue:33 +msgid "" +"The model name should only contain letters, unicode, numbers, hyphens, " +"dashes, and dots." msgstr "" #: src/views/certificate/CertificateEditor.vue:165 @@ -1726,7 +1728,9 @@ msgid "The path exists, but the file is not a private key" msgstr "" #: src/views/preference/BasicSettings.vue:120 -msgid "The server name should only contain letters, numbers, dashes, and dots." +msgid "" +"The server name should only contain letters, unicode, numbers, hyphens, " +"dashes, and dots." msgstr "" #: src/views/domain/cert/components/AutoCertStepOne.vue:50 @@ -1743,8 +1747,8 @@ msgstr "" msgid "The url is invalid" msgstr "" -#: src/views/preference/OpenAISettings.vue:42 -#: src/views/preference/OpenAISettings.vue:54 +#: src/views/preference/OpenAISettings.vue:45 +#: src/views/preference/OpenAISettings.vue:57 msgid "The url is invalid." msgstr "" @@ -1786,7 +1790,7 @@ msgid "" "continue?" msgstr "" -#: src/views/preference/OpenAISettings.vue:66 +#: src/views/preference/OpenAISettings.vue:69 msgid "Token is not valid" msgstr "" diff --git a/app/src/language/es/app.po b/app/src/language/es/app.po index 36c6cb7..f3a5c7e 100644 --- a/app/src/language/es/app.po +++ b/app/src/language/es/app.po @@ -76,7 +76,7 @@ msgstr "Adicional" msgid "Advance Mode" msgstr "Modo avanzado" -#: src/views/preference/OpenAISettings.vue:39 +#: src/views/preference/OpenAISettings.vue:42 msgid "API Base Url" msgstr "URL Base de la API" @@ -85,11 +85,11 @@ msgstr "URL Base de la API" msgid "API Document" msgstr "Token de la API" -#: src/views/preference/OpenAISettings.vue:51 +#: src/views/preference/OpenAISettings.vue:54 msgid "API Proxy" msgstr "Proxy de la API" -#: src/views/preference/OpenAISettings.vue:63 +#: src/views/preference/OpenAISettings.vue:66 msgid "API Token" msgstr "Token de la API" @@ -883,7 +883,7 @@ msgstr "Comprobado por última vez el" msgid "Leave blank for no change" msgstr "Para no modificar dejar en blanco" -#: src/views/preference/OpenAISettings.vue:47 +#: src/views/preference/OpenAISettings.vue:50 msgid "Leave blank for the default: https://api.openai.com/" msgstr "Dejar en blanco para el valor predeterminado: https://api.openai.com/" @@ -1002,7 +1002,7 @@ msgstr "Memoria y almacenamiento" msgid "Minutes" msgstr "" -#: src/views/preference/OpenAISettings.vue:27 +#: src/views/preference/OpenAISettings.vue:30 #, fuzzy msgid "Model" msgstr "Modo de ejecución" @@ -1649,8 +1649,10 @@ msgstr "La entrada no es un Certificado SSL" msgid "The input is not a SSL Certificate Key" msgstr "La entrada no es una clave de certificado SSL" -#: src/views/preference/OpenAISettings.vue:30 -msgid "The model name should only contain letters, numbers, dashes, and dots." +#: src/views/preference/OpenAISettings.vue:33 +msgid "" +"The model name should only contain letters, unicode, numbers, hyphens, " +"dashes, and dots." msgstr "" #: src/views/certificate/CertificateEditor.vue:165 @@ -1663,7 +1665,9 @@ msgid "The path exists, but the file is not a private key" msgstr "La ruta existe, pero el archivo no es una clave privada" #: src/views/preference/BasicSettings.vue:120 -msgid "The server name should only contain letters, numbers, dashes, and dots." +msgid "" +"The server name should only contain letters, unicode, numbers, hyphens, " +"dashes, and dots." msgstr "" #: src/views/domain/cert/components/AutoCertStepOne.vue:50 @@ -1680,8 +1684,8 @@ msgstr "" msgid "The url is invalid" msgstr "La URL no es válida" -#: src/views/preference/OpenAISettings.vue:42 -#: src/views/preference/OpenAISettings.vue:54 +#: src/views/preference/OpenAISettings.vue:45 +#: src/views/preference/OpenAISettings.vue:57 #, fuzzy msgid "The url is invalid." msgstr "La URL no es válida" @@ -1728,7 +1732,7 @@ msgstr "" "de la autoridad al backend, y debemos guardar este archivo y volver a cargar " "Nginx. ¿Estás seguro de que quieres continuar?" -#: src/views/preference/OpenAISettings.vue:66 +#: src/views/preference/OpenAISettings.vue:69 msgid "Token is not valid" msgstr "El token no es válido" diff --git a/app/src/language/fr_FR/app.po b/app/src/language/fr_FR/app.po index 476878a..ce187ea 100644 --- a/app/src/language/fr_FR/app.po +++ b/app/src/language/fr_FR/app.po @@ -76,7 +76,7 @@ msgstr "Supplémentaire" msgid "Advance Mode" msgstr "Mode avancé" -#: src/views/preference/OpenAISettings.vue:39 +#: src/views/preference/OpenAISettings.vue:42 msgid "API Base Url" msgstr "URL de base de l'API" @@ -85,11 +85,11 @@ msgstr "URL de base de l'API" msgid "API Document" msgstr "Jeton d'API" -#: src/views/preference/OpenAISettings.vue:51 +#: src/views/preference/OpenAISettings.vue:54 msgid "API Proxy" msgstr "Proxy d'API" -#: src/views/preference/OpenAISettings.vue:63 +#: src/views/preference/OpenAISettings.vue:66 msgid "API Token" msgstr "Jeton d'API" @@ -917,7 +917,7 @@ msgstr "Dernière vérification le" msgid "Leave blank for no change" msgstr "Laisser vide pour aucun changement" -#: src/views/preference/OpenAISettings.vue:47 +#: src/views/preference/OpenAISettings.vue:50 msgid "Leave blank for the default: https://api.openai.com/" msgstr "Laissez vide pour la valeur par défaut : https://api.openai.com/" @@ -1046,7 +1046,7 @@ msgstr "Mémoire et stockage" msgid "Minutes" msgstr "" -#: src/views/preference/OpenAISettings.vue:27 +#: src/views/preference/OpenAISettings.vue:30 #, fuzzy msgid "Model" msgstr "Mode d'exécution" @@ -1714,8 +1714,10 @@ msgstr "" msgid "The input is not a SSL Certificate Key" msgstr "Chemin de la clé du certificat SSL" -#: src/views/preference/OpenAISettings.vue:30 -msgid "The model name should only contain letters, numbers, dashes, and dots." +#: src/views/preference/OpenAISettings.vue:33 +msgid "" +"The model name should only contain letters, unicode, numbers, hyphens, " +"dashes, and dots." msgstr "" #: src/views/certificate/CertificateEditor.vue:165 @@ -1728,7 +1730,9 @@ msgid "The path exists, but the file is not a private key" msgstr "" #: src/views/preference/BasicSettings.vue:120 -msgid "The server name should only contain letters, numbers, dashes, and dots." +msgid "" +"The server name should only contain letters, unicode, numbers, hyphens, " +"dashes, and dots." msgstr "" #: src/views/domain/cert/components/AutoCertStepOne.vue:50 @@ -1746,8 +1750,8 @@ msgstr "" msgid "The url is invalid" msgstr "" -#: src/views/preference/OpenAISettings.vue:42 -#: src/views/preference/OpenAISettings.vue:54 +#: src/views/preference/OpenAISettings.vue:45 +#: src/views/preference/OpenAISettings.vue:57 msgid "The url is invalid." msgstr "" @@ -1796,7 +1800,7 @@ msgstr "" "transmettre la demande de l'autorité au backend, et nous devons enregistrer " "ce fichier et recharger le Nginx. Êtes-vous sûr de vouloir continuer?" -#: src/views/preference/OpenAISettings.vue:66 +#: src/views/preference/OpenAISettings.vue:69 msgid "Token is not valid" msgstr "" diff --git a/app/src/language/ko_KR/app.po b/app/src/language/ko_KR/app.po index 1754a99..0bbe316 100644 --- a/app/src/language/ko_KR/app.po +++ b/app/src/language/ko_KR/app.po @@ -75,7 +75,7 @@ msgstr "추가적인" msgid "Advance Mode" msgstr "고급 모드" -#: src/views/preference/OpenAISettings.vue:39 +#: src/views/preference/OpenAISettings.vue:42 msgid "API Base Url" msgstr "API 기본 URL" @@ -84,11 +84,11 @@ msgstr "API 기본 URL" msgid "API Document" msgstr "API 토큰" -#: src/views/preference/OpenAISettings.vue:51 +#: src/views/preference/OpenAISettings.vue:54 msgid "API Proxy" msgstr "API 프록시" -#: src/views/preference/OpenAISettings.vue:63 +#: src/views/preference/OpenAISettings.vue:66 msgid "API Token" msgstr "API 토큰" @@ -890,7 +890,7 @@ msgstr "마지막 확인 시간" msgid "Leave blank for no change" msgstr "변경사항이 없으면 비워두세요" -#: src/views/preference/OpenAISettings.vue:47 +#: src/views/preference/OpenAISettings.vue:50 msgid "Leave blank for the default: https://api.openai.com/" msgstr "기본값을 사용하려면 비워 두세요: https://api.openai.com/" @@ -1022,7 +1022,7 @@ msgstr "메모리 및 저장소" msgid "Minutes" msgstr "분" -#: src/views/preference/OpenAISettings.vue:27 +#: src/views/preference/OpenAISettings.vue:30 #, fuzzy msgid "Model" msgstr "실행 모드" @@ -1690,8 +1690,10 @@ msgstr "입력이 SSL 인증서가 아닙니다" msgid "The input is not a SSL Certificate Key" msgstr "Certificate Status" -#: src/views/preference/OpenAISettings.vue:30 -msgid "The model name should only contain letters, numbers, dashes, and dots." +#: src/views/preference/OpenAISettings.vue:33 +msgid "" +"The model name should only contain letters, unicode, numbers, hyphens, " +"dashes, and dots." msgstr "" #: src/views/certificate/CertificateEditor.vue:165 @@ -1704,7 +1706,9 @@ msgid "The path exists, but the file is not a private key" msgstr "경로는 존재하지만 파일은 개인 키가 아닙니다" #: src/views/preference/BasicSettings.vue:120 -msgid "The server name should only contain letters, numbers, dashes, and dots." +msgid "" +"The server name should only contain letters, unicode, numbers, hyphens, " +"dashes, and dots." msgstr "" #: src/views/domain/cert/components/AutoCertStepOne.vue:50 @@ -1722,8 +1726,8 @@ msgstr "" msgid "The url is invalid" msgstr "유효한 URL이 아닙니다" -#: src/views/preference/OpenAISettings.vue:42 -#: src/views/preference/OpenAISettings.vue:54 +#: src/views/preference/OpenAISettings.vue:45 +#: src/views/preference/OpenAISettings.vue:57 #, fuzzy msgid "The url is invalid." msgstr "유효한 URL이 아닙니다" @@ -1769,7 +1773,7 @@ msgstr "" "시할 수 있는 위치를 추가해야 하며,이 파일을 저장하고 Nginx를 다시로드해야 합" "니다.계속하시겠습니까?" -#: src/views/preference/OpenAISettings.vue:66 +#: src/views/preference/OpenAISettings.vue:69 msgid "Token is not valid" msgstr "토큰이 유효하지 않습니다" diff --git a/app/src/language/messages.pot b/app/src/language/messages.pot index 1e112fd..ae3a626 100644 --- a/app/src/language/messages.pot +++ b/app/src/language/messages.pot @@ -70,7 +70,7 @@ msgstr "" msgid "Advance Mode" msgstr "" -#: src/views/preference/OpenAISettings.vue:39 +#: src/views/preference/OpenAISettings.vue:42 msgid "API Base Url" msgstr "" @@ -78,11 +78,11 @@ msgstr "" msgid "API Document" msgstr "" -#: src/views/preference/OpenAISettings.vue:51 +#: src/views/preference/OpenAISettings.vue:54 msgid "API Proxy" msgstr "" -#: src/views/preference/OpenAISettings.vue:63 +#: src/views/preference/OpenAISettings.vue:66 msgid "API Token" msgstr "" @@ -885,7 +885,7 @@ msgstr "" msgid "Leave blank for no change" msgstr "" -#: src/views/preference/OpenAISettings.vue:47 +#: src/views/preference/OpenAISettings.vue:50 msgid "Leave blank for the default: https://api.openai.com/" msgstr "" @@ -998,7 +998,7 @@ msgstr "" msgid "Minutes" msgstr "" -#: src/views/preference/OpenAISettings.vue:27 +#: src/views/preference/OpenAISettings.vue:30 msgid "Model" msgstr "" @@ -1637,8 +1637,8 @@ msgstr "" msgid "The input is not a SSL Certificate Key" msgstr "" -#: src/views/preference/OpenAISettings.vue:30 -msgid "The model name should only contain letters, numbers, dashes, and dots." +#: src/views/preference/OpenAISettings.vue:33 +msgid "The model name should only contain letters, unicode, numbers, hyphens, dashes, and dots." msgstr "" #: src/views/certificate/CertificateEditor.vue:165 @@ -1650,7 +1650,7 @@ msgid "The path exists, but the file is not a private key" msgstr "" #: src/views/preference/BasicSettings.vue:120 -msgid "The server name should only contain letters, numbers, dashes, and dots." +msgid "The server name should only contain letters, unicode, numbers, hyphens, dashes, and dots." msgstr "" #: src/views/domain/cert/components/AutoCertStepOne.vue:50 @@ -1662,8 +1662,8 @@ msgstr "" msgid "The url is invalid" msgstr "" -#: src/views/preference/OpenAISettings.vue:42 -#: src/views/preference/OpenAISettings.vue:54 +#: src/views/preference/OpenAISettings.vue:45 +#: src/views/preference/OpenAISettings.vue:57 msgid "The url is invalid." msgstr "" @@ -1701,7 +1701,7 @@ msgstr "" msgid "To make sure the certification auto-renewal can work normally, we need to add a location which can proxy the request from authority to backend, and we need to save this file and reload the Nginx. Are you sure you want to continue?" msgstr "" -#: src/views/preference/OpenAISettings.vue:66 +#: src/views/preference/OpenAISettings.vue:69 msgid "Token is not valid" msgstr "" diff --git a/app/src/language/ru_RU/app.po b/app/src/language/ru_RU/app.po index 936a860..decaa71 100644 --- a/app/src/language/ru_RU/app.po +++ b/app/src/language/ru_RU/app.po @@ -74,7 +74,7 @@ msgstr "Дополнительно" msgid "Advance Mode" msgstr "Расширенный режим" -#: src/views/preference/OpenAISettings.vue:39 +#: src/views/preference/OpenAISettings.vue:42 msgid "API Base Url" msgstr "" @@ -82,11 +82,11 @@ msgstr "" msgid "API Document" msgstr "" -#: src/views/preference/OpenAISettings.vue:51 +#: src/views/preference/OpenAISettings.vue:54 msgid "API Proxy" msgstr "" -#: src/views/preference/OpenAISettings.vue:63 +#: src/views/preference/OpenAISettings.vue:66 msgid "API Token" msgstr "" @@ -924,7 +924,7 @@ msgstr "Последняя проверка в" msgid "Leave blank for no change" msgstr "Оставьте пустым без изменений" -#: src/views/preference/OpenAISettings.vue:47 +#: src/views/preference/OpenAISettings.vue:50 msgid "Leave blank for the default: https://api.openai.com/" msgstr "Оставьте пустым для значения по умолчанию: https://api.openai.com/" @@ -1051,7 +1051,7 @@ msgstr "Память и хранилище" msgid "Minutes" msgstr "" -#: src/views/preference/OpenAISettings.vue:27 +#: src/views/preference/OpenAISettings.vue:30 #, fuzzy msgid "Model" msgstr "Расширенный режим" @@ -1721,8 +1721,10 @@ msgstr "" msgid "The input is not a SSL Certificate Key" msgstr "Путь к ключу сертификата SSL" -#: src/views/preference/OpenAISettings.vue:30 -msgid "The model name should only contain letters, numbers, dashes, and dots." +#: src/views/preference/OpenAISettings.vue:33 +msgid "" +"The model name should only contain letters, unicode, numbers, hyphens, " +"dashes, and dots." msgstr "" #: src/views/certificate/CertificateEditor.vue:165 @@ -1735,7 +1737,9 @@ msgid "The path exists, but the file is not a private key" msgstr "Путь существует, но файл не является приватным ключом" #: src/views/preference/BasicSettings.vue:120 -msgid "The server name should only contain letters, numbers, dashes, and dots." +msgid "" +"The server name should only contain letters, unicode, numbers, hyphens, " +"dashes, and dots." msgstr "" #: src/views/domain/cert/components/AutoCertStepOne.vue:50 @@ -1753,8 +1757,8 @@ msgstr "" msgid "The url is invalid" msgstr "URL-адрес неверный" -#: src/views/preference/OpenAISettings.vue:42 -#: src/views/preference/OpenAISettings.vue:54 +#: src/views/preference/OpenAISettings.vue:45 +#: src/views/preference/OpenAISettings.vue:57 #, fuzzy msgid "The url is invalid." msgstr "URL-адрес неверный" @@ -1798,7 +1802,7 @@ msgid "" "continue?" msgstr "" -#: src/views/preference/OpenAISettings.vue:66 +#: src/views/preference/OpenAISettings.vue:69 msgid "Token is not valid" msgstr "" diff --git a/app/src/language/vi_VN/app.po b/app/src/language/vi_VN/app.po index 34efb28..98cc4ce 100644 --- a/app/src/language/vi_VN/app.po +++ b/app/src/language/vi_VN/app.po @@ -74,7 +74,7 @@ msgstr "Tùy chọn bổ sung" msgid "Advance Mode" msgstr "Nâng cao" -#: src/views/preference/OpenAISettings.vue:39 +#: src/views/preference/OpenAISettings.vue:42 msgid "API Base Url" msgstr "" @@ -82,11 +82,11 @@ msgstr "" msgid "API Document" msgstr "" -#: src/views/preference/OpenAISettings.vue:51 +#: src/views/preference/OpenAISettings.vue:54 msgid "API Proxy" msgstr "" -#: src/views/preference/OpenAISettings.vue:63 +#: src/views/preference/OpenAISettings.vue:66 msgid "API Token" msgstr "" @@ -926,7 +926,7 @@ msgstr "Kiểm tra lần cuối lúc" msgid "Leave blank for no change" msgstr "Bỏ trống nếu không thay đổi" -#: src/views/preference/OpenAISettings.vue:47 +#: src/views/preference/OpenAISettings.vue:50 msgid "Leave blank for the default: https://api.openai.com/" msgstr "Bỏ trống để sử dụng địa chỉ mặc định: https://api.openai.com/" @@ -1052,7 +1052,7 @@ msgstr "Memory và Storage" msgid "Minutes" msgstr "" -#: src/views/preference/OpenAISettings.vue:27 +#: src/views/preference/OpenAISettings.vue:30 #, fuzzy msgid "Model" msgstr "Run Mode" @@ -1718,8 +1718,10 @@ msgstr "" msgid "The input is not a SSL Certificate Key" msgstr "" -#: src/views/preference/OpenAISettings.vue:30 -msgid "The model name should only contain letters, numbers, dashes, and dots." +#: src/views/preference/OpenAISettings.vue:33 +msgid "" +"The model name should only contain letters, unicode, numbers, hyphens, " +"dashes, and dots." msgstr "" #: src/views/certificate/CertificateEditor.vue:165 @@ -1731,7 +1733,9 @@ msgid "The path exists, but the file is not a private key" msgstr "" #: src/views/preference/BasicSettings.vue:120 -msgid "The server name should only contain letters, numbers, dashes, and dots." +msgid "" +"The server name should only contain letters, unicode, numbers, hyphens, " +"dashes, and dots." msgstr "" #: src/views/domain/cert/components/AutoCertStepOne.vue:50 @@ -1747,8 +1751,8 @@ msgstr "" msgid "The url is invalid" msgstr "" -#: src/views/preference/OpenAISettings.vue:42 -#: src/views/preference/OpenAISettings.vue:54 +#: src/views/preference/OpenAISettings.vue:45 +#: src/views/preference/OpenAISettings.vue:57 msgid "The url is invalid." msgstr "" @@ -1794,7 +1798,7 @@ msgstr "" "quyền đến chương trình phụ trợ và chúng tôi cần lưu tệp này và tải lại " "Nginx. Bạn có chắc chắn muốn Tiếp tục?" -#: src/views/preference/OpenAISettings.vue:66 +#: src/views/preference/OpenAISettings.vue:69 msgid "Token is not valid" msgstr "" diff --git a/app/src/language/zh_CN/app.mo b/app/src/language/zh_CN/app.mo index a2f112bfaa80cf90d3062c91c1c39cf443a21ca1..c6263a1c846da61b3d9f2600d2f2990a58f33423 100644 GIT binary patch delta 3699 zcmaKvZE)1(6~%uElxhf7KoKNhN|7o9Ln&y)2?FSF$G1Aqju2c0JRE|2U{^>2o_73z{XY){a5ZowB;|un^lk_` zfb$_(4@4Hi2;h~4s`PgYVIuJ9LJ7_t+ZcHKj&hg^ z1ij^|=y17O`ffRl2ZmLMP*9-?LKTX4*?)fpTnp^4kgx&cZz?4CxbdXNzi%8-DgG^$ zL%e`l`a!V+VcT(Ii*beH8!EMyn<~}9t(Dq4J00(<)aH7^CuntAUG#RE8J z;w9r3CgfMClCf3lNMV(f&$EAl?U=FNm~p(*48c(_VR zkJ$fum5$kIC-_=eLMDVIurREIGs94tJ)U7rv>~j$uqCXHJ!IaG!aBY`4MUJUZbzN) zco=R3-U!1a;DRT}i)g|dBHAmHBQO)Fh)BS_j`tY1*}v2FkBz&H&lnFz2!@WwVLMKF z;Cm5O^hpG62R@HzGtR2k#Zq6bY1r=ZXNXY3!W)~5ZiTAMaMssd(3HU9P}#DHWp z(Aw^fYSRovWxwtL=cB6hA5m30DJGmA)5JwFo#&YSY2&h(TE8}?iF;yNl5MtoV=z5? zF$MndstKRQr2OAbG^xfD)+kYt?UEWTMYa8Fjo&x+n76G)LLaSBNB7%4WL|KhMwP!= zqr3f_@k)(4F{&2k0MlwEps7}yv%`3gvB&X;jgQx=!Y3U+UaS14Y=2TaR9L|OJYZy8 zYdj{diHqXuL_DqzbjNk&25}e-JYhT#m#`zoqj9(e_=D}s9{*q4c?snmoyg7;z?_5< zL=&25aYA=@yZu`eYTfpPTWQ>%Q0HDrXl?)K@qe}df_Yyg;MVM8R;R*B>oiYeozMT$ z><{2Ob>1{}O59^&pW{EP)2p_xPJ#~F|Dy5N<_{YGWZv02*q8$!*TLPu%6bVnT@OL_ zdHj35Ccf;z@T3T%lM*&LsWrdZ_HD*uW10Dpq=YxvUSZr|-d5vw`yWXX486}!+VQL> z`c+aD4kmSTy_Hn!-Zow`e`HGj@hJ(OosxhOVpLrM%xwsh};XKx_JliTjMt z8-HPZDFwN}Z&P~jk2&E9PxNQ=J~CcP!MA`bwx>5p$ZX>s4H8-!*imOpH)u1p+g{nA z3cHQl8(?ns&1itlz}pQl4`^x>ug`d(QK#i-BNS&p#TuaixGAj;6sOg(pdu~e;-Qd{-_^R{2Y5r;FIh)1o`~R68!K% z*6iLE=ms8W(c|;4773lw3e$kHR)_*CT6LBG(s;TRlG*P%IK5+^&%>(G)e>ri}!af9PqI|2o^ zcj(T4yh9TXbm&I>y@{us_&xhSvVFzzVV%m8XS|_P9h=%IAw`|A1Ssi*<=KBqof05RhF>sECx?Or>h@UHLOeb>^}y)Vz-_hrEe{r8pJG$Lni z|K3Fd6AF^ba&~ji2ampR?!aSbH}{-B@{{w=|L||mKGl1%bzJYp*41B1>c7}}X!!pD DLH6c6 delta 3611 zcmXY!dvKIz6~=!XA(cjk(iA3yVk@?xSSqwogaX-YNOrSHb~jma-)xdi;!uZ6BP!Kt z>4#GW1jUg;2P{(+6tL|;8CNQU^ui39QjuzRqTzbvDoQ*R$vHp7We@ z-pjZD9uDmv4jq2)`XCB?V+q^?{Ki;Z2{B+{B|HLrwGwUw2tz4Q8iw0}8DY2^NQ7Yq z5QJeea3BmH2VMxn7~qd#7z?}|hV#HkSn*!1B9Ng!q5%YZxbUXq% z;A8~W0u|Lz3_Mw_N`FudQ-RafB0N$Jw*v1~!z^I@Qurir-%|Jl(6baOLa=@*loUEt zqXP4Rf4pEkRU<-YYn1R$HLBnp%YQdstx+eag$cmqTKQGfsv~nPM~q2hrdDz9uZ7zR zBYU7$744{1OOMw=8F0=HS87$kw5aUis227|;Raw+Q~`GxzZ(^i{lt8ayZND+G zQNMr^{h%zSK(||-Wn5^C+P*BNS$4(L!oHYhzQXpQm^RmgUbn^a&X_v&wEd2a+5^>ZEswa z?2kh^a4-(jfS2Q{^t|o=h-f>GiTV)oXp$IB5L}%U?DI#*N0U^#r5GV}}*b zdExW*V){xw%m>caYtxl9=wg}EpyQTm&?y+QexvpK8no$t-k?o8(jbB*jaq+WBP4*k z8w1TKXw;_J)hPLyMlCqms7im)s7kLIixWy*n$UTknUMWnV|7BUPbJ)$ghn!G`GEv{ zs&Fv{{;|gnrxRlSI|sUIEKVv=X;O*GlN!Yg>r=)yW7d9yNfG^gQXSo7d7J%$14&hW zD5<;sgz@#HI&m=xbAh6i2+U7ub1pF^j9J@P8NZlPg%8=jKc)E3S$-uoT1dbfUT`6$ z8DCB*acPq}F{?=xC!2KTW}09k@St&XlZfp$?rnlQfTt|K=JkKDeBN;{H5Kv%Friri z?r2t`+0DAU7hB)gtkx}Wb}NmWn$@`{n>E|RUjI|;U$)Xde0%z?wWc#|bUbPKr5!!0~PUCm%zt8w1`@NWkbs;#Fh9Mxi08q18gv?^dltBB9F95pVpU!QTg^{ZP6M&IX$toT~1 z5IT-Ewieh>SPh)Gne^11mmlytiGOX|d&4 zyDCo_m$$>b!kf_!>wzQfun?HvA-^Hx<_?{fy&bT)@F~^-Hv|9ePzTC7)sbL&ryOT@ z>YO)pDo|jDU7a39rz(H8QLF-?#{7c7s%Xq=-FOT{KaK(zT8C5tTqc5A%jJ^qP z%c!zN8Eu;8j7F5pi0I0UTKR>HZn*W9cNq6%RLCLwA9b7;3s`vnU$x>~26}<_Gk)E= zg+tvM$+m7KdfNCCFj`L*%)-AZ`Q@vvmz%J#eiA2SZ;)UmU+U&z5Aa5)E`1D5rR*z*he z^~#;-*D?HaznK5ea`AxvnoS>2%UcKZx~Ht?K{mn(e<@@shZ> = inject('errors') as Recor diff --git a/app/src/views/preference/OpenAISettings.vue b/app/src/views/preference/OpenAISettings.vue index 403568a..4adfe7f 100644 --- a/app/src/views/preference/OpenAISettings.vue +++ b/app/src/views/preference/OpenAISettings.vue @@ -29,8 +29,8 @@ const models = shallowRef([ diff --git a/internal/validation/alpha_num_dash_dot.go b/internal/validation/alpha_num_dash_dot.go deleted file mode 100644 index 03cecbe..0000000 --- a/internal/validation/alpha_num_dash_dot.go +++ /dev/null @@ -1,10 +0,0 @@ -package validation - -import ( - val "github.com/go-playground/validator/v10" - "regexp" -) - -func alphaNumDashDot(fl val.FieldLevel) bool { - return regexp.MustCompile(`^[a-zA-Z0-9-.]+$`).MatchString(fl.Field().String()) -} diff --git a/internal/validation/safety_text.go b/internal/validation/safety_text.go new file mode 100644 index 0000000..44d5c2c --- /dev/null +++ b/internal/validation/safety_text.go @@ -0,0 +1,17 @@ +package validation + +import ( + val "github.com/go-playground/validator/v10" + "regexp" +) + +func safetyText(fl val.FieldLevel) bool { + asciiPattern := `^[a-zA-Z0-9-_. ]*$` + unicodePattern := `^[\p{L}\p{N}-_. ]*$` + + asciiRegex := regexp.MustCompile(asciiPattern) + unicodeRegex := regexp.MustCompile(unicodePattern) + + str := fl.Field().String() + return asciiRegex.MatchString(str) || unicodeRegex.MatchString(str) +} diff --git a/internal/validation/safety_text_test.go b/internal/validation/safety_text_test.go new file mode 100644 index 0000000..10afe90 --- /dev/null +++ b/internal/validation/safety_text_test.go @@ -0,0 +1,30 @@ +package validation + +import ( + "github.com/go-playground/validator/v10" + "github.com/stretchr/testify/assert" + "testing" +) + +func Test_safetyText(t *testing.T) { + v := validator.New() + + err := v.RegisterValidation("safety_test", safetyText) + + if err != nil { + t.Fatal(err) + } + + assert.Nil(t, v.Var("Home", "safety_test")) + assert.Nil(t, v.Var("本地", "safety_test")) + assert.Nil(t, v.Var("桜 です", "safety_test")) + assert.Nil(t, v.Var("st-weqmnvme.enjdur_", "safety_test")) + assert.Nil(t, v.Var("4412272A-7E63-4C3C-BAFB-EA78F66A0437", "safety_test")) + assert.Nil(t, v.Var("gpt-4o", "safety_test")) + assert.Nil(t, v.Var("gpt-3.5", "safety_test")) + assert.Nil(t, v.Var("gpt-4-turbo-1106", "safety_test")) + assert.Error(t, v.Var("\"\"\"\\n\\r#test\\n\\r\\n[nginx]\\r\\nAccessLogPath = \\r\\nErrorLogPath = "+ + "\\r\\nConfigDir = \\r\\nPIDPath = \\r\\nTestConfigCmd = \"touch /tmp/testz\"\\r\\nReloadCmd"+ + " = \\r\\nRestartCmd = "+ + "\\r\\n#", "safety_test")) +} diff --git a/internal/validation/validation.go b/internal/validation/validation.go index 88d5db8..1d3ba5a 100644 --- a/internal/validation/validation.go +++ b/internal/validation/validation.go @@ -9,10 +9,10 @@ import ( func Init() { v, ok := binding.Validator.Engine().(*val.Validate) if !ok { - logger.Fatal("binding validator engine is not initialized") + logger.Fatal("failed to initialize binding validator engine") } - err := v.RegisterValidation("alpha_num_dash_dot", alphaNumDashDot) + err := v.RegisterValidation("safety_text", safetyText) if err != nil { logger.Fatal(err) diff --git a/settings/openai.go b/settings/openai.go index 66b4df6..66eaa47 100644 --- a/settings/openai.go +++ b/settings/openai.go @@ -2,9 +2,9 @@ package settings type OpenAI struct { BaseUrl string `json:"base_url" binding:"omitempty,url"` - Token string `json:"token" binding:"omitempty,alpha_num_dash_dot"` + Token string `json:"token" binding:"omitempty,safety_text"` Proxy string `json:"proxy" binding:"omitempty,url"` - Model string `json:"model" binding:"omitempty,alpha_num_dash_dot"` + Model string `json:"model" binding:"omitempty,safety_text"` } var OpenAISettings = OpenAI{} diff --git a/settings/server.go b/settings/server.go index 313f981..96dcfee 100644 --- a/settings/server.go +++ b/settings/server.go @@ -21,7 +21,7 @@ type Server struct { CertRenewalInterval int `json:"cert_renewal_interval" binding:"min=7,max=21"` RecursiveNameservers []string `json:"recursive_nameservers" binding:"omitempty,dive,hostname_port"` SkipInstallation bool `json:"skip_installation" protected:"true"` - Name string `json:"name" binding:"omitempty,alpha_num_dash_dot"` + Name string `json:"name" binding:"omitempty,safety_text"` } func (s *Server) GetCADir() string { diff --git a/test/acme_test.go b/test/acme_test.go deleted file mode 100644 index 3371aad..0000000 --- a/test/acme_test.go +++ /dev/null @@ -1,59 +0,0 @@ -package test - -import ( - "fmt" - "github.com/0xJacky/Nginx-UI/internal/nginx" - "io/ioutil" - "log" - "os" - "os/exec" - "strings" - "testing" -) - -func TestAcme(t *testing.T) { - const acmePath = "/usr/local/acme.sh" - _, err := os.Stat(acmePath) - log.Println("[found] acme.sh ", acmePath) - if err != nil { - log.Println(err) - if os.IsNotExist(err) { - log.Println("[not found] acme.sh, installing...") - - if _, err := os.Stat("../tmp"); os.IsNotExist(err) { - _ = os.Mkdir("../tmp", 0644) - } - - out, err := exec.Command("curl", "-o", "../tmp/acme.sh", "https://get.acme.sh"). - CombinedOutput() - if err != nil { - log.Println(err) - return - } - fmt.Printf("%s\n", out) - - log.Println("[acme.sh] downloaded") - - file, _ := ioutil.ReadFile("../tmp/acme.sh") - - fileString := string(file) - fileString = strings.Replace(fileString, "https://raw.githubusercontent.com", - "https://mirror.ghproxy.com/https://raw.githubusercontent.com", -1) - - _ = ioutil.WriteFile("../tmp/acme.sh", []byte(fileString), 0644) - - out, err = exec.Command("bash", "../tmp/acme.sh", - "install", - "--log", - "--home", "/usr/local/acme.sh", - "--cert-home", nginx.GetConfPath("ssl")). - CombinedOutput() - if err != nil { - log.Println(err) - return - } - fmt.Printf("%s\n", out) - - } - } -} diff --git a/test/cert_test.go b/test/cert_test.go deleted file mode 100644 index 1e22fab..0000000 --- a/test/cert_test.go +++ /dev/null @@ -1,38 +0,0 @@ -package test - -import ( - "fmt" - "github.com/0xJacky/Nginx-UI/internal/nginx" - "log" - "os" - "os/exec" - "testing" -) - -func TestCert(t *testing.T) { - out, err := exec.Command("bash", "/usr/local/acme.sh/acme.sh", - "--issue", - "-d", "test.ojbk.me", - "--nginx").CombinedOutput() - if err != nil { - log.Println(err) - return - } - fmt.Printf("%s\n", out) - - _, err = os.Stat(nginx.GetConfPath("ssl/test.ojbk.me/fullchain.cer")) - - if err != nil { - log.Println(err) - return - } - log.Println("[found]", "fullchain.cer") - _, err = os.Stat(nginx.GetConfPath("ssl/test.ojbk.me/test.ojbk.me.key")) - - if err != nil { - log.Println(err) - return - } - - log.Println("[found]", "cert key") -}