rename IsServerHttps to IsServerHTTPS

kiali · Dec 7, 2023 · 495c6c8 · 495c6c8
1 parent b1f9873
commit 495c6c8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/business/authentication/openid_auth_controller.go b/business/authentication/openid_auth_controller.go
@@ -372,7 +372,7 @@ func (c OpenIdAuthController) redirectToAuthServerHandler(w http.ResponseWriter,
 	nonceCookie := http.Cookie{
 		Expires:  expirationTime,
 		HttpOnly: true,
-		Secure:   conf.IsServerHttps(),
+		Secure:   conf.IsServerHTTPS(),
 		Name:     OpenIdNonceCookieName,
 		Path:     conf.Server.WebRoot,
 		SameSite: http.SameSiteLaxMode,
@@ -495,7 +495,7 @@ func (p *openidFlowHelper) callbackCleanup(w http.ResponseWriter) *openidFlowHel
 		Name:     OpenIdNonceCookieName,
 		Expires:  time.Unix(0, 0),
 		HttpOnly: true,
-		Secure:   conf.IsServerHttps(),
+		Secure:   conf.IsServerHTTPS(),
 		Path:     conf.Server.WebRoot,
 		SameSite: http.SameSiteStrictMode,
 		Value:    "",

diff --git a/business/authentication/session_persistor.go b/business/authentication/session_persistor.go
@@ -137,7 +137,7 @@ func (p CookieSessionPersistor) CreateSession(_ *http.Request, w http.ResponseWr
 			Value:    chunk,
 			Expires:  expiresOn,
 			HttpOnly: true,
-			Secure:   conf.IsServerHttps(),
+			Secure:   conf.IsServerHTTPS(),
 			Path:     conf.Server.WebRoot,
 			SameSite: http.SameSiteStrictMode,
 		}
@@ -153,7 +153,7 @@ func (p CookieSessionPersistor) CreateSession(_ *http.Request, w http.ResponseWr
 			Value:    strconv.Itoa(len(sessionDataChunks)),
 			Expires:  expiresOn,
 			HttpOnly: true,
-			Secure:   conf.IsServerHttps(),
+			Secure:   conf.IsServerHTTPS(),
 			Path:     conf.Server.WebRoot,
 			SameSite: http.SameSiteStrictMode,
 		}
@@ -329,7 +329,7 @@ func (p CookieSessionPersistor) TerminateSession(r *http.Request, w http.Respons
 				Value:    "",
 				Expires:  time.Unix(0, 0),
 				HttpOnly: true,
-				Secure:   conf.IsServerHttps(),
+				Secure:   conf.IsServerHTTPS(),
 				MaxAge:   -1,
 				Path:     conf.Server.WebRoot,
 				SameSite: http.SameSiteStrictMode,

diff --git a/business/authentication/session_persistor_test.go b/business/authentication/session_persistor_test.go
@@ -47,7 +47,7 @@ func TestSecureFlag(t *testing.T) {
 
 	cookie := response.Cookies()[0]
 	assert.True(t, cookie.HttpOnly)
-	assert.True(t, true, cfg.IsServerHttps())
+	assert.True(t, true, cfg.IsServerHTTPS())
 	assert.True(t, cookie.Secure)
 }
 
@@ -78,8 +78,8 @@ func TestCreateSessionNoChunks(t *testing.T) {
 
 	cookie := response.Cookies()[0]
 	assert.True(t, cookie.HttpOnly)
-	assert.Equal(t, false, cfg.IsServerHttps())
-	assert.Equal(t, cfg.IsServerHttps(), cookie.Secure)
+	assert.Equal(t, false, cfg.IsServerHTTPS())
+	assert.Equal(t, cfg.IsServerHTTPS(), cookie.Secure)
 	assert.Equal(t, AESSessionCookieName, cookie.Name)
 	assert.Equal(t, "/kiali-app", cookie.Path)
 	assert.Equal(t, http.SameSiteStrictMode, cookie.SameSite)
@@ -131,7 +131,7 @@ func TestCreateSessionWithChunks(t *testing.T) {
 
 	for _, cookie := range response.Cookies() {
 		assert.True(t, cookie.HttpOnly)
-		assert.Equal(t, cfg.IsServerHttps(), cookie.Secure)
+		assert.Equal(t, cfg.IsServerHTTPS(), cookie.Secure)
 		assert.Equal(t, "/kiali-app", cookie.Path)
 		assert.Equal(t, http.SameSiteStrictMode, cookie.SameSite)
 		assert.Equal(t, expiresTime, cookie.Expires)

diff --git a/config/config.go b/config/config.go
@@ -877,8 +877,8 @@ func (conf *Config) AllNamespacesAccessible() bool {
 	return conf.Deployment.ClusterWideAccess
 }
 
-// IsServerHttps returns true if the server endpoint should use HTTPS. If false, only plaintext HTTP is supported.
-func (conf *Config) IsServerHttps() bool {
+// IsServerHTTPS returns true if the server endpoint should use HTTPS. If false, only plaintext HTTP is supported.
+func (conf *Config) IsServerHTTPS() bool {
 	return conf.Identity.CertFile != "" && conf.Identity.PrivateKeyFile != ""
 }
 

diff --git a/server/server.go b/server/server.go
@@ -101,7 +101,7 @@ func (s *Server) Start() {
 
 	go func() {
 		var err error
-		if s.conf.IsServerHttps() {
+		if s.conf.IsServerHTTPS() {
 			log.Infof("Server endpoint will require https")
 			log.Infof("Server will support protocols: %v", s.httpServer.TLSConfig.NextProtos)
 			s.router.Use(secureHttpsMiddleware)

diff --git a/server/server_test.go b/server/server_test.go
@@ -124,7 +124,7 @@ func TestAnonymousMode(t *testing.T) {
 	apiURLWithAuthentication := serverURL + "/api/authenticate"
 	apiURL := serverURL + "/api"
 
-	assert.False(t, conf.IsServerHttps())
+	assert.False(t, conf.IsServerHTTPS())
 
 	config.Set(conf)
 
@@ -215,7 +215,7 @@ func TestSecureComm(t *testing.T) {
 	apiURL := serverURL + "/api"
 	metricsURL := fmt.Sprintf("http://%v:%v/", testHostname, testMetricsPort)
 
-	assert.True(t, conf.IsServerHttps())
+	assert.True(t, conf.IsServerHTTPS())
 
 	config.Set(conf)