X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/fe86a70d9aeabc2120e2d2a11d995c19ef74f3f8..157c1f04bd3b04cbdcef5efb3cb280d0e10f1e7f:/src/s_conf.c diff --git a/src/s_conf.c b/src/s_conf.c index 94e8669..c3df6fd 100644 --- a/src/s_conf.c +++ b/src/s_conf.c @@ -30,6 +30,7 @@ #include "s_newconf.h" #include "newconf.h" #include "s_serv.h" +#include "s_user.h" #include "s_stats.h" #include "channel.h" #include "class.h" @@ -49,6 +50,7 @@ #include "blacklist.h" #include "privilege.h" #include "sslproc.h" +#include "bandbi.h" struct config_server_hide ConfigServerHide; @@ -373,11 +375,10 @@ verify_access(struct Client *client_p, const char *username) else if(aconf->status & CONF_KILL) { if(ConfigFileEntry.kline_with_reason) - { sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP), - me.name, client_p->name, aconf->passwd); - } + me.name, client_p->name, + get_user_ban_reason(aconf)); add_reject(client_p, aconf->user, aconf->host); return (BANNED_CLIENT); } @@ -634,63 +635,10 @@ rehash(int sig) return (0); } -static struct banconf_entry -{ - const char **filename; - void (*func) (FILE *); - int perm; -} banconfs[] = { - { &ConfigFileEntry.klinefile, parse_k_file, 0 }, - { &ConfigFileEntry.klinefile, parse_k_file, 1 }, - { &ConfigFileEntry.dlinefile, parse_d_file, 0 }, - { &ConfigFileEntry.dlinefile, parse_d_file, 1 }, - { &ConfigFileEntry.xlinefile, parse_x_file, 0 }, - { &ConfigFileEntry.xlinefile, parse_x_file, 1 }, - { &ConfigFileEntry.resvfile, parse_resv_file,0 }, - { &ConfigFileEntry.resvfile, parse_resv_file,1 }, - { NULL, NULL, 0 } -}; - void rehash_bans(int sig) { - FILE *file; - char buf[MAXPATHLEN]; - int i; - - if(sig != 0) - sendto_realops_snomask(SNO_GENERAL, L_ALL, - "Got signal SIGUSR2, reloading ban confs"); - - clear_out_address_conf_bans(); - clear_s_newconf_bans(); - - for(i = 0; banconfs[i].filename; i++) - { - if(banconfs[i].perm) - snprintf(buf, sizeof(buf), "%s.perm", *banconfs[i].filename); - else - snprintf(buf, sizeof(buf), "%s", *banconfs[i].filename); - - if((file = fopen(buf, "r")) == NULL) - { - if(banconfs[i].perm) - continue; - - ilog(L_MAIN, "Failed reading ban file %s", - *banconfs[i].filename); - sendto_realops_snomask(SNO_GENERAL, L_ALL, - "Can't open %s file bans could be missing!", - *banconfs[i].filename); - } - else - { - (banconfs[i].func)(file); - fclose(file); - } - } - - check_banned_lines(); + bandb_rehash_bans(); } /* @@ -732,6 +680,8 @@ set_default_conf(void) ConfigFileEntry.default_operstring = rb_strdup("is an IRC operator"); ConfigFileEntry.default_adminstring = rb_strdup("is a Server Administrator"); + ConfigFileEntry.default_operhost = rb_strdup(""); + ConfigFileEntry.static_quit = rb_strdup(""); ConfigFileEntry.servicestring = rb_strdup("is a Network Service"); ConfigFileEntry.default_umodes = UMODE_INVISIBLE; @@ -745,6 +695,7 @@ set_default_conf(void) ConfigFileEntry.nick_delay = 900; /* 15 minutes */ ConfigFileEntry.target_change = YES; ConfigFileEntry.anti_spam_exit_message_time = 0; + ConfigFileEntry.use_part_messages = YES; ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT; ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT; ConfigFileEntry.client_exit = YES; @@ -768,6 +719,7 @@ set_default_conf(void) ConfigFileEntry.pace_wait_simple = 1; ConfigFileEntry.short_motd = NO; ConfigFileEntry.no_oper_flood = NO; + ConfigFileEntry.true_no_oper_flood = NO; ConfigFileEntry.fname_userlog = NULL; ConfigFileEntry.fname_fuserlog = NULL; ConfigFileEntry.fname_operlog = NULL; @@ -787,6 +739,7 @@ set_default_conf(void) ConfigFileEntry.collision_fnc = YES; ConfigFileEntry.global_snotices = YES; ConfigFileEntry.operspy_dont_care_user_info = NO; + ConfigFileEntry.secret_channels_in_whois = NO; #ifdef HAVE_LIBZ ConfigFileEntry.compression_level = 4; @@ -797,16 +750,23 @@ set_default_conf(void) ConfigFileEntry.oper_only_umodes = UMODE_SERVNOTICE; ConfigFileEntry.oper_snomask = SNO_GENERAL; + ConfigChannel.autochanmodes = rb_strdup("nt"); + ConfigChannel.exemptchanops = rb_strdup(""); + ConfigChannel.use_halfop = YES; + ConfigChannel.use_admin = YES; ConfigChannel.use_except = YES; ConfigChannel.use_invex = YES; ConfigChannel.use_knock = YES; ConfigChannel.use_forward = YES; + ConfigChannel.use_local_channels = YES; ConfigChannel.knock_delay = 300; ConfigChannel.knock_delay_channel = 60; ConfigChannel.max_chans_per_user = 15; ConfigChannel.max_bans = 25; ConfigChannel.max_bans_large = 500; ConfigChannel.only_ascii_channels = NO; + ConfigChannel.cycle_host_change = YES; + ConfigChannel.host_in_topic = YES; ConfigChannel.burst_topicwho = NO; ConfigChannel.kick_on_split_riding = NO; @@ -814,6 +774,16 @@ set_default_conf(void) ConfigChannel.default_split_server_count = 10; ConfigChannel.no_join_on_split = NO; ConfigChannel.no_create_on_split = YES; + ConfigChannel.resv_forcepart = YES; + ConfigChannel.kick_no_rejoin_time = 30; + + ConfigChannel.exempt_cmode_c = NO; + ConfigChannel.exempt_cmode_C = NO; + ConfigChannel.exempt_cmode_D = NO; + ConfigChannel.exempt_cmode_T = NO; + ConfigChannel.exempt_cmode_N = NO; + ConfigChannel.exempt_cmode_G = NO; + ConfigChannel.exempt_cmode_K = NO; ConfigServerHide.flatten_links = 0; ConfigServerHide.links_delay = 300; @@ -831,8 +801,12 @@ set_default_conf(void) ConfigFileEntry.reject_duration = 120; ConfigFileEntry.throttle_count = 4; ConfigFileEntry.throttle_duration = 60; + ConfigFileEntry.expire_override_time = 300; ServerInfo.default_max_clients = MAXCONNECTIONS; + + if (!alias_dict) + alias_dict = irc_dictionary_create(strcasecmp); } #undef YES @@ -906,6 +880,52 @@ validate_conf(void) splitmode = 0; splitchecking = 0; } + + if(!valid_hostname(ConfigFileEntry.default_operhost)) + { + conf_report_error("Warning -- invalid default_operhost specified, ignoring."); + ConfigFileEntry.default_operhost = rb_strdup(""); + } + + /* Parse the exemptchanops option and set the internal variables + * that we will use. */ + char * ech; + + for(ech = ConfigChannel.exemptchanops; *ech; ech++) + { + if(*ech == 'c') + { + ConfigChannel.exempt_cmode_c = 1; + continue; + } + if(*ech == 'C') + { + ConfigChannel.exempt_cmode_C = 1; + continue; + } + if(*ech == 'D') + { + ConfigChannel.exempt_cmode_D = 1; + continue; + } + if(*ech == 'T') + { + ConfigChannel.exempt_cmode_T = 1; + continue; + } + if(*ech == 'N') + { + ConfigChannel.exempt_cmode_N = 1; + continue; + } + if(*ech == 'G') + { + ConfigChannel.exempt_cmode_G = 1; + continue; + } + if(*ech == 'K') + ConfigChannel.exempt_cmode_K = 1; + } } /* add_temp_kline() @@ -1103,6 +1123,33 @@ get_printable_conf(struct ConfItem *aconf, char **name, char **host, *port = (int) aconf->port; } +char * +get_user_ban_reason(struct ConfItem *aconf) +{ + static char reasonbuf[BUFSIZE]; + + if (aconf->flags & CONF_FLAGS_TEMPORARY && + (aconf->status == CONF_KILL || aconf->status == CONF_DLINE)) + rb_snprintf(reasonbuf, sizeof reasonbuf, + "Temporary %c-line %d min. - ", + aconf->status == CONF_DLINE ? 'D' : 'K', + (aconf->hold - aconf->created) / 60); + else + reasonbuf[0] = '\0'; + if (aconf->passwd) + rb_strlcat(reasonbuf, aconf->passwd, sizeof reasonbuf); + else + rb_strlcat(reasonbuf, "No Reason", sizeof reasonbuf); + if (aconf->created) + { + rb_strlcat(reasonbuf, " (", sizeof reasonbuf); + rb_strlcat(reasonbuf, smalldate(aconf->created), + sizeof reasonbuf); + rb_strlcat(reasonbuf, ")", sizeof reasonbuf); + } + return reasonbuf; +} + void get_printable_kline(struct Client *source_p, struct ConfItem *aconf, char **host, char **reason, @@ -1111,8 +1158,8 @@ get_printable_kline(struct Client *source_p, struct ConfItem *aconf, static char null[] = ""; *host = EmptyString(aconf->host) ? null : aconf->host; - *reason = EmptyString(aconf->passwd) ? null : aconf->passwd; *user = EmptyString(aconf->user) ? null : aconf->user; + *reason = get_user_ban_reason(aconf); if(EmptyString(aconf->spasswd) || !IsOper(source_p)) *oper_reason = NULL; @@ -1134,7 +1181,7 @@ read_conf_files(int cold) conf_fbfile_in = NULL; - filename = get_conf_name(CONF_TYPE); + filename = ConfigFileEntry.configfile; /* We need to know the initial filename for the yyerror() to report FIXME: The full path is in conffilenamebuf first time since we @@ -1252,8 +1299,11 @@ clear_out_old_conf(void) } /* remove any aliases... -- nenolod */ - irc_dictionary_destroy(alias_dict, free_alias_cb, NULL); - alias_dict = NULL; + if (alias_dict != NULL) + { + irc_dictionary_destroy(alias_dict, free_alias_cb, NULL); + alias_dict = NULL; + } destroy_blacklists(); @@ -1263,162 +1313,6 @@ clear_out_old_conf(void) } -/* write_confitem() - * - * inputs - kline, dline or resv type flag - * - client pointer to report to - * - user name of target - * - host name of target - * - reason for target - * - time string - * - type of xline - * output - NONE - * side effects - This function takes care of finding the right conf - * file and adding the line to it, as well as notifying - * opers and the user. - */ -void -write_confitem(KlineType type, struct Client *source_p, char *user, - char *host, const char *reason, const char *oper_reason, - const char *current_date, int xtype) -{ - char buffer[1024]; - FILE *out; - const char *filename; /* filename to use for kline */ - - filename = get_conf_name(type); - - if(type == KLINE_TYPE) - { - if(EmptyString(oper_reason)) - { - sendto_realops_snomask(SNO_GENERAL, L_ALL, - "%s added K-Line for [%s@%s] [%s]", - get_oper_name(source_p), user, - host, reason); - ilog(L_KLINE, "K %s 0 %s %s %s", - get_oper_name(source_p), user, host, reason); - } - else - { - sendto_realops_snomask(SNO_GENERAL, L_ALL, - "%s added K-Line for [%s@%s] [%s|%s]", - get_oper_name(source_p), user, - host, reason, oper_reason); - ilog(L_KLINE, "K %s 0 %s %s %s|%s", - get_oper_name(source_p), user, host, - reason, oper_reason); - } - - sendto_one_notice(source_p, ":Added K-Line [%s@%s]", - user, host); - } - else if(type == DLINE_TYPE) - { - if(EmptyString(oper_reason)) - { - sendto_realops_snomask(SNO_GENERAL, L_ALL, - "%s added D-Line for [%s] [%s]", - get_oper_name(source_p), host, reason); - ilog(L_KLINE, "D %s 0 %s %s", - get_oper_name(source_p), host, reason); - } - else - { - sendto_realops_snomask(SNO_GENERAL, L_ALL, - "%s added D-Line for [%s] [%s|%s]", - get_oper_name(source_p), host, - reason, oper_reason); - ilog(L_KLINE, "D %s 0 %s %s|%s", - get_oper_name(source_p), host, - reason, oper_reason); - } - - sendto_one_notice(source_p, ":Added D-Line [%s] to %s", host, filename); - - } - else if(type == RESV_TYPE) - { - sendto_realops_snomask(SNO_GENERAL, L_ALL, - "%s added RESV for [%s] [%s]", - get_oper_name(source_p), host, reason); - ilog(L_KLINE, "R %s 0 %s %s", - get_oper_name(source_p), host, reason); - - sendto_one_notice(source_p, ":Added RESV for [%s] [%s]", - host, reason); - } - - if((out = fopen(filename, "a")) == NULL) - { - sendto_realops_snomask(SNO_GENERAL, L_ALL, "*** Problem opening %s ", filename); - sendto_one_notice(source_p, ":*** Problem opening file, added temporarily only"); - return; - } - - if(oper_reason == NULL) - oper_reason = ""; - - if(type == KLINE_TYPE) - { - rb_snprintf(buffer, sizeof(buffer), - "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n", - user, host, reason, oper_reason, current_date, - get_oper_name(source_p), (long int)rb_current_time()); - } - else if(type == DLINE_TYPE) - { - rb_snprintf(buffer, sizeof(buffer), - "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n", host, - reason, oper_reason, current_date, get_oper_name(source_p), (long int)rb_current_time()); - } - else if(type == RESV_TYPE) - { - rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n", - host, reason, get_oper_name(source_p), (long int)rb_current_time()); - } - - if(fputs(buffer, out) == -1) - { - sendto_realops_snomask(SNO_GENERAL, L_ALL, "*** Problem writing to %s", filename); - sendto_one_notice(source_p, ":*** Problem writing to file, added temporarily only"); - fclose(out); - return; - } - - if (fclose(out)) - { - sendto_realops_snomask(SNO_GENERAL, L_ALL, "*** Problem writing to %s", filename); - sendto_one_notice(source_p, ":*** Problem writing to file, added temporarily only"); - return; - } -} - -/* get_conf_name - * - * inputs - type of conf file to return name of file for - * output - pointer to filename for type of conf - * side effects - none - */ -const char * -get_conf_name(KlineType type) -{ - if(type == CONF_TYPE) - { - return (ConfigFileEntry.configfile); - } - else if(type == DLINE_TYPE) - { - return (ConfigFileEntry.dlinefile); - } - else if(type == RESV_TYPE) - { - return (ConfigFileEntry.resvfile); - } - - return ConfigFileEntry.klinefile; -} - /* * conf_add_class_to_conf * inputs - pointer to config item