mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2026-09-22 08:00:53 +00:00
fix: update cert reload logic and translation in Mux mode (#11751)
* fix: update SSL setting check to include 'Mux' option in GetSystemSSL function * fix: update language files to clarify muxHelper descriptions for security implications * feat: add keepdeps.go to preserve enterprise-only dependencies in OSS builds * revert: revert cherrypick
This commit is contained in:
@@ -1233,7 +1233,7 @@ func saveCertificateFile(websiteSSL *model.WebsiteSSL, logger *log.Logger) {
|
||||
func GetSystemSSL() (bool, uint) {
|
||||
var sslSetting model.Setting
|
||||
_ = global.CoreDB.Model(&model.Setting{}).Where("key = ?", "SSL").First(&sslSetting).Error
|
||||
if sslSetting.Value == "Enable" {
|
||||
if sslSetting.Value == "Enable" || sslSetting.Value == "Mux" {
|
||||
var sslIDSetting model.Setting
|
||||
_ = global.CoreDB.Model(&model.Setting{}).Where("key = ?", "SSLID").First(&sslIDSetting).Error
|
||||
idValue, _ := strconv.Atoi(sslIDSetting.Value)
|
||||
|
||||
@@ -2035,7 +2035,7 @@ const message = {
|
||||
https: 'Setting HTTPS for the panel improves access security',
|
||||
strictHelper: 'Non-HTTPS traffic cannot connect to the panel',
|
||||
muxHelper:
|
||||
'The panel will listen on both HTTP and HTTPS ports and redirect HTTP to HTTPS, but this may reduce security',
|
||||
"The panel will listen on both HTTP and HTTPS protocols and redirect HTTP traffic to HTTPS, but this may reduce the panel's security",
|
||||
certType: 'Certificate type',
|
||||
selfSigned: 'Self signed',
|
||||
selfSignedHelper: `Browsers may not trust self-signed certificates and may display security warnings.`,
|
||||
|
||||
@@ -2049,7 +2049,7 @@ const message = {
|
||||
https: 'Configurar HTTPS para el panel mejora la seguridad de acceso',
|
||||
strictHelper: 'El tráfico no HTTPS no puede conectarse al panel',
|
||||
muxHelper:
|
||||
'El panel escuchará en los puertos HTTP y HTTPS y redirigirá HTTP a HTTPS, pero esto puede reducir la seguridad',
|
||||
'El panel escuchará en los protocolos HTTP y HTTPS y redirigirá HTTP a HTTPS, pero esto puede reducir la seguridad del panel',
|
||||
certType: 'Tipo de certificado',
|
||||
selfSigned: 'Autofirmado',
|
||||
selfSignedHelper:
|
||||
|
||||
@@ -1958,7 +1958,7 @@ const message = {
|
||||
https: 'パネルにHTTPSを設定するとアクセスセキュリティが向上します',
|
||||
strictHelper: 'HTTPS以外のトラフィックはパネルに接続できません',
|
||||
muxHelper:
|
||||
'パネルはHTTPポートとHTTPSポートの両方を監視し、HTTPをHTTPSにリダイレクトしますが、セキュリティが低下する可能性があります',
|
||||
'パネルはHTTPピュロコールとHTTPSピュロコールの両方を監視し、HTTPをHTTPSにリダイレクトしますが、このモードではパネルのセキュリティが低下する可能性があります',
|
||||
certType: '証明書の種類',
|
||||
selfSigned: '自己署名',
|
||||
selfSignedHelper: `ブラウザは、自己署名の証明書を信頼していない場合があり、セキュリティ警告を表示する場合があります。`,
|
||||
|
||||
@@ -1926,7 +1926,8 @@ const message = {
|
||||
|
||||
https: '패널에 HTTPS를 설정하면 액세스 보안이 향상됩니다',
|
||||
strictHelper: '비 HTTPS 트래픽은 패널에 연결할 수 없습니다',
|
||||
muxHelper: '패널은 HTTP 및 HTTPS 포트 모두를 수신하고 HTTP를 HTTPS로 리디렉션하지만 보안이 저하될 수 있습니다',
|
||||
muxHelper:
|
||||
'패널은 HTTP 및 HTTPS 프로토콜 모두를 수신하고 HTTP를 HTTPS로 리디렉션하지만 보안이 저하될 수 있습니다',
|
||||
certType: '인증서 유형',
|
||||
selfSigned: '자가 서명',
|
||||
selfSignedHelper: '자가 서명 인증서는 브라우저에서 신뢰하지 않을 수 있으며 보안 경고가 표시될 수 있습니다.',
|
||||
|
||||
@@ -2016,7 +2016,7 @@ const message = {
|
||||
https: 'Mengatur HTTPS untuk panel meningkatkan keselamatan akses',
|
||||
strictHelper: 'Trafik bukan HTTPS tidak boleh menyambung ke panel',
|
||||
muxHelper:
|
||||
'Panel akan mendengar pada kedua-dua port HTTP dan HTTPS dan mengarahkan HTTP ke HTTPS, tetapi ini mungkin mengurangkan keselamatan',
|
||||
'Panel akan mendengar pada kedua-dua protokol HTTP dan HTTPS dan mengarahkan HTTP ke HTTPS, tetapi ini mungkin mengurangkan keselamatan panel',
|
||||
certType: 'Jenis sijil',
|
||||
selfSigned: 'Diterbitkan sendiri',
|
||||
selfSignedHelper:
|
||||
|
||||
@@ -2004,7 +2004,7 @@ const message = {
|
||||
https: 'Configurar HTTPS para o painel melhora a segurança de acesso',
|
||||
strictHelper: 'Tráfego não HTTPS não pode se conectar ao painel',
|
||||
muxHelper:
|
||||
'O painel ouvirá nas portas HTTP e HTTPS e redirecionará HTTP para HTTPS, mas isso pode reduzir a segurança',
|
||||
'O painel ouvirá nas protocolos HTTP e HTTPS e redirecionará HTTP para HTTPS, mas isso pode reduzir a segurança do painel',
|
||||
certType: 'Tipo de certificado',
|
||||
selfSigned: 'Autoassinado',
|
||||
selfSignedHelper:
|
||||
|
||||
@@ -2002,7 +2002,7 @@ const message = {
|
||||
https: 'Настройка HTTPS для панели повышает безопасность доступа',
|
||||
strictHelper: 'Трафик без HTTPS не может подключиться к панели',
|
||||
muxHelper:
|
||||
'Панель будет прослушивать порты HTTP и HTTPS и перенаправлять HTTP на HTTPS, но это может снизить безопасность',
|
||||
'Панель будет прослушивать протоколы HTTP и HTTPS и перенаправлять HTTP на HTTPS, но это может снизить безопасность панели',
|
||||
certType: 'Тип сертификата',
|
||||
selfSigned: 'Самоподписанный',
|
||||
selfSignedHelper:
|
||||
|
||||
@@ -2056,7 +2056,7 @@ const message = {
|
||||
https: 'Panel için HTTPS ayarlamak erişim güvenliğini artırır',
|
||||
strictHelper: 'HTTPS olmayan trafik panele bağlanamaz',
|
||||
muxHelper:
|
||||
"Panel hem HTTP hem de HTTPS portlarını dinleyecek ve HTTP'yi HTTPS'ye yönlendirecektir, ancak bu güvenliği azaltabilir",
|
||||
"Panel hem HTTP hem de HTTPS protokollarını dinleyecek ve HTTP'yi HTTPS'ye yönlendirecektir, bu modda panel güvenliğini azaltabilir",
|
||||
certType: 'Sertifika türü',
|
||||
selfSigned: 'Kendi kendine imzalı',
|
||||
selfSignedHelper:
|
||||
|
||||
@@ -1980,7 +1980,7 @@ const message = {
|
||||
|
||||
https: '為面板設置 HTTPS 可提升訪問安全性',
|
||||
strictHelper: '非 HTTPS 流量無法連接面板',
|
||||
muxHelper: '面板將同時監聽 HTTP 和 HTTPS 端口,並將 HTTP 重定向到 HTTPS,但可能會降低安全性',
|
||||
muxHelper: '面板將同時監聽 HTTP 和 HTTPS 協議,並將 HTTP 重定向到 HTTPS,此模式下可能會降低面板安全性',
|
||||
certType: '證書類型',
|
||||
selfSigned: '自簽名',
|
||||
selfSignedHelper: '自簽證書,不被瀏覽器信任,顯示不安全是正常現象',
|
||||
|
||||
@@ -1980,7 +1980,7 @@ const message = {
|
||||
|
||||
https: '为面板设置HTTPS可提升访问安全性',
|
||||
strictHelper: '非 HTTPS 流量无法连接面板',
|
||||
muxHelper: '面板将同时监听 HTTP 和 HTTPS 端口,并将 HTTP 重定向到 HTTPS,但可能会降低安全性',
|
||||
muxHelper: '面板将同时监听 HTTP 和 HTTPS 协议,并将 HTTP 重定向到 HTTPS,此模式下可能会降低面板安全性',
|
||||
certType: '证书类型',
|
||||
selfSigned: '自签名',
|
||||
selfSignedHelper: '自签证书,不被浏览器信任,显示不安全是正常现象',
|
||||
|
||||
Reference in New Issue
Block a user