@@ -94,7 +94,7 @@ func GetConfig() *Configuration {
94
94
// database - all DB variables
95
95
func database () (databaseConfig DatabaseConfig , err error ) {
96
96
// RDBMS
97
- activateRDBMS := strings .TrimSpace (os .Getenv ("ACTIVATE_RDBMS" ))
97
+ activateRDBMS := strings .ToLower ( strings . TrimSpace (os .Getenv ("ACTIVATE_RDBMS" ) ))
98
98
if activateRDBMS == Activated {
99
99
dbRDBMS , errThis := databaseRDBMS ()
100
100
if errThis != nil {
@@ -106,7 +106,7 @@ func database() (databaseConfig DatabaseConfig, err error) {
106
106
databaseConfig .RDBMS .Activate = activateRDBMS
107
107
108
108
// REDIS
109
- activateRedis := strings .TrimSpace (os .Getenv ("ACTIVATE_REDIS" ))
109
+ activateRedis := strings .ToLower ( strings . TrimSpace (os .Getenv ("ACTIVATE_REDIS" ) ))
110
110
if activateRedis == Activated {
111
111
dbRedis , errThis := databaseRedis ()
112
112
if errThis != nil {
@@ -118,7 +118,7 @@ func database() (databaseConfig DatabaseConfig, err error) {
118
118
databaseConfig .REDIS .Activate = activateRedis
119
119
120
120
// MongoDB
121
- activateMongo := strings .TrimSpace (os .Getenv ("ACTIVATE_MONGO" ))
121
+ activateMongo := strings .ToLower ( strings . TrimSpace (os .Getenv ("ACTIVATE_MONGO" ) ))
122
122
if activateMongo == Activated {
123
123
dbMongo , errThis := databaseMongo ()
124
124
if errThis != nil {
@@ -135,7 +135,7 @@ func database() (databaseConfig DatabaseConfig, err error) {
135
135
// databaseRDBMS - all RDBMS variables
136
136
func databaseRDBMS () (databaseConfig DatabaseConfig , err error ) {
137
137
// Env
138
- databaseConfig .RDBMS .Env .Driver = strings .TrimSpace (os .Getenv ("DBDRIVER" ))
138
+ databaseConfig .RDBMS .Env .Driver = strings .ToLower ( strings . TrimSpace (os .Getenv ("DBDRIVER" ) ))
139
139
databaseConfig .RDBMS .Env .Host = strings .TrimSpace (os .Getenv ("DBHOST" ))
140
140
databaseConfig .RDBMS .Env .Port = strings .TrimSpace (os .Getenv ("DBPORT" ))
141
141
databaseConfig .RDBMS .Env .TimeZone = strings .TrimSpace (os .Getenv ("DBTIMEZONE" ))
@@ -224,9 +224,9 @@ func databaseMongo() (databaseConfig DatabaseConfig, err error) {
224
224
225
225
// email - config for using external email services
226
226
func email () (emailConfig EmailConfig , err error ) {
227
- emailConfig .Activate = strings .TrimSpace (os .Getenv ("ACTIVATE_EMAIL_SERVICE" ))
227
+ emailConfig .Activate = strings .ToLower ( strings . TrimSpace (os .Getenv ("ACTIVATE_EMAIL_SERVICE" ) ))
228
228
if emailConfig .Activate == Activated {
229
- emailConfig .Provider = strings .TrimSpace (os .Getenv ("EMAIL_SERVICE_PROVIDER" ))
229
+ emailConfig .Provider = strings .ToLower ( strings . TrimSpace (os .Getenv ("EMAIL_SERVICE_PROVIDER" ) ))
230
230
emailConfig .APIToken = strings .TrimSpace (os .Getenv ("EMAIL_API_TOKEN" ))
231
231
emailConfig .AddrFrom = strings .TrimSpace (os .Getenv ("EMAIL_FROM" ))
232
232
@@ -277,7 +277,7 @@ func email() (emailConfig EmailConfig, err error) {
277
277
278
278
// logger - config for sentry.io
279
279
func logger () (loggerConfig LoggerConfig ) {
280
- loggerConfig .Activate = strings .TrimSpace (os .Getenv ("ACTIVATE_SENTRY" ))
280
+ loggerConfig .Activate = strings .ToLower ( strings . TrimSpace (os .Getenv ("ACTIVATE_SENTRY" ) ))
281
281
if loggerConfig .Activate == Activated {
282
282
loggerConfig .SentryDsn = strings .TrimSpace (os .Getenv ("SentryDSN" ))
283
283
}
@@ -299,14 +299,14 @@ func security() (securityConfig SecurityConfig, err error) {
299
299
}
300
300
301
301
// Basic auth
302
- securityConfig .MustBasicAuth = strings .TrimSpace (os .Getenv ("ACTIVATE_BASIC_AUTH" ))
302
+ securityConfig .MustBasicAuth = strings .ToLower ( strings . TrimSpace (os .Getenv ("ACTIVATE_BASIC_AUTH" ) ))
303
303
if securityConfig .MustBasicAuth == Activated {
304
304
securityConfig .BasicAuth .Username = strings .TrimSpace (os .Getenv ("USERNAME" ))
305
305
securityConfig .BasicAuth .Password = strings .TrimSpace (os .Getenv ("PASSWORD" ))
306
306
}
307
307
308
308
// JWT
309
- securityConfig .MustJWT = strings .TrimSpace (os .Getenv ("ACTIVATE_JWT" ))
309
+ securityConfig .MustJWT = strings .ToLower ( strings . TrimSpace (os .Getenv ("ACTIVATE_JWT" ) ))
310
310
if securityConfig .MustJWT == Activated {
311
311
securityConfig .JWT , err = getParamsJWT ()
312
312
if err != nil {
@@ -318,24 +318,24 @@ func security() (securityConfig SecurityConfig, err error) {
318
318
}
319
319
320
320
// When user logs off, invalidate the tokens
321
- securityConfig .InvalidateJWT = strings .TrimSpace (os .Getenv ("INVALIDATE_JWT" ))
321
+ securityConfig .InvalidateJWT = strings .ToLower ( strings . TrimSpace (os .Getenv ("INVALIDATE_JWT" ) ))
322
322
323
323
// Cookie for authentication and authorization
324
- authCookieActivate := strings .TrimSpace (os .Getenv ("AUTH_COOKIE_ACTIVATE" ))
324
+ authCookieActivate := strings .ToLower ( strings . TrimSpace (os .Getenv ("AUTH_COOKIE_ACTIVATE" ) ))
325
325
if authCookieActivate == Activated {
326
326
securityConfig .AuthCookieActivate = true
327
327
securityConfig .AuthCookiePath = strings .TrimSpace (os .Getenv ("AUTH_COOKIE_PATH" ))
328
328
securityConfig .AuthCookieDomain = strings .TrimSpace (os .Getenv ("AUTH_COOKIE_DOMAIN" ))
329
329
330
- if strings .TrimSpace (os .Getenv ("AUTH_COOKIE_SECURE" )) == Activated {
330
+ if strings .ToLower ( strings . TrimSpace (os .Getenv ("AUTH_COOKIE_SECURE" ) )) == Activated {
331
331
securityConfig .AuthCookieSecure = true
332
332
}
333
333
334
- if strings .TrimSpace (os .Getenv ("AUTH_COOKIE_HttpOnly" )) == Activated {
334
+ if strings .ToLower ( strings . TrimSpace (os .Getenv ("AUTH_COOKIE_HttpOnly" ) )) == Activated {
335
335
securityConfig .AuthCookieHTTPOnly = true
336
336
}
337
337
338
- authCookieSameSite := strings .TrimSpace (os .Getenv ("AUTH_COOKIE_SameSite" ))
338
+ authCookieSameSite := strings .ToLower ( strings . TrimSpace (os .Getenv ("AUTH_COOKIE_SameSite" ) ))
339
339
if len (authCookieSameSite ) > 0 {
340
340
if authCookieSameSite == "strict" {
341
341
securityConfig .AuthCookieSameSite = http .SameSiteStrictMode
@@ -348,13 +348,13 @@ func security() (securityConfig SecurityConfig, err error) {
348
348
}
349
349
}
350
350
351
- if strings .TrimSpace (os .Getenv ("SERVE_JWT_AS_RESPONSE_BODY" )) != "no" {
351
+ if strings .ToLower ( strings . TrimSpace (os .Getenv ("SERVE_JWT_AS_RESPONSE_BODY" ) )) != "no" {
352
352
securityConfig .ServeJwtAsResBody = true
353
353
}
354
354
}
355
355
356
356
// Hashing passwords
357
- securityConfig .MustHash = strings .TrimSpace (os .Getenv ("ACTIVATE_HASHING" ))
357
+ securityConfig .MustHash = strings .ToLower ( strings . TrimSpace (os .Getenv ("ACTIVATE_HASHING" ) ))
358
358
if securityConfig .MustHash == Activated {
359
359
securityConfig .HashPass , err = getParamsHash ()
360
360
if err != nil {
@@ -364,7 +364,7 @@ func security() (securityConfig SecurityConfig, err error) {
364
364
}
365
365
366
366
// config for ChaCha20-Poly1305 encryption
367
- activateCipher := strings .TrimSpace (os .Getenv ("ACTIVATE_CIPHER" ))
367
+ activateCipher := strings .ToLower ( strings . TrimSpace (os .Getenv ("ACTIVATE_CIPHER" ) ))
368
368
if activateCipher == Activated {
369
369
securityConfig .MustCipher = true
370
370
@@ -390,15 +390,15 @@ func security() (securityConfig SecurityConfig, err error) {
390
390
// Email verification and password recovery
391
391
securityConfig .VerifyEmail = false
392
392
securityConfig .RecoverPass = false
393
- if strings .TrimSpace (os .Getenv ("VERIFY_EMAIL" )) == "yes" {
393
+ if strings .ToLower ( strings . TrimSpace (os .Getenv ("VERIFY_EMAIL" ))) == Activated {
394
394
securityConfig .VerifyEmail = true
395
395
}
396
- if strings .TrimSpace (os .Getenv ("RECOVER_PASSWORD" )) == "yes" {
396
+ if strings .ToLower ( strings . TrimSpace (os .Getenv ("RECOVER_PASSWORD" ))) == Activated {
397
397
securityConfig .RecoverPass = true
398
398
}
399
399
400
400
// Two-factor authentication
401
- securityConfig .Must2FA = strings .TrimSpace (os .Getenv ("ACTIVATE_2FA" ))
401
+ securityConfig .Must2FA = strings .ToLower ( strings . TrimSpace (os .Getenv ("ACTIVATE_2FA" ) ))
402
402
if securityConfig .Must2FA == Activated {
403
403
securityConfig .TwoFA .Issuer = strings .TrimSpace (os .Getenv ("TWO_FA_ISSUER" ))
404
404
@@ -443,21 +443,21 @@ func security() (securityConfig SecurityConfig, err error) {
443
443
444
444
// false: sha2_256()
445
445
// true: blake2b(sha2_256())
446
- doubleHashTwoFA := strings .TrimSpace (os .Getenv ("TWO_FA_DOUBLE_HASH" ))
446
+ doubleHashTwoFA := strings .ToLower ( strings . TrimSpace (os .Getenv ("TWO_FA_DOUBLE_HASH" ) ))
447
447
if doubleHashTwoFA == Activated {
448
448
securityConfig .TwoFA .DoubleHash = true
449
449
}
450
450
}
451
451
452
452
// App firewall
453
- securityConfig .MustFW = strings .TrimSpace (os .Getenv ("ACTIVATE_FIREWALL" ))
453
+ securityConfig .MustFW = strings .ToLower ( strings . TrimSpace (os .Getenv ("ACTIVATE_FIREWALL" ) ))
454
454
if securityConfig .MustFW == Activated {
455
455
securityConfig .Firewall .ListType = strings .TrimSpace (os .Getenv ("LISTTYPE" ))
456
456
securityConfig .Firewall .IP = strings .TrimSpace (os .Getenv ("IP" ))
457
457
}
458
458
459
459
// CORS
460
- securityConfig .MustCORS = strings .TrimSpace (os .Getenv ("ACTIVATE_CORS" ))
460
+ securityConfig .MustCORS = strings .ToLower ( strings . TrimSpace (os .Getenv ("ACTIVATE_CORS" ) ))
461
461
if securityConfig .MustCORS == Activated {
462
462
cp := middleware.CORSPolicy {}
463
463
@@ -589,14 +589,14 @@ func security() (securityConfig SecurityConfig, err error) {
589
589
func server () (serverConfig ServerConfig ) {
590
590
serverConfig .ServerHost = strings .TrimSpace (os .Getenv ("APP_HOST" ))
591
591
serverConfig .ServerPort = strings .TrimSpace (os .Getenv ("APP_PORT" ))
592
- serverConfig .ServerEnv = strings .TrimSpace (os .Getenv ("APP_ENV" ))
592
+ serverConfig .ServerEnv = strings .ToLower ( strings . TrimSpace (os .Getenv ("APP_ENV" ) ))
593
593
594
594
return
595
595
}
596
596
597
597
// view - HTML renderer
598
598
func view () (viewConfig ViewConfig , err error ) {
599
- viewConfig .Activate = strings .TrimSpace (os .Getenv ("ACTIVATE_VIEW" ))
599
+ viewConfig .Activate = strings .ToLower ( strings . TrimSpace (os .Getenv ("ACTIVATE_VIEW" ) ))
600
600
if viewConfig .Activate == Activated {
601
601
viewConfig .Directory = strings .TrimRight (strings .TrimSpace (os .Getenv ("TEMPLATE_DIR" )), "/" )
602
602
0 commit comments