X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/fa72cee166158abdeaffd7c0b9b24263396e5358..cb097b8840594b6a77aab21d0b4c20f036a7d012:/src/s_user.c diff --git a/src/s_user.c b/src/s_user.c index e4f81a5..d5f163d 100644 --- a/src/s_user.c +++ b/src/s_user.c @@ -73,7 +73,7 @@ int user_modes[256] = { UMODE_DEAF, /* D */ 0, /* E */ 0, /* F */ - 0, /* G */ + UMODE_SCALLERID, /* G */ 0, /* H */ 0, /* I */ 0, /* J */ @@ -109,7 +109,7 @@ int user_modes[256] = { 0, /* m */ 0, /* n */ UMODE_OPER, /* o */ - 0, /* p */ + UMODE_OVERRIDE, /* p */ 0, /* q */ 0, /* r */ UMODE_SERVNOTICE, /* s */ @@ -711,7 +711,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User * if(aconf->autojoin != NULL) { - user_join(client_p, source_p, aconf->autojoin, NULL, 0); + user_join(client_p, source_p, aconf->autojoin, NULL); } } @@ -905,6 +905,15 @@ show_other_user_mode(struct Client *source_p, struct Client *target_p) target_p->name, buf); } +static void +expire_umode_p(void *data) +{ + struct Client *source_p = data; + char *parv[4] = {source_p->name, source_p->name, "-p", NULL}; + source_p->localClient->override_timeout_event = NULL; + user_mode(source_p, source_p, 3, parv); +} + /* * user_mode - set get current users mode * @@ -1138,6 +1147,12 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char source_p->umodes &= ~UMODE_ADMIN; } + if(MyConnect(source_p) && (source_p->umodes & UMODE_OVERRIDE) && (!IsOperOverride(source_p))) + { + sendto_one_notice(source_p, ":*** You need oper and the override flag for +p"); + source_p->umodes &= ~UMODE_OVERRIDE; + } + /* let modules providing usermodes know that we've changed our usermode --nenolod */ hdata.client = source_p; hdata.oldumodes = setflags; @@ -1157,6 +1172,19 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK), construct_snobuf(source_p->snomask)); + /* If we're setting +p, expire it, but only from local clients */ + if(ConfigFileEntry.expire_override_time && MyClient(source_p) && (source_p->umodes & ~setflags) & UMODE_OVERRIDE) + { + source_p->localClient->override_timeout_event = + rb_event_addonce("expire_override", expire_umode_p, source_p, ConfigFileEntry.expire_override_time); + } + else if(MyClient(source_p) && source_p->localClient->override_timeout_event && (setflags & ~source_p->umodes) & UMODE_OVERRIDE) + { + rb_event_delete(source_p->localClient->override_timeout_event); + source_p->localClient->override_timeout_event = NULL; + } + + return (0); } @@ -1293,6 +1321,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p) { unsigned int old = source_p->umodes, oldsnomask = source_p->snomask; hook_data_umode_changed hdata; + struct ConfItem *aconf; SetOper(source_p); @@ -1303,6 +1332,26 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p) else source_p->umodes |= DEFAULT_OPER_UMODES; + if(oper_p->vhost || !EmptyString(ConfigFileEntry.default_operhost)) + { + if(oper_p->vhost) + change_nick_user_host(source_p, source_p->name, source_p->username, oper_p->vhost, 0, "Changing host"); + else + change_nick_user_host(source_p, source_p->name, source_p->username, ConfigFileEntry.default_operhost, 0, "Changing host"); + + sendto_one_numeric(source_p, RPL_HOSTHIDDEN, "%s :is now your hidden host (set by %s)", source_p->host, source_p->servptr->name); + + sendto_server(NULL, NULL, + CAP_EUID | CAP_TS6, NOCAPS, ":%s CHGHOST %s :%s", + use_id(&me), use_id(source_p), source_p->host); + sendto_server(NULL, NULL, + CAP_TS6, CAP_EUID, ":%s ENCAP * CHGHOST %s :%s", + use_id(&me), use_id(source_p), source_p->host); + + if (!IsDynSpoof(source_p)) + SetDynSpoof(source_p); + } + if (oper_p->snomask) { source_p->snomask |= oper_p->snomask; @@ -1354,6 +1403,18 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p) sendto_one_notice(source_p, ":*** Oper privs are %s", oper_p->privset->privs); send_oper_motd(source_p); + aconf = source_p->localClient->att_conf; + + /* Do the auth::autojoin_opers wizardry here */ + if(aconf->autojoin_opers != NULL) + { + /* opers should never be banned from the opers channel. + * Plus this is post-umode being set so you'll pass +I $o or +O. + * Hence why we're making this a normal clean join. --jdhore + */ + user_join(&me, source_p, aconf->autojoin_opers, NULL); + } + return (1); } @@ -1422,7 +1483,7 @@ change_nick_user_host(struct Client *target_p, const char *nick, const char *use struct membership *mscptr; int changed = irccmp(target_p->name, nick); int changed_case = strcmp(target_p->name, nick); - int do_qjm = irccmp(target_p->username, user) || irccmp(target_p->host, host); + int do_qjm = irccmp(target_p->username, user) || (irccmp(target_p->host, host) && ConfigChannel.cycle_host_change); char mode[10], modeval[NICKLEN * 2 + 2], reason[256], *mptr; va_list ap; @@ -1451,6 +1512,13 @@ change_nick_user_host(struct Client *target_p, const char *nick, const char *use chptr = mscptr->chptr; mptr = mode; + if(is_owner(mscptr)) + { + *mptr++ = 'a'; + strcat(modeval, nick); + strcat(modeval, " "); + } + if(is_chanop(mscptr)) { *mptr++ = 'o'; @@ -1458,6 +1526,13 @@ change_nick_user_host(struct Client *target_p, const char *nick, const char *use strcat(modeval, " "); } + if(is_halfop(mscptr)) + { + *mptr++ = 'h'; + strcat(modeval, nick); + strcat(modeval, " "); + } + if(is_voiced(mscptr)) { *mptr++ = 'v';