X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FIRCParser.c;h=17aeef45ed25ecfaf89d056c2b94d39c4214f497;hb=902ebfe5551be2daa3edf8141bcee91f62c0a5e0;hp=b757f5dc4d28ca18c9af2f356120ded843736a97;hpb=a2a7e52f6be12cccfc69cb85c4df521a746bba6c;p=NeonServV5.git diff --git a/src/IRCParser.c b/src/IRCParser.c index b757f5d..17aeef4 100644 --- a/src/IRCParser.c +++ b/src/IRCParser.c @@ -1,5 +1,5 @@ -/* IRCParser.c - NeonServ v5.2 - * Copyright (C) 2011 Philipp Kreil (pk910) +/* IRCParser.c - NeonServ v5.3 + * Copyright (C) 2011-2012 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ #include "DBHelper.h" #include "BanNode.h" #include "ModeNode.h" +#include "tools.h" struct irc_cmd *irc_commands = NULL; static struct UserNode *registering_users = NULL; @@ -56,7 +57,11 @@ int parse_lines(struct ClientSocket *client, char *lines, int len) { static void parse_line(struct ClientSocket *client, char *line) { int argc = 0; char *argv[MAXNUMPARAMS]; - printf("[recv %lu] %s\n", (unsigned long) strlen(line), line); + #ifdef HAVE_THREADS + putlog(LOGLEVEL_RAW, "[%d recv %lu] %s\n", getCurrentThreadID(), (unsigned long) strlen(line), line); + #else + putlog(LOGLEVEL_RAW, "[recv %lu] %s\n", (unsigned long) strlen(line), line); + #endif if(line[0] == ':') line++; else @@ -115,7 +120,7 @@ static USERLIST_CALLBACK(got_channel_userlist) { event_join(chanuser); } -static IRC_CMD(raw_001) { +static IRC_CMD(raw_002) { //fixed: ZNC fakes a 001 raw even if we're not connected! struct UserNode *user = getUserByNick(argv[0]); if(!user) user = addUser(argv[0]); @@ -168,10 +173,18 @@ static int is_onlyBotSeeUser(struct ClientSocket *client, struct UserNode *user) static IRC_CMD(raw_join) { if(from == NULL || argc < 1) return 0; + SYNCHRONIZE(cache_sync); struct UserNode *user = getUserByMask(from); struct ChanNode *chan = getChanByName(argv[0]); - if(!chan && !(user->flags & USERFLAG_ISBOT)) return 0; - if(chan && chan->chanbot != client->user) return 1; //we ignore it - but it's not a parse error + if(!chan && (!user || !(user->flags & USERFLAG_ISBOT))) { + DESYNCHRONIZE(cache_sync); + return 0; + } + if(chan && (((!user || !isBot(user)) && chan->chanbot != client->user) || ((user && isBot(user)) && client->user != user))) { + DESYNCHRONIZE(cache_sync); + return 1; //we ignore it - but it's not a parse error + } + //let Bots always add themselves! (maybe they join invisible) if(user == NULL) { user = addUserMask(from); } @@ -201,11 +214,13 @@ static IRC_CMD(raw_join) { //request member list chan->chanbot = user; struct ChanUser *chanuser = addChanUser(chan, user); //it must be a bot - get_userlist(chan, got_channel_userlist, chanuser); + get_userlist_with_invisible(chan, 0, got_channel_userlist, chanuser); putsock(client, "MODE %s", chan->name); putsock(client, "MODE %s +b", chan->name); - } else if(!isUserOnChan(user, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) { + } else if(!isUserOnChan(user, chan) && ((chan->flags & CHANFLAG_RECEIVED_USERLIST) || isBot(user))) { struct ChanUser *chanuser = addChanUser(chan, user); + if(isBot(user) && isModeSet(chan->modes, 'D')) //if the bot joins a channel it could also be invisible + chanuser->flags |= CHANUSERFLAG_INVISIBLE; if(!noEvent) { if(wasRegistering) user->flags |= USERFLAG_WAS_REGISTRING; @@ -213,41 +228,130 @@ static IRC_CMD(raw_join) { if(wasRegistering) user->flags &= ~USERFLAG_WAS_REGISTRING; } + if(!(user->flags & USERFLAG_ISBOT) && (chan->flags & CHANFLAG_REJOINING)) { + //ABORT REJOIN (security break) + struct ClientSocket **clients = chan->rejoin_array; + while(*clients) { + putsock(*clients, "JOIN %s", chan->name); + clients++; + } + free(chan->rejoin_array); + chan->flags &= ~CHANFLAG_REJOINING; + } + } else if(chan->usercount == 1 && isUserOnChan(user, chan)) { + //first bot rejoined + struct ChanUser *chanuser = getChanUser(user, chan); + chanuser->flags &= ~CHANUSERFLAG_VOICED; + chanuser->flags |= CHANUSERFLAG_OPPED; } + DESYNCHRONIZE(cache_sync); return 1; } +static void check_full_rejoin(struct ChanNode *chan) { + struct ChanUser *chanuser; + char do_rejoin = 1; + int botcount = 0; + for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) { + if((chanuser->flags & CHANUSERFLAG_OPPED) || !(chanuser->user->flags & USERFLAG_ISBOT)) { + do_rejoin = 0; + break; + } + if((chanuser->user->flags & USERFLAG_ISBOT)) + botcount++; + } + if(do_rejoin) { + struct ClientSocket **clients = calloc(botcount, sizeof(*clients)); + struct ClientSocket *bot, *chanbot; + int i = 0; + for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) { + if(bot->user != chan->chanbot && isUserOnChan(bot->user, chan)) { + clients[i++] = bot; + putsock(bot, "PART %s :rejoining", chan->name); + } else if(bot->user == chan->chanbot) + chanbot = bot; + } + chan->flags |= CHANFLAG_REJOINING; + chan->rejoin_array = clients; + if(botcount == 1) { + //we're alone + putsock(chanbot, "PART %s :magic hop", chan->name); + putsock(chanbot, "JOIN %s", chan->name); + } + } +} + static IRC_CMD(raw_part) { if(from == NULL || argc < 1) return 0; + SYNCHRONIZE(cache_sync); struct UserNode *user = getUserByMask(from); - if(user == NULL) return 0; + if(user == NULL) { + DESYNCHRONIZE(cache_sync); + return 0; + } struct ChanNode *chan = getChanByName(argv[0]); - if(chan == NULL) return 0; - if(chan->chanbot != client->user) return 1; //we ignore it - but it's not a parse error - if(isUserOnChan(user, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) { + if(chan == NULL) { + DESYNCHRONIZE(cache_sync); + return 0; + } + if((!isBot(user) && chan->chanbot != client->user) || (isBot(user) && client->user != user)) { + DESYNCHRONIZE(cache_sync); + return 1; //we ignore it - but it's not a parse error + } + int keep_channel = 1; + if(chan->chanbot == user && (chan->flags & CHANFLAG_REJOINING)) { + struct ClientSocket **clients = chan->rejoin_array; + while(*clients) { + putsock(*clients, "JOIN %s", chan->name); + clients++; + } + free(chan->rejoin_array); + chan->flags &= ~CHANFLAG_REJOINING; + DESYNCHRONIZE(cache_sync); + return 0; + } else if(isUserOnChan(user, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) { struct ChanUser *chanuser = getChanUser(user, chan); delChanUser(chanuser, 0); //we need to free the chanuser manually! event_part(chanuser, (argc > 1 ? argv[1] : NULL)); freeChanUser(chanuser); if(chan->chanbot == user) { //check if theres another bot in the channel - otherwise free it - checkChannelVisibility(chan); + keep_channel = checkChannelVisibility(chan); } } if(user->channel == NULL && !(user->flags & USERFLAG_ISBOT)) { //remove the user delUser(user, 1); } + if(keep_channel && (chan->flags & CHANFLAG_RECEIVED_USERLIST) && !(chan->flags & CHANFLAG_REJOINING)) { + check_full_rejoin(chan); + } + else if(keep_channel && (chan->flags & CHANFLAG_REJOINING) && chan->usercount == 1) { + //bot is alone... rejoin! + putsock(client, "PART %s :magic hop", chan->name); + putsock(client, "JOIN %s", chan->name); + } + DESYNCHRONIZE(cache_sync); return 1; } static IRC_CMD(raw_quit) { if(from == NULL || argc < 1) return 0; + SYNCHRONIZE(cache_sync); struct UserNode *user = getUserByMask(from); - if(user == NULL) return 0; - if(!is_firstBotSeeUser(client, user)) return 1; //we ignore it - but it's not a parse error + if(user == NULL) { + DESYNCHRONIZE(cache_sync); + return 0; + } + if(!is_firstBotSeeUser(client, user)) { + DESYNCHRONIZE(cache_sync); + return 1; //we ignore it - but it's not a parse error + } int registering = !stricmp(argv[0], "Registered"); - if((registering && (user->flags & USERFLAG_ISBOT))) return 1; //bot is registering - just ignore it + if((registering && (user->flags & USERFLAG_ISBOT))) { + DESYNCHRONIZE(cache_sync); + return 1; //bot is registering - just ignore it + } delUser(user, 0); //a little bit crazy, but we want to delete the user on the channel's userlists - but not the users channel list event_quit(user, argv[0]); if(user->flags & USERFLAG_ISBOT) { @@ -262,10 +366,19 @@ static IRC_CMD(raw_quit) { struct ClientSocket *bot; for(bot = getBots(0, NULL); bot; bot = getBots(0, bot)) { if(bot->user == user) { + bot->flags &= ~SOCKET_FLAG_READY; bot->user = NULL; break; } } + } else if(!registering) { + struct ChanUser *chanuser; + struct ChanNode *chan; + for(chanuser = user->channel; chanuser; chanuser = chanuser->next_chan) { + chan = chanuser->chan; + if((chan->flags & CHANFLAG_RECEIVED_USERLIST) && !(chan->flags & CHANFLAG_REJOINING)) + check_full_rejoin(chan); + } } if(registering && !(user->flags & USERFLAG_ISBOT)) { user->next = registering_users; @@ -273,6 +386,7 @@ static IRC_CMD(raw_quit) { registering_users = user; } else delUser(user, 1); //now we fully free the user + DESYNCHRONIZE(cache_sync); return 1; } @@ -302,19 +416,32 @@ void bot_disconnect(struct ClientSocket *client) { } } client->user = NULL; + client->flags &= ~SOCKET_FLAG_READY; } } static IRC_CMD(raw_kick) { if(from == NULL || argc < 3) return 0; + SYNCHRONIZE(cache_sync); struct UserNode *user = getUserByMask(from); struct UserNode *target = getUserByNick(argv[1]); struct ChanNode *chan = getChanByName(argv[0]); - if(chan == NULL || target == NULL) return 0; - if(chan->chanbot != client->user) return 1; //we ignore it - but it's not a parse error + if(chan == NULL || target == NULL) { + DESYNCHRONIZE(cache_sync); + return 0; + } + if(((!isBot(target) && chan->chanbot != client->user) || (isBot(target) && client->user != target))) { + DESYNCHRONIZE(cache_sync); + return 1; //we ignore it - but it's not a parse error + } + int keep_channel = 1; if(isUserOnChan(target, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) { if(user == NULL) { - user = createTempUser(from); + user = createTempUserMask(from); + if(!user) { + DESYNCHRONIZE(cache_sync); + return 0; + } user->flags |= USERFLAG_ISTMPUSER; } struct ChanUser *chanuser = getChanUser(target, chan); @@ -322,7 +449,7 @@ static IRC_CMD(raw_kick) { event_kick(user, chanuser, argv[1]); if(chanuser->chan->chanbot == user) { //check if theres another bot in the channel - otherwise free it - checkChannelVisibility(chan); + keep_channel = checkChannelVisibility(chan); } freeChanUser(chanuser); } @@ -330,6 +457,10 @@ static IRC_CMD(raw_kick) { //remove the user delUser(target, 1); } + if(keep_channel && (chan->flags & CHANFLAG_RECEIVED_USERLIST) && !(chan->flags & CHANFLAG_REJOINING)) { + check_full_rejoin(chan); + } + DESYNCHRONIZE(cache_sync); return 1; } @@ -340,7 +471,8 @@ static IRC_CMD(raw_topic) { if(chan == NULL) return 0; if(chan->chanbot != client->user) return 1; //just ignore it to prevent event duplicates if(user == NULL) { - user = createTempUser(from); + user = createTempUserMask(from); + if(!user) return 0; user->flags |= USERFLAG_ISTMPUSER; } event_topic(user, chan, argv[1]); @@ -350,9 +482,28 @@ static IRC_CMD(raw_topic) { static IRC_CMD(raw_privmsg) { if(from == NULL || argc < 2) return 0; + if(!stricmplen(from, "*status", 7) || !stricmplen(from, "-sBNC", 5)) { + #ifdef HAVE_THREADS + unsigned int tid = (unsigned int) pthread_self_tid(); + while(!clientsocket_parseorder_top(tid)) { + usleep(1000); //1ms + } + #endif + if(!match("Disconnected from IRC.*", argv[1])) { + //ZNC DISCONNECT + bot_disconnect(client); + return 1; + } + if(!match("* disconnected from the server.", argv[1])) { + //sBNC DISCONNECT + bot_disconnect(client); + return 1; + } + } struct UserNode *user = getUserByMask(from); if(user == NULL) { - user = createTempUser(from); + user = createTempUserMask(from); + if(!user) return 0; user->flags |= USERFLAG_ISTMPUSER; } if(argv[0][0] == '#') { //Channel message @@ -399,7 +550,8 @@ static IRC_CMD(raw_notice) { if(from == NULL || argc < 2) return 0; struct UserNode *user = getUserByMask(from); if(user == NULL) { - user = createTempUser(from); + user = createTempUserMask(from); + if(!user) return 0; user->flags |= USERFLAG_ISTMPUSER; } if(argv[0][0] == '#') { //Channel notice @@ -453,7 +605,8 @@ static IRC_CMD(raw_invite) { if(from == NULL || argc < 2) return 0; struct UserNode *user = getUserByMask(from); if(user == NULL) { - user = createTempUser(from); + user = createTempUserMask(from); + if(!user) return 0; user->flags |= USERFLAG_ISTMPUSER; } event_invite(client, user, argv[1]); @@ -464,7 +617,8 @@ static IRC_CMD(raw_mode) { if(from == NULL || argc < 2) return 0; struct UserNode *user = getUserByMask(from); if(user == NULL) { - user = createTempUser(from); + user = createTempUserMask(from); + if(!user) return 0; user->flags |= USERFLAG_ISTMPUSER; } if(argv[0][0] == '#') { @@ -472,8 +626,8 @@ static IRC_CMD(raw_mode) { struct ChanNode *chan = getChanByName(argv[0]); if(!chan) return 0; if(chan->chanbot != client->user) return 1; - event_mode(user, chan, argv[1], argv+2, argc-2); parseModes(chan->modes, argv[1], argv+2, argc-2); + event_mode(user, chan, argv[1], argv+2, argc-2); } else { //UserMode } @@ -496,7 +650,7 @@ static IRC_CMD(raw_251) { if(argc < 2) return 0; char *total_user_str = argv[1]; char total_visible[20], total_invisible[20]; - int i, total_visible_pos = 0, total_invisible_pos = 0; + int i = 0, total_visible_pos = 0, total_invisible_pos = 0; while(*total_user_str) { if(*total_user_str == ' ') { i++; @@ -532,7 +686,7 @@ static IRC_CMD(raw_332) { void init_parser() { //all the raws we receive... - register_irc_function("001", raw_001); + register_irc_function("002", raw_002); register_irc_function("251", raw_251); register_irc_function("254", raw_254); register_irc_function("324", raw_324); @@ -592,7 +746,12 @@ char* merge_argv_char(char **argv, int start, int end, char seperator) { for(i = start; i < end; i++) { p = argv[i]; while(*p) p++; - *p = seperator; + if(i < end-1) { + while(p != argv[i+1]) { + *p++ = seperator; + } + } else + *p = seperator; } if(p) *p = '\0'; return argv[start];