OrgGo/Mainflux.mainflux
1
0
Fork 0
mirror of https://github.com/mainflux/mainflux.git synced 2025-04-26 13:48:53 +08:00
Code Issues Projects Releases Wiki Activity

NOISSUE - Update self register environment variable name (#1493)

Browse Source 
* NOISSUE - Update naming of env variable (#1484)

Signed-off-by: Burak Sekili <buraksekili@gmail.com>
This commit is contained in:
Burak Sekili 2021-11-03 12:30:52 +03:00 committed by GitHub
parent 90e4561491
commit dc935858bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
cmd/users/main.go
View File

@ -74,7 +74,7 @@ const (
defAuthURL = "localhost:8181"
defAuthTimeout = "1s"
defOnlyAdminCreatesUser = "" // If empty, everybody can create a user. Otherwise, only admin can create a user.
defSelfRegister = "true" // By default, everybody can create a user. Otherwise, only admin can create a user.
envLogLevel = "MF_USERS_LOG_LEVEL"
envDBHost = "MF_USERS_DB_HOST"
@ -112,26 +112,26 @@ const (
envAuthURL = "MF_AUTH_GRPC_URL"
envAuthTimeout = "MF_AUTH_GRPC_TIMEOUT"
envOnlyAdminCreatesUser = "MF_ONLY_ADMIN_CREATES_USER"
envSelfRegister = "MF_USERS_ALLOW_SELF_REGISTER"
)
type config struct {
logLevel string
dbConfig postgres.Config
emailConf email.Config
httpPort string
serverCert string
serverKey string
jaegerURL string
resetURL string
authTLS bool
authCACerts string
authURL string
authTimeout time.Duration
adminEmail string
adminPassword string
passRegex *regexp.Regexp
adminCreatesUser string
logLevel string
dbConfig postgres.Config
emailConf email.Config
httpPort string
serverCert string
serverKey string
jaegerURL string
resetURL string
authTLS bool
authCACerts string
authURL string
authTimeout time.Duration
adminEmail string
adminPassword string
passRegex *regexp.Regexp
selfRegister bool
}
func main() {
@ -189,6 +189,11 @@ func loadConfig() config {
log.Fatalf("Invalid password validation rules %s\n", envPassRegex)
}
selfRegister, err := strconv.ParseBool(mainflux.Env(envSelfRegister, defSelfRegister))
if err != nil {
log.Fatalf("Invalid %s value: %s", envSelfRegister, err.Error())
}
dbConfig := postgres.Config{
Host: mainflux.Env(envDBHost, defDBHost),
Port: mainflux.Env(envDBPort, defDBPort),
@ -213,22 +218,22 @@ func loadConfig() config {
}
return config{
logLevel: mainflux.Env(envLogLevel, defLogLevel),
dbConfig: dbConfig,
emailConf: emailConf,
httpPort: mainflux.Env(envHTTPPort, defHTTPPort),
serverCert: mainflux.Env(envServerCert, defServerCert),
serverKey: mainflux.Env(envServerKey, defServerKey),
jaegerURL: mainflux.Env(envJaegerURL, defJaegerURL),
resetURL: mainflux.Env(envTokenResetEndpoint, defTokenResetEndpoint),
authTLS: tls,
authCACerts: mainflux.Env(envAuthCACerts, defAuthCACerts),
authURL: mainflux.Env(envAuthURL, defAuthURL),
authTimeout: authTimeout,
adminEmail: mainflux.Env(envAdminEmail, defAdminEmail),
adminPassword: mainflux.Env(envAdminPassword, defAdminPassword),
passRegex: passRegex,
adminCreatesUser: mainflux.Env(envOnlyAdminCreatesUser, defOnlyAdminCreatesUser),
logLevel: mainflux.Env(envLogLevel, defLogLevel),
dbConfig: dbConfig,
emailConf: emailConf,
httpPort: mainflux.Env(envHTTPPort, defHTTPPort),
serverCert: mainflux.Env(envServerCert, defServerCert),
serverKey: mainflux.Env(envServerKey, defServerKey),
jaegerURL: mainflux.Env(envJaegerURL, defJaegerURL),
resetURL: mainflux.Env(envTokenResetEndpoint, defTokenResetEndpoint),
authTLS: tls,
authCACerts: mainflux.Env(envAuthCACerts, defAuthCACerts),
authURL: mainflux.Env(envAuthURL, defAuthURL),
authTimeout: authTimeout,
adminEmail: mainflux.Env(envAdminEmail, defAdminEmail),
adminPassword: mainflux.Env(envAdminPassword, defAdminPassword),
passRegex: passRegex,
selfRegister: selfRegister,
}
}
@ -324,7 +329,29 @@ func newService(db *sqlx.DB, tracer opentracing.Tracer, auth mainflux.AuthServic
os.Exit(1)
}
if c.adminCreatesUser != "" {
switch c.selfRegister {
case true:
// If MF_USERS_ALLOW_SELF_REGISTER environment variable is "true",
// everybody can create a new user. Here, check the existence of that
// policy. If the policy does not exist, create it; otherwise, there is
// no need to do anything further.
_, err := auth.Authorize(context.Background(), &mainflux.AuthorizeReq{Obj: "user", Act: "create", Sub: "*"})
if err != nil {
// Add a policy that allows anybody to create a user
apr, err := auth.AddPolicy(context.Background(), &mainflux.AddPolicyReq{Obj: "user", Act: "create", Sub: "*"})
if err != nil {
logger.Error("failed to add the policy related to MF_USERS_ALLOW_SELF_REGISTER: " + err.Error())
os.Exit(1)
}
if !apr.GetAuthorized() {
logger.Error("failed to authorized the policy result related to MF_USERS_ALLOW_SELF_REGISTER: " + users.ErrAuthorization.Error())
os.Exit(1)
}
}
default:
// If MF_USERS_ALLOW_SELF_REGISTER environment variable is "false",
// everybody cannot create a new user. Therefore, delete a policy that
// allows everybody to create a new user.
dpr, err := auth.DeletePolicy(context.Background(), &mainflux.DeletePolicyReq{Obj: "user", Act: "create", Sub: "*"})
if err != nil {
logger.Error("failed to delete a policy: " + err.Error())

2
docker/.env
View File

@ -56,7 +56,7 @@ MF_USERS_ADMIN_EMAIL=admin@example.com
MF_USERS_ADMIN_PASSWORD=12345678
MF_USERS_RESET_PWD_TEMPLATE=users.tmpl
MF_USERS_PASS_REGEX=^.{8,}$
MF_ONLY_ADMIN_CREATES_USER=
MF_USERS_ALLOW_SELF_REGISTER=true
### Email utility
MF_EMAIL_HOST=smtp.mailtrap.io

2
docker/docker-compose.yml
View File

@ -192,7 +192,7 @@ services:
MF_AUTH_GRPC_TIMEOUT: ${MF_AUTH_GRPC_TIMEOUT}
MF_USERS_ADMIN_EMAIL: ${MF_USERS_ADMIN_EMAIL}
MF_USERS_ADMIN_PASSWORD: ${MF_USERS_ADMIN_PASSWORD}
MF_ONLY_ADMIN_CREATES_USER: ${MF_ONLY_ADMIN_CREATES_USER}
MF_USERS_ALLOW_SELF_REGISTER: ${MF_USERS_ALLOW_SELF_REGISTER}
ports:
- ${MF_USERS_HTTP_PORT}:${MF_USERS_HTTP_PORT}
networks: