X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/b8be4a3f4cc6f82d13e62079813fef37eed24683..6abfcc55d0633e93af512c2679dc33a767960334:/src/s_user.c diff --git a/src/s_user.c b/src/s_user.c index fa6ce1b..862e9c7 100644 --- a/src/s_user.c +++ b/src/s_user.c @@ -314,6 +314,14 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char return (CLIENT_EXITED); } + if(IsConfSSLNeeded(aconf) && !IsSSL(source_p)) + { + ServerStats.is_ref++; + sendto_one_notice(source_p, ":*** Notice -- You need to use SSL/TLS to use this server"); + exit_client(client_p, source_p, &me, "Use SSL/TLS"); + return (CLIENT_EXITED); + } + if(!IsGotId(source_p)) { const char *p; @@ -649,11 +657,21 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User * else identifyservice_p = NULL; if (identifyservice_p != NULL) - sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s", - get_id(source_p, identifyservice_p), - ConfigFileEntry.identifyservice, - ConfigFileEntry.identifycommand, - source_p->localClient->passwd); + { + if (!EmptyString(source_p->localClient->auth_user)) + sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s %s", + get_id(source_p, identifyservice_p), + ConfigFileEntry.identifyservice, + ConfigFileEntry.identifycommand, + source_p->localClient->auth_user, + source_p->localClient->passwd); + else + sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s", + get_id(source_p, identifyservice_p), + ConfigFileEntry.identifyservice, + ConfigFileEntry.identifycommand, + source_p->localClient->passwd); + } } memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd)); rb_free(source_p->localClient->passwd); @@ -694,7 +712,7 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User * int valid_hostname(const char *hostname) { - const char *p = hostname; + const char *p = hostname, *last_slash = 0; int found_sep = 0; s_assert(NULL != p); @@ -702,7 +720,7 @@ valid_hostname(const char *hostname) if(hostname == NULL) return NO; - if('.' == *p || ':' == *p) + if('.' == *p || ':' == *p || '/' == *p) return NO; while (*p) @@ -711,13 +729,21 @@ valid_hostname(const char *hostname) return NO; if(*p == '.' || *p == ':') found_sep++; + else if(*p == '/') + { + found_sep++; + last_slash = p; + } p++; } if(found_sep == 0) - return(NO); + return NO; - return (YES); + if(last_slash && IsDigit(last_slash[1])) + return NO; + + return YES; } /* @@ -784,63 +810,86 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf) /* If this user is being spoofed, tell them so */ if(IsConfDoSpoofIp(aconf)) { - sendto_one_notice(source_p, ":*** Spoofing your IP. congrats."); + sendto_one_notice(source_p, ":*** Spoofing your IP"); } /* If this user is in the exception class, Set it "E lined" */ if(IsConfExemptKline(aconf)) { SetExemptKline(source_p); - sendto_one_notice(source_p, ":*** You are exempt from K/X lines. congrats."); + sendto_one_notice(source_p, ":*** You are exempt from K/X lines"); } if(IsConfExemptDNSBL(aconf)) /* kline exempt implies this, don't send both */ if(!IsConfExemptKline(aconf)) - sendto_one_notice(source_p, ":*** You are exempt from DNS blacklists."); + sendto_one_notice(source_p, ":*** You are exempt from DNS blacklists"); /* If this user is exempt from user limits set it F lined" */ if(IsConfExemptLimits(aconf)) { - sendto_one_notice(source_p, ":*** You are exempt from user limits. congrats."); + sendto_one_notice(source_p, ":*** You are exempt from user limits"); } if(IsConfExemptFlood(aconf)) { SetExemptFlood(source_p); - sendto_one_notice(source_p, ":*** You are exempt from flood limits."); + sendto_one_notice(source_p, ":*** You are exempt from flood limits"); } if(IsConfExemptSpambot(aconf)) { SetExemptSpambot(source_p); - sendto_one_notice(source_p, ":*** You are exempt from spambot checks."); + sendto_one_notice(source_p, ":*** You are exempt from spambot checks"); } if(IsConfExemptJupe(aconf)) { SetExemptJupe(source_p); - sendto_one_notice(source_p, ":*** You are exempt from juped channel warnings."); + sendto_one_notice(source_p, ":*** You are exempt from juped channel warnings"); } if(IsConfExemptResv(aconf)) { SetExemptResv(source_p); - sendto_one_notice(source_p, ":*** You are exempt from resvs."); + sendto_one_notice(source_p, ":*** You are exempt from resvs"); } if(IsConfExemptShide(aconf)) { SetExemptShide(source_p); - sendto_one_notice(source_p, ":*** You are exempt from serverhiding."); + sendto_one_notice(source_p, ":*** You are exempt from serverhiding"); } } +static void +show_other_user_mode(struct Client *source_p, struct Client *target_p) +{ + int i; + char buf[BUFSIZE]; + char *m; + + m = buf; + *m++ = '+'; + + for (i = 0; i < 128; i++) /* >= 127 is extended ascii */ + if (target_p->umodes & user_modes[i]) + *m++ = (char) i; + *m = '\0'; + + if (MyConnect(target_p) && target_p->snomask != 0) + sendto_one_notice(source_p, ":Modes for %s are %s %s", + target_p->name, buf, + construct_snobuf(target_p->snomask)); + else + sendto_one_notice(source_p, ":Modes for %s are %s", + target_p->name, buf); +} + /* * user_mode - set get current users mode * * m_umode() added 15/10/91 By Darren Reed. - * parv[0] - sender * parv[1] - username to change mode for * parv[2] - modes to change */ @@ -886,9 +935,12 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char return 0; } - if(source_p != target_p || target_p->from != source_p->from) + if(source_p != target_p) { - sendto_one(source_p, form_str(ERR_USERSDONTMATCH), me.name, source_p->name); + if (MyOper(source_p) && parc < 3) + show_other_user_mode(source_p, target_p); + else + sendto_one(source_p, form_str(ERR_USERSDONTMATCH), me.name, source_p->name); return 0; } @@ -965,6 +1017,8 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char source_p->localClient->opername = NULL; rb_dlinkFindDestroy(source_p, &local_oper_list); + privilegeset_unref(source_p->localClient->privset); + source_p->localClient->privset = NULL; } rb_dlinkFindDestroy(source_p, &oper_list); @@ -1250,6 +1304,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p) source_p->flags2 |= oper_p->flags; source_p->localClient->opername = rb_strdup(oper_p->name); + source_p->localClient->privset = privilegeset_ref(oper_p->privset); rb_dlinkAddAlloc(source_p, &local_oper_list); rb_dlinkAddAlloc(source_p, &oper_list); @@ -1266,7 +1321,7 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p) call_hook(h_umode_changed, &hdata); sendto_realops_snomask(SNO_GENERAL, L_ALL, - "%s (%s@%s) is now an operator", source_p->name, + "%s (%s!%s@%s) is now an operator", oper_p->name, source_p->name, source_p->username, source_p->host); if(!(old & UMODE_INVISIBLE) && IsInvisible(source_p)) ++Count.invisi;