Skip to content
Snippets Groups Projects
Commit bf4073d1 authored by rswindell's avatar rswindell
Browse files

login() method rejects deleted or inactive user accounts.

parent 4f7c2ff8
No related branches found
No related tags found
No related merge requests found
...@@ -317,6 +317,12 @@ js_login(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ...@@ -317,6 +317,12 @@ js_login(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
return(JS_TRUE); return(JS_TRUE);
} }
if(user.misc&(DELETED|INACTIVE)) {
lprintf("%04d %s !DELETED OR INACTIVE USER #%d: %s"
,client->socket,client->service->protocol,user.number,p);
return(JS_TRUE);
}
/* Password */ /* Password */
if(user.pass[0]) { if(user.pass[0]) {
if((js_str=JS_ValueToString(cx, argv[1]))==NULL) if((js_str=JS_ValueToString(cx, argv[1]))==NULL)
...@@ -678,21 +684,15 @@ static void js_service_thread(void* arg) ...@@ -678,21 +684,15 @@ static void js_service_thread(void* arg)
lprintf("%04d !JavaScript FAILED to compile script (%s)",socket,spath); lprintf("%04d !JavaScript FAILED to compile script (%s)",socket,spath);
else { else {
JS_ExecuteScript(js_cx, js_glob, js_script, &rval); JS_ExecuteScript(js_cx, js_glob, js_script, &rval);
lprintf("%04d %s JS_DestroyScript",socket,service->protocol); // lprintf("%04d %s JS_DestroyScript",socket,service->protocol);
JS_DestroyScript(js_cx, js_script); JS_DestroyScript(js_cx, js_script);
// lprintf("%04d JS_GC",socket);
// JS_GC(js_cx);
} }
close_socket(socket); close_socket(socket);
// lprintf("%04d JS_EndRequest",socket); // lprintf("%04d %s JS_DestroyContext",socket,service->protocol);
// JS_EndRequest(js_cx);
lprintf("%04d %s JS_DestroyContext",socket,service->protocol);
JS_DestroyContext(js_cx); /* Free Context */ JS_DestroyContext(js_cx); /* Free Context */
lprintf("%04d %s JS_DestroyRuntime",socket,service->protocol); // lprintf("%04d %s JS_DestroyRuntime",socket,service->protocol);
JS_DestroyRuntime(js_runtime); JS_DestroyRuntime(js_runtime);
if(service_client.user.number) { if(service_client.user.number) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment