#include "blacklist.h"
#include "sslproc.h"
#include "privilege.h"
+#include "chmode.h"
#define CF_TYPE(x) ((x) & CF_MTYPE)
static int yy_defer_accept = 1;
struct TopConf *conf_cur_block;
-static char *conf_cur_block_name;
+static char *conf_cur_block_name = NULL;
static rb_dlink_list conf_items;
static char *yy_blacklist_reason = NULL;
static int yy_blacklist_ipv4 = 1;
static int yy_blacklist_ipv6 = 0;
+static rb_dlink_list yy_blacklist_filters;
static char *yy_privset_extends = NULL;
static const char *
conf_strtype(int type)
{
- switch (type & CF_MTYPE)
+ switch (CF_TYPE(type))
{
case CF_INT:
return "integer value";
}
int
-add_top_conf(const char *name, int (*sfunc) (struct TopConf *),
+add_top_conf(const char *name, int (*sfunc) (struct TopConf *),
int (*efunc) (struct TopConf *), struct ConfEntry *items)
{
struct TopConf *tc;
else if (ConfigFileEntry.nicklen < 9 + 1)
{
conf_report_error("Warning -- serverinfo::nicklen is too low (%u) -- forcing 9",
- ConfigFileEntry.nicklen);
+ ConfigFileEntry.nicklen - 1);
ConfigFileEntry.nicklen = 9 + 1;
}
}
m_bn = rb_basename((char *) data);
- if(findmodule_byname(m_bn) != -1)
- return;
-
- load_one_module((char *) data, 0);
+ if(findmodule_byname(m_bn) == -1)
+ load_one_module((char *) data, 0);
rb_free(m_bn);
#else
int dir = 1;
int mode;
- if((args->type & CF_MTYPE) != CF_STRING)
+ if(CF_TYPE(args->type) != CF_STRING)
{
conf_report_error("Warning -- %s is not a string; ignoring.", whatis);
continue;
yy_tmpoper->name);
return 0;
}
-
+
yy_tmpoper->rsa_pubkey =
(RSA *) PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
conf_parm_t *args = data;
for (; args; args = args->next)
{
- if((args->type & CF_MTYPE) != CF_INT)
+ if(CF_TYPE(args->type) != CF_INT)
{
conf_report_error
("listener::port argument is not an integer " "-- ignoring.");
}
if(listener_address == NULL)
{
- add_listener(args->v.number, listener_address, AF_INET, ssl, yy_defer_accept);
+ add_listener(args->v.number, listener_address, AF_INET, ssl, ssl || yy_defer_accept);
#ifdef RB_IPV6
- add_listener(args->v.number, listener_address, AF_INET6, ssl, yy_defer_accept);
+ add_listener(args->v.number, listener_address, AF_INET6, ssl, ssl || yy_defer_accept);
#endif
}
else
#ifdef RB_IPV6
if(strchr(listener_address, ':') != NULL)
family = AF_INET6;
- else
+ else
#endif
family = AF_INET;
-
- add_listener(args->v.number, listener_address, family, ssl, yy_defer_accept);
-
+
+ add_listener(args->v.number, listener_address, family, ssl, ssl || yy_defer_accept);
+
}
}
if(yy_aconf->spasswd)
yy_tmp->spasswd = rb_strdup(yy_aconf->spasswd);
-
+
/* this will always exist.. */
yy_tmp->info.name = rb_strdup(yy_aconf->info.name);
conf_add_class_to_conf(yy_tmp);
- if (find_exact_conf_by_address("*", CONF_CLIENT, "*"))
+ if ((found_conf = find_exact_conf_by_address("*", CONF_CLIENT, "*")) && found_conf->spasswd == NULL)
conf_report_error("Ignoring redundant auth block (after *@*)");
- else if (find_exact_conf_by_address(yy_tmp->host, CONF_CLIENT, yy_tmp->user))
+ else if ((found_conf = find_exact_conf_by_address(yy_tmp->host, CONF_CLIENT, yy_tmp->user)) &&
+ (!found_conf->spasswd || (yy_tmp->spasswd &&
+ 0 == irccmp(found_conf->spasswd, yy_tmp->spasswd))))
conf_report_error("Ignoring duplicate auth block for %s@%s",
yy_tmp->user, yy_tmp->host);
else
if(args->next != NULL)
{
- if((args->type & CF_MTYPE) != CF_QSTRING)
+ if(CF_TYPE(args->type) != CF_QSTRING)
{
conf_report_error("Ignoring shared::oper -- server is not a qstring");
return;
else
yy_shared->server = rb_strdup("*");
- if((args->type & CF_MTYPE) != CF_QSTRING)
+ if(CF_TYPE(args->type) != CF_QSTRING)
{
conf_report_error("Ignoring shared::oper -- oper is not a qstring");
return;
}
break;
}
- }
+ }
}
static void
set_modes_from_table(&ConfigFileEntry.oper_umodes, "umode", umode_table, data);
}
+static void
+conf_set_general_certfp_method(void *data)
+{
+ char *method = data;
+
+ if (!strcasecmp(method, "sha1"))
+ ConfigFileEntry.certfp_method = RB_SSL_CERTFP_METH_SHA1;
+ else if (!strcasecmp(method, "sha256"))
+ ConfigFileEntry.certfp_method = RB_SSL_CERTFP_METH_SHA256;
+ else if (!strcasecmp(method, "sha512"))
+ ConfigFileEntry.certfp_method = RB_SSL_CERTFP_METH_SHA512;
+ else
+ {
+ ConfigFileEntry.certfp_method = RB_SSL_CERTFP_METH_SHA1;
+ conf_report_error("Ignoring general::certfp_method -- bogus certfp method %s", method);
+ }
+}
+
static void
conf_set_general_oper_only_umodes(void *data)
{
ConfigServerHide.links_delay = val;
}
-static int
-conf_begin_service(struct TopConf *tc)
-{
- struct Client *target_p;
- rb_dlink_node *ptr;
-
- RB_DLINK_FOREACH(ptr, global_serv_list.head)
- {
- target_p = ptr->data;
-
- target_p->flags &= ~FLAGS_SERVICE;
- }
-
- return 0;
-}
-
static void
conf_set_service_name(void *data)
{
- struct Client *target_p;
const char *s;
char *tmp;
int dots = 0;
tmp = rb_strdup(data);
rb_dlinkAddAlloc(tmp, &service_list);
-
- if((target_p = find_server(NULL, tmp)))
- target_p->flags |= FLAGS_SERVICE;
}
static int
yy_alias->target = rb_strdup(data);
}
+static void
+conf_set_channel_autochanmodes(void *data)
+{
+ char *pm;
+ int what = MODE_ADD;
+
+ ConfigChannel.autochanmodes = 0;
+ for (pm = (char *) data; *pm; pm++)
+ {
+ switch (*pm)
+ {
+ case '+':
+ what = MODE_ADD;
+ break;
+ case '-':
+ what = MODE_DEL;
+ break;
+
+ default:
+ if (chmode_table[(unsigned char) *pm].set_func == chm_simple)
+ {
+ if (what == MODE_ADD)
+ ConfigChannel.autochanmodes |= chmode_table[(unsigned char) *pm].mode_type;
+ else
+ ConfigChannel.autochanmodes &= ~chmode_table[(unsigned char) *pm].mode_type;
+ }
+ else
+ {
+ conf_report_error("channel::autochanmodes -- Invalid channel mode %c", pm);
+ continue;
+ }
+ break;
+ }
+ }
+}
+
+/* XXX for below */
+static void conf_set_blacklist_reason(void *data);
+
static void
conf_set_blacklist_host(void *data)
{
+ if (yy_blacklist_host)
+ {
+ conf_report_error("blacklist::host %s overlaps existing host %s",
+ (char *)data, yy_blacklist_host);
+
+ /* Cleanup */
+ conf_set_blacklist_reason(NULL);
+ return;
+ }
+
+ yy_blacklist_ipv4 = 1;
+ yy_blacklist_ipv6 = 0;
yy_blacklist_host = rb_strdup(data);
}
}
}
+static void
+conf_set_blacklist_matches(void *data)
+{
+ conf_parm_t *args = data;
+
+ for (; args; args = args->next)
+ {
+ struct BlacklistFilter *filter;
+ char *str = args->v.string;
+ char *p;
+ int type = BLACKLIST_FILTER_LAST;
+
+ if (CF_TYPE(args->type) != CF_QSTRING)
+ {
+ conf_report_error("blacklist::matches -- must be quoted string");
+ continue;
+ }
+
+ if (str == NULL)
+ {
+ conf_report_error("blacklist::matches -- invalid entry");
+ continue;
+ }
+
+ if (strlen(str) > HOSTIPLEN)
+ {
+ conf_report_error("blacklist::matches has an entry too long: %s",
+ str);
+ continue;
+ }
+
+ for (p = str; *p != '\0'; p++)
+ {
+ /* Check for validity */
+ if (*p == '.')
+ type = BLACKLIST_FILTER_ALL;
+ else if (!isalnum((unsigned char)*p))
+ {
+ conf_report_error("blacklist::matches has invalid IP match entry %s",
+ str);
+ type = 0;
+ break;
+ }
+ }
+
+ if (type == BLACKLIST_FILTER_ALL)
+ {
+ /* Basic IP sanity check */
+ struct rb_sockaddr_storage tmp;
+ if (rb_inet_pton(AF_INET, str, &tmp) <= 0)
+ {
+ conf_report_error("blacklist::matches has invalid IP match entry %s",
+ str);
+ continue;
+ }
+ }
+ else if (type == BLACKLIST_FILTER_LAST)
+ {
+ /* Verify it's the correct length */
+ if (strlen(str) > 3)
+ {
+ conf_report_error("blacklist::matches has invalid octet match entry %s",
+ str);
+ continue;
+ }
+ }
+ else
+ {
+ continue; /* Invalid entry */
+ }
+
+ filter = rb_malloc(sizeof(struct BlacklistFilter));
+ filter->type = type;
+ rb_strlcpy(filter->filterstr, str, sizeof(filter->filterstr));
+
+ rb_dlinkAdd(filter, &filter->node, &yy_blacklist_filters);
+ }
+}
+
static void
conf_set_blacklist_reason(void *data)
{
- yy_blacklist_reason = rb_strdup(data);
+ rb_dlink_node *ptr, *nptr;
- if (yy_blacklist_host && yy_blacklist_reason)
+ if (yy_blacklist_host && data)
{
+ yy_blacklist_reason = rb_strdup(data);
if (yy_blacklist_ipv6)
{
/* Make sure things fit (64 = alnum count + dots) */
}
}
- new_blacklist(yy_blacklist_host, yy_blacklist_reason, yy_blacklist_ipv4, yy_blacklist_ipv6);
+ new_blacklist(yy_blacklist_host, yy_blacklist_reason, yy_blacklist_ipv4, yy_blacklist_ipv6,
+ &yy_blacklist_filters);
+ }
cleanup_bl:
- rb_free(yy_blacklist_host);
- rb_free(yy_blacklist_reason);
- yy_blacklist_host = NULL;
- yy_blacklist_reason = NULL;
- yy_blacklist_ipv4 = 1;
- yy_blacklist_ipv6 = 0;
+ if (data == NULL)
+ {
+ RB_DLINK_FOREACH_SAFE(ptr, nptr, yy_blacklist_filters.head)
+ {
+ rb_dlinkDelete(ptr, &yy_blacklist_filters);
+ rb_free(ptr);
+ }
+ }
+ else
+ {
+ yy_blacklist_filters = (rb_dlink_list){ NULL, NULL, 0 };
}
+
+ rb_free(yy_blacklist_host);
+ rb_free(yy_blacklist_reason);
+ yy_blacklist_host = NULL;
+ yy_blacklist_reason = NULL;
+ yy_blacklist_ipv4 = 1;
+ yy_blacklist_ipv6 = 0;
}
/* public functions */
int
conf_end_block(struct TopConf *tc)
{
+ int ret = 0;
if(tc->tc_efunc)
- return tc->tc_efunc(tc);
+ ret = tc->tc_efunc(tc);
rb_free(conf_cur_block_name);
- return 0;
+ conf_cur_block_name = NULL;
+ return ret;
}
static void
}
int
-conf_call_set(struct TopConf *tc, char *item, conf_parm_t * value, int type)
+conf_call_set(struct TopConf *tc, char *item, conf_parm_t * value)
{
struct ConfEntry *cf;
conf_parm_t *cp;
if(CF_TYPE(value->v.list->type) != CF_TYPE(cf->cf_type))
{
- /* if it expects a string value, but we got a yesno,
+ /* if it expects a string value, but we got a yesno,
* convert it back
*/
if((CF_TYPE(value->v.list->type) == CF_YESNO) &&
if((tc = find_top_conf(topconf)) == NULL)
return -1;
- if((cf = find_conf_item(tc, name)) != NULL)
+ if(find_conf_item(tc, name) != NULL)
return -1;
cf = rb_malloc(sizeof(struct ConfEntry));
static struct ConfEntry conf_serverinfo_table[] =
{
{ "description", CF_QSTRING, NULL, 0, &ServerInfo.description },
- { "network_desc", CF_QSTRING, NULL, 0, &ServerInfo.network_desc },
{ "hub", CF_YESNO, NULL, 0, &ServerInfo.hub },
{ "network_name", CF_QSTRING, conf_set_serverinfo_network_name, 0, NULL },
{ "ssl_private_key", CF_QSTRING, NULL, 0, &ServerInfo.ssl_private_key },
{ "ssl_ca_cert", CF_QSTRING, NULL, 0, &ServerInfo.ssl_ca_cert },
- { "ssl_cert", CF_QSTRING, NULL, 0, &ServerInfo.ssl_cert },
+ { "ssl_cert", CF_QSTRING, NULL, 0, &ServerInfo.ssl_cert },
{ "ssl_dh_params", CF_QSTRING, NULL, 0, &ServerInfo.ssl_dh_params },
{ "ssld_count", CF_INT, NULL, 0, &ServerInfo.ssld_count },
{ "default_operstring", CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.default_operstring },
{ "default_adminstring",CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.default_adminstring },
{ "servicestring", CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.servicestring },
- { "egdpool_path", CF_QSTRING, NULL, PATH_MAX, &ConfigFileEntry.egdpool_path },
{ "kline_reason", CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.kline_reason },
{ "identify_service", CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.identifyservice },
{ "identify_command", CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.identifycommand },
+ { "sasl_service", CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.sasl_service },
{ "anti_spam_exit_message_time", CF_TIME, NULL, 0, &ConfigFileEntry.anti_spam_exit_message_time },
{ "disable_fake_channels", CF_YESNO, NULL, 0, &ConfigFileEntry.disable_fake_channels },
{ "caller_id_wait", CF_TIME, NULL, 0, &ConfigFileEntry.caller_id_wait },
{ "client_exit", CF_YESNO, NULL, 0, &ConfigFileEntry.client_exit },
{ "collision_fnc", CF_YESNO, NULL, 0, &ConfigFileEntry.collision_fnc },
+ { "resv_fnc", CF_YESNO, NULL, 0, &ConfigFileEntry.resv_fnc },
{ "connect_timeout", CF_TIME, NULL, 0, &ConfigFileEntry.connect_timeout },
{ "default_floodcount", CF_INT, NULL, 0, &ConfigFileEntry.default_floodcount },
{ "default_ident_timeout", CF_INT, NULL, 0, &ConfigFileEntry.default_ident_timeout },
{ "stats_y_oper_only", CF_YESNO, NULL, 0, &ConfigFileEntry.stats_y_oper_only },
{ "target_change", CF_YESNO, NULL, 0, &ConfigFileEntry.target_change },
{ "ts_max_delta", CF_TIME, NULL, 0, &ConfigFileEntry.ts_max_delta },
- { "use_egd", CF_YESNO, NULL, 0, &ConfigFileEntry.use_egd },
{ "ts_warn_delta", CF_TIME, NULL, 0, &ConfigFileEntry.ts_warn_delta },
{ "use_whois_actually", CF_YESNO, NULL, 0, &ConfigFileEntry.use_whois_actually },
{ "warn_no_nline", CF_YESNO, NULL, 0, &ConfigFileEntry.warn_no_nline },
{ "client_flood_message_time", CF_INT, NULL, 0, &ConfigFileEntry.client_flood_message_time },
{ "max_ratelimit_tokens", CF_INT, NULL, 0, &ConfigFileEntry.max_ratelimit_tokens },
{ "away_interval", CF_INT, NULL, 0, &ConfigFileEntry.away_interval },
+ { "certfp_method", CF_STRING, conf_set_general_certfp_method, 0, NULL },
{ "\0", 0, NULL, 0, NULL }
};
{ "resv_forcepart", CF_YESNO, NULL, 0, &ConfigChannel.resv_forcepart },
{ "channel_target_change", CF_YESNO, NULL, 0, &ConfigChannel.channel_target_change },
{ "disable_local_channels", CF_YESNO, NULL, 0, &ConfigChannel.disable_local_channels },
+ { "autochanmodes", CF_QSTRING, conf_set_channel_autochanmodes, 0, NULL },
{ "\0", 0, NULL, 0, NULL }
};
add_top_conf("auth", conf_begin_auth, conf_end_auth, conf_auth_table);
add_top_conf("shared", conf_cleanup_shared, conf_cleanup_shared, NULL);
- add_conf_item("shared", "oper", CF_QSTRING|CF_FLIST, conf_set_shared_oper);
+ add_conf_item("shared", "oper", CF_QSTRING | CF_FLIST, conf_set_shared_oper);
add_conf_item("shared", "flags", CF_STRING | CF_FLIST, conf_set_shared_flags);
add_top_conf("connect", conf_begin_connect, conf_end_connect, conf_connect_table);
add_top_conf("channel", NULL, NULL, conf_channel_table);
add_top_conf("serverhide", NULL, NULL, conf_serverhide_table);
- add_top_conf("service", conf_begin_service, NULL, NULL);
+ add_top_conf("service", NULL, NULL, NULL);
add_conf_item("service", "name", CF_QSTRING, conf_set_service_name);
add_top_conf("alias", conf_begin_alias, conf_end_alias, NULL);
add_top_conf("blacklist", NULL, NULL, NULL);
add_conf_item("blacklist", "host", CF_QSTRING, conf_set_blacklist_host);
add_conf_item("blacklist", "type", CF_STRING | CF_FLIST, conf_set_blacklist_type);
+ add_conf_item("blacklist", "matches", CF_QSTRING | CF_FLIST, conf_set_blacklist_matches);
add_conf_item("blacklist", "reject_reason", CF_QSTRING, conf_set_blacklist_reason);
}
projects / solanum.git / blobdiff