1750c82208
Added arguments command and label to all command executor functions,
hopefully for massive performance increase.
This is due to the following mess in PythonLoader:
``` Java
@Override
public boolean onCommand(CommandSender sender, Command command, String
label, String[] args) {
boolean result;
if (argcount == -1) {
try {
result = call(4, sender, command, label, args);
argcount = 4;
} catch (PyException e) {
//this could goof up someone ... they'll probably yell at us and
eventually read this code ... fuck them
if (e.type == Py.TypeError && (e.value.toString().endsWith("takes
exactly 3 arguments (4 given)") || e.value.toString().endsWith("takes
exactly 4 arguments (5 given)"))) {
result = call(3, sender, command, label, args);
argcount = 3;
} else if (e.type == Py.TypeError && (e.value.toString().endsWith("takes
exactly 2 arguments (4 given)") || e.value.toString().endsWith("takes
exactly 3 arguments (5 given)"))) {
result = call(2, sender, command, label, args);
argcount = 2;
} else {
throw e;
}
}
} else {
result = call(argcount, sender, command, label, args);
}
return result;
}
```
Note: Still WIP on reports - I'm working on making it keep solved
reports to fix issue 10
117 lines
3.7 KiB
Python
117 lines
3.7 KiB
Python
#pylint: disable = F0401
|
|
import mysqlhack #pylint: disable = unused-import
|
|
import thread
|
|
from re import match
|
|
from com.ziclix.python.sql import zxJDBC
|
|
from helpers import *
|
|
from secrets import *
|
|
from random import randrange
|
|
|
|
|
|
|
|
|
|
|
|
# table schema:
|
|
# string "uuid", limit: 32, null: false
|
|
# string "token", limit: 6, null: false
|
|
# string "email", null: false
|
|
|
|
|
|
def mysql_query(query, args, fetch = True):
|
|
conn = zxJDBC.connect(mysql_database, mysql_user, mysql_pass, "com.mysql.jdbc.Driver")
|
|
curs = conn.cursor()
|
|
curs.execute(query, args)
|
|
if fetch:
|
|
results = curs.fetchall()
|
|
else:
|
|
results = conn.commit()
|
|
curs.close()
|
|
conn.close()
|
|
return results
|
|
|
|
|
|
def generate_token(length):
|
|
cons = 'bcdfghjklmnpqrstvwxyz'
|
|
vows = 'aeiou'
|
|
|
|
token = ''
|
|
start = randrange(2)
|
|
for i in range(0, length):
|
|
if i % 2 == start:
|
|
token += cons[randrange(21)]
|
|
else:
|
|
token += vows[randrange(5)]
|
|
return token
|
|
|
|
|
|
def get_token(uuid):
|
|
results = mysql_query("SELECT DISTINCT `token`, `email` FROM register_tokens WHERE `uuid` = ? LIMIT 1", (uuid,))
|
|
return results[0] if len(results) == 1 else None
|
|
|
|
|
|
def token_command(sender):
|
|
plugin_header(sender, "Website Token")
|
|
if is_player(sender):
|
|
try:
|
|
token = get_token(sender.getUniqueId().toString().replace("-", ""))
|
|
if token:
|
|
msg(sender, "&aEmail: &e%s" % token[1])
|
|
msg(sender, "&aToken: &e%s" % token[0])
|
|
msg(sender, "&cIMPORTANT: never share the token with anyone!")
|
|
msg(sender, "&cIt could be used to claim your website account!")
|
|
else:
|
|
msg(sender, "&cYou don't have a token yet! Use &e/gettoken <email>&c.")
|
|
except Exception, e:
|
|
error(e)
|
|
msg(sender, "&cError getting your token, please contact an admin!")
|
|
else:
|
|
msg(sender, "&cThis is only for players..")
|
|
|
|
|
|
def tokengen_command(sender, args):
|
|
plugin_header(sender, "Website Token")
|
|
if is_player(sender):
|
|
if len(args) < 1:
|
|
msg(sender, "&cPlease use &e/gettoken <email adress>")
|
|
else:
|
|
# email may contain spaces
|
|
mail = " ".join(args)
|
|
# email regex, needs something followed by an @ followed by domain or IP
|
|
if match("^.+@(.+\\..{2,}|\\[[0-9a-fA-F:.]+\\])$", mail) != None:
|
|
token = generate_token(6)
|
|
uuid = sender.getUniqueId().toString().replace("-", "")
|
|
try:
|
|
mysql_query("DELETE FROM register_tokens WHERE `uuid` = ?", (uuid,), False)
|
|
mysql_query("INSERT INTO register_tokens (`uuid`, `token`, `email`) VALUES (?, ?, ?)", (uuid, token, mail), False)
|
|
msg(sender, "&aToken generated!")
|
|
msg(sender, "&aEmail: &e%s" % mail)
|
|
msg(sender, "&aToken: &e%s" % token)
|
|
msg(sender, "&cIMPORTANT: never share the token with anyone!")
|
|
msg(sender, "&cIt could be used to claim your website account!")
|
|
except Exception, e:
|
|
error(e)
|
|
msg(sender, "&cError getting your token, please contact an admin!")
|
|
else:
|
|
msg(sender, "&c'&6%s&c' doesn't look like a valid email adress!" % mail)
|
|
else:
|
|
msg(sender, "&cThis is only for players..")
|
|
|
|
|
|
|
|
@hook.command("token")
|
|
def on_token_command(sender, command, label, args):
|
|
thread.start_new_thread(token_command, (sender,))
|
|
return True
|
|
|
|
|
|
@hook.command("gettoken")
|
|
def on_gettoken_command(sender, command, label, args):
|
|
thread.start_new_thread(tokengen_command, (sender, args))
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
|