Skip to content
Snippets Groups Projects
Commit 069fec13 authored by echicken's avatar echicken :chicken:
Browse files

Throw actual Error objects.

parent bd566b77
Branches
Tags
1 merge request!463MRC mods by Codefenix (2024-10-20)
...@@ -57,9 +57,7 @@ function validateSession(cookies) { ...@@ -57,9 +57,7 @@ function validateSession(cookies) {
try { try {
usr.number = cookie[0]; usr.number = cookie[0];
if (usr.number < 1) { if (usr.number < 1) throw new Error('Invalid user number ' + cookie[0] + ' in cookie.');
throw 'Invalid user number ' + cookie[0] + ' in cookie.';
}
} catch (err) { } catch (err) {
log(LOG_DEBUG, err); log(LOG_DEBUG, err);
continue; continue;
...@@ -67,9 +65,7 @@ function validateSession(cookies) { ...@@ -67,9 +65,7 @@ function validateSession(cookies) {
var session = getSession(usr.number); var session = getSession(usr.number);
if (typeof session !== 'object') continue; if (typeof session !== 'object') continue;
if (typeof session.key != 'string' || session.key != cookie[1]) { if (typeof session.key != 'string' || session.key != cookie[1]) continue;
continue;
}
var _usr = authenticate(usr.alias, usr.security.password, false); var _usr = authenticate(usr.alias, usr.security.password, false);
_usr = undefined; _usr = undefined;
...@@ -78,8 +74,7 @@ function validateSession(cookies) { ...@@ -78,8 +74,7 @@ function validateSession(cookies) {
if (session.session_start === undefined || time() - parseInt(session.session_start, 10) > settings.timeout) { if (session.session_start === undefined || time() - parseInt(session.session_start, 10) > settings.timeout) {
setSessionValue(usr.number, 'session_start', time()); setSessionValue(usr.number, 'session_start', time());
if(!usr.is_sysop || (system.settings&SYS_SYSSTAT)) { if(!usr.is_sysop || (system.settings&SYS_SYSSTAT)) {
const logonlist_lib = load({}, 'logonlist_lib.js'); load({}, 'logonlist_lib.js').add({ node: 'Web' });
logonlist_lib.add({ node: 'Web' });
} }
} }
break; break;
...@@ -102,16 +97,16 @@ function destroySession(cookies) { ...@@ -102,16 +97,16 @@ function destroySession(cookies) {
usr.number = cookie[0]; usr.number = cookie[0];
if(usr.number < 1) { if(usr.number < 1) {
throw 'Invalid user number ' + cookie[0] + ' in cookie.'; throw new Error('Invalid user number ' + cookie[0] + ' in cookie.');
} }
var session = getSession(usr.number); var session = getSession(usr.number);
if (typeof session !== 'object') { if (typeof session !== 'object') {
throw 'Invalid session for user #' + usr.number; throw new Error('Invalid session for user #' + usr.number);
} }
if (session.key !== cookie[1]) { if (session.key !== cookie[1]) {
throw 'Invalid session key for user #' + user.number; throw new Error('Invalid session key for user #' + user.number);
} }
set_cookie( set_cookie(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment