X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/9230426e7a899ed8856cf5299aa982afb052c790..67cecc2b22f4fc2e1745d72fd4b14ebf271a4d5f:/src/channel.c diff --git a/src/channel.c b/src/channel.c index b342492..ddc397c 100644 --- a/src/channel.c +++ b/src/channel.c @@ -41,6 +41,8 @@ #include "s_conf.h" /* ConfigFileEntry, ConfigChannel */ #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; @@ -91,14 +93,19 @@ 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_bh_free(channel_heap, chptr); } @@ -174,11 +181,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_owner(msptr)) + { + if(!combine) + return "!"; + *p++ = '!'; + } + if(is_chanop(msptr)) { if(!combine) @@ -186,6 +200,13 @@ find_channel_status(struct membership *msptr, int combine) *p++ = '@'; } + if(is_halfop(msptr)) + { + if(!combine) + return "%"; + *p++ = '%'; + } + if(is_voiced(msptr)) *p++ = '+'; @@ -193,6 +214,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_owner() + * + * input - membership to check for owner + * output - 1 if the user is an owner, 0 if the user is not or owner + * is disabled. + * side effects - + * + */ +int +is_owner(struct membership *msptr) +{ + if(!ConfigChannel.use_owner) + 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 owner, 0 elsewise + * side effects - + */ +int +is_any_op(struct membership *msptr) +{ + if(is_chanop(msptr) || is_halfop(msptr) || is_owner(msptr)) + return 1; + else + return 0; +} + +/* is_chanop_voiced() + * + * input - memebership to check for status + * output - 1 if the user is op, halfop, owner, or voice, 0 elsewise + * side effects - + */ +int +is_chanop_voiced(struct membership *msptr) +{ + if(is_chanop(msptr) || is_voiced(msptr) || is_halfop(msptr) || is_owner(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_owner(target)) + return 1; + else if(is_halfop(source) && !is_any_op(target)) + return 1; + else if(is_owner(source)) + return 1; + + return 0; +} + /* add_user_to_channel() * * input - channel to add client to, client to add, channel flags @@ -721,9 +829,14 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key) int use_althost = 0; int i = 0; hook_data_channel moduledata; + struct Metadata *md; + struct DictionaryIter iter; s_assert(source_p->localClient != NULL); + if(IsOverride(source_p)) + return 0; + rb_sprintf(src_host, "%s!%s@%s", source_p->name, source_p->username, source_p->host); rb_sprintf(src_iphost, "%s!%s@%s", source_p->name, source_p->username, source_p->sockhost); if(source_p->localClient->mangledhost != NULL) @@ -746,6 +859,15 @@ 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); + DICTIONARY_FOREACH(md, &iter, chptr->metadata) + { + if(!strcmp(md->name, "KICKNOREJOIN") && !strcmp(md->value, source_p->id) && (md->timevalue + ConfigChannel.kick_no_rejoin_time > rb_current_time())) + return ERR_KICKNOREJOIN; + /* cleanup any stale KICKNOREJOIN metadata we find while we're at it */ + if(!strcmp(md->name, "KICKNOREJOIN") && !(md->timevalue + ConfigChannel.kick_no_rejoin_time > 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) @@ -846,6 +968,9 @@ can_send(struct Channel *chptr, struct Client *source_p, struct membership *mspt if(is_chanop_voiced(msptr)) return CAN_SEND_OPV; + if(IsOverride(source_p)) + return CAN_SEND_NONOP; + if(chptr->mode.mode & MODE_MODERATED) return CAN_SEND_NO; @@ -878,7 +1003,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); @@ -903,6 +1028,30 @@ find_bannickchange_channel(struct Client *client_p) return NULL; } +/* find_nonickchange_channel() + * Input: client to check + * Output: channel preventing nick change + */ +struct Channel * +find_nonickchange_channel(struct Client *client_p) +{ + struct Channel *chptr; + struct membership *msptr; + rb_dlink_node *ptr; + + if (!MyClient(client_p)) + return NULL; + + RB_DLINK_FOREACH(ptr, client_p->user->channel.head) + { + msptr = ptr->data; + chptr = msptr->chptr; + if (chptr->mode.mode & MODE_NONICK && (!ConfigChannel.exempt_cmode_N || !is_any_op(msptr))) + return chptr; + } + return NULL; +} + /* void check_spambot_warning(struct Client *source_p) * Input: Client to check, channel name or NULL if this is a part. * Output: none @@ -1077,6 +1226,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 @@ -1100,8 +1269,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) { @@ -1408,8 +1581,6 @@ check_forward(struct Client *source_p, struct Channel *chptr, * output - NONE * side effects - Use has decided to join 0. This is legacy * from the days when channels were numbers not names. *sigh* - * There is a bunch of evilness necessary here due to - * anti spambot code. */ void do_join_0(struct Client *client_p, struct Client *source_p) @@ -1424,12 +1595,12 @@ do_join_0(struct Client *client_p, struct Client *source_p) sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s JOIN 0", use_id(source_p)); + while((ptr = source_p->user->channel.head)) + { if(source_p->user->channel.head && MyConnect(source_p) && !IsOper(source_p) && !IsExemptSpambot(source_p)) check_spambot_warning(source_p, NULL); - while((ptr = source_p->user->channel.head)) - { msptr = ptr->data; chptr = msptr->chptr; sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s", @@ -1442,31 +1613,41 @@ do_join_0(struct Client *client_p, struct Client *source_p) int check_channel_name_loc(struct Client *source_p, const char *name) { + const char *p; + s_assert(name != NULL); if(EmptyString(name)) return 0; if(ConfigFileEntry.disable_fake_channels && !IsOper(source_p)) { - for(; *name; ++name) + for(p = name; *p; ++p) { - if(!IsChanChar(*name) || IsFakeChanChar(*name)) + if(!IsChanChar(*p) || IsFakeChanChar(*p)) return 0; } } else { - for(; *name; ++name) + for(p = name; *p; ++p) { - if(!IsChanChar(*name)) + if(!IsChanChar(*p)) return 0; } } + if(ConfigChannel.only_ascii_channels) + { + for(p = name; *p; ++p) + if(*p < 33 || *p > 126) + return 0; + } + + return 1; } -void user_join(struct Client * client_p, struct Client * source_p, char * channels, char * keys) +void user_join(struct Client * client_p, struct Client * source_p, const char * channels, const char * keys) { static char jbuf[BUFSIZE]; struct Channel *chptr = NULL; @@ -1478,7 +1659,6 @@ void user_join(struct Client * client_p, struct Client * source_p, char * channe char *p = NULL, *p2 = NULL; char *chanlist; char *mykey; - int successful_join_count = 0; /* Number of channels successfully joined */ jbuf[0] = '\0'; @@ -1507,7 +1687,8 @@ void user_join(struct Client * client_p, struct Client * source_p, char * channe } /* 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); @@ -1612,14 +1793,9 @@ void user_join(struct Client * client_p, struct Client * source_p, char * channe { sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS), me.name, source_p->name, name); - if(successful_join_count) - source_p->localClient->last_join_time = rb_current_time(); return; } - if(flags == 0) /* if channel doesn't exist, don't penalize */ - successful_join_count++; - if(chptr == NULL) /* If I already have a chptr, no point doing this */ { chptr = get_or_create_channel(source_p, name, NULL); @@ -1628,15 +1804,10 @@ void user_join(struct Client * client_p, struct Client * source_p, char * channe { sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE), me.name, source_p->name, name); - if(successful_join_count > 0) - successful_join_count--; continue; } } - if(!IsOper(source_p) && !IsExemptSpambot(source_p)) - check_spambot_warning(source_p, name); - /* can_join checks for +i key, bans etc */ if((i = can_join(source_p, chptr, key))) { @@ -1650,13 +1821,15 @@ void user_join(struct Client * client_p, struct Client * source_p, char * channe if(i != ERR_CUSTOM) sendto_one(source_p, form_str(i), me.name, source_p->name, name); - if(successful_join_count > 0) - successful_join_count--; continue; } sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname); } + + if(flags == 0 && + !IsOper(source_p) && !IsExemptSpambot(source_p)) + check_spambot_warning(source_p, name); /* add the user to the channel */ add_user_to_channel(chptr, source_p, flags); @@ -1679,8 +1852,22 @@ void user_join(struct Client * client_p, struct Client * source_p, char * channe if(flags & CHFL_CHANOP) { chptr->channelts = rb_current_time(); - chptr->mode.mode |= MODE_TOPICLIMIT; - chptr->mode.mode |= MODE_NOPRIVMSGS; + + /* autochanmodes stuff */ + if(ConfigChannel.autochanmodes) + { + char * ch; + for(ch = ConfigChannel.autochanmodes; *ch; *ch++) + { + chptr->mode.mode |= chmode_table[*ch].mode_type; + } + } + else + { + chptr->mode.mode |= MODE_TOPICLIMIT; + chptr->mode.mode |= MODE_NOPRIVMSGS; + } + modes = channel_modes(chptr, &me); sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s %s", @@ -1713,9 +1900,6 @@ void user_join(struct Client * client_p, struct Client * source_p, char * channe channel_member_names(chptr, source_p, 1); - if(successful_join_count) - source_p->localClient->last_join_time = rb_current_time(); - hook_info.client = source_p; hook_info.chptr = chptr; hook_info.key = key; @@ -1724,3 +1908,122 @@ void user_join(struct Client * client_p, struct Client * source_p, char * channe 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); + } +}