X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/b8643345db466e87d1fa4cd7b0e990ee1b080550..133755685ef38d8f9ac79ac27c4505b9e96f81fd:/src/channel.c diff --git a/src/channel.c b/src/channel.c index 8e3f570..39d2f85 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; @@ -92,14 +92,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); } @@ -180,7 +185,7 @@ find_channel_status(struct membership *msptr, int combine) p = buffer; - if(is_owner(msptr)) + if(is_admin(msptr)) { if(!combine) return "!"; @@ -219,27 +224,29 @@ find_channel_status(struct membership *msptr, int combine) int is_halfop(struct membership *msptr) { - /* will do something other than return 0 when owner is implemented */ if(!ConfigChannel.use_halfop) return 0; + if(is_chmode_h(msptr)) + return 1; else return 0; } -/* is_owner() +/* is_admin() * - * input - membership to check for owner - * output - 1 if the user is an owner, 0 if the user is not or owner + * 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_owner(struct membership *msptr) +is_admin(struct membership *msptr) { - /* will do something other than return 0 when owner is implemented */ - if(!ConfigChannel.use_owner) + if(!ConfigChannel.use_admin) return 0; + if(is_chmode_a(msptr)) + return 1; else return 0; } @@ -247,13 +254,13 @@ is_owner(struct membership *msptr) /* is_any_op() * * input - membership to check for ops - * output - 1 if the user is op, halfop, or owner, 0 elsewise + * 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_owner(msptr)) + if(is_chanop(msptr) || is_halfop(msptr) || is_admin(msptr)) return 1; else return 0; @@ -262,13 +269,13 @@ is_any_op(struct membership *msptr) /* is_chanop_voiced() * * input - memebership to check for status - * output - 1 if the user is op, halfop, owner, or voice, 0 elsewise + * 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_owner(msptr)) + if(is_chanop(msptr) || is_voiced(msptr) || is_halfop(msptr) || is_admin(msptr)) return 1; else return 0; @@ -283,11 +290,11 @@ is_chanop_voiced(struct membership *msptr) int can_kick_deop(struct membership *source, struct membership *target) { - if(is_chanop(source) && !is_owner(target)) + if(is_chanop(source) && !is_admin(target)) return 1; else if(is_halfop(source) && !is_any_op(target)) return 1; - else if(is_owner(source)) + else if(is_admin(source)) return 1; return 0; @@ -818,15 +825,15 @@ 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); - 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) @@ -849,6 +856,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) @@ -949,9 +967,6 @@ 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; @@ -1027,9 +1042,7 @@ find_nonickchange_channel(struct Client *client_p) { msptr = ptr->data; chptr = msptr->chptr; - if (is_any_op(msptr)) - continue; - if (chptr->mode.mode & MODE_NONICK) + if (chptr->mode.mode & MODE_NONICK && (!ConfigChannel.exempt_cmode_N || !is_any_op(msptr))) return chptr; } return NULL; @@ -1252,8 +1265,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) { @@ -1514,6 +1531,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 */ @@ -1666,7 +1734,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); @@ -1789,7 +1858,16 @@ 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) || + 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) || (!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL)) { /* might be wrong, but is there any other better location for such? @@ -1801,8 +1879,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 && @@ -1886,3 +1964,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); + } +}