Commit 71eb7a7c authored by nanahira's avatar nanahira

catchup

parent 87d7ee61
...@@ -83,7 +83,8 @@ ...@@ -83,7 +83,8 @@
"kick_user": true, "kick_user": true,
"start_death": true, "start_death": true,
"pre_dashboard": true, "pre_dashboard": true,
"update_dashboard": true "update_dashboard": true,
"vip": true
}, },
"judge": { "judge": {
"get_rooms": true, "get_rooms": true,
......
...@@ -3779,7 +3779,7 @@ if settings.modules.http ...@@ -3779,7 +3779,7 @@ if settings.modules.http
response.end(addCallback(u.query.callback, duellog)) response.end(addCallback(u.query.callback, duellog))
else if u.pathname == '/api/getkeys' and settings.modules.vip.enabled else if u.pathname == '/api/getkeys' and settings.modules.vip.enabled
if !(u.query.pass == settings.modules.http.password) if !auth.auth(u.query.username, u.query.pass, "vip", "get_keys")
response.writeHead(200) response.writeHead(200)
response.end(addCallback(u.query.callback, "Unauthorized.")) response.end(addCallback(u.query.callback, "Unauthorized."))
return return
...@@ -4038,6 +4038,10 @@ if settings.modules.http ...@@ -4038,6 +4038,10 @@ if settings.modules.http
response.end(addCallback(u.query.callback, "['room not found', '" + u.query.deathcancel + "']")) response.end(addCallback(u.query.callback, "['room not found', '" + u.query.deathcancel + "']"))
else if u.query.generatekey and settings.modules.vip.enabled else if u.query.generatekey and settings.modules.vip.enabled
if !auth.auth(u.query.username, u.query.pass, "vip", "generate_keys")
response.writeHead(200)
response.end(addCallback(u.query.callback, "['密码错误', 0]"))
return
VIP_generate_cdkeys(u.query.generatekey, settings.modules.vip.generate_count) VIP_generate_cdkeys(u.query.generatekey, settings.modules.vip.generate_count)
response.writeHead(200) response.writeHead(200)
response.end(addCallback(u.query.callback, "['Keys generated', '" + u.query.generatekey + "']")) response.end(addCallback(u.query.callback, "['Keys generated', '" + u.query.generatekey + "']"))
......
...@@ -4892,7 +4892,7 @@ ...@@ -4892,7 +4892,7 @@
response.end(addCallback(u.query.callback, duellog)); response.end(addCallback(u.query.callback, duellog));
} }
} else if (u.pathname === '/api/getkeys' && settings.modules.vip.enabled) { } else if (u.pathname === '/api/getkeys' && settings.modules.vip.enabled) {
if (!(u.query.pass === settings.modules.http.password)) { if (!auth.auth(u.query.username, u.query.pass, "vip", "get_keys")) {
response.writeHead(200); response.writeHead(200);
response.end(addCallback(u.query.callback, "Unauthorized.")); response.end(addCallback(u.query.callback, "Unauthorized."));
return; return;
...@@ -5215,6 +5215,11 @@ ...@@ -5215,6 +5215,11 @@
response.end(addCallback(u.query.callback, "['room not found', '" + u.query.deathcancel + "']")); response.end(addCallback(u.query.callback, "['room not found', '" + u.query.deathcancel + "']"));
} }
} else if (u.query.generatekey && settings.modules.vip.enabled) { } else if (u.query.generatekey && settings.modules.vip.enabled) {
if (!auth.auth(u.query.username, u.query.pass, "vip", "generate_keys")) {
response.writeHead(200);
response.end(addCallback(u.query.callback, "['密码错误', 0]"));
return;
}
VIP_generate_cdkeys(u.query.generatekey, settings.modules.vip.generate_count); VIP_generate_cdkeys(u.query.generatekey, settings.modules.vip.generate_count);
response.writeHead(200); response.writeHead(200);
response.end(addCallback(u.query.callback, "['Keys generated', '" + u.query.generatekey + "']")); response.end(addCallback(u.query.callback, "['Keys generated', '" + u.query.generatekey + "']"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment