aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoni Sawicki <tenox@google.com>2022-03-27 02:14:31 -0700
committerAntoni Sawicki <tenox@google.com>2022-03-27 02:14:31 -0700
commit8d4d5aeca3343ca6398e1df7b40b85be4867a12f (patch)
treee793f67efa19577f408f0f6d814b360a162363cb
parente5f7f7115df5ba6ee938b45abf08d13de64cbe27 (diff)
downloadwfm-8d4d5aeca3343ca6398e1df7b40b85be4867a12f.tar.gz
create new pwdb
-rw-r--r--users.go9
-rw-r--r--wfm.go8
2 files changed, 12 insertions, 5 deletions
diff --git a/users.go b/users.go
index e26d423..0481e5b 100644
--- a/users.go
+++ b/users.go
@@ -50,6 +50,8 @@ func manageUsers() {
switch flag.Arg(1) {
case "list":
listUsers()
+ case "newfile":
+ saveUsers()
case "add":
addUser(flag.Arg(2), rwStrBool(flag.Arg(3)))
case "delete":
@@ -59,17 +61,19 @@ func manageUsers() {
case "access":
setUser(flag.Arg(2), rwStrBool(flag.Arg(3)))
default:
- fmt.Println("usage: user <list|add|delete|passwd|access> [username] [rw|ro]")
+ fmt.Println("usage: user <list|add|delete|passwd|access|newfile> [username] [rw|ro]")
}
}
func listUsers() {
+ loadUsers()
for _, u := range users {
fmt.Printf("User: %q, RW: %v\n", u.User, u.RW)
}
}
func addUser(usr string, rw bool) {
+ loadUsers()
if usr == "" {
log.Fatal("user add requires username and ro/rw\n")
}
@@ -83,6 +87,7 @@ func addUser(usr string, rw bool) {
}
func delUser(usr string) {
+ loadUsers()
var udb []userDB
for _, u := range users {
if u.User == usr {
@@ -98,6 +103,7 @@ func delUser(usr string) {
}
func pwdUser(usr string) {
+ loadUsers()
if usr == "" {
log.Fatal("user passwd requires username\n")
}
@@ -122,6 +128,7 @@ func pwdUser(usr string) {
}
func setUser(usr string, rw bool) {
+ loadUsers()
if usr == "" {
log.Fatal("user add requires username and ro/rw\n")
}
diff --git a/wfm.go b/wfm.go
index 04db263..fc27abf 100644
--- a/wfm.go
+++ b/wfm.go
@@ -91,10 +91,6 @@ func main() {
flag.Var(&denyPfxs, "deny_pfx", "deny access / hide this path prefix (multi)")
flag.Parse()
- if *passwdDb != "" {
- loadUsers()
- }
-
if flag.Arg(0) == "user" {
manageUsers()
return
@@ -102,6 +98,10 @@ func main() {
log.Print("WFM Starting up")
+ if *passwdDb != "" {
+ loadUsers()
+ }
+
if !*allowAcmDir && *acmDir != "" {
denyPfxs = append(denyPfxs, *acmDir)
}