Skip to content

Commit 62871ac

Browse files
authored
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
1 parent 7401906 commit 62871ac

11 files changed

Lines changed: 12 additions & 11 deletions

File tree

agent/app/service/website_utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1233,7 +1233,7 @@ func saveCertificateFile(websiteSSL *model.WebsiteSSL, logger *log.Logger) {
12331233
func GetSystemSSL() (bool, uint) {
12341234
var sslSetting model.Setting
12351235
_ = global.CoreDB.Model(&model.Setting{}).Where("key = ?", "SSL").First(&sslSetting).Error
1236-
if sslSetting.Value == "Enable" {
1236+
if sslSetting.Value == "Enable" || sslSetting.Value == "Mux" {
12371237
var sslIDSetting model.Setting
12381238
_ = global.CoreDB.Model(&model.Setting{}).Where("key = ?", "SSLID").First(&sslIDSetting).Error
12391239
idValue, _ := strconv.Atoi(sslIDSetting.Value)

frontend/src/lang/modules/en.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2035,7 +2035,7 @@ const message = {
20352035
https: 'Setting HTTPS for the panel improves access security',
20362036
strictHelper: 'Non-HTTPS traffic cannot connect to the panel',
20372037
muxHelper:
2038-
'The panel will listen on both HTTP and HTTPS ports and redirect HTTP to HTTPS, but this may reduce security',
2038+
"The panel will listen on both HTTP and HTTPS protocols and redirect HTTP traffic to HTTPS, but this may reduce the panel's security",
20392039
certType: 'Certificate type',
20402040
selfSigned: 'Self signed',
20412041
selfSignedHelper: `Browsers may not trust self-signed certificates and may display security warnings.`,

frontend/src/lang/modules/es-es.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2049,7 +2049,7 @@ const message = {
20492049
https: 'Configurar HTTPS para el panel mejora la seguridad de acceso',
20502050
strictHelper: 'El tráfico no HTTPS no puede conectarse al panel',
20512051
muxHelper:
2052-
'El panel escuchará en los puertos HTTP y HTTPS y redirigirá HTTP a HTTPS, pero esto puede reducir la seguridad',
2052+
'El panel escuchará en los protocolos HTTP y HTTPS y redirigirá HTTP a HTTPS, pero esto puede reducir la seguridad del panel',
20532053
certType: 'Tipo de certificado',
20542054
selfSigned: 'Autofirmado',
20552055
selfSignedHelper:

frontend/src/lang/modules/ja.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1958,7 +1958,7 @@ const message = {
19581958
https: 'パネルにHTTPSを設定するとアクセスセキュリティが向上します',
19591959
strictHelper: 'HTTPS以外のトラフィックはパネルに接続できません',
19601960
muxHelper:
1961-
'パネルはHTTPポートとHTTPSポートの両方を監視し、HTTPをHTTPSにリダイレクトしますが、セキュリティが低下する可能性があります',
1961+
'パネルはHTTPピュロコールとHTTPSピュロコールの両方を監視し、HTTPをHTTPSにリダイレクトしますが、このモードではパネルのセキュリティが低下する可能性があります',
19621962
certType: '証明書の種類',
19631963
selfSigned: '自己署名',
19641964
selfSignedHelper: `ブラウザは、自己署名の証明書を信頼していない場合があり、セキュリティ警告を表示する場合があります。`,

frontend/src/lang/modules/ko.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1926,7 +1926,8 @@ const message = {
19261926

19271927
https: '패널에 HTTPS를 설정하면 액세스 보안이 향상됩니다',
19281928
strictHelper: '비 HTTPS 트래픽은 패널에 연결할 수 없습니다',
1929-
muxHelper: '패널은 HTTP 및 HTTPS 포트 모두를 수신하고 HTTP를 HTTPS로 리디렉션하지만 보안이 저하될 수 있습니다',
1929+
muxHelper:
1930+
'패널은 HTTP 및 HTTPS 프로토콜 모두를 수신하고 HTTP를 HTTPS로 리디렉션하지만 보안이 저하될 수 있습니다',
19301931
certType: '인증서 유형',
19311932
selfSigned: '자가 서명',
19321933
selfSignedHelper: '자가 서명 인증서는 브라우저에서 신뢰하지 않을 수 있으며 보안 경고가 표시될 수 있습니다.',

frontend/src/lang/modules/ms.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2016,7 +2016,7 @@ const message = {
20162016
https: 'Mengatur HTTPS untuk panel meningkatkan keselamatan akses',
20172017
strictHelper: 'Trafik bukan HTTPS tidak boleh menyambung ke panel',
20182018
muxHelper:
2019-
'Panel akan mendengar pada kedua-dua port HTTP dan HTTPS dan mengarahkan HTTP ke HTTPS, tetapi ini mungkin mengurangkan keselamatan',
2019+
'Panel akan mendengar pada kedua-dua protokol HTTP dan HTTPS dan mengarahkan HTTP ke HTTPS, tetapi ini mungkin mengurangkan keselamatan panel',
20202020
certType: 'Jenis sijil',
20212021
selfSigned: 'Diterbitkan sendiri',
20222022
selfSignedHelper:

frontend/src/lang/modules/pt-br.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2004,7 +2004,7 @@ const message = {
20042004
https: 'Configurar HTTPS para o painel melhora a segurança de acesso',
20052005
strictHelper: 'Tráfego não HTTPS não pode se conectar ao painel',
20062006
muxHelper:
2007-
'O painel ouvirá nas portas HTTP e HTTPS e redirecionará HTTP para HTTPS, mas isso pode reduzir a segurança',
2007+
'O painel ouvirá nas protocolos HTTP e HTTPS e redirecionará HTTP para HTTPS, mas isso pode reduzir a segurança do painel',
20082008
certType: 'Tipo de certificado',
20092009
selfSigned: 'Autoassinado',
20102010
selfSignedHelper:

frontend/src/lang/modules/ru.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2002,7 +2002,7 @@ const message = {
20022002
https: 'Настройка HTTPS для панели повышает безопасность доступа',
20032003
strictHelper: 'Трафик без HTTPS не может подключиться к панели',
20042004
muxHelper:
2005-
'Панель будет прослушивать порты HTTP и HTTPS и перенаправлять HTTP на HTTPS, но это может снизить безопасность',
2005+
'Панель будет прослушивать протоколы HTTP и HTTPS и перенаправлять HTTP на HTTPS, но это может снизить безопасность панели',
20062006
certType: 'Тип сертификата',
20072007
selfSigned: 'Самоподписанный',
20082008
selfSignedHelper:

frontend/src/lang/modules/tr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2056,7 +2056,7 @@ const message = {
20562056
https: 'Panel için HTTPS ayarlamak erişim güvenliğini artırır',
20572057
strictHelper: 'HTTPS olmayan trafik panele bağlanamaz',
20582058
muxHelper:
2059-
"Panel hem HTTP hem de HTTPS portlarını dinleyecek ve HTTP'yi HTTPS'ye yönlendirecektir, ancak bu güvenliği azaltabilir",
2059+
"Panel hem HTTP hem de HTTPS protokollarını dinleyecek ve HTTP'yi HTTPS'ye yönlendirecektir, bu modda panel güvenliğini azaltabilir",
20602060
certType: 'Sertifika türü',
20612061
selfSigned: 'Kendi kendine imzalı',
20622062
selfSignedHelper:

frontend/src/lang/modules/zh-Hant.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1980,7 +1980,7 @@ const message = {
19801980

19811981
https: '為面板設置 HTTPS 可提升訪問安全性',
19821982
strictHelper: '非 HTTPS 流量無法連接面板',
1983-
muxHelper: '面板將同時監聽 HTTP 和 HTTPS 端口,並將 HTTP 重定向到 HTTPS,但可能會降低安全性',
1983+
muxHelper: '面板將同時監聽 HTTP 和 HTTPS 協議,並將 HTTP 重定向到 HTTPS,此模式下可能會降低面板安全性',
19841984
certType: '證書類型',
19851985
selfSigned: '自簽名',
19861986
selfSignedHelper: '自簽證書,不被瀏覽器信任,顯示不安全是正常現象',

0 commit comments

Comments
 (0)