Skip to content

Commit c3ab00d

Browse files
committed
improvement: lowercase letters where required
1 parent 9526e27 commit c3ab00d

File tree

2 files changed

+26
-28
lines changed

2 files changed

+26
-28
lines changed

config/config.go

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func GetConfig() *Configuration {
9494
// database - all DB variables
9595
func database() (databaseConfig DatabaseConfig, err error) {
9696
// RDBMS
97-
activateRDBMS := strings.TrimSpace(os.Getenv("ACTIVATE_RDBMS"))
97+
activateRDBMS := strings.ToLower(strings.TrimSpace(os.Getenv("ACTIVATE_RDBMS")))
9898
if activateRDBMS == Activated {
9999
dbRDBMS, errThis := databaseRDBMS()
100100
if errThis != nil {
@@ -106,7 +106,7 @@ func database() (databaseConfig DatabaseConfig, err error) {
106106
databaseConfig.RDBMS.Activate = activateRDBMS
107107

108108
// REDIS
109-
activateRedis := strings.TrimSpace(os.Getenv("ACTIVATE_REDIS"))
109+
activateRedis := strings.ToLower(strings.TrimSpace(os.Getenv("ACTIVATE_REDIS")))
110110
if activateRedis == Activated {
111111
dbRedis, errThis := databaseRedis()
112112
if errThis != nil {
@@ -118,7 +118,7 @@ func database() (databaseConfig DatabaseConfig, err error) {
118118
databaseConfig.REDIS.Activate = activateRedis
119119

120120
// MongoDB
121-
activateMongo := strings.TrimSpace(os.Getenv("ACTIVATE_MONGO"))
121+
activateMongo := strings.ToLower(strings.TrimSpace(os.Getenv("ACTIVATE_MONGO")))
122122
if activateMongo == Activated {
123123
dbMongo, errThis := databaseMongo()
124124
if errThis != nil {
@@ -135,7 +135,7 @@ func database() (databaseConfig DatabaseConfig, err error) {
135135
// databaseRDBMS - all RDBMS variables
136136
func databaseRDBMS() (databaseConfig DatabaseConfig, err error) {
137137
// Env
138-
databaseConfig.RDBMS.Env.Driver = strings.TrimSpace(os.Getenv("DBDRIVER"))
138+
databaseConfig.RDBMS.Env.Driver = strings.ToLower(strings.TrimSpace(os.Getenv("DBDRIVER")))
139139
databaseConfig.RDBMS.Env.Host = strings.TrimSpace(os.Getenv("DBHOST"))
140140
databaseConfig.RDBMS.Env.Port = strings.TrimSpace(os.Getenv("DBPORT"))
141141
databaseConfig.RDBMS.Env.TimeZone = strings.TrimSpace(os.Getenv("DBTIMEZONE"))
@@ -224,9 +224,9 @@ func databaseMongo() (databaseConfig DatabaseConfig, err error) {
224224

225225
// email - config for using external email services
226226
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")))
228228
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")))
230230
emailConfig.APIToken = strings.TrimSpace(os.Getenv("EMAIL_API_TOKEN"))
231231
emailConfig.AddrFrom = strings.TrimSpace(os.Getenv("EMAIL_FROM"))
232232

@@ -277,7 +277,7 @@ func email() (emailConfig EmailConfig, err error) {
277277

278278
// logger - config for sentry.io
279279
func logger() (loggerConfig LoggerConfig) {
280-
loggerConfig.Activate = strings.TrimSpace(os.Getenv("ACTIVATE_SENTRY"))
280+
loggerConfig.Activate = strings.ToLower(strings.TrimSpace(os.Getenv("ACTIVATE_SENTRY")))
281281
if loggerConfig.Activate == Activated {
282282
loggerConfig.SentryDsn = strings.TrimSpace(os.Getenv("SentryDSN"))
283283
}
@@ -299,14 +299,14 @@ func security() (securityConfig SecurityConfig, err error) {
299299
}
300300

301301
// Basic auth
302-
securityConfig.MustBasicAuth = strings.TrimSpace(os.Getenv("ACTIVATE_BASIC_AUTH"))
302+
securityConfig.MustBasicAuth = strings.ToLower(strings.TrimSpace(os.Getenv("ACTIVATE_BASIC_AUTH")))
303303
if securityConfig.MustBasicAuth == Activated {
304304
securityConfig.BasicAuth.Username = strings.TrimSpace(os.Getenv("USERNAME"))
305305
securityConfig.BasicAuth.Password = strings.TrimSpace(os.Getenv("PASSWORD"))
306306
}
307307

308308
// JWT
309-
securityConfig.MustJWT = strings.TrimSpace(os.Getenv("ACTIVATE_JWT"))
309+
securityConfig.MustJWT = strings.ToLower(strings.TrimSpace(os.Getenv("ACTIVATE_JWT")))
310310
if securityConfig.MustJWT == Activated {
311311
securityConfig.JWT, err = getParamsJWT()
312312
if err != nil {
@@ -318,24 +318,24 @@ func security() (securityConfig SecurityConfig, err error) {
318318
}
319319

320320
// 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")))
322322

323323
// 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")))
325325
if authCookieActivate == Activated {
326326
securityConfig.AuthCookieActivate = true
327327
securityConfig.AuthCookiePath = strings.TrimSpace(os.Getenv("AUTH_COOKIE_PATH"))
328328
securityConfig.AuthCookieDomain = strings.TrimSpace(os.Getenv("AUTH_COOKIE_DOMAIN"))
329329

330-
if strings.TrimSpace(os.Getenv("AUTH_COOKIE_SECURE")) == Activated {
330+
if strings.ToLower(strings.TrimSpace(os.Getenv("AUTH_COOKIE_SECURE"))) == Activated {
331331
securityConfig.AuthCookieSecure = true
332332
}
333333

334-
if strings.TrimSpace(os.Getenv("AUTH_COOKIE_HttpOnly")) == Activated {
334+
if strings.ToLower(strings.TrimSpace(os.Getenv("AUTH_COOKIE_HttpOnly"))) == Activated {
335335
securityConfig.AuthCookieHTTPOnly = true
336336
}
337337

338-
authCookieSameSite := strings.TrimSpace(os.Getenv("AUTH_COOKIE_SameSite"))
338+
authCookieSameSite := strings.ToLower(strings.TrimSpace(os.Getenv("AUTH_COOKIE_SameSite")))
339339
if len(authCookieSameSite) > 0 {
340340
if authCookieSameSite == "strict" {
341341
securityConfig.AuthCookieSameSite = http.SameSiteStrictMode
@@ -348,13 +348,13 @@ func security() (securityConfig SecurityConfig, err error) {
348348
}
349349
}
350350

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" {
352352
securityConfig.ServeJwtAsResBody = true
353353
}
354354
}
355355

356356
// Hashing passwords
357-
securityConfig.MustHash = strings.TrimSpace(os.Getenv("ACTIVATE_HASHING"))
357+
securityConfig.MustHash = strings.ToLower(strings.TrimSpace(os.Getenv("ACTIVATE_HASHING")))
358358
if securityConfig.MustHash == Activated {
359359
securityConfig.HashPass, err = getParamsHash()
360360
if err != nil {
@@ -364,7 +364,7 @@ func security() (securityConfig SecurityConfig, err error) {
364364
}
365365

366366
// config for ChaCha20-Poly1305 encryption
367-
activateCipher := strings.TrimSpace(os.Getenv("ACTIVATE_CIPHER"))
367+
activateCipher := strings.ToLower(strings.TrimSpace(os.Getenv("ACTIVATE_CIPHER")))
368368
if activateCipher == Activated {
369369
securityConfig.MustCipher = true
370370

@@ -390,15 +390,15 @@ func security() (securityConfig SecurityConfig, err error) {
390390
// Email verification and password recovery
391391
securityConfig.VerifyEmail = false
392392
securityConfig.RecoverPass = false
393-
if strings.TrimSpace(os.Getenv("VERIFY_EMAIL")) == "yes" {
393+
if strings.ToLower(strings.TrimSpace(os.Getenv("VERIFY_EMAIL"))) == Activated {
394394
securityConfig.VerifyEmail = true
395395
}
396-
if strings.TrimSpace(os.Getenv("RECOVER_PASSWORD")) == "yes" {
396+
if strings.ToLower(strings.TrimSpace(os.Getenv("RECOVER_PASSWORD"))) == Activated {
397397
securityConfig.RecoverPass = true
398398
}
399399

400400
// Two-factor authentication
401-
securityConfig.Must2FA = strings.TrimSpace(os.Getenv("ACTIVATE_2FA"))
401+
securityConfig.Must2FA = strings.ToLower(strings.TrimSpace(os.Getenv("ACTIVATE_2FA")))
402402
if securityConfig.Must2FA == Activated {
403403
securityConfig.TwoFA.Issuer = strings.TrimSpace(os.Getenv("TWO_FA_ISSUER"))
404404

@@ -443,21 +443,21 @@ func security() (securityConfig SecurityConfig, err error) {
443443

444444
// false: sha2_256()
445445
// 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")))
447447
if doubleHashTwoFA == Activated {
448448
securityConfig.TwoFA.DoubleHash = true
449449
}
450450
}
451451

452452
// App firewall
453-
securityConfig.MustFW = strings.TrimSpace(os.Getenv("ACTIVATE_FIREWALL"))
453+
securityConfig.MustFW = strings.ToLower(strings.TrimSpace(os.Getenv("ACTIVATE_FIREWALL")))
454454
if securityConfig.MustFW == Activated {
455455
securityConfig.Firewall.ListType = strings.TrimSpace(os.Getenv("LISTTYPE"))
456456
securityConfig.Firewall.IP = strings.TrimSpace(os.Getenv("IP"))
457457
}
458458

459459
// CORS
460-
securityConfig.MustCORS = strings.TrimSpace(os.Getenv("ACTIVATE_CORS"))
460+
securityConfig.MustCORS = strings.ToLower(strings.TrimSpace(os.Getenv("ACTIVATE_CORS")))
461461
if securityConfig.MustCORS == Activated {
462462
cp := middleware.CORSPolicy{}
463463

@@ -589,14 +589,14 @@ func security() (securityConfig SecurityConfig, err error) {
589589
func server() (serverConfig ServerConfig) {
590590
serverConfig.ServerHost = strings.TrimSpace(os.Getenv("APP_HOST"))
591591
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")))
593593

594594
return
595595
}
596596

597597
// view - HTML renderer
598598
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")))
600600
if viewConfig.Activate == Activated {
601601
viewConfig.Directory = strings.TrimRight(strings.TrimSpace(os.Getenv("TEMPLATE_DIR")), "/")
602602

config/getConfig.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package config
22

3-
import "strings"
4-
53
// IsProd returns true when app is running in production mode
64
func IsProd() bool {
7-
return strings.ToLower(GetConfig().Server.ServerEnv) == "production"
5+
return GetConfig().Server.ServerEnv == "production"
86
}
97

108
// IsSentry returns true when sentry logger is enabled in .env

0 commit comments

Comments
 (0)