rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Start working on event log

Browse source
This commit is contained in:
calzoneman 2014-01-27 18:37:48 -06:00
parent 447a70be98
commit 5f3fa8922d
5 changed files with 39 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/web/account.js
View file

@ -99,7 +99,8 @@ function handleChangePassword(req, res) {
});
return;
}
Logger.eventlog(webserver.ipForRequest(req) + " changed password for " + name);
Logger.eventlog.log("[account] " + webserver.ipForRequest(req) +
" changed password for " + name);
sendJade(res, "account-edit", {
loggedIn: loginName !== false,
loginName: loginName,
@ -128,7 +129,7 @@ function handleChangeEmail(req, res) {
return;
}
if (!$util.isValidEmail(email)) {
if (!$util.isValidEmail(email) && email !== "") {
sendJade(res, "account-edit", {
loggedIn: loginName !== false,
loginName: loginName,
@ -156,9 +157,9 @@ function handleChangeEmail(req, res) {
});
return;
}
// TODO event log
Logger.syslog.log(webserver.ipForRequest(req) + " changed email for " + name +
" to " + email);
Logger.eventlog.log("[account] " + webserver.ipForRequest(req) +
" changed email for " + name +
" to " + email);
sendJade(res, "account-edit", {
loggedIn: loginName !== false,
loginName: loginName,
@ -250,6 +251,11 @@ function handleNewChannel(req, res) {
}
db.channels.register(name, user.name, function (err, channel) {
if (!err) {
Logger.eventlog.log("[channel] " + user.name + "@" +
webserver.ipForRequest(req) + " registered channel " +
name);
}
db.channels.listUserChannels(loginName, function (err2, channels) {
sendJade(res, "account-channels", {
loggedIn: true,
@ -317,6 +323,11 @@ function handleDeleteChannel(req, res) {
return;
}
db.channels.drop(name, function (err) {
if (!err) {
Logger.eventlog.log("[channel] " + loginName + "@" +
webserver.ipForRequest(req) + " deleted channel " +
name);
}
db.channels.listUserChannels(loginName, function (err2, channels) {
sendJade(res, "account-channels", {
loggedIn: true,
@ -518,6 +529,9 @@ function handlePasswordReset(req, res) {
return;
}
Logger.eventlog.log("[account] " + ip + " requested password recovery for " +
name + " <" + email + ">");
if (!Config.get("mail.enabled")) {
sendJade(res, "account-passwordreset", {
reset: false,

4
lib/web/auth.js
View file

@ -30,7 +30,7 @@ function handleLogin(req, res) {
db.users.verifyLogin(name, password, function (err, user) {
if (err) {
if (err === "Invalid username/password combination") {
Logger.syslog.log("Login failed (bad password): " + name
Logger.eventlog.log("[loginfail] Login failed (bad password): " + name
+ "@" + webserver.ipForRequest(req));
}
sendJade(res, "login", {
@ -190,7 +190,7 @@ function handleRegister(req, res) {
registerError: err
});
} else {
Logger.syslog.log(ip + " registered account: " + name +
Logger.eventlog.log("[register] " + ip + " registered account: " + name +
(email.length > 0 ? " <" + email + ">" : ""));
sendJade(res, "register", {
registered: true,