X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/4355dbd3c9e2325c97dd464c78360edf4a957ade..b72bd23a03fa5236e1e96baa693fe0549f0f2609:/src/channel.c diff --git a/src/channel.c b/src/channel.c index d00be83..9cb71e8 100644 --- a/src/channel.c +++ b/src/channel.c @@ -21,7 +21,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: channel.c 3580 2007-11-07 23:45:14Z jilles $ */ #include "stdinc.h" @@ -42,6 +41,7 @@ #include "s_newconf.h" #include "logger.h" #include "packet.h" +#include "irc_dictionary.h" struct config_channel_entry ConfigChannel; rb_dlink_list global_channel_list; @@ -66,6 +66,8 @@ static int h_can_join; static int h_can_create_channel; static int h_channel_join; +struct module_modes ModuleModes; + /* init_channels() * * input - @@ -85,6 +87,40 @@ init_channels(void) h_can_create_channel = register_hook("can_create_channel"); } +/* is this the best place to put this? */ +/* init_module_modes() + * + * input - + * output - + * side effects - various MODE_ values are set to 0 + */ +void +init_module_modes() +{ + ModuleModes.MODE_REGONLY = 0; + ModuleModes.MODE_NOCTCP = 0; + ModuleModes.MODE_NOCOLOR = 0; + ModuleModes.MODE_EXLIMIT = 0; + ModuleModes.MODE_PERMANENT = 0; + ModuleModes.MODE_OPMODERATE = 0; + ModuleModes.MODE_FREEINVITE = 0; + ModuleModes.MODE_FREETARGET = 0; + ModuleModes.MODE_DISFORWARD = 0; + ModuleModes.MODE_THROTTLE = 0; + ModuleModes.MODE_FORWARD = 0; + ModuleModes.MODE_NONOTICE = 0; + ModuleModes.MODE_NOACTION = 0; + ModuleModes.MODE_NOKICK = 0; + ModuleModes.MODE_NONICK = 0; + ModuleModes.MODE_NOCAPS = 0; + ModuleModes.MODE_NOREJOIN = 0; + ModuleModes.MODE_NOREPEAT = 0; + ModuleModes.MODE_NOOPERKICK = 0; + + ModuleModes.CHFL_QUIET = 0; +} + + /* * allocate_channel - Allocates a channel */ @@ -92,15 +128,21 @@ struct Channel * allocate_channel(const char *chname) { struct Channel *chptr; + struct Dictionary *metadata; chptr = rb_bh_alloc(channel_heap); chptr->chname = rb_strdup(chname); + + metadata = irc_dictionary_create(irccmp); + chptr->metadata = metadata; return (chptr); } void free_channel(struct Channel *chptr) { + channel_metadata_clear(chptr); rb_free(chptr->chname); + rb_free(chptr->mode_lock); rb_bh_free(channel_heap, chptr); } @@ -175,11 +217,18 @@ find_channel_membership(struct Channel *chptr, struct Client *client_p) const char * find_channel_status(struct membership *msptr, int combine) { - static char buffer[3]; + static char buffer[5]; char *p; p = buffer; + if(is_admin(msptr)) + { + if(!combine) + return "!"; + *p++ = '!'; + } + if(is_chanop(msptr)) { if(!combine) @@ -187,6 +236,13 @@ find_channel_status(struct membership *msptr, int combine) *p++ = '@'; } + if(is_halfop(msptr)) + { + if(!combine) + return "%"; + *p++ = '%'; + } + if(is_voiced(msptr)) *p++ = '+'; @@ -194,6 +250,93 @@ find_channel_status(struct membership *msptr, int combine) return buffer; } +/* is_halfop() + * + * input - membership to check for halfops + * output - 1 if the user is halfopped, 0 if the user is not or halfop + * is disabled. + * side effects - + * + */ +int +is_halfop(struct membership *msptr) +{ + if(!ConfigChannel.use_halfop) + return 0; + if(is_chmode_h(msptr)) + return 1; + else + return 0; +} + +/* is_admin() + * + * input - membership to check for admin + * output - 1 if the user is an admin, 0 if the user is not or admin + * is disabled. + * side effects - + * + */ +int +is_admin(struct membership *msptr) +{ + if(!ConfigChannel.use_admin) + return 0; + if(is_chmode_a(msptr)) + return 1; + else + return 0; +} + +/* is_any_op() + * + * input - membership to check for ops + * output - 1 if the user is op, halfop, or admin, 0 elsewise + * side effects - + */ +int +is_any_op(struct membership *msptr) +{ + if(is_chanop(msptr) || is_halfop(msptr) || is_admin(msptr)) + return 1; + else + return 0; +} + +/* is_chanop_voiced() + * + * input - memebership to check for status + * output - 1 if the user is op, halfop, admin, or voice, 0 elsewise + * side effects - + */ +int +is_chanop_voiced(struct membership *msptr) +{ + if(is_chanop(msptr) || is_voiced(msptr) || is_halfop(msptr) || is_admin(msptr)) + return 1; + else + return 0; +} + +/* can_kick_deop() + * + * input - two memeberships + * output - 1 if the first memebership can kick/deop the second, 0 elsewise + * side effects - + */ +int +can_kick_deop(struct membership *source, struct membership *target) +{ + if(is_chanop(source) && !is_admin(target)) + return 1; + else if(is_halfop(source) && !is_any_op(target)) + return 1; + else if(is_admin(source)) + return 1; + + return 0; +} + /* add_user_to_channel() * * input - channel to add client to, client to add, channel flags @@ -246,7 +389,7 @@ remove_user_from_channel(struct membership *msptr) if(client_p->servptr == &me) rb_dlinkDelete(&msptr->locchannode, &chptr->locmembers); - if(!(chptr->mode.mode & MODE_PERMANENT) && rb_dlink_list_length(&chptr->members) <= 0) + if(!(chptr->mode.mode & ModuleModes.MODE_PERMANENT) && rb_dlink_list_length(&chptr->members) <= 0) destroy_channel(chptr); rb_bh_free(member_heap, msptr); @@ -281,7 +424,7 @@ remove_user_from_channels(struct Client *client_p) if(client_p->servptr == &me) rb_dlinkDelete(&msptr->locchannode, &chptr->locmembers); - if(!(chptr->mode.mode & MODE_PERMANENT) && rb_dlink_list_length(&chptr->members) <= 0) + if(!(chptr->mode.mode & ModuleModes.MODE_PERMANENT) && rb_dlink_list_length(&chptr->members) <= 0) destroy_channel(chptr); rb_bh_free(member_heap, msptr); @@ -617,6 +760,10 @@ is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr, struct Ban *actualBan = NULL; struct Ban *actualExcept = NULL; + /* check to make sure quiets even exist on this server first */ + if(ModuleModes.CHFL_QUIET == 0) + return 0; + if(!MyClient(who)) return 0; @@ -652,7 +799,7 @@ is_quieted(struct Channel *chptr, struct Client *who, struct membership *msptr, if(match(actualBan->banstr, s) || match(actualBan->banstr, s2) || match_cidr(actualBan->banstr, s2) || - match_extban(actualBan->banstr, who, chptr, CHFL_QUIET) || + match_extban(actualBan->banstr, who, chptr, ModuleModes.CHFL_QUIET) || (s3 != NULL && match(actualBan->banstr, s3))) break; else @@ -719,9 +866,12 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key) char src_host[NICKLEN + USERLEN + HOSTLEN + 6]; char src_iphost[NICKLEN + USERLEN + HOSTLEN + 6]; char src_althost[NICKLEN + USERLEN + HOSTLEN + 6]; + char text[10]; int use_althost = 0; int i = 0; hook_data_channel moduledata; + struct Metadata *md; + struct DictionaryIter iter; s_assert(source_p->localClient != NULL); @@ -747,6 +897,17 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key) if((is_banned(chptr, source_p, NULL, src_host, src_iphost)) == CHFL_BAN) return (ERR_BANNEDFROMCHAN); + rb_snprintf(text, sizeof(text), "K%s", source_p->id); + + DICTIONARY_FOREACH(md, &iter, chptr->metadata) + { + if(!strcmp(md->value, "KICKNOREJOIN") && !strcmp(md->name, text) && (md->timevalue + 2 > rb_current_time())) + return ERR_KICKNOREJOIN; + /* cleanup any stale KICKNOREJOIN metadata we find while we're at it */ + if(!strcmp(md->value, "KICKNOREJOIN") && !(md->timevalue + 2 > rb_current_time())) + channel_metadata_delete(chptr, md->name, 0); + } + if(chptr->mode.mode & MODE_INVITEONLY) { RB_DLINK_FOREACH(invite, source_p->user->invited.head) @@ -779,15 +940,19 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key) if(chptr->mode.limit && rb_dlink_list_length(&chptr->members) >= (unsigned long) chptr->mode.limit) i = ERR_CHANNELISFULL; - if(chptr->mode.mode & MODE_REGONLY && EmptyString(source_p->user->suser)) + if(chptr->mode.mode & ModuleModes.MODE_REGONLY && EmptyString(source_p->user->suser)) i = ERR_NEEDREGGEDNICK; /* join throttling stuff --nenolod */ - else if(chptr->mode.join_num > 0 && chptr->mode.join_time > 0) + /* only check for throttles if they exist on this server --Taros */ + else if(ModuleModes.MODE_THROTTLE) { - if ((rb_current_time() - chptr->join_delta <= - chptr->mode.join_time) && (chptr->join_count >= - chptr->mode.join_num)) - i = ERR_THROTTLE; + if(chptr->mode.join_num > 0 && chptr->mode.join_time > 0) + { + if ((rb_current_time() - chptr->join_delta <= + chptr->mode.join_time) && (chptr->join_count >= + chptr->mode.join_num)) + i = ERR_THROTTLE; + } } /* allow /invite to override +l/+r/+j also -- jilles */ @@ -879,7 +1044,7 @@ find_bannickchange_channel(struct Client *client_p) char src_host[NICKLEN + USERLEN + HOSTLEN + 6]; char src_iphost[NICKLEN + USERLEN + HOSTLEN + 6]; - if (!MyClient(client_p)) + if (!MyClient(client_p) || IsOverride(client_p)) return NULL; rb_sprintf(src_host, "%s!%s@%s", client_p->name, client_p->username, client_p->host); @@ -922,9 +1087,7 @@ find_nonickchange_channel(struct Client *client_p) { msptr = ptr->data; chptr = msptr->chptr; - if (is_chanop_voiced(msptr)) - continue; - if (chptr->mode.mode & MODE_NONICK) + if (chptr->mode.mode & ModuleModes.MODE_NONICK && (!ConfigChannel.exempt_cmode_N || !is_any_op(msptr))) return chptr; } return NULL; @@ -1104,6 +1267,26 @@ set_channel_topic(struct Channel *chptr, const char *topic, const char *topic_in } } +/* has_common_channel() + * + * input - pointer to client + * - pointer to another client + * output - 1 if the two have a channel in common, 0 elsewise + * side effects - none + */ +int +has_common_channel(struct Client *client1, struct Client *client2) +{ + rb_dlink_node *ptr; + + RB_DLINK_FOREACH(ptr, client1->user->channel.head) + { + if(IsMember(client2, ((struct membership *)ptr->data)->chptr)) + return 1; + } + return 0; +} + /* channel_modes() * * inputs - pointer to channel @@ -1127,8 +1310,12 @@ channel_modes(struct Channel *chptr, struct Client *client_p) *pbuf = '\0'; for (i = 0; i < 256; i++) + { + if(chmode_table[i].set_func == chm_hidden && !IsOper(client_p) && IsClient(client_p)) + continue; if(chptr->mode.mode & chmode_flags[i]) *mbuf++ = i; + } if(chptr->mode.limit) { @@ -1155,7 +1342,7 @@ channel_modes(struct Channel *chptr, struct Client *client_p) chptr->mode.join_time); } - if(*chptr->mode.forward && (ConfigChannel.use_forward || !IsClient(client_p))) + if(*chptr->mode.forward && (ModuleModes.MODE_FORWARD || !IsClient(client_p))) { *mbuf++ = 'f'; @@ -1389,6 +1576,57 @@ send_cap_mode_changes(struct Client *client_p, struct Client *source_p, } } +void +resv_chan_forcepart(const char *name, const char *reason, int temp_time) +{ + rb_dlink_node *ptr; + rb_dlink_node *next_ptr; + struct Channel *chptr; + struct membership *msptr; + struct Client *target_p; + + if(!ConfigChannel.resv_forcepart) + return; + + /* for each user on our server in the channel list + * send them a PART, and notify opers. + */ + chptr = find_channel(name); + if(chptr != NULL) + { + RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head) + { + msptr = ptr->data; + target_p = msptr->client_p; + + if(IsExemptResv(target_p)) + continue; + + sendto_server(target_p, chptr, CAP_TS6, NOCAPS, + ":%s PART %s", target_p->id, chptr->chname); + + sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s :%s", + target_p->name, target_p->username, + target_p->host, chptr->chname, target_p->name); + + remove_user_from_channel(msptr); + + /* notify opers & user they were removed from the channel */ + sendto_realops_snomask(SNO_GENERAL, L_ALL, + "Forced PART for %s!%s@%s from %s (%s)", + target_p->name, target_p->username, + target_p->host, name, reason); + + if(temp_time > 0) + sendto_one_notice(target_p, ":*** Channel %s is temporarily unavailable on this server.", + name); + else + sendto_one_notice(target_p, ":*** Channel %s is no longer available on this server.", + name); + } + } +} + /* Check what we will forward to, without sending any notices to the user * -- jilles */ @@ -1415,7 +1653,7 @@ check_forward(struct Client *source_p, struct Channel *chptr, if (hash_find_resv(chptr->chname)) return NULL; /* Don't forward to +Q channel */ - if (chptr->mode.mode & MODE_DISFORWARD) + if (chptr->mode.mode & ModuleModes.MODE_DISFORWARD) return NULL; i = can_join(source_p, chptr, key); if (i == 0) @@ -1541,7 +1779,8 @@ void user_join(struct Client * client_p, struct Client * source_p, const char * } /* check it begins with # or &, and local chans are disabled */ - else if(!IsChannelName(name)) + else if(!IsChannelName(name) || + ( !ConfigChannel.use_local_channels && name[0] == '&')) { sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL, form_str(ERR_NOSUCHCHANNEL), name); @@ -1635,7 +1874,10 @@ void user_join(struct Client * client_p, struct Client * source_p, const char * continue; } - flags = CHFL_CHANOP; + if(ConfigChannel.admin_on_channel_create && ConfigChannel.use_admin) + flags = CHFL_ADMIN | CHFL_CHANOP; + else + flags = CHFL_CHANOP; } if((rb_dlink_list_length(&source_p->user->channel) >= @@ -1664,8 +1906,17 @@ void user_join(struct Client * client_p, struct Client * source_p, const char * /* can_join checks for +i key, bans etc */ if((i = can_join(source_p, chptr, key))) { - if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) || - (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL)) + if(IsOverride(source_p)) + { + sendto_wallops_flags(UMODE_WALLOP, &me, + "%s is overriding JOIN to [%s]", + get_oper_name(source_p), chptr->chname); + sendto_server(NULL, chptr, NOCAPS, NOCAPS, + ":%s WALLOPS :%s is overriding JOIN to [%s]", + me.name, get_oper_name(source_p), chptr->chname); + } + else if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) || + (!ModuleModes.MODE_FORWARD || (chptr = check_forward(source_p, chptr, key)) == NULL)) { /* might be wrong, but is there any other better location for such? * see extensions/chm_operonly.c for other comments on this @@ -1676,8 +1927,8 @@ void user_join(struct Client * client_p, struct Client * source_p, const char * continue; } - - sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname); + else + sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname); } if(flags == 0 && @@ -1761,3 +2012,122 @@ void user_join(struct Client * client_p, struct Client * source_p, const char * return; } + +/* + * channel_metadata_add + * + * inputs - pointer to channel struct + * - name of metadata item you wish to add + * - value of metadata item + * - 1 if metadata should be propegated, 0 if not + * output - none + * side effects - metadata is added to the channel in question + * - metadata is propegated if propegate is set. + */ +struct Metadata * +channel_metadata_add(struct Channel *target, const char *name, const char *value, int propegate) +{ + struct Metadata *md; + + md = rb_malloc(sizeof(struct Metadata)); + md->name = rb_strdup(name); + md->value = rb_strdup(value); + + irc_dictionary_add(target->metadata, md->name, md); + + if(propegate) + sendto_match_servs(&me, "*", CAP_ENCAP, NOCAPS, "ENCAP * METADATA ADD %s %s :%s", + target->chname, name, value); + + return md; +} + +/* + * channel_metadata_time_add + * + * inputs - pointer to channel struct + * - name of metadata item you wish to add + * - time_t you wish to add + * - value you wish to add + * output - none + * side effects - metadata is added to the channel in question + */ +struct Metadata * +channel_metadata_time_add(struct Channel *target, const char *name, time_t timevalue, const char *value) +{ + struct Metadata *md; + + md = rb_malloc(sizeof(struct Metadata)); + md->name = rb_strdup(name); + md->value = rb_strdup(value); + md->timevalue = timevalue; + + irc_dictionary_add(target->metadata, md->name, md); + + return md; +} + +/* + * channel_metadata_delete + * + * inputs - pointer to channel struct + * - name of metadata item you wish to delete + * output - none + * side effects - metadata is deleted from the channel in question + * - deletion is propegated if propegate is set + */ +void +channel_metadata_delete(struct Channel *target, const char *name, int propegate) +{ + struct Metadata *md = channel_metadata_find(target, name); + + if(!md) + return; + + irc_dictionary_delete(target->metadata, md->name); + + rb_free(md); + + if(propegate) + sendto_match_servs(&me, "*", CAP_ENCAP, NOCAPS, "ENCAP * METADATA DELETE %s %s", + target->chname, name); +} + +/* + * channel_metadata_find + * + * inputs - pointer to channel struct + * - name of metadata item you wish to read + * output - the requested metadata, if it exists, elsewise null. + * side effects - + */ +struct Metadata * +channel_metadata_find(struct Channel *target, const char *name) +{ + if(!target) + return NULL; + + if(!target->metadata) + return NULL; + + return irc_dictionary_retrieve(target->metadata, name); +} + +/* + * channel_metadata_clear + * + * inputs - pointer to channel struct + * output - none + * side effects - metadata is cleared from the channel in question + */ +void +channel_metadata_clear(struct Channel *chptr) +{ + struct Metadata *md; + struct DictionaryIter iter; + + DICTIONARY_FOREACH(md, &iter, chptr->metadata) + { + channel_metadata_delete(chptr, md->name, 0); + } +}