diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/acf-util/logon-controller.lua | 32 | ||||
| -rw-r--r-- | app/acf-util/logon-model.lua | 2 | ||||
| -rw-r--r-- | app/acf_www-controller.lua | 12 |
3 files changed, 26 insertions, 20 deletions
diff --git a/app/acf-util/logon-controller.lua b/app/acf-util/logon-controller.lua index 18e4e0f..c0fa8b9 100644 --- a/app/acf-util/logon-controller.lua +++ b/app/acf-util/logon-controller.lua @@ -29,27 +29,23 @@ logon = function(self) userid.errtxt = "There was a problem logging in" else -- the login was successful - give them a new session, and redir to logged in - session.id = session.random_hash ( 512) - session.userinfo = self.model.get_userinfo (userid) - self.conf.controller="welcome" - self.conf.action = "" - self.conf.type = "redir" - error (self.conf) + session.id = session.random_hash ( 512) + session.userinfo = self.model.get_userinfo (userid) + self.conf.controller="welcome" + self.conf.action = "" + self.conf.type = "redir" + logevent ("Logon was successful for " .. session.userinfo.username) + error (self.conf) end else - self.conf.controller = "" - self.conf.action = "" - self.conf.prefix = "" - self.conf.type = "redir" - error(self.conf) - end -- If we reach this point, just give them the login page - return ( cfe ({type="form", - option={ script=ENV["SCRIPT_NAME"], - prefix=self.conf.prefix, - controller = self.conf.controller, - action = "logon" }, - value = { userid, password, logon } })) + return ( cfe ({type="form", + option={ script=ENV["SCRIPT_NAME"], + prefix=self.conf.prefix, + controller = self.conf.controller, + action = "logon" }, + value = { userid, password, logon } })) + end end diff --git a/app/acf-util/logon-model.lua b/app/acf-util/logon-model.lua index 48b3cf2..dac48cd 100644 --- a/app/acf-util/logon-model.lua +++ b/app/acf-util/logon-model.lua @@ -26,7 +26,7 @@ logon = function (self, id, password ) -- record event and ignore the attempt -- All ok? -- look up their role, issue new session - return auth.authenticate (id, password) + return auth.authenticate (self, id, password) end logoff = function (self, sessionid) diff --git a/app/acf_www-controller.lua b/app/acf_www-controller.lua index 03ad5da..1d5966e 100644 --- a/app/acf_www-controller.lua +++ b/app/acf_www-controller.lua @@ -17,7 +17,9 @@ local parent_exception_handler mvc = {} mvc.on_load = function (self, parent) - + -- open the log file + self.conf.logfile = io.open ("/var/log/acf.log", "a+") + -- Make sure we have some kind of sane defaults for libdir and sessiondir self.conf.libdir = self.conf.libdir or ( self.conf.appdir .. "/lib/" ) self.conf.sessiondir = self.conf.sessiondir or "/tmp/" @@ -71,6 +73,8 @@ mvc.post_exec = function (self) sessionlib.save_session(conf.sessiondir, sessiondata.id, sessiondata) end + -- Close the logfile + conf.logfile:close() end @@ -228,3 +232,9 @@ cfe = function ( optiontable ) return me end +-- FIXME - need to think more about this.. +logevent = function ( message ) + conf.logfile:write (string.format("%s: %s\n", os.date(), message)) +end + + |