From: pk910 Date: Wed, 24 Aug 2011 08:58:07 +0000 (+0200) Subject: added cmd_giveowner X-Git-Tag: v5.3~484 X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=commitdiff_plain;h=bd45ca5fc3a5ee0a4bfd8b1a3c3a8d4a9a03cd0e added cmd_giveowner --- diff --git a/DATABASE.txt b/DATABASE.txt index e6d81b4..783469e 100644 --- a/DATABASE.txt +++ b/DATABASE.txt @@ -11,5 +11,18 @@ CREATE TABLE IF NOT EXISTS `godlog` ( `godlog_time` int(15) NOT NULL, `godlog_cmd` varchar(512) NOT NULL, PRIMARY KEY (`godlog_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM; + +ALTER TABLE `channels` ADD `channel_lastgiveowner` INT( 11 ) NOT NULL AFTER `channel_lastvisit` + +CREATE TABLE IF NOT EXISTS `owner_history` ( +`owner_history_id` INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY , +`owner_history_cid` INT( 11 ) NOT NULL , +`owner_history_uid` INT( 11 ) NOT NULL , +`owner_history_time` INT( 11 ) NOT NULL , +INDEX ( `owner_history_cid` ) +) ENGINE = MYISAM ; + +ALTER TABLE `chanusers` ADD INDEX ( `chanuser_cid` ) ; +ALTER TABLE `chanusers` ADD INDEX ( `chanuser_uid` ) ; diff --git a/bot_NeonServ.c b/bot_NeonServ.c index e95c4a0..e74a890 100644 --- a/bot_NeonServ.c +++ b/bot_NeonServ.c @@ -78,6 +78,10 @@ static const struct default_language_entry msgtab[] = { {"NS_MDELUSER_DONE", "Deleted \002%d\002 account(s) matching \002%s\002 with access from \002%d\002 to \002%d\002 from the %s user list."}, {"NS_TRIM_DURATION_TOO_SHORT", "You must include a minimum inactivity duration of at least %d seconds to trim."}, {"NS_TRIM_DONE", "Trimmed \002%d users\002 with access from %d to %d from the %s user list who were inactive for at least %s."}, + {"NS_GIVEOWNER_SELF", "You cannot give ownership to your own account."}, + {"NS_GIVEOWNER_TIMEOUT", "You must wait %s before you can give ownership of \002%s\002 to someone else."}, + {"NS_GIVEOWNER_CONFIRM", "To really give ownership to \002%1$s\002, you must use 'giveownership *%1$s %2$s'."}, + {"NS_GIVEOWNER_DONE", "Ownership of \002%s\002 has been transferred to account \002%s\002."}, {NULL, NULL} }; @@ -93,7 +97,7 @@ INCLUDE ALL CMD's HERE #include "cmd_neonserv_delme.c" #include "cmd_neonserv_mdeluser.c" #include "cmd_neonserv_trim.c" /* TODO: trim bans */ -//#include "cmd_neonserv_giveownership.c" +#include "cmd_neonserv_giveowner.c" #include "cmd_neonserv_users.c" #include "cmd_neonserv_up.c" #include "cmd_neonserv_down.c" @@ -242,6 +246,7 @@ void init_NeonServ() { register_command(BOTID, "downall", neonserv_cmd_downall, 0, 0); register_command(BOTID, "mdeluser", neonserv_cmd_mdeluser, 2, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); register_command(BOTID, "trim", neonserv_cmd_trim, 2, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); + register_command(BOTID, "giveowner", neonserv_cmd_giveowner, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); start_bots(); bind_bot_ready(neonserv_bot_ready); diff --git a/cmd_neonserv_giveowner.c b/cmd_neonserv_giveowner.c new file mode 100644 index 0000000..5cf3185 --- /dev/null +++ b/cmd_neonserv_giveowner.c @@ -0,0 +1,122 @@ + +/* +* argv[0] - nick / *auth +* argv[1] - key +*/ + +#define GIVEOWNER_TIMEOUT 86400 /* 60*60*24 = 86400 */ + +static USERAUTH_CALLBACK(neonserv_cmd_giveowner_nick_lookup); +static void neonserv_cmd_giveowner_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nick, char *auth, char *key); + +struct neonserv_cmd_giveowner_cache { + struct ClientSocket *client, *textclient; + struct UserNode *user; + struct ChanNode *chan; + char *nick; + char *key; +}; + +static CMD_BIND(neonserv_cmd_giveowner) { + check_mysql(); + if(getChannelAccess(user, chan, 0) != 500) { + reply(getTextBot(), user, "NS_ACCESS_DENIED"); + return; + } + MYSQL_RES *res; + MYSQL_ROW row; + int userid; + printf_mysql_query("SELECT `channel_lastgiveowner` FROM `channels` WHERE `channel_id` = '%s'", chan->channel_id); + res = mysql_use(); + if ((row = mysql_fetch_row(res)) == NULL) return; + if(strcmp(row[0], "0") && (atoi(row[0]) + GIVEOWNER_TIMEOUT) > time(0)) { + char timeBuf[MAXLEN]; + reply(getTextBot(), user, "NS_GIVEOWNER_TIMEOUT", timeToStr(user, (GIVEOWNER_TIMEOUT - (time(0) - atoi(row[0]))), 2, timeBuf), chan->name); + return; + } + if(argv[0][0] == '*') { + //we've got an auth + argv[0]++; + neonserv_cmd_giveowner_async1(client, getTextBot(), user, chan, argv[0], argv[0], (argc != 1 ? argv[1] : NULL)); + } else { + struct UserNode *cuser = getUserByNick(argv[0]); + if(!cuser) { + cuser = createTempUser(argv[0]); + cuser->flags |= USERFLAG_ISTMPUSER; + } + if(cuser->flags & USERFLAG_ISAUTHED) { + neonserv_cmd_giveowner_async1(client, getTextBot(), user, chan, argv[0], cuser->auth, (argc != 1 ? argv[1] : NULL)); + } else { + struct neonserv_cmd_giveowner_cache *cache = malloc(sizeof(*cache)); + if (!cache) { + perror("malloc() failed"); + return; + } + cache->client = client; + cache->textclient = getTextBot(); + cache->user = user; + cache->chan = chan; + cache->nick = strdup(argv[0]); + cache->key = (argc != 1 ? strdup(argv[1]) : NULL); + get_userauth(cuser, neonserv_cmd_giveowner_nick_lookup, cache); + } + } +} + +static USERAUTH_CALLBACK(neonserv_cmd_giveowner_nick_lookup) { + struct neonserv_cmd_giveowner_cache *cache = data; + if(!user) { + //USER_DOES_NOT_EXIST + reply(cache->textclient, cache->user, "NS_USER_UNKNOWN", cache->nick); + } + else if(!(user->flags & USERFLAG_ISAUTHED)) { + //USER_NOT_AUTHED + reply(cache->textclient, cache->user, "NS_USER_NEED_AUTH", cache->nick); + } + else + neonserv_cmd_giveowner_async1(cache->client, cache->textclient, cache->user, cache->chan, user->nick, user->auth, cache->key); + free(cache->nick); + if(cache->key) + free(cache->key); + free(cache); +} + +static void neonserv_cmd_giveowner_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nick, char *auth, char *key) { + //we've got a valid auth now... + if(!stricmp(user->auth, auth)) { + reply(textclient, user, "NS_GIVEOWNER_SELF"); + return; + } + MYSQL_RES *res; + MYSQL_ROW row; + int userid; + printf_mysql_query("SELECT `user_id` FROM `users` WHERE `user_user` = '%s'", escape_string(auth)); + res = mysql_use(); + if ((row = mysql_fetch_row(res)) != NULL) { + userid = atoi(row[0]); + //check if the user is already added + printf_mysql_query("SELECT `chanuser_access`, `chanuser_id` FROM `chanusers` WHERE `chanuser_cid` = '%d' AND `chanuser_uid` = '%d'", chan->channel_id, userid); + res = mysql_use(); + if ((row = mysql_fetch_row(res)) != NULL) { + int seed = 0; + char *tmp; + char giveownerkey[16]; + for(tmp = user->auth; *tmp; tmp++) + seed = (seed * 0xEECE66DL ^ ((*tmp << 24) | (*tmp << 16) | (*tmp << 8) | *tmp)); + for(tmp = chan->name; *tmp; tmp++) + seed = (seed * 0xEECE66DL ^ ((*tmp << 24) | (*tmp << 16) | (*tmp << 8) | *tmp)); + sprintf(giveownerkey, "%08x", seed); + if(key && !stricmp(giveownerkey, key)) { + //give ownership + printf_mysql_query("UPDATE `chanusers` SET `chanuser_access` = '500' WHERE `chanuser_id` = '%s'", row[1]); + printf_mysql_query("UPDATE `chanusers` SET `chanuser_access` = '499' WHERE `chanuser_cid` = '%d' AND `chanuser_uid` = (SELECT `user_id` FROM `users` WHERE `user_user` = '%s')", chan->channel_id, escape_string(user->auth)); + printf_mysql_query("INSERT INTO `owner_history` (`owner_history_cid`, `owner_history_uid`, `owner_history_time`) VALUE ('%d', '%d', UNIX_TIMESTAMP())", chan->channel_id, userid); + reply(textclient, user, "NS_GIVEOWNER_DONE", chan->name, auth); + } else { + reply(textclient, user, "NS_GIVEOWNER_CONFIRM", auth, giveownerkey); + } + return; + } + } + reply(textclient, user, "NS_NOT_ON_USERLIST", nick, chan->name); +}