Removed built-in users alpine and foo from core, and instead redirect to create new user when none exist.

git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@1738 ab2d0c66-481e-0410-8bed-d214d4d58bed

6 files changed, 26 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 1d41c75..4c43d2a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ DISTPKG=$(P).tar.bz2
 
 SUBDIRS=app lib www
 EXTRA_DIST=config.mk Makefile README
-CONF_FILES=acf.conf passwd roles
+CONF_FILES=acf.conf
 
 DISTFILES=$(EXTRA_DIST) $(CONF_FILES)
 
@@ -52,6 +52,5 @@ phony+=install
 install: install-recursive $(CONF_FILES)
 	mkdir -p $(DESTDIR)/etc/acf
 	cp $(CONF_FILES) $(DESTDIR)/etc/acf
-	chmod 600 $(DESTDIR)/etc/acf/passwd
 
 .PHONY: $(phony)
diff --git a/app/acf-util/logon-controller.lua b/app/acf-util/logon-controller.lua
index 978ee8c..c8cd82a 100644
--- a/app/acf-util/logon-controller.lua
+++ b/app/acf-util/logon-controller.lua
@@ -6,6 +6,17 @@ default_action = "status"
 
 -- Logon a new user based upon id and password in clientdata
 logon = function(self)
+	-- If there are no users defined, add privileges and dispatch password/newuser
+	local users = self.model:list_users()
+	if #users.value == 0 then
+		self.sessiondata.permissions.password = {}
+		self.sessiondata.permissions.password.newuser = {"temp"}
+		self:dispatch(self.conf.prefix, "password", "newuser")
+		self.sessiondata.permissions.password = nil
+		self.conf.suppress_view = true
+		return
+	end
+
 	local userid = cfe({ value=clientdata.userid or "", label="User ID" })
 	local password = cfe({ label="Password" })
 	local redir = cfe({ value=clientdata.redir or "/welcome/read", label="" })
diff --git a/app/acf-util/logon-model.lua b/app/acf-util/logon-model.lua
index b817cf9..c110ee6 100644
--- a/app/acf-util/logon-model.lua
+++ b/app/acf-util/logon-model.lua
@@ -57,3 +57,6 @@ logon = function (self, userid, password, ip_addr, sessiondir, sessiondata)
 	return cfe({ type="boolean", value=false, label="Logon Success" })
 end
 
+list_users = function(self)
+	return cfe({ type="list", value=authenticator.list_users(self), label="Users" })
+end
diff --git a/app/acf-util/password-model.lua b/app/acf-util/password-model.lua
index 87c2e6f..fb06fae 100755
--- a/app/acf-util/password-model.lua
+++ b/app/acf-util/password-model.lua
@@ -7,7 +7,17 @@ function create_user(self, userdata)
 end
 
 function read_user(self, user)
-	return authenticator.get_userinfo(self, user)
+	local retval = authenticator.get_userinfo(self, user)
+	if not user then
+		local userlist = authenticator.list_users(self)
+		if #userlist == 0 then
+			-- There are no users yet, suggest some values
+			retval.value.userid.value = "root"
+			retval.value.username.value = "Admin account"
+			retval.value.roles.value = {"ADMIN"}
+		end
+	end
+	return retval
 end
 
 function update_user(self, userdata)
diff --git a/passwd b/passwd
deleted file mode 100644
index 16c8b69..0000000
--- a/passwd
+++ /dev/null
@@ -1,2 +0,0 @@
-alpine:cc03e747a6afbbcbf8be7668acfebee5:Test Account:ADMIN
-foo:cc03e747a6afbbcbf8be7668acfebee5:Test Account:USER
diff --git a/roles b/roles
deleted file mode 100644
index e69de29..0000000
--- a/roles
+++ /dev/null