X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconf.c;h=fc12cd9ba826ed19903120433464b6d148a59f3d;hp=ad2baa9ef2a73fe6b424b1832f871c94f38407b4;hb=0e4e22a7a671d1e8efbc44bffd80062191f75c38;hpb=bb6ee46892e94a8c7aae9eaa89981343fbd6863d diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index ad2baa9e..fc12cd9b 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 Alexander Barton (alex@barton.de) + * Copyright (c)2001-2008 Alexander Barton (alex@barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,8 +14,6 @@ #include "portab.h" -static char UNUSED id[] = "$Id: conf.c,v 1.105 2008/03/18 20:12:47 fw Exp $"; - #include "imp.h" #include #include @@ -44,6 +42,7 @@ static char UNUSED id[] = "$Id: conf.c,v 1.105 2008/03/18 20:12:47 fw Exp $"; #include "client.h" #include "defines.h" #include "log.h" +#include "match.h" #include "resolve.h" #include "tool.h" @@ -55,10 +54,10 @@ static bool Use_Log = true; static CONF_SERVER New_Server; static int New_Server_Idx; - +static size_t Conf_Channel_Count; static void Set_Defaults PARAMS(( bool InitServers )); static bool Read_Config PARAMS(( bool ngircd_starting )); -static void Validate_Config PARAMS(( bool TestOnly, bool Rehash )); +static bool Validate_Config PARAMS(( bool TestOnly, bool Rehash )); static void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg )); static void Handle_OPERATOR PARAMS(( int Line, char *Var, char *Arg )); @@ -72,6 +71,44 @@ static void Config_Error_TooLong PARAMS(( const int LINE, const char *Value )); static void Init_Server_Struct PARAMS(( CONF_SERVER *Server )); +#ifdef WANT_IPV6 +#define DEFAULT_LISTEN_ADDRSTR "::,0.0.0.0" +#else +#define DEFAULT_LISTEN_ADDRSTR "0.0.0.0" +#endif + +#ifdef SSL_SUPPORT +struct SSLOptions Conf_SSLOptions; + +static void +ConfSSL_Init(void) +{ + free(Conf_SSLOptions.KeyFile); + Conf_SSLOptions.KeyFile = NULL; + + free(Conf_SSLOptions.CertFile); + Conf_SSLOptions.CertFile = NULL; + + free(Conf_SSLOptions.DHFile); + Conf_SSLOptions.DHFile = NULL; + array_free_wipe(&Conf_SSLOptions.KeyFilePassword); +} + + +static void +ConfSSL_Puts(void) +{ + if (Conf_SSLOptions.KeyFile) + printf( " SSLKeyFile = %s\n", Conf_SSLOptions.KeyFile); + if (Conf_SSLOptions.CertFile) + printf( " SSLCertFile = %s\n", Conf_SSLOptions.CertFile); + if (Conf_SSLOptions.DHFile) + printf( " SSLDHFile = %s\n", Conf_SSLOptions.DHFile); + if (array_bytes(&Conf_SSLOptions.KeyFilePassword)) + puts(" SSLKeyFilePassword = " ); + array_free_wipe(&Conf_SSLOptions.KeyFilePassword); +} +#endif static char * strdup_warn(const char *str) @@ -169,12 +206,16 @@ Conf_Test( void ) struct passwd *pwd; struct group *grp; unsigned int i; - char *topic; + bool config_valid; + size_t predef_channel_count; + struct Conf_Channel *predef_chan; Use_Log = false; - Read_Config( true ); - Validate_Config(true, false); + if (! Read_Config(true)) + return 1; + + config_valid = Validate_Config(true, false); /* If stdin and stdout ("you can read our nice message and we can * read in your keypress") are valid tty's, wait for a key: */ @@ -196,11 +237,16 @@ Conf_Test( void ) printf( " MotdPhrase = %s\n", Conf_MotdPhrase ); printf( " ChrootDir = %s\n", Conf_Chroot ); printf( " PidFile = %s\n", Conf_PidFile); + printf(" Listen = %s\n", Conf_ListenAddress); fputs(" Ports = ", stdout); ports_puts(&Conf_ListenPorts); +#ifdef SSL_SUPPORT + fputs(" SSLPorts = ", stdout); + ports_puts(&Conf_SSLOptions.ListenPorts); + ConfSSL_Puts(); +#endif - printf( " Listen = %s\n", Conf_ListenAddress ); pwd = getpwuid( Conf_UID ); if( pwd ) printf( " ServerUID = %s\n", pwd->pw_name ); else printf( " ServerUID = %ld\n", (long)Conf_UID ); @@ -214,11 +260,10 @@ Conf_Test( void ) printf( " OperServerMode = %s\n", yesno_to_str(Conf_OperServerMode)); printf( " PredefChannelsOnly = %s\n", yesno_to_str(Conf_PredefChannelsOnly)); printf( " NoDNS = %s\n", yesno_to_str(Conf_NoDNS)); + printf( " NoIdent = %s\n", yesno_to_str(Conf_NoIdent)); #ifdef WANT_IPV6 - printf(" ListenIPv6 = %s\n", yesno_to_str(Conf_ListenIPv6)); - printf(" ListenIPv4 = %s\n", yesno_to_str(Conf_ListenIPv4)); - printf(" ConnectIPv4= %s\n", yesno_to_str(Conf_ConnectIPv6)); + printf(" ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6)); printf(" ConnectIPv6 = %s\n", yesno_to_str(Conf_ConnectIPv4)); #endif printf( " MaxConnections = %ld\n", Conf_MaxConnections); @@ -245,27 +290,33 @@ Conf_Test( void ) printf( " Name = %s\n", Conf_Server[i].name ); printf( " Host = %s\n", Conf_Server[i].host ); printf( " Port = %u\n", (unsigned int)Conf_Server[i].port ); +#ifdef SSL_SUPPORT + printf( " SSLConnect = %s\n", Conf_Server[i].SSLConnect?"yes":"no"); +#endif printf( " MyPassword = %s\n", Conf_Server[i].pwd_in ); printf( " PeerPassword = %s\n", Conf_Server[i].pwd_out ); + printf( " ServiceMask = %s\n", Conf_Server[i].svs_mask); printf( " Group = %d\n", Conf_Server[i].group ); printf( " Passive = %s\n\n", Conf_Server[i].flags & CONF_SFLAG_DISABLED ? "yes" : "no"); } - for( i = 0; i < Conf_Channel_Count; i++ ) { - if( ! Conf_Channel[i].name[0] ) continue; + predef_channel_count = array_length(&Conf_Channels, sizeof(*predef_chan)); + predef_chan = array_start(&Conf_Channels); + + for (i = 0; i < predef_channel_count; i++, predef_chan++) { + if (!predef_chan->name[0]) + continue; /* Valid "Channel" section */ puts( "[CHANNEL]" ); - printf( " Name = %s\n", Conf_Channel[i].name ); - printf( " Modes = %s\n", Conf_Channel[i].modes ); - printf( " Key = %s\n", Conf_Channel[i].key ); - printf( " MaxUsers = %lu\n", Conf_Channel[i].maxusers ); - - topic = (char*)array_start(&Conf_Channel[i].topic); - printf( " Topic = %s\n\n", topic ? topic : ""); + printf(" Name = %s\n", predef_chan->name); + printf(" Modes = %s\n", predef_chan->modes); + printf(" Key = %s\n", predef_chan->key); + printf(" MaxUsers = %lu\n", predef_chan->maxusers); + printf(" Topic = %s\n\n", predef_chan->topic); } - return 0; + return (config_valid ? 0 : 1); } /* Conf_Test */ @@ -424,6 +475,16 @@ Conf_AddServer( char *Name, UINT16 Port, char *Host, char *MyPwd, char *PeerPwd } /* Conf_AddServer */ +/** + * Check if the given nick name is an service + */ +GLOBAL bool +Conf_IsService(int ConfServer, char *Nick) +{ + return MatchCaseInsensitive(Conf_Server[ConfServer].svs_mask, Nick); +} /* Conf_IsService */ + + static void Set_Defaults( bool InitServers ) { @@ -448,8 +509,8 @@ Set_Defaults( bool InitServers ) strlcpy( Conf_PidFile, PID_FILE, sizeof( Conf_PidFile )); - strcpy( Conf_ListenAddress, "" ); - + free(Conf_ListenAddress); + Conf_ListenAddress = NULL; Conf_UID = Conf_GID = 0; Conf_PingTimeout = 120; @@ -462,13 +523,12 @@ Set_Defaults( bool InitServers ) Conf_OperCanMode = false; Conf_NoDNS = false; + Conf_NoIdent = false; Conf_PredefChannelsOnly = false; Conf_OperServerMode = false; Conf_ConnectIPv4 = true; - Conf_ListenIPv4 = true; Conf_ConnectIPv6 = true; - Conf_ListenIPv6 = true; Conf_MaxConnections = 0; Conf_MaxConnectionsIP = 5; @@ -542,7 +602,9 @@ Read_Config( bool ngircd_starting ) strcpy( section, "" ); Init_Server_Struct( &New_Server ); New_Server_Idx = NONE; - +#ifdef SSL_SUPPORT + ConfSSL_Init(); +#endif /* Read configuration file */ while( true ) { if( ! fgets( str, LINE_LEN, fd )) break; @@ -597,20 +659,11 @@ Read_Config( bool ngircd_starting ) else New_Server_Idx = i; continue; } - if( strcasecmp( section, "[CHANNEL]" ) == 0 ) { - if( Conf_Channel_Count + 1 > MAX_DEFCHANNELS ) { - Config_Error( LOG_ERR, "Too many pre-defined channels configured." ); - } else { - /* Initialize new channel structure */ - strcpy( Conf_Channel[Conf_Channel_Count].name, "" ); - strcpy( Conf_Channel[Conf_Channel_Count].modes, "" ); - strcpy( Conf_Channel[Conf_Channel_Count].key, "" ); - Conf_Channel[Conf_Channel_Count].maxusers = 0; - array_free(&Conf_Channel[Conf_Channel_Count].topic); - Conf_Channel_Count++; - } + if (strcasecmp(section, "[CHANNEL]") == 0) { + Conf_Channel_Count++; continue; } + Config_Error( LOG_ERR, "%s, line %d: Unknown section \"%s\"!", NGIRCd_ConfFile, line, section ); section[0] = 0x1; } @@ -650,6 +703,14 @@ Read_Config( bool ngircd_starting ) exit( 1 ); } } + + if (!Conf_ListenAddress) + Conf_ListenAddress = strdup_warn(DEFAULT_LISTEN_ADDRSTR); + + if (!Conf_ListenAddress) { + Config_Error(LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME); + exit(1); + } return true; } /* Read_Config */ @@ -838,21 +899,21 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) Conf_NoDNS = Check_ArgIsTrue( Arg ); return; } -#ifdef WANT_IPV6 - /* the default setting for all the WANT_IPV6 special options is 'true' */ - if( strcasecmp( Var, "ListenIPv6" ) == 0 ) { - /* listen on ipv6 sockets, if available? */ - Conf_ListenIPv6 = Check_ArgIsTrue( Arg ); - return; - } - if( strcasecmp( Var, "ListenIPv4" ) == 0 ) { - /* - * listen on ipv4 sockets, if available? - * this allows "ipv6-only" setups. - */ - Conf_ListenIPv4 = Check_ArgIsTrue( Arg ); + if (strcasecmp(Var, "NoIdent") == 0) { + /* don't do IDENT lookups when clients connect? */ + Conf_NoIdent = Check_ArgIsTrue(Arg); +#ifndef IDENTAUTH + if (!Conf_NoIdent) { + /* user has enabled ident lookups explicitly, but ... */ + Config_Error(LOG_WARNING, + "%s: line %d: NoIdent=False, but ngircd was built without IDENT support", + NGIRCd_ConfFile, Line); + } +#endif return; } +#ifdef WANT_IPV6 + /* the default setting for all the WANT_IPV6 special options is 'true' */ if( strcasecmp( Var, "ConnectIPv6" ) == 0 ) { /* connect to other hosts using ipv6, if they have an AAAA record? */ Conf_ConnectIPv6 = Check_ArgIsTrue( Arg ); @@ -911,14 +972,55 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) if( strcasecmp( Var, "Listen" ) == 0 ) { /* IP-Address to bind sockets */ - len = strlcpy( Conf_ListenAddress, Arg, sizeof( Conf_ListenAddress )); - if (len >= sizeof( Conf_ListenAddress )) - Config_Error_TooLong( Line, Var ); + if (Conf_ListenAddress) { + Config_Error(LOG_ERR, "Multiple Listen= options, ignoring: %s", Arg); + return; + } + Conf_ListenAddress = strdup_warn(Arg); + /* + * if allocation fails, we're in trouble: + * we cannot ignore the error -- otherwise ngircd + * would listen on all interfaces. + */ + if (!Conf_ListenAddress) { + Config_Error(LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME); + exit(1); + } return; } - Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!", - NGIRCd_ConfFile, Line, Var ); +#ifdef SSL_SUPPORT + if( strcasecmp( Var, "SSLPorts" ) == 0 ) { + ports_parse(&Conf_SSLOptions.ListenPorts, Line, Arg); + return; + } + + if( strcasecmp( Var, "SSLKeyFile" ) == 0 ) { + assert(Conf_SSLOptions.KeyFile == NULL ); + Conf_SSLOptions.KeyFile = strdup_warn(Arg); + return; + } + if( strcasecmp( Var, "SSLCertFile" ) == 0 ) { + assert(Conf_SSLOptions.CertFile == NULL ); + Conf_SSLOptions.CertFile = strdup_warn(Arg); + return; + } + + if( strcasecmp( Var, "SSLKeyFilePassword" ) == 0 ) { + assert(array_bytes(&Conf_SSLOptions.KeyFilePassword) == 0); + if (!array_copys(&Conf_SSLOptions.KeyFilePassword, Arg)) + Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Could not copy %s: %s!", + NGIRCd_ConfFile, Line, Var, strerror(errno)); + return; + } + if( strcasecmp( Var, "SSLDHFile" ) == 0 ) { + assert(Conf_SSLOptions.DHFile == NULL); + Conf_SSLOptions.DHFile = strdup_warn( Arg ); + return; + } +#endif + Config_Error(LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!", + NGIRCd_ConfFile, Line, Var); } /* Handle_GLOBAL */ @@ -1026,6 +1128,12 @@ Handle_SERVER( int Line, char *Var, char *Arg ) NGIRCd_ConfFile, Line, port ); return; } +#ifdef SSL_SUPPORT + if( strcasecmp( Var, "SSLConnect" ) == 0 ) { + New_Server.SSLConnect = Check_ArgIsTrue(Arg); + return; + } +#endif if( strcasecmp( Var, "Group" ) == 0 ) { /* Server group */ #ifdef HAVE_ISDIGIT @@ -1041,19 +1149,29 @@ Handle_SERVER( int Line, char *Var, char *Arg ) New_Server.flags |= CONF_SFLAG_DISABLED; return; } - + if (strcasecmp(Var, "ServiceMask") == 0) { + len = strlcpy(New_Server.svs_mask, ngt_LowerStr(Arg), + sizeof(New_Server.svs_mask)); + if (len >= sizeof(New_Server.svs_mask)) + Config_Error_TooLong(Line, Var); + return; + } + Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var ); } /* Handle_SERVER */ static bool -Handle_Channelname(size_t chancount, const char *name) +Handle_Channelname(struct Conf_Channel *new_chan, const char *name) { - size_t size = sizeof( Conf_Channel[chancount].name ); - char *dest = Conf_Channel[chancount].name; + size_t size = sizeof(new_chan->name); + char *dest = new_chan->name; - if (*name && *name != '#') { + /* Channels names must begin with "&" or "#", if it is + * missing, add a '#'. This is only here for user convenience. + */ + if (*name && *name != '#' && *name != '&') { *dest = '#'; --size; ++dest; @@ -1063,48 +1181,54 @@ Handle_Channelname(size_t chancount, const char *name) static void -Handle_CHANNEL( int Line, char *Var, char *Arg ) +Handle_CHANNEL(int Line, char *Var, char *Arg) { size_t len; - size_t chancount = 0; + size_t chancount; + struct Conf_Channel *chan; assert( Line > 0 ); assert( Var != NULL ); assert( Arg != NULL ); - if (Conf_Channel_Count > 0) - chancount = Conf_Channel_Count - 1; + assert(Conf_Channel_Count > 0); - if( strcasecmp( Var, "Name" ) == 0 ) { - if (!Handle_Channelname(chancount, Arg)) - Config_Error_TooLong( Line, Var ); + chancount = Conf_Channel_Count - 1; + + chan = array_alloc(&Conf_Channels, sizeof(*chan), chancount); + if (!chan) { + Config_Error(LOG_ERR, "Could not allocate memory for predefined channel (%d:%s = %s)", Line, Var, Arg); + return; + } + if (strcasecmp(Var, "Name") == 0) { + if (!Handle_Channelname(chan, Arg)) + Config_Error_TooLong(Line, Var); return; } - if( strcasecmp( Var, "Modes" ) == 0 ) { + if (strcasecmp(Var, "Modes") == 0) { /* Initial modes */ - len = strlcpy( Conf_Channel[chancount].modes, Arg, sizeof( Conf_Channel[chancount].modes )); - if (len >= sizeof( Conf_Channel[chancount].modes )) + len = strlcpy(chan->modes, Arg, sizeof(chan->modes)); + if (len >= sizeof(chan->modes)) Config_Error_TooLong( Line, Var ); return; } if( strcasecmp( Var, "Topic" ) == 0 ) { /* Initial topic */ - if (!array_copys( &Conf_Channel[chancount].topic, Arg)) + len = strlcpy(chan->topic, Arg, sizeof(chan->topic)); + if (len >= sizeof(chan->topic)) Config_Error_TooLong( Line, Var ); return; } - if( strcasecmp( Var, "Key" ) == 0 ) { /* Initial Channel Key (mode k) */ - len = strlcpy(Conf_Channel[chancount].key, Arg, sizeof(Conf_Channel[chancount].key)); - if (len >= sizeof( Conf_Channel[chancount].key )) + len = strlcpy(chan->key, Arg, sizeof(chan->key)); + if (len >= sizeof(chan->key)) Config_Error_TooLong(Line, Var); return; } - if( strcasecmp( Var, "MaxUsers" ) == 0 ) { /* maximum user limit, mode l */ - Conf_Channel[chancount].maxusers = (unsigned long) atol(Arg); - if (Conf_Channel[chancount].maxusers == 0) + chan->maxusers = (unsigned long) atol(Arg); + if (chan->maxusers == 0) Config_Error_NaN(Line, Var); return; } @@ -1114,7 +1238,7 @@ Handle_CHANNEL( int Line, char *Var, char *Arg ) } /* Handle_CHANNEL */ -static void +static bool Validate_Config(bool Configtest, bool Rehash) { /* Validate configuration settings. */ @@ -1122,6 +1246,7 @@ Validate_Config(bool Configtest, bool Rehash) #ifdef DEBUG int i, servers, servers_once; #endif + bool config_valid = true; char *ptr; /* Validate configured server name, see RFC 2812 section 2.3.1 */ @@ -1140,6 +1265,7 @@ Validate_Config(bool Configtest, bool Rehash) if (!Conf_ServerName[0]) { /* No server name configured! */ + config_valid = false; Config_Error(LOG_ALERT, "No (valid) server name configured in \"%s\" (section 'Global': 'Name')!", NGIRCd_ConfFile); @@ -1153,6 +1279,7 @@ Validate_Config(bool Configtest, bool Rehash) if (Conf_ServerName[0] && !strchr(Conf_ServerName, '.')) { /* No dot in server name! */ + config_valid = false; Config_Error(LOG_ALERT, "Invalid server name configured in \"%s\" (section 'Global': 'Name'): Dot missing!", NGIRCd_ConfFile); @@ -1167,6 +1294,7 @@ Validate_Config(bool Configtest, bool Rehash) #ifdef STRICT_RFC if (!Conf_ServerAdminMail[0]) { /* No administrative contact configured! */ + config_valid = false; Config_Error(LOG_ALERT, "No administrator email address configured in \"%s\" ('AdminEMail')!", NGIRCd_ConfFile); @@ -1186,16 +1314,6 @@ Validate_Config(bool Configtest, bool Rehash) "No administrative information configured but required by RFC!"); } -#ifdef WANT_IPV6 - if (!Conf_ListenIPv4 && !Conf_ListenIPv6) - Config_Error(LOG_ALERT, - "Both \"ListenIPv4\" and \"ListenIPv6\" are set to 'no'; no network protocol available!"); - - if (!Conf_ConnectIPv4 && !Conf_ConnectIPv6) - Config_Error(LOG_ALERT, - "Both \"ConnectIPv4\" and \"ConnectIPv6\" are set to 'no'; ngircd will fail to connect to other irc servers"); -#endif - #ifdef DEBUG servers = servers_once = 0; for (i = 0; i < MAX_SERVERS; i++) { @@ -1209,6 +1327,8 @@ Validate_Config(bool Configtest, bool Rehash) "Configuration: Operators=%d, Servers=%d[%d], Channels=%d", Conf_Oper_Count, servers, servers_once, Conf_Channel_Count); #endif + + return config_valid; } /* Validate_Config */