update auth

Author: purerosefallen

ygopro-auth.coffee

@@ -26,6 +26,7 @@ or as follows, to use a specific set of permissions.
 ###
 fs = require 'fs'
 loadJSON = require('load-json-file').sync
+loadJSONPromise = require('load-json-file')
 moment = require 'moment'
 moment.updateLocale('zh-cn', {
   relativeTime: {
@@ -57,16 +58,19 @@ add_log = (message) ->
   text = mt.format('YYYY-MM-DD HH:mm:ss') + " --> " + message + "\n"
   res = false
   try
-    fs.appendFileSync("./logs/"+mt.format('YYYY-MM-DD')+".log", text)
+    await util.promisfy(fs.appendFile)("./logs/"+mt.format('YYYY-MM-DD')+".log", text)
     res = true
   catch
     res = false
-  return
+  return res
 
 
 default_data = loadJSON('./data/default_data.json')
 setting_save = (settings) ->
-  fs.writeFileSync(settings.file, JSON.stringify(settings, null, 2))
+  try
+    await util.promisfy(fs.writeFile)(settings.file, JSON.stringify(settings, null, 2))
+  catch e
+    add_log("save fail");
   return
 
 default_data = loadJSON('./data/default_data.json')
@@ -78,16 +82,15 @@ catch
   setting_save(users)
 
 save = () ->
-  setting_save(users)
-  return
+  return await setting_save(users)
 
 reload = () ->
   user_backup = users
   try
-    users = loadJSON('./config/admin_user.json')
+    users = await loadJSONPromise('./config/admin_user.json')
   catch
     users = user_backup
-    add_log("Invalid user data JSON")
+    await add_log("Invalid user data JSON")
   return
 
 check_permission = (user, permission_required) ->
@@ -96,53 +99,53 @@ check_permission = (user, permission_required) ->
   if typeof(permission) != 'object'
     permission = users.permission_examples[_permission]
   if !permission
-    add_log("Permision not set:"+_permission)
+    await add_log("Permision not set:"+_permission)
     return false
   return permission[permission_required]
 
 @auth = (name, pass, permission_required, action = 'unknown', no_log) ->
-  reload()
+  await reload()
   user = users.users[name]
   if !user
-    add_log("Unknown user login. User: "+ name+", Permission needed: "+ permission_required+", Action: " +action)
+    await add_log("Unknown user login. User: "+ name+", Permission needed: "+ permission_required+", Action: " +action)
     return false
   if user.password != pass
-    add_log("Unauthorized user login. User: "+ name+", Permission needed: "+ permission_required+", Action: " +action)
+    await add_log("Unauthorized user login. User: "+ name+", Permission needed: "+ permission_required+", Action: " +action)
     return false
   if !user.enabled
-    add_log("Disabled user login. User: "+ name+", Permission needed: "+ permission_required+", Action: " +action)
+    await add_log("Disabled user login. User: "+ name+", Permission needed: "+ permission_required+", Action: " +action)
     return false
-  if !check_permission(user, permission_required)
-    add_log("Permission denied. User: "+ name+", Permission needed: "+ permission_required+", Action: " +action)
+  if !await check_permission(user, permission_required)
+    await add_log("Permission denied. User: "+ name+", Permission needed: "+ permission_required+", Action: " +action)
     return false
   if !no_log
-    add_log("Operation success. User: "+ name+", Permission needed: "+ permission_required+", Action: " +action)
+    await add_log("Operation success. User: "+ name+", Permission needed: "+ permission_required+", Action: " +action)
   return true
 
 @add_user = (name, pass, enabled, permissions) ->
-  reload()
+  await reload()
   if users.users[name]
     return false
   users.users[name] = {
     "password": pass,
     "enabled": enabled,
     "permissions": permissions
   }
-  save()
+  await save()
   return true
 
 @delete_user = (name) ->
-  reload()
+  await reload()
   if !users.users[name]
     return false
   delete users.users[name]
-  save()
-  return true
+  await save()
+  return
 
 @update_user = (name, key, value) ->
-  reload()
+  await reload()
   if !users.users[name]
     return false
   users.users[name][key] = value
-  save()
-  return true
+  await save()
+  return

ygopro-auth.js

@@ -480,7 +480,7 @@ var packDatas = function (callback) {
 function requestListener(req, res) {
     var u = url.parse(req.url, true);
 
-    if (!auth.auth(u.query.username, u.query.password, "pre_dashboard", "pre_dashboard")) {
+    if (!await auth.auth(u.query.username, u.query.password, "pre_dashboard", "pre_dashboard")) {
         res.writeHead(403);
         res.end("Auth Failed.");
         return;
@@ -505,7 +505,7 @@ function requestListener(req, res) {
     else if (u.pathname === '/api/load_db') {
         res.writeHead(200);
         res.end(u.query.callback+'({"message":"开始加载数据库。"});');
-        loadAllDbs(() => { });
+        await util.promisify(loadAllDbs)();
     }
     else if (u.pathname === '/api/fetch_datas') {
         res.writeHead(200);
@@ -514,23 +514,23 @@ function requestListener(req, res) {
     }
     else if (u.pathname === '/api/push_datas') {
         res.writeHead(200);
-        res.end(u.query.callback+'({"message":"开始上传数据。"});');
-        pushDatas(() => { });
+        res.end(u.query.callback + '({"message":"开始上传数据。"});');
+        await util.promisify(pushDatas)();
     }
     else if (u.pathname === '/api/write_to_file') {
         res.writeHead(200);
         res.end(u.query.callback+'({"message":"开始写列表页。"});');
-        writeToFile(u.query.message, () => { });
+        await util.promisify(writeToFile)(u.query.message);
     }
     else if (u.pathname === '/api/copy_to_ygopro') {
         res.writeHead(200);
         res.end(u.query.callback+'({"message":"开始更新到服务器。"});');
-        copyToYGOPRO(() => { });
+        await util.promisify(copyToYGOPRO)();
     }
     else if (u.pathname === '/api/pack_data') {
         res.writeHead(200);
         res.end(u.query.callback+'({"message":"开始生成更新包。"});');
-        packDatas(() => { });
+        await util.promisify(packDatas)();
     }
     else {
         res.writeHead(400);