Remove redundant config field

eliona-smart-building-assistant · Jun 26, 2024 · e301018 · e301018
1 parent bbaac32
commit e301018
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 33 deletions.
diff --git a/apiserver/README.md b/apiserver/README.md
@@ -13,7 +13,7 @@ To see how to make this your own, look here:
 [README](https://openapi-generator.tech)
 
 - API version: 1.0.0
-- Build date: 2024-06-26T08:43:07.565963939Z[Etc/UTC]
+- Build date: 2024-06-26T08:44:30.583847215Z[Etc/UTC]
 
 
 ### Running the server

diff --git a/apiserver/model_configuration.go b/apiserver/model_configuration.go
@@ -48,9 +48,6 @@ type Configuration struct {
 	// If you have to use a customized Entity Id, you can overwrite it here. Normally the default value can be left as it is.
 	EntityId string `json:"entityId,omitempty"`
 
-	// Only send cookies over encrypted connection (HTTPS)
-	CookieSecure bool `json:"cookieSecure,omitempty"`
-
 	// The url to redirect if the login failed. If this value is null the default page /noLogin will showed up
 	LoginFailedUrl string `json:"loginFailedUrl,omitempty"`
 }

diff --git a/app.go b/app.go
@@ -101,7 +101,6 @@ func run() {
 		&config.AllowInitializationByIdp,
 		&config.SignedRequest,
 		&config.ForceAuthn,
-		&config.CookieSecure,
 		saml.PUBLIC_BASE_PATH,
 	)
 	if err != nil {

diff --git a/appdb/config.go b/appdb/config.go
diff --git a/conf/conf.go b/conf/conf.go
@@ -69,7 +69,6 @@ func InsertAutoSamlConfiguration(ctx context.Context) error {
 			SignedRequest:            AUTO_CNF_DEFAULT_SIGNING_REQ,
 			ForceAuthn:               AUTO_CNF_DEFAULT_FORCE_AUTHN,
 			EntityID:                 AUTO_CNF_DEFAULT_ENTITY_ID,
-			CookieSecure:             AUTO_CNF_DEFAULT_COOKIE_SECURE,
 			LoginFailedURL:           AUTO_CNF_DEFAULT_LOGIN_FAIL_URL,
 		}
 		attributeMapping appdb.AttributeMap = appdb.AttributeMap{

diff --git a/conf/converter.go b/conf/converter.go
@@ -39,7 +39,6 @@ func ConfigApiToDbForm(config *apiserver.Configuration) (*appdb.Config, error) {
 		SignedRequest:            config.SignedRequest,
 		ForceAuthn:               config.ForceAuthn,
 		EntityID:                 config.EntityId,
-		CookieSecure:             config.CookieSecure,
 		LoginFailedURL:           config.LoginFailedUrl,
 	}, nil
 }
@@ -58,7 +57,6 @@ func ConfigDbToApiForm(config *appdb.Config) (*apiserver.Configuration, error) {
 		SignedRequest:              config.SignedRequest,
 		ForceAuthn:                 config.ForceAuthn,
 		EntityId:                   config.EntityID,
-		CookieSecure:               config.CookieSecure,
 		LoginFailedUrl:             config.LoginFailedURL,
 	}, nil
 }

diff --git a/conf/init.sql b/conf/init.sql
@@ -29,7 +29,6 @@ CREATE TABLE IF NOT EXISTS saml_sp.config (
     signed_request              BOOLEAN         NOT NULL DEFAULT true                                         , -- sign the SAML request
     force_authn                 BOOLEAN         NOT NULL DEFAULT false                                        ,
     entity_id                   TEXT            NOT NULL DEFAULT '{ownUrl}/apps-public/saml-sso/saml/metadata',
-    cookie_secure               BOOLEAN         NOT NULL DEFAULT false                                        ,
     login_failed_url            TEXT            NOT NULL DEFAULT '{ownUrl}/noLogin'                             -- redirect url when a user login fails
 ) ;
 

diff --git a/openapi.yaml b/openapi.yaml
@@ -297,13 +297,6 @@ components:
           readOnly: false
           default: "{ownUrl}/saml/metadata"
           example: "{ownUrl}/saml/metadata"
-        cookieSecure:
-          description: Only send cookies over encrypted connection (HTTPS)
-          type: boolean
-          nullable: false
-          readOnly: false
-          default: false
-          example: false
         loginFailedUrl:
           description: The url to redirect if the login failed. If this value is null the default page /noLogin will showed up
           type: string

diff --git a/saml/service_provider.go b/saml/service_provider.go
@@ -40,12 +40,12 @@ func NewServiceProvider(certificate string, privateKey string, pubBaseUrl string
 	idpMetadata []byte) (*ServiceProvider, error) {
 
 	return NewServiceProviderAdvanced(certificate, privateKey, pubBaseUrl, idpMetadata, nil, nil,
-		nil, nil, nil, "")
+		nil, nil, "")
 }
 
 func NewServiceProviderAdvanced(certificate string, privateKey string, baseUrl string, idpMetadata []byte,
-	entityId *string, allowInitByIdp *bool, signedRequest *bool, forceAuthn *bool,
-	cookieSecure *bool, pubBasePath string) (*ServiceProvider, error) {
+	entityId *string, allowInitByIdp *bool, signedRequest *bool, forceAuthn *bool, pubBasePath string,
+) (*ServiceProvider, error) {
 	var serviceProvider ServiceProvider = ServiceProvider{
 		pubBasePath: pubBasePath,
 	}
@@ -87,10 +87,6 @@ func NewServiceProviderAdvanced(certificate string, privateKey string, baseUrl s
 	if forceAuthn != nil {
 		opts.ForceAuthn = *forceAuthn
 	}
-	if cookieSecure != nil {
-		// opts.CookieSecure: true // option not available any more
-		log.Debug(LOG_REGIO, "cookie secure not implemented")
-	}
 
 	serviceProvider.sp, err = samlsp.New(opts)
 

diff --git a/utils/testing.go b/utils/testing.go
@@ -31,7 +31,6 @@ func CreateRandomApiConfig() apiserver.Configuration {
 		SignedRequest:            RandomBoolean(),
 		ForceAuthn:               RandomBoolean(),
 		EntityId:                 RandomUrl() + "/" + RandomCharacter(5, false),
-		CookieSecure:             RandomBoolean(),
 		LoginFailedUrl:           RandomUrl() + "/" + RandomCharacter(RandomInt(2, 10), false),
 	}