/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information.
- *
- * Configuration management (reading, parsing & validation)
*/
-
#include "portab.h"
-static char UNUSED id[] = "$Id: conf.c,v 1.77 2005/06/17 19:16:53 fw Exp $";
+/**
+ * @file
+ * Configuration management (reading, parsing & validation)
+ */
#include "imp.h"
#include <assert.h>
# include <ctype.h>
#endif
+#include "array.h"
#include "ngircd.h"
#include "conn.h"
-#include "client.h"
+#include "channel.h"
#include "defines.h"
#include "log.h"
-#include "resolve.h"
+#include "match.h"
#include "tool.h"
#include "exp.h"
#include "conf.h"
-LOCAL bool Use_Log = true;
-LOCAL CONF_SERVER New_Server;
-LOCAL int New_Server_Idx;
+static bool Use_Log = true, Using_MotdFile = true;
+static CONF_SERVER New_Server;
+static int New_Server_Idx;
+static size_t Conf_Oper_Count;
+static size_t Conf_Channel_Count;
+static char Conf_MotdFile[FNAME_LEN];
-LOCAL void Set_Defaults PARAMS(( bool InitServers ));
-LOCAL void Read_Config PARAMS(( void ));
-LOCAL void Validate_Config PARAMS(( bool TestOnly ));
+static void Set_Defaults PARAMS(( bool InitServers ));
+static bool Read_Config PARAMS(( bool ngircd_starting ));
+static bool Validate_Config PARAMS(( bool TestOnly, bool Rehash ));
-LOCAL void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg ));
-LOCAL void Handle_OPERATOR PARAMS(( int Line, char *Var, char *Arg ));
-LOCAL void Handle_SERVER PARAMS(( int Line, char *Var, char *Arg ));
-LOCAL void Handle_CHANNEL PARAMS(( int Line, char *Var, char *Arg ));
+static void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg ));
+static void Handle_LIMITS PARAMS(( int Line, char *Var, char *Arg ));
+static void Handle_OPTIONS PARAMS(( int Line, char *Var, char *Arg ));
+static void Handle_OPERATOR PARAMS(( int Line, char *Var, char *Arg ));
+static void Handle_SERVER PARAMS(( int Line, char *Var, char *Arg ));
+static void Handle_CHANNEL PARAMS(( int Line, char *Var, char *Arg ));
-LOCAL void Config_Error PARAMS(( const int Level, const char *Format, ... ));
+static void Config_Error PARAMS(( const int Level, const char *Format, ... ));
-LOCAL void Config_Error_NaN PARAMS(( const int LINE, const char *Value ));
-LOCAL void Config_Error_TooLong PARAMS(( const int LINE, const char *Value ));
+static void Config_Error_NaN PARAMS(( const int LINE, const char *Value ));
+static void Config_Error_Section PARAMS(( const int Line, const char *Item,
+ const char *Section ));
+static void Config_Error_TooLong PARAMS(( const int LINE, const char *Value ));
-LOCAL void Init_Server_Struct PARAMS(( CONF_SERVER *Server ));
+static void Init_Server_Struct PARAMS(( CONF_SERVER *Server ));
-GLOBAL void
-Conf_Init( void )
+#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;
+
+/**
+ * Initialize SSL configuration.
+ */
+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);
+}
+
+/**
+ * Make sure that a configured file is readable.
+ *
+ * Currently, this function is only used for SSL-related options ...
+ *
+ * @param Var Configuration variable
+ * @param Filename Configured filename
+ */
+static void
+CheckFileReadable(const char *Var, const char *Filename)
+{
+ FILE *fp;
+
+ fp = fopen(Filename, "r");
+ if (fp)
+ fclose(fp);
+ else
+ Config_Error(LOG_ERR, "Can't read \"%s\" (\"%s\"): %s",
+ Filename, Var, strerror(errno));
+}
+
+#endif
+
+
+/**
+ * Duplicate string and warn on errors.
+ *
+ * @returns Pointer to string on success, NULL otherwise.
+ */
+static char *
+strdup_warn(const char *str)
+{
+ char *ptr = strdup(str);
+ if (!ptr)
+ Config_Error(LOG_ERR,
+ "Could not allocate memory for string: %s", str);
+ return ptr;
+}
+
+/**
+ * Output a comma separated list of ports (integer values).
+ */
+static void
+ports_puts(array *a)
+{
+ size_t len;
+ UINT16 *ports;
+ len = array_length(a, sizeof(UINT16));
+ if (len--) {
+ ports = (UINT16*) array_start(a);
+ printf("%u", (unsigned int) *ports);
+ while (len--) {
+ ports++;
+ printf(", %u", (unsigned int) *ports);
+ }
+ }
+ putc('\n', stdout);
+}
+
+/**
+ * Parse a comma separated string into an array of port numbers (integers).
+ */
+static void
+ports_parse(array *a, int Line, char *Arg)
{
- Set_Defaults( true );
- Read_Config( );
- Validate_Config( false );
-} /* Config_Init */
+ char *ptr;
+ int port;
+ UINT16 port16;
+
+ array_trunc(a);
+
+ ptr = strtok( Arg, "," );
+ while (ptr) {
+ ngt_TrimStr(ptr);
+ port = atoi(ptr);
+ if (port > 0 && port < 0xFFFF) {
+ port16 = (UINT16) port;
+ if (!array_catb(a, (char*)&port16, sizeof port16))
+ Config_Error(LOG_ERR, "%s, line %d Could not add port number %ld: %s",
+ NGIRCd_ConfFile, Line, port, strerror(errno));
+ } else {
+ Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Illegal port number %ld!",
+ NGIRCd_ConfFile, Line, port );
+ }
+ ptr = strtok( NULL, "," );
+ }
+}
+/**
+ * Initialize configuration module.
+ */
GLOBAL void
+Conf_Init( void )
+{
+ Read_Config( true );
+ Validate_Config(false, false);
+}
+
+/**
+ * "Rehash" (reload) server configuration.
+ *
+ * @returns true if configuration has been re-read, false on errors.
+ */
+GLOBAL bool
Conf_Rehash( void )
{
- Set_Defaults( false );
- Read_Config( );
- Validate_Config( false );
-} /* Config_Rehash */
+ if (!Read_Config(false))
+ return false;
+ Validate_Config(false, true);
+
+ /* Update CLIENT structure of local server */
+ Client_SetInfo(Client_ThisServer(), Conf_ServerInfo);
+ return true;
+}
+
+/**
+ * Output a boolean value as "yes/no" string.
+ */
+static const char*
+yesno_to_str(int boolean_value)
+{
+ if (boolean_value)
+ return "yes";
+ return "no";
+}
+
+/**
+ * Free all IRC operator configuration structures.
+ */
+static void
+opers_free(void)
+{
+ struct Conf_Oper *op;
+ size_t len;
+
+ len = array_length(&Conf_Opers, sizeof(*op));
+ op = array_start(&Conf_Opers);
+ while (len--) {
+ free(op->mask);
+ op++;
+ }
+ array_free(&Conf_Opers);
+}
+/**
+ * Output all IRC operator configuration structures.
+ */
+static void
+opers_puts(void)
+{
+ struct Conf_Oper *op;
+ size_t len;
+
+ len = array_length(&Conf_Opers, sizeof(*op));
+ op = array_start(&Conf_Opers);
+ while (len--) {
+ assert(op->name[0]);
+
+ puts("[OPERATOR]");
+ printf(" Name = %s\n", op->name);
+ printf(" Password = %s\n", op->pwd);
+ printf(" Mask = %s\n\n", op->mask ? op->mask : "");
+ op++;
+ }
+}
+/**
+ * Read configuration, validate and output it.
+ *
+ * This function waits for a keypress of the user when stdin/stdout are valid
+ * tty's ("you can read our nice message and we can read in your keypress").
+ *
+ * @return 0 on succes, 1 on failure(s); therefore the result code can
+ * directly be used by exit() when running "ngircd --configtest".
+ */
GLOBAL int
Conf_Test( void )
{
- /* Read configuration, validate and output it. */
-
struct passwd *pwd;
struct group *grp;
- int i;
+ unsigned int i;
+ bool config_valid;
+ size_t predef_channel_count;
+ struct Conf_Channel *predef_chan;
Use_Log = false;
- Set_Defaults( true );
-
- Read_Config( );
- Validate_Config( true );
- /* 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: */
- if( isatty( fileno( stdin )) && isatty( fileno( stdout )))
- {
- puts( "OK, press enter to see a dump of your service configuration ..." );
- getchar( );
- }
- else puts( "Ok, dump of your server configuration follows:\n" );
-
- puts( "[GLOBAL]" );
- printf( " Name = %s\n", Conf_ServerName );
- printf( " Info = %s\n", Conf_ServerInfo );
- printf( " Password = %s\n", Conf_ServerPwd );
- printf( " AdminInfo1 = %s\n", Conf_ServerAdmin1 );
- printf( " AdminInfo2 = %s\n", Conf_ServerAdmin2 );
- printf( " AdminEMail = %s\n", Conf_ServerAdminMail );
- printf( " MotdFile = %s\n", Conf_MotdFile );
- printf( " MotdPhrase = %s\n", Conf_MotdPhrase );
- printf( " ChrootDir = %s\n", Conf_Chroot );
- printf( " PidFile = %s\n", Conf_PidFile);
- printf( " Ports = " );
- for( i = 0; i < Conf_ListenPorts_Count; i++ )
- {
- if( i != 0 ) printf( ", " );
- printf( "%u", (unsigned int) Conf_ListenPorts[i] );
- }
- puts( "" );
- 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 );
- grp = getgrgid( Conf_GID );
- if( grp ) printf( " ServerGID = %s\n", grp->gr_name );
- else printf( " ServerGID = %ld\n", (long)Conf_GID );
- printf( " PingTimeout = %d\n", Conf_PingTimeout );
- printf( " PongTimeout = %d\n", Conf_PongTimeout );
- printf( " ConnectRetry = %d\n", Conf_ConnectRetry );
- printf( " OperCanUseMode = %s\n", Conf_OperCanMode == true? "yes" : "no" );
- printf( " OperServerMode = %s\n", Conf_OperServerMode == true? "yes" : "no" );
- if( Conf_MaxConnections > 0 ) printf( " MaxConnections = %ld\n", Conf_MaxConnections );
- else printf( " MaxConnections = -1\n" );
- if( Conf_MaxConnectionsIP > 0 ) printf( " MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP );
- else printf( " MaxConnectionsIP = -1\n" );
- if( Conf_MaxJoins > 0 ) printf( " MaxJoins = %d\n", Conf_MaxJoins );
- else printf( " MaxJoins = -1\n" );
- puts( "" );
-
- for( i = 0; i < Conf_Oper_Count; i++ )
- {
- if( ! Conf_Oper[i].name[0] ) continue;
-
- /* Valid "Operator" section */
- puts( "[OPERATOR]" );
- printf( " Name = %s\n", Conf_Oper[i].name );
- printf( " Password = %s\n", Conf_Oper[i].pwd );
- if ( Conf_Oper[i].mask ) printf( " Mask = %s\n", Conf_Oper[i].mask );
- puts( "" );
+ if (! Read_Config(true))
+ return 1;
+
+ config_valid = Validate_Config(true, false);
+
+ /* Valid tty? */
+ if(isatty(fileno(stdin)) && isatty(fileno(stdout))) {
+ puts("OK, press enter to see a dump of your server configuration ...");
+ getchar();
+ } else
+ puts("Ok, dump of your server configuration follows:\n");
+
+ puts("[GLOBAL]");
+ printf(" Name = %s\n", Conf_ServerName);
+ printf(" AdminInfo1 = %s\n", Conf_ServerAdmin1);
+ printf(" AdminInfo2 = %s\n", Conf_ServerAdmin2);
+ printf(" AdminEMail = %s\n", Conf_ServerAdminMail);
+ printf(" Info = %s\n", Conf_ServerInfo);
+ printf(" Listen = %s\n", Conf_ListenAddress);
+ if (Using_MotdFile) {
+ printf(" MotdFile = %s\n", Conf_MotdFile);
+ printf(" MotdPhrase =\n");
+ } else {
+ printf(" MotdFile = \n");
+ printf(" MotdPhrase = %s\n", array_bytes(&Conf_Motd)
+ ? (const char*) array_start(&Conf_Motd) : "");
}
+#ifndef PAM
+ printf(" Password = %s\n", Conf_ServerPwd);
+#endif
+ printf(" PidFile = %s\n", Conf_PidFile);
+ printf(" Ports = ");
+ ports_puts(&Conf_ListenPorts);
+ grp = getgrgid(Conf_GID);
+ if (grp)
+ printf(" ServerGID = %s\n", grp->gr_name);
+ else
+ printf(" ServerGID = %ld\n", (long)Conf_GID);
+ pwd = getpwuid(Conf_UID);
+ if (pwd)
+ printf(" ServerUID = %s\n", pwd->pw_name);
+ else
+ printf(" ServerUID = %ld\n", (long)Conf_UID);
+ puts("");
+
+ puts("[LIMITS]");
+ printf(" ConnectRetry = %d\n", Conf_ConnectRetry);
+ printf(" MaxConnections = %ld\n", Conf_MaxConnections);
+ printf(" MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP);
+ printf(" MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1);
+ printf(" MaxNickLength = %u\n", Conf_MaxNickLength - 1);
+ printf(" PingTimeout = %d\n", Conf_PingTimeout);
+ printf(" PongTimeout = %d\n", Conf_PongTimeout);
+ puts("");
+
+ puts("[OPTIONS]");
+ printf(" AllowRemoteOper = %s\n", yesno_to_str(Conf_AllowRemoteOper));
+ printf(" ChrootDir = %s\n", Conf_Chroot);
+ printf(" CloakHost = %s\n", Conf_CloakHost);
+ printf(" CloakUserToNick = %s\n", yesno_to_str(Conf_CloakUserToNick));
+#ifdef WANT_IPV6
+ printf(" ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6));
+ printf(" ConnectIPv6 = %s\n", yesno_to_str(Conf_ConnectIPv4));
+#endif
+ printf(" DNS = %s\n", yesno_to_str(Conf_DNS));
+#ifdef IDENT
+ printf(" Ident = %s\n", yesno_to_str(Conf_Ident));
+#endif
+ printf(" NoticeAuth = %s\n", yesno_to_str(Conf_NoticeAuth));
+ printf(" OperCanUseMode = %s\n", yesno_to_str(Conf_OperCanMode));
+ printf(" OperServerMode = %s\n", yesno_to_str(Conf_OperServerMode));
+#ifdef PAM
+ printf(" PAM = %s\n", yesno_to_str(Conf_PAM));
+#endif
+ printf(" PredefChannelsOnly = %s\n", yesno_to_str(Conf_PredefChannelsOnly));
+#ifndef STRICT_RFC
+ printf(" RequireAuthPing = %s\n", yesno_to_str(Conf_AuthPing));
+#endif
+ printf(" ScrubCTCP = %s\n", yesno_to_str(Conf_ScrubCTCP));
+#ifdef SSL_SUPPORT
+ printf(" SSLCertFile = %s\n", Conf_SSLOptions.CertFile);
+ printf(" SSLDHFile = %s\n", Conf_SSLOptions.DHFile);
+ printf(" SSLKeyFile = %s\n", Conf_SSLOptions.KeyFile);
+ if (array_bytes(&Conf_SSLOptions.KeyFilePassword))
+ puts(" SSLKeyFilePassword = <secret>");
+ else
+ puts(" SSLKeyFilePassword = ");
+ array_free_wipe(&Conf_SSLOptions.KeyFilePassword);
+ printf(" SSLPorts = ");
+ ports_puts(&Conf_SSLOptions.ListenPorts);
+#endif
+#ifdef SYSLOG
+ printf(" SyslogFacility = %s\n",
+ ngt_SyslogFacilityName(Conf_SyslogFacility));
+#endif
+ printf(" WebircPassword = %s\n", Conf_WebircPwd);
+ puts("");
- for( i = 0; i < MAX_SERVERS; i++ )
- {
+ opers_puts();
+
+ for( i = 0; i < MAX_SERVERS; i++ ) {
if( ! Conf_Server[i].name[0] ) continue;
-
+
/* Valid "Server" section */
puts( "[SERVER]" );
printf( " Name = %s\n", Conf_Server[i].name );
printf( " Host = %s\n", Conf_Server[i].host );
- printf( " Port = %d\n", Conf_Server[i].port );
+ 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 );
- puts( "" );
+ 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( " Topic = %s\n", Conf_Channel[i].topic );
- puts( "" );
+ 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", predef_chan->topic);
+ printf(" KeyFile = %s\n\n", predef_chan->keyfile);
}
-
- return 0;
-} /* Conf_Test */
+ return (config_valid ? 0 : 1);
+}
+/**
+ * Remove connection information from configured server.
+ *
+ * If the server is set as "once", delete it from our configuration;
+ * otherwise set the time for the next connection attempt.
+ *
+ * Non-server connections will be silently ignored.
+ */
GLOBAL void
Conf_UnsetServer( CONN_ID Idx )
{
- /* Set next time for next connection attempt, if this is a server
- * link that is (still) configured here. If the server is set as
- * "once", delete it from our configuration.
- * Non-Server-Connections will be silently ignored. */
-
int i;
+ time_t t;
/* Check all our configured servers */
- for( i = 0; i < MAX_SERVERS; i++ )
- {
+ for( i = 0; i < MAX_SERVERS; i++ ) {
if( Conf_Server[i].conn_id != Idx ) continue;
/* Gotcha! Mark server configuration as "unused": */
Conf_Server[i].conn_id = NONE;
- if( Conf_Server[i].flags & CONF_SFLAG_ONCE )
- {
+ if( Conf_Server[i].flags & CONF_SFLAG_ONCE ) {
/* Delete configuration here */
Init_Server_Struct( &Conf_Server[i] );
- }
- else
- {
+ } else {
/* Set time for next connect attempt */
- if( Conf_Server[i].lasttry < time( NULL ) - Conf_ConnectRetry )
- {
- /* Okay, the connection was established "long enough": */
- Conf_Server[i].lasttry = time( NULL ) - Conf_ConnectRetry + RECONNECT_DELAY;
- }
+ t = time(NULL);
+ if (Conf_Server[i].lasttry < t - Conf_ConnectRetry) {
+ /* The connection has been "long", so we don't
+ * require the next attempt to be delayed. */
+ Conf_Server[i].lasttry =
+ t - Conf_ConnectRetry + RECONNECT_DELAY;
+ } else
+ Conf_Server[i].lasttry = t;
}
}
-} /* Conf_UnsetServer */
-
+}
+/**
+ * Set connection information for specified configured server.
+ */
GLOBAL void
Conf_SetServer( int ConfServer, CONN_ID Idx )
{
- /* Set connection for specified configured server */
-
assert( ConfServer > NONE );
assert( Idx > NONE );
Conf_Server[ConfServer].conn_id = Idx;
-} /* Conf_SetServer */
-
+}
+/**
+ * Get index of server in configuration structure.
+ */
GLOBAL int
Conf_GetServer( CONN_ID Idx )
{
- /* Get index of server in configuration structure */
-
int i = 0;
-
+
assert( Idx > NONE );
- for( i = 0; i < MAX_SERVERS; i++ )
- {
+ for( i = 0; i < MAX_SERVERS; i++ ) {
if( Conf_Server[i].conn_id == Idx ) return i;
}
return NONE;
-} /* Conf_GetServer */
-
+}
+/**
+ * Enable a server by name and adjust its port number.
+ *
+ * @returns true if a server has been enabled and now has a valid port
+ * number and host name for outgoing connections.
+ */
GLOBAL bool
-Conf_EnableServer( char *Name, UINT16 Port )
+Conf_EnableServer( const char *Name, UINT16 Port )
{
- /* Enable specified server and adjust port */
-
int i;
assert( Name != NULL );
-
- for( i = 0; i < MAX_SERVERS; i++ )
- {
- if( strcasecmp( Conf_Server[i].name, Name ) == 0 )
- {
+ for( i = 0; i < MAX_SERVERS; i++ ) {
+ if( strcasecmp( Conf_Server[i].name, Name ) == 0 ) {
/* Gotcha! Set port and enable server: */
Conf_Server[i].port = Port;
Conf_Server[i].flags &= ~CONF_SFLAG_DISABLED;
- return true;
+ return (Conf_Server[i].port && Conf_Server[i].host[0]);
}
}
return false;
-} /* Conf_EnableServer */
-
+}
+/**
+ * Enable a server by name.
+ *
+ * The server is only usable as outgoing server, if it has set a valid port
+ * number for outgoing connections!
+ * If not, you have to use Conf_EnableServer() function to make it available.
+ *
+ * @returns true if a server has been enabled; false otherwise.
+ */
GLOBAL bool
-Conf_DisableServer( char *Name )
+Conf_EnablePassiveServer(const char *Name)
{
- /* Enable specified server and adjust port */
-
int i;
assert( Name != NULL );
+ for (i = 0; i < MAX_SERVERS; i++) {
+ if ((strcasecmp( Conf_Server[i].name, Name ) == 0)
+ && (Conf_Server[i].port > 0)) {
+ /* BINGO! Enable server */
+ Conf_Server[i].flags &= ~CONF_SFLAG_DISABLED;
+ return true;
+ }
+ }
+ return false;
+}
- for( i = 0; i < MAX_SERVERS; i++ )
- {
- if( strcasecmp( Conf_Server[i].name, Name ) == 0 )
- {
+/**
+ * Disable a server by name.
+ * An already established connection will be disconnected.
+ *
+ * @returns true if a server was found and has been disabled.
+ */
+GLOBAL bool
+Conf_DisableServer( const char *Name )
+{
+ int i;
+
+ assert( Name != NULL );
+ for( i = 0; i < MAX_SERVERS; i++ ) {
+ if( strcasecmp( Conf_Server[i].name, Name ) == 0 ) {
/* Gotcha! Disable and disconnect server: */
Conf_Server[i].flags |= CONF_SFLAG_DISABLED;
- if( Conf_Server[i].conn_id > NONE ) Conn_Close( Conf_Server[i].conn_id, NULL, "Server link terminated on operator request", true);
+ if( Conf_Server[i].conn_id > NONE )
+ Conn_Close(Conf_Server[i].conn_id, NULL,
+ "Server link terminated on operator request",
+ true);
return true;
}
}
return false;
-} /* Conf_DisableServer */
-
+}
+/**
+ * Add a new remote server to our configuration.
+ *
+ * @param Name Name of the new server.
+ * @param Port Port number to connect to or 0 for incoming connections.
+ * @param Host Host name to connect to.
+ * @param MyPwd Password that will be sent to the peer.
+ * @param PeerPwd Password that must be received from the peer.
+ * @returns true if the new server has been added; false otherwise.
+ */
GLOBAL bool
-Conf_AddServer( char *Name, UINT16 Port, char *Host, char *MyPwd, char *PeerPwd )
+Conf_AddServer(const char *Name, UINT16 Port, const char *Host,
+ const char *MyPwd, const char *PeerPwd)
{
- /* Add new server to configuration */
-
int i;
assert( Name != NULL );
assert( PeerPwd != NULL );
/* Search unused item in server configuration structure */
- for( i = 0; i < MAX_SERVERS; i++ )
- {
+ for( i = 0; i < MAX_SERVERS; i++ ) {
/* Is this item used? */
if( ! Conf_Server[i].name[0] ) break;
}
strlcpy( Conf_Server[i].pwd_in, PeerPwd, sizeof( Conf_Server[i].pwd_in ));
Conf_Server[i].port = Port;
Conf_Server[i].flags = CONF_SFLAG_ONCE;
-
- return true;
-} /* Conf_AddServer */
+ return true;
+}
-LOCAL void
-Set_Defaults( bool InitServers )
+/**
+ * Check if the given nick name is an service.
+ *
+ * @returns true if the given nick name belongs to an "IRC service".
+ */
+GLOBAL bool
+Conf_IsService(int ConfServer, const char *Nick)
{
- /* Initialize configuration variables with default values. */
+ return MatchCaseInsensitive(Conf_Server[ConfServer].svs_mask, Nick);
+}
+/**
+ * Initialize configuration settings with their default values.
+ */
+static void
+Set_Defaults(bool InitServers)
+{
int i;
- strcpy( Conf_ServerName, "" );
- snprintf( Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s", PACKAGE_NAME, PACKAGE_VERSION );
- strcpy( Conf_ServerPwd, "" );
-
- strcpy( Conf_ServerAdmin1, "" );
- strcpy( Conf_ServerAdmin2, "" );
- strcpy( Conf_ServerAdminMail, "" );
-
- strlcpy( Conf_MotdFile, SYSCONFDIR, sizeof( Conf_MotdFile ));
- strlcat( Conf_MotdFile, MOTD_FILE, sizeof( Conf_MotdFile ));
-
- strlcpy( Conf_MotdPhrase, MOTD_PHRASE, sizeof( Conf_MotdPhrase ));
-
- strlcpy( Conf_Chroot, CHROOT_DIR, sizeof( Conf_Chroot ));
-
- strlcpy( Conf_PidFile, PID_FILE, sizeof( Conf_PidFile ));
-
- Conf_ListenPorts_Count = 0;
- strcpy( Conf_ListenAddress, "" );
-
+ /* Global */
+ strcpy(Conf_ServerName, "");
+ strcpy(Conf_ServerAdmin1, "");
+ strcpy(Conf_ServerAdmin2, "");
+ strcpy(Conf_ServerAdminMail, "");
+ snprintf(Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s",
+ PACKAGE_NAME, PACKAGE_VERSION);
+ free(Conf_ListenAddress);
+ Conf_ListenAddress = NULL;
+ array_free(&Conf_Motd);
+ strlcpy(Conf_MotdFile, SYSCONFDIR, sizeof(Conf_MotdFile));
+ strlcat(Conf_MotdFile, MOTD_FILE, sizeof(Conf_MotdFile));
+ strcpy(Conf_ServerPwd, "");
+ strlcpy(Conf_PidFile, PID_FILE, sizeof(Conf_PidFile));
Conf_UID = Conf_GID = 0;
-
+
+ /* Limits */
+ Conf_ConnectRetry = 60;
+ Conf_MaxConnections = 0;
+ Conf_MaxConnectionsIP = 5;
+ Conf_MaxJoins = 10;
+ Conf_MaxNickLength = CLIENT_NICK_LEN_DEFAULT;
Conf_PingTimeout = 120;
Conf_PongTimeout = 20;
- Conf_ConnectRetry = 60;
+ /* Options */
+ Conf_AllowRemoteOper = false;
+#ifndef STRICT_RFC
+ Conf_AuthPing = false;
+#endif
+ strlcpy(Conf_Chroot, CHROOT_DIR, sizeof(Conf_Chroot));
+ strcpy(Conf_CloakHost, "");
+ Conf_CloakUserToNick = false;
+ Conf_ConnectIPv4 = true;
+#ifdef WANT_IPV6
+ Conf_ConnectIPv6 = true;
+#else
+ Conf_ConnectIPv6 = false;
+#endif
+ Conf_DNS = true;
+#ifdef IDENTAUTH
+ Conf_Ident = true;
+#else
+ Conf_Ident = false;
+#endif
+ Conf_NoticeAuth = false;
+ Conf_OperCanMode = false;
+ Conf_OperServerMode = false;
+#ifdef PAM
+ Conf_PAM = true;
+#else
+ Conf_PAM = false;
+#endif
+ Conf_PredefChannelsOnly = false;
+#ifdef SYSLOG
+ Conf_ScrubCTCP = false;
+#ifdef LOG_LOCAL5
+ Conf_SyslogFacility = LOG_LOCAL5;
+#else
+ Conf_SyslogFacility = 0;
+#endif
+#endif
+ /* Initialize IRC operators and channels */
Conf_Oper_Count = 0;
Conf_Channel_Count = 0;
- Conf_OperCanMode = false;
- Conf_OperServerMode = false;
-
- Conf_MaxConnections = -1;
- Conf_MaxConnectionsIP = 5;
- Conf_MaxJoins = 10;
-
/* Initialize server configuration structures */
- if( InitServers ) for( i = 0; i < MAX_SERVERS; Init_Server_Struct( &Conf_Server[i++] ));
-} /* Set_Defaults */
+ if (InitServers) {
+ for (i = 0; i < MAX_SERVERS;
+ Init_Server_Struct(&Conf_Server[i++]));
+ }
+}
+/**
+ * Get number of configured listening ports.
+ *
+ * @returns The number of ports (IPv4+IPv6) on which the server should listen.
+ */
+static bool
+no_listenports(void)
+{
+ size_t cnt = array_bytes(&Conf_ListenPorts);
+#ifdef SSL_SUPPORT
+ cnt += array_bytes(&Conf_SSLOptions.ListenPorts);
+#endif
+ return cnt == 0;
+}
-LOCAL void
-Read_Config( void )
+/**
+ * Read MOTD ("message of the day") file.
+ *
+ * @param filename Name of the file to read.
+ */
+static void
+Read_Motd(const char *filename)
{
- /* Read configuration file. */
+ char line[127];
+ FILE *fp;
+
+ if (*filename == '\0')
+ return;
+
+ fp = fopen(filename, "r");
+ if (!fp) {
+ Config_Error(LOG_WARNING, "Can't read MOTD file \"%s\": %s",
+ filename, strerror(errno));
+ return;
+ }
+
+ array_free(&Conf_Motd);
+ Using_MotdFile = true;
+
+ while (fgets(line, (int)sizeof line, fp)) {
+ ngt_TrimLastChr( line, '\n');
+
+ /* add text including \0 */
+ if (!array_catb(&Conf_Motd, line, strlen(line) + 1)) {
+ Log(LOG_WARNING, "Cannot add MOTD text: %s", strerror(errno));
+ break;
+ }
+ }
+ fclose(fp);
+}
+/**
+ * Read ngIRCd configuration file.
+ *
+ * Please note that this function uses exit(1) on fatal errors and therefore
+ * can result in ngIRCd terminating!
+ *
+ * @param ngircd_starting Flag indicating if ngIRCd is starting or not.
+ * @returns true when the configuration file has been read
+ * successfully; false otherwise.
+ */
+static bool
+Read_Config( bool ngircd_starting )
+{
char section[LINE_LEN], str[LINE_LEN], *var, *arg, *ptr;
+ const UINT16 defaultport = 6667;
int line, i, n;
FILE *fd;
/* Open configuration file */
fd = fopen( NGIRCd_ConfFile, "r" );
- if( ! fd )
- {
+ if( ! fd ) {
/* No configuration file found! */
- Config_Error( LOG_ALERT, "Can't read configuration \"%s\": %s", NGIRCd_ConfFile, strerror( errno ));
+ Config_Error( LOG_ALERT, "Can't read configuration \"%s\": %s",
+ NGIRCd_ConfFile, strerror( errno ));
+ if (!ngircd_starting)
+ return false;
Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
exit( 1 );
}
+ opers_free();
+ Set_Defaults( ngircd_starting );
+
Config_Error( LOG_INFO, "Reading configuration from \"%s\" ...", NGIRCd_ConfFile );
/* Clean up server configuration structure: mark all already
* And delete all servers which are "duplicates" of servers
* that are already marked as "once" (such servers have been
* created by the last rehash but are now useless). */
- for( i = 0; i < MAX_SERVERS; i++ )
- {
+ for( i = 0; i < MAX_SERVERS; i++ ) {
if( Conf_Server[i].conn_id == NONE ) Init_Server_Struct( &Conf_Server[i] );
- else
- {
+ else {
/* This structure is in use ... */
- if( Conf_Server[i].flags & CONF_SFLAG_ONCE )
- {
+ if( Conf_Server[i].flags & CONF_SFLAG_ONCE ) {
/* Check for duplicates */
- for( n = 0; n < MAX_SERVERS; n++ )
- {
+ for( n = 0; n < MAX_SERVERS; n++ ) {
if( n == i ) continue;
- if( Conf_Server[i].conn_id == Conf_Server[n].conn_id )
- {
+ if( Conf_Server[i].conn_id == Conf_Server[n].conn_id ) {
Init_Server_Struct( &Conf_Server[n] );
- Log( LOG_DEBUG, "Deleted unused duplicate server %d (kept %d).", n, i );
+#ifdef DEBUG
+ Log(LOG_DEBUG,"Deleted unused duplicate server %d (kept %d).",
+ n, i );
+#endif
}
}
- }
- else
- {
+ } else {
/* Mark server as "once" */
Conf_Server[i].flags |= CONF_SFLAG_ONCE;
Log( LOG_DEBUG, "Marked server %d as \"once\"", i );
strcpy( section, "" );
Init_Server_Struct( &New_Server );
New_Server_Idx = NONE;
-
+#ifdef SSL_SUPPORT
+ ConfSSL_Init();
+#endif
/* Read configuration file */
- while( true )
- {
+ while( true ) {
if( ! fgets( str, LINE_LEN, fd )) break;
ngt_TrimStr( str );
line++;
if( str[0] == ';' || str[0] == '#' || str[0] == '\0' ) continue;
/* Is this the beginning of a new section? */
- if(( str[0] == '[' ) && ( str[strlen( str ) - 1] == ']' ))
- {
+ if(( str[0] == '[' ) && ( str[strlen( str ) - 1] == ']' )) {
strlcpy( section, str, sizeof( section ));
- if( strcasecmp( section, "[GLOBAL]" ) == 0 ) continue;
- if( strcasecmp( section, "[OPERATOR]" ) == 0 )
- {
- if( Conf_Oper_Count + 1 > MAX_OPERATORS ) Config_Error( LOG_ERR, "Too many operators configured." );
- else
- {
- /* Initialize new operator structure */
- Conf_Oper[Conf_Oper_Count].name[0] = '\0';
- Conf_Oper[Conf_Oper_Count].pwd[0] = '\0';
- if (Conf_Oper[Conf_Oper_Count].mask) {
- free(Conf_Oper[Conf_Oper_Count].mask );
- Conf_Oper[Conf_Oper_Count].mask = NULL;
- }
- Conf_Oper_Count++;
- }
+ if (strcasecmp(section, "[GLOBAL]") == 0 ||
+ strcasecmp(section, "[LIMITS]") == 0 ||
+ strcasecmp(section, "[OPTIONS]") == 0)
continue;
- }
- if( strcasecmp( section, "[SERVER]" ) == 0 )
- {
+
+ if( strcasecmp( section, "[SERVER]" ) == 0 ) {
/* Check if there is already a server to add */
- if( New_Server.name[0] )
- {
+ if( New_Server.name[0] ) {
/* Copy data to "real" server structure */
assert( New_Server_Idx > NONE );
Conf_Server[New_Server_Idx] = New_Server;
Init_Server_Struct( &New_Server );
/* Search unused item in server configuration structure */
- for( i = 0; i < MAX_SERVERS; i++ )
- {
+ for( i = 0; i < MAX_SERVERS; i++ ) {
/* Is this item used? */
if( ! Conf_Server[i].name[0] ) break;
}
- if( i >= MAX_SERVERS )
- {
+ if( i >= MAX_SERVERS ) {
/* Oops, no free item found! */
Config_Error( LOG_ERR, "Too many servers configured." );
New_Server_Idx = NONE;
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].topic, "" );
- Conf_Channel_Count++;
- }
+ if (strcasecmp(section, "[CHANNEL]") == 0) {
+ Conf_Channel_Count++;
+ continue;
+ }
+ if (strcasecmp(section, "[OPERATOR]") == 0) {
+ Conf_Oper_Count++;
continue;
}
- Config_Error( LOG_ERR, "%s, line %d: Unknown section \"%s\"!", NGIRCd_ConfFile, line, section );
+
+ Config_Error(LOG_ERR,
+ "%s, line %d: Unknown section \"%s\"!",
+ NGIRCd_ConfFile, line, section);
section[0] = 0x1;
}
if( section[0] == 0x1 ) continue;
/* Split line into variable name and parameters */
ptr = strchr( str, '=' );
- if( ! ptr )
- {
+ if( ! ptr ) {
Config_Error( LOG_ERR, "%s, line %d: Syntax error!", NGIRCd_ConfFile, line );
continue;
}
var = str; ngt_TrimStr( var );
arg = ptr + 1; ngt_TrimStr( arg );
- if( strcasecmp( section, "[GLOBAL]" ) == 0 ) Handle_GLOBAL( line, var, arg );
- else if( strcasecmp( section, "[OPERATOR]" ) == 0 ) Handle_OPERATOR( line, var, arg );
- else if( strcasecmp( section, "[SERVER]" ) == 0 ) Handle_SERVER( line, var, arg );
- else if( strcasecmp( section, "[CHANNEL]" ) == 0 ) Handle_CHANNEL( line, var, arg );
- else Config_Error( LOG_ERR, "%s, line %d: Variable \"%s\" outside section!", NGIRCd_ConfFile, line, var );
+ if(strcasecmp(section, "[GLOBAL]") == 0)
+ Handle_GLOBAL(line, var, arg);
+ else if(strcasecmp(section, "[LIMITS]") == 0)
+ Handle_LIMITS(line, var, arg);
+ else if(strcasecmp(section, "[OPTIONS]") == 0)
+ Handle_OPTIONS(line, var, arg);
+ else if(strcasecmp(section, "[OPERATOR]") == 0)
+ Handle_OPERATOR(line, var, arg);
+ else if(strcasecmp(section, "[SERVER]") == 0)
+ Handle_SERVER(line, var, arg);
+ else if(strcasecmp(section, "[CHANNEL]") == 0)
+ Handle_CHANNEL(line, var, arg);
+ else
+ Config_Error(LOG_ERR,
+ "%s, line %d: Variable \"%s\" outside section!",
+ NGIRCd_ConfFile, line, var);
}
/* Close configuration file */
fclose( fd );
/* Check if there is still a server to add */
- if( New_Server.name[0] )
- {
+ if( New_Server.name[0] ) {
/* Copy data to "real" server structure */
assert( New_Server_Idx > NONE );
Conf_Server[New_Server_Idx] = New_Server;
}
-
- /* If there are no ports configured use the default: 6667 */
- if( Conf_ListenPorts_Count < 1 )
+
+ /* not a single listening port? Add default. */
+ if (no_listenports() &&
+ !array_copyb(&Conf_ListenPorts, (char*) &defaultport, sizeof defaultport))
{
- Conf_ListenPorts_Count = 1;
- Conf_ListenPorts[0] = 6667;
+ Config_Error(LOG_ALERT, "Could not add default listening Port %u: %s",
+ (unsigned int) defaultport, strerror(errno));
+
+ exit(1);
}
-} /* Read_Config */
+ 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);
+ }
+
+ /* No MOTD phrase configured? (re)try motd file. */
+ if (array_bytes(&Conf_Motd) == 0)
+ Read_Motd(Conf_MotdFile);
+
+#ifdef SSL_SUPPORT
+ /* Make sure that all SSL-related files are readable */
+ CheckFileReadable("SSLCertFile", Conf_SSLOptions.CertFile);
+ CheckFileReadable("SSLDHFile", Conf_SSLOptions.DHFile);
+ CheckFileReadable("SSLKeyFile", Conf_SSLOptions.KeyFile);
+#endif
+
+ return true;
+}
-LOCAL bool
+/**
+ * Check whether an string argument is true or false.
+ *
+ * @param Arg Input string.
+ * @returns true if string has been parsed as "yes"/"true"/"on".
+ */
+static bool
Check_ArgIsTrue( const char *Arg )
{
if( strcasecmp( Arg, "yes" ) == 0 ) return true;
if( atoi( Arg ) != 0 ) return true;
return false;
-} /* Check_ArgIsTrue */
-
+}
-LOCAL void
-Handle_GLOBAL( int Line, char *Var, char *Arg )
+/**
+ * Handle setting of "MaxNickLength".
+ *
+ * @param Line Line number in configuration file.
+ * @raram Arg Input string.
+ * @returns New configured maximum nick name length.
+ */
+static unsigned int
+Handle_MaxNickLength(int Line, const char *Arg)
{
- struct passwd *pwd;
- struct group *grp;
- char *ptr;
- long port;
-
- assert( Line > 0 );
- assert( Var != NULL );
- assert( Arg != NULL );
-
- if( strcasecmp( Var, "Name" ) == 0 )
- {
- /* Server name */
- if( strlcpy( Conf_ServerName, Arg, sizeof( Conf_ServerName )) >= sizeof( Conf_ServerName ))
- Config_Error_TooLong( Line, Var );
-
- return;
+ unsigned new;
+
+ new = (unsigned) atoi(Arg) + 1;
+ if (new > CLIENT_NICK_LEN) {
+ Config_Error(LOG_WARNING,
+ "%s, line %d: Value of \"MaxNickLength\" exceeds %u!",
+ NGIRCd_ConfFile, Line, CLIENT_NICK_LEN - 1);
+ return CLIENT_NICK_LEN;
}
- if( strcasecmp( Var, "Info" ) == 0 )
- {
- /* Info text of server */
- if( strlcpy( Conf_ServerInfo, Arg, sizeof( Conf_ServerInfo )) >= sizeof( Conf_ServerInfo ))
- Config_Error_TooLong ( Line, Var );
+ if (new < 2) {
+ Config_Error(LOG_WARNING,
+ "%s, line %d: Value of \"MaxNickLength\" must be at least 1!",
+ NGIRCd_ConfFile, Line);
+ return 2;
+ }
+ return new;
+}
- return;
+/**
+ * Output a warning messages if IDENT is configured but not compiled in.
+ */
+static void
+WarnIdent(int UNUSED Line)
+{
+#ifndef IDENTAUTH
+ if (Conf_Ident) {
+ /* user has enabled ident lookups explicitly, but ... */
+ Config_Error(LOG_WARNING,
+ "%s: line %d: \"Ident = yes\", but ngircd was built without IDENT support!",
+ NGIRCd_ConfFile, Line);
}
- if( strcasecmp( Var, "Password" ) == 0 )
- {
- /* Global server password */
- if( strlcpy( Conf_ServerPwd, Arg, sizeof( Conf_ServerPwd )) >= sizeof( Conf_ServerPwd ))
- Config_Error_TooLong( Line, Var );
+#endif
+}
+/**
+ * Output a warning messages if IPv6 is configured but not compiled in.
+ */
+static void
+WarnIPv6(int UNUSED Line)
+{
+#ifndef WANT_IPV6
+ if (Conf_ConnectIPv6) {
+ /* user has enabled IPv6 explicitly, but ... */
+ Config_Error(LOG_WARNING,
+ "%s: line %d: \"ConnectIPv6 = yes\", but ngircd was built without IPv6 support!",
+ NGIRCd_ConfFile, Line);
+ }
+#endif
+}
+
+/**
+ * Output a warning messages if PAM is configured but not compiled in.
+ */
+static void
+WarnPAM(int UNUSED Line)
+{
+#ifndef PAM
+ if (Conf_PAM) {
+ Config_Error(LOG_WARNING,
+ "%s: line %d: \"PAM = yes\", but ngircd was built without PAM support!",
+ NGIRCd_ConfFile, Line);
+ }
+#endif
+}
+
+/**
+ * Handle legacy "NoXXX" options in [GLOBAL] section.
+ *
+ * TODO: This function and support for "NoXXX" could be removed starting
+ * with ngIRCd release 19 (one release after marking it "deprecated").
+ *
+ * @param Var Variable name.
+ * @param Arg Argument string.
+ * @returns true if a NoXXX option has been processed; false otherwise.
+ */
+static bool
+CheckLegacyNoOption(const char *Var, const char *Arg)
+{
+ if(strcasecmp(Var, "NoDNS") == 0) {
+ Conf_DNS = !Check_ArgIsTrue( Arg );
+ return true;
+ }
+ if (strcasecmp(Var, "NoIdent") == 0) {
+ Conf_Ident = !Check_ArgIsTrue(Arg);
+ return true;
+ }
+ if(strcasecmp(Var, "NoPAM") == 0) {
+ Conf_PAM = !Check_ArgIsTrue(Arg);
+ return true;
+ }
+ return false;
+}
+
+/**
+ * Handle deprecated legacy options in [GLOBAL] section.
+ *
+ * TODO: This function and support for these options in the [Global] section
+ * could be removed starting with ngIRCd release 19 (one release after
+ * marking it "deprecated").
+ *
+ * @param Var Variable name.
+ * @param Arg Argument string.
+ * @returns true if a legacy option has been processed; false otherwise.
+ */
+static const char*
+CheckLegacyGlobalOption(int Line, char *Var, char *Arg)
+{
+ if (strcasecmp(Var, "AllowRemoteOper") == 0
+ || strcasecmp(Var, "ChrootDir") == 0
+ || strcasecmp(Var, "ConnectIPv4") == 0
+ || strcasecmp(Var, "ConnectIPv6") == 0
+ || strcasecmp(Var, "OperCanUseMode") == 0
+ || strcasecmp(Var, "OperServerMode") == 0
+ || strcasecmp(Var, "PredefChannelsOnly") == 0
+#ifdef SSL_SUPPORT
+ || strcasecmp(Var, "SSLCertFile") == 0
+ || strcasecmp(Var, "SSLDHFile") == 0
+ || strcasecmp(Var, "SSLKeyFile") == 0
+ || strcasecmp(Var, "SSLKeyFilePassword") == 0
+ || strcasecmp(Var, "SSLPorts") == 0
+#endif
+ || strcasecmp(Var, "SyslogFacility") == 0
+ || strcasecmp(Var, "WebircPassword") == 0) {
+ Handle_OPTIONS(Line, Var, Arg);
+ return "[Options]";
+ }
+ if (strcasecmp(Var, "ConnectRetry") == 0
+ || strcasecmp(Var, "MaxConnections") == 0
+ || strcasecmp(Var, "MaxConnectionsIP") == 0
+ || strcasecmp(Var, "MaxJoins") == 0
+ || strcasecmp(Var, "MaxNickLength") == 0
+ || strcasecmp(Var, "PingTimeout") == 0
+ || strcasecmp(Var, "PongTimeout") == 0) {
+ Handle_LIMITS(Line, Var, Arg);
+ return "[Limits]";
+ }
+
+ return NULL;
+}
+
+/**
+ * Strip "no" prefix of a string.
+ *
+ * TODO: This function and support for "NoXXX" should be removed starting
+ * with ngIRCd release 19! (One release after marking it "deprecated").
+ *
+ * @param str Pointer to input string starting with "no".
+ * @returns New pointer to string without "no" prefix.
+ */
+static const char *
+NoNo(const char *str)
+{
+ assert(strncasecmp("no", str, 2) == 0 && str[2]);
+ return str + 2;
+}
+
+/**
+ * Invert "boolean" string.
+ *
+ * TODO: This function and support for "NoXXX" should be removed starting
+ * with ngIRCd release 19! (One release after marking it "deprecated").
+ *
+ * @param arg "Boolean" input string.
+ * @returns Pointer to inverted "boolean string".
+ */
+static const char *
+InvertArg(const char *arg)
+{
+ return yesno_to_str(!Check_ArgIsTrue(arg));
+}
+
+/**
+ * Handle variable in [Global] configuration section.
+ *
+ * @param Line Line numer in configuration file.
+ * @param Var Variable name.
+ * @param Arg Variable argument.
+ */
+static void
+Handle_GLOBAL( int Line, char *Var, char *Arg )
+{
+ struct passwd *pwd;
+ struct group *grp;
+ size_t len;
+ const char *section;
+
+ assert(Line > 0);
+ assert(Var != NULL);
+ assert(Arg != NULL);
+
+ if (strcasecmp(Var, "Name") == 0) {
+ len = strlcpy(Conf_ServerName, Arg, sizeof(Conf_ServerName));
+ if (len >= sizeof(Conf_ServerName))
+ Config_Error_TooLong(Line, Var);
return;
}
- if( strcasecmp( Var, "AdminInfo1" ) == 0 )
- {
- /* Administrative info #1 */
- if( strlcpy( Conf_ServerAdmin1, Arg, sizeof( Conf_ServerAdmin1 )) >= sizeof( Conf_ServerAdmin1 )) Config_Error_TooLong ( Line, Var );
+ if (strcasecmp(Var, "AdminInfo1") == 0) {
+ len = strlcpy(Conf_ServerAdmin1, Arg, sizeof(Conf_ServerAdmin1));
+ if (len >= sizeof(Conf_ServerAdmin1))
+ Config_Error_TooLong(Line, Var);
return;
}
- if( strcasecmp( Var, "AdminInfo2" ) == 0 )
- {
- /* Administrative info #2 */
- if( strlcpy( Conf_ServerAdmin2, Arg, sizeof( Conf_ServerAdmin2 )) >= sizeof( Conf_ServerAdmin2 )) Config_Error_TooLong ( Line, Var );
+ if (strcasecmp(Var, "AdminInfo2") == 0) {
+ len = strlcpy(Conf_ServerAdmin2, Arg, sizeof(Conf_ServerAdmin2));
+ if (len >= sizeof(Conf_ServerAdmin2))
+ Config_Error_TooLong(Line, Var);
return;
}
- if( strcasecmp( Var, "AdminEMail" ) == 0 )
- {
- /* Administrative email contact */
- if( strlcpy( Conf_ServerAdminMail, Arg, sizeof( Conf_ServerAdminMail )) >= sizeof( Conf_ServerAdminMail )) Config_Error_TooLong( Line, Var );
+ if (strcasecmp(Var, "AdminEMail") == 0) {
+ len = strlcpy(Conf_ServerAdminMail, Arg,
+ sizeof(Conf_ServerAdminMail));
+ if (len >= sizeof(Conf_ServerAdminMail))
+ Config_Error_TooLong(Line, Var);
return;
}
- if( strcasecmp( Var, "Ports" ) == 0 )
- {
- /* Ports on that the server should listen. More port numbers
- * must be separated by "," */
- ptr = strtok( Arg, "," );
- while( ptr )
- {
- ngt_TrimStr( ptr );
- port = atol( ptr );
- if( Conf_ListenPorts_Count + 1 > MAX_LISTEN_PORTS ) Config_Error( LOG_ERR, "Too many listen ports configured. Port %ld ignored.", port );
- else
- {
- if( port > 0 && port < 0xFFFF ) Conf_ListenPorts[Conf_ListenPorts_Count++] = (UINT16)port;
- else Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Illegal port number %ld!", NGIRCd_ConfFile, Line, port );
- }
- ptr = strtok( NULL, "," );
+ if (strcasecmp(Var, "Info") == 0) {
+ len = strlcpy(Conf_ServerInfo, Arg, sizeof(Conf_ServerInfo));
+ if (len >= sizeof(Conf_ServerInfo))
+ Config_Error_TooLong(Line, Var);
+ return;
+ }
+ if (strcasecmp(Var, "Listen") == 0) {
+ 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;
}
- if( strcasecmp( Var, "MotdFile" ) == 0 )
- {
- /* "Message of the day" (MOTD) file */
- if( strlcpy( Conf_MotdFile, Arg, sizeof( Conf_MotdFile )) >= sizeof( Conf_MotdFile ))
- Config_Error_TooLong( Line, Var );
-
+ if (strcasecmp(Var, "MotdFile") == 0) {
+ len = strlcpy(Conf_MotdFile, Arg, sizeof(Conf_MotdFile));
+ if (len >= sizeof(Conf_MotdFile))
+ Config_Error_TooLong(Line, Var);
return;
}
- if( strcasecmp( Var, "MotdPhrase" ) == 0 )
- {
- /* "Message of the day" phrase (instead of file) */
- if( strlcpy( Conf_MotdPhrase, Arg, sizeof( Conf_MotdPhrase )) >= sizeof( Conf_MotdPhrase ))
- Config_Error_TooLong( Line, Var );
-
+ if (strcasecmp(Var, "MotdPhrase") == 0) {
+ len = strlen(Arg);
+ if (len == 0)
+ return;
+ if (len >= LINE_LEN) {
+ Config_Error_TooLong(Line, Var);
+ return;
+ }
+ if (!array_copyb(&Conf_Motd, Arg, len + 1))
+ Config_Error(LOG_WARNING,
+ "%s, line %d: Could not append MotdPhrase: %s",
+ NGIRCd_ConfFile, Line, strerror(errno));
+ Using_MotdFile = false;
return;
}
- if( strcasecmp( Var, "ChrootDir" ) == 0 )
- {
- /* directory for chroot() */
- if( strlcpy( Conf_Chroot, Arg, sizeof( Conf_Chroot )) >= sizeof( Conf_Chroot ))
- Config_Error_TooLong( Line, Var );
-
+ if(strcasecmp(Var, "Password") == 0) {
+ len = strlcpy(Conf_ServerPwd, Arg, sizeof(Conf_ServerPwd));
+ if (len >= sizeof(Conf_ServerPwd))
+ Config_Error_TooLong(Line, Var);
+ return;
+ }
+ if (strcasecmp(Var, "PidFile") == 0) {
+ len = strlcpy(Conf_PidFile, Arg, sizeof(Conf_PidFile));
+ if (len >= sizeof(Conf_PidFile))
+ Config_Error_TooLong(Line, Var);
+ return;
+ }
+ if (strcasecmp(Var, "Ports") == 0) {
+ ports_parse(&Conf_ListenPorts, Line, Arg);
+ return;
+ }
+ if (strcasecmp(Var, "ServerGID") == 0) {
+ grp = getgrnam(Arg);
+ if (grp)
+ Conf_GID = grp->gr_gid;
+ else {
+ Conf_GID = (unsigned int)atoi(Arg);
+ if (!Conf_GID && strcmp(Arg, "0"))
+ Config_Error_NaN(Line, Var);
+ }
+ return;
+ }
+ if (strcasecmp(Var, "ServerUID") == 0) {
+ pwd = getpwnam(Arg);
+ if (pwd)
+ Conf_UID = pwd->pw_uid;
+ else {
+ Conf_UID = (unsigned int)atoi(Arg);
+ if (!Conf_UID && strcmp(Arg, "0"))
+ Config_Error_NaN(Line, Var);
+ }
return;
}
- if ( strcasecmp( Var, "PidFile" ) == 0 )
- {
- /* name of pidfile */
- if( strlcpy( Conf_PidFile, Arg, sizeof( Conf_PidFile )) >= sizeof( Conf_PidFile ))
- Config_Error_TooLong( Line, Var );
-
+ if (CheckLegacyNoOption(Var, Arg)) {
+ /* TODO: This function and support for "NoXXX" could be
+ * be removed starting with ngIRCd release 19 (one release
+ * after marking it "deprecated"). */
+ Config_Error(LOG_WARNING,
+ "%s, line %d (section \"Global\"): \"No\"-Prefix is deprecated, use \"%s = %s\" in [Options] section!",
+ NGIRCd_ConfFile, Line, NoNo(Var), InvertArg(Arg));
+ if (strcasecmp(Var, "NoIdent") == 0)
+ WarnIdent(Line);
+ else if (strcasecmp(Var, "NoPam") == 0)
+ WarnPAM(Line);
+ return;
+ }
+ if ((section = CheckLegacyGlobalOption(Line, Var, Arg))) {
+ /** TODO: This function and support for these options in the
+ * [Global] section could be removed starting with ngIRCd
+ * release 19 (one release after marking it "deprecated"). */
+ Config_Error(LOG_WARNING,
+ "%s, line %d (section \"Global\"): \"%s\" is deprecated here, move it to %s!",
+ NGIRCd_ConfFile, Line, Var, section);
return;
}
- if( strcasecmp( Var, "ServerUID" ) == 0 )
- {
- /* UID the daemon should switch to */
- pwd = getpwnam( Arg );
- if( pwd ) Conf_UID = pwd->pw_uid;
- else
- {
-#ifdef HAVE_ISDIGIT
- if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var );
- else
-#endif
- Conf_UID = (unsigned int)atoi( Arg );
+ Config_Error_Section(Line, Var, "Global");
+}
+
+/**
+ * Handle variable in [Limits] configuration section.
+ *
+ * @param Line Line numer in configuration file.
+ * @param Var Variable name.
+ * @param Arg Variable argument.
+ */
+static void
+Handle_LIMITS(int Line, char *Var, char *Arg)
+{
+ assert(Line > 0);
+ assert(Var != NULL);
+ assert(Arg != NULL);
+
+ if (strcasecmp(Var, "ConnectRetry") == 0) {
+ Conf_ConnectRetry = atoi(Arg);
+ if (Conf_ConnectRetry < 5) {
+ Config_Error(LOG_WARNING,
+ "%s, line %d: Value of \"ConnectRetry\" too low!",
+ NGIRCd_ConfFile, Line);
+ Conf_ConnectRetry = 5;
}
return;
}
- if( strcasecmp( Var, "ServerGID" ) == 0 )
- {
- /* GID the daemon should use */
- grp = getgrnam( Arg );
- if( grp ) Conf_GID = grp->gr_gid;
- else
- {
-#ifdef HAVE_ISDIGIT
- if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var );
- else
-#endif
- Conf_GID = (unsigned int)atoi( Arg );
- }
+ if (strcasecmp(Var, "MaxConnections") == 0) {
+ Conf_MaxConnections = atol(Arg);
+ if (!Conf_MaxConnections && strcmp(Arg, "0"))
+ Config_Error_NaN(Line, Var);
return;
}
- if( strcasecmp( Var, "PingTimeout" ) == 0 )
- {
- /* PING timeout */
- Conf_PingTimeout = atoi( Arg );
- if( Conf_PingTimeout < 5 )
- {
- Config_Error( LOG_WARNING, "%s, line %d: Value of \"PingTimeout\" too low!", NGIRCd_ConfFile, Line );
+ if (strcasecmp(Var, "MaxConnectionsIP") == 0) {
+ Conf_MaxConnectionsIP = atoi(Arg);
+ if (!Conf_MaxConnectionsIP && strcmp(Arg, "0"))
+ Config_Error_NaN(Line, Var);
+ return;
+ }
+ if (strcasecmp(Var, "MaxJoins") == 0) {
+ Conf_MaxJoins = atoi(Arg);
+ if (!Conf_MaxJoins && strcmp(Arg, "0"))
+ Config_Error_NaN(Line, Var);
+ return;
+ }
+ if (strcasecmp(Var, "MaxNickLength") == 0) {
+ Conf_MaxNickLength = Handle_MaxNickLength(Line, Arg);
+ return;
+ }
+ if (strcasecmp(Var, "PingTimeout") == 0) {
+ Conf_PingTimeout = atoi(Arg);
+ if (Conf_PingTimeout < 5) {
+ Config_Error(LOG_WARNING,
+ "%s, line %d: Value of \"PingTimeout\" too low!",
+ NGIRCd_ConfFile, Line);
Conf_PingTimeout = 5;
}
return;
}
- if( strcasecmp( Var, "PongTimeout" ) == 0 )
- {
- /* PONG timeout */
- Conf_PongTimeout = atoi( Arg );
- if( Conf_PongTimeout < 5 )
- {
- Config_Error( LOG_WARNING, "%s, line %d: Value of \"PongTimeout\" too low!", NGIRCd_ConfFile, Line );
+ if (strcasecmp(Var, "PongTimeout") == 0) {
+ Conf_PongTimeout = atoi(Arg);
+ if (Conf_PongTimeout < 5) {
+ Config_Error(LOG_WARNING,
+ "%s, line %d: Value of \"PongTimeout\" too low!",
+ NGIRCd_ConfFile, Line);
Conf_PongTimeout = 5;
}
return;
}
- if( strcasecmp( Var, "ConnectRetry" ) == 0 )
- {
- /* Seconds between connection attempts to other servers */
- Conf_ConnectRetry = atoi( Arg );
- if( Conf_ConnectRetry < 5 )
- {
- Config_Error( LOG_WARNING, "%s, line %d: Value of \"ConnectRetry\" too low!", NGIRCd_ConfFile, Line );
- Conf_ConnectRetry = 5;
- }
+
+ Config_Error_Section(Line, Var, "Limits");
+}
+
+/**
+ * Handle variable in [Options] configuration section.
+ *
+ * @param Line Line numer in configuration file.
+ * @param Var Variable name.
+ * @param Arg Variable argument.
+ */
+static void
+Handle_OPTIONS(int Line, char *Var, char *Arg)
+{
+ size_t len;
+
+ assert(Line > 0);
+ assert(Var != NULL);
+ assert(Arg != NULL);
+
+ if (strcasecmp(Var, "AllowRemoteOper") == 0) {
+ Conf_AllowRemoteOper = Check_ArgIsTrue(Arg);
return;
}
- if( strcasecmp( Var, "OperCanUseMode" ) == 0 )
- {
- /* Are IRC operators allowed to use MODE in channels they aren't Op in? */
- Conf_OperCanMode = Check_ArgIsTrue( Arg );
+ if (strcasecmp(Var, "ChrootDir") == 0) {
+ len = strlcpy(Conf_Chroot, Arg, sizeof(Conf_Chroot));
+ if (len >= sizeof(Conf_Chroot))
+ Config_Error_TooLong(Line, Var);
return;
}
- if( strcasecmp( Var, "OperServerMode" ) == 0 )
- {
- /* Mask IRC operator as if coming from the server? (ircd-irc2 compat hack) */
- Conf_OperServerMode = Check_ArgIsTrue( Arg );
+ if (strcasecmp(Var, "CloakHost") == 0) {
+ len = strlcpy(Conf_CloakHost, Arg, sizeof(Conf_CloakHost));
+ if (len >= sizeof(Conf_CloakHost))
+ Config_Error_TooLong(Line, Var);
return;
}
- if( strcasecmp( Var, "MaxConnections" ) == 0 )
- {
- /* Maximum number of connections. Values <= 0 are equal to "no limit". */
-#ifdef HAVE_ISDIGIT
- if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var);
- else
-#endif
- Conf_MaxConnections = atol( Arg );
+ if (strcasecmp(Var, "CloakUserToNick") == 0) {
+ Conf_CloakUserToNick = Check_ArgIsTrue(Arg);
+ return;
+ }
+ if (strcasecmp(Var, "ConnectIPv6") == 0) {
+ Conf_ConnectIPv6 = Check_ArgIsTrue(Arg);
+ WarnIPv6(Line);
+ return;
+ }
+ if (strcasecmp(Var, "ConnectIPv4") == 0) {
+ Conf_ConnectIPv4 = Check_ArgIsTrue(Arg);
+ return;
+ }
+ if (strcasecmp(Var, "DNS") == 0) {
+ Conf_DNS = Check_ArgIsTrue(Arg);
+ return;
+ }
+ if (strcasecmp(Var, "Ident") == 0) {
+ Conf_Ident = Check_ArgIsTrue(Arg);
+ WarnIdent(Line);
+ return;
+ }
+ if (strcasecmp(Var, "NoticeAuth") == 0) {
+ Conf_NoticeAuth = Check_ArgIsTrue(Arg);
+ return;
+ }
+ if (strcasecmp(Var, "OperCanUseMode") == 0) {
+ Conf_OperCanMode = Check_ArgIsTrue(Arg);
+ return;
+ }
+ if (strcasecmp(Var, "OperServerMode") == 0) {
+ Conf_OperServerMode = Check_ArgIsTrue(Arg);
+ return;
+ }
+ if (strcasecmp(Var, "PAM") == 0) {
+ Conf_PAM = Check_ArgIsTrue(Arg);
+ WarnPAM(Line);
+ return;
+ }
+ if (strcasecmp(Var, "PredefChannelsOnly") == 0) {
+ Conf_PredefChannelsOnly = Check_ArgIsTrue(Arg);
+ return;
+ }
+#ifndef STRICT_RFC
+ if (strcasecmp(Var, "RequireAuthPing") == 0) {
+ Conf_AuthPing = Check_ArgIsTrue(Arg);
return;
}
- if( strcasecmp( Var, "MaxConnectionsIP" ) == 0 )
- {
- /* Maximum number of simoultanous connections from one IP. Values <= 0 are equal to "no limit". */
-#ifdef HAVE_ISDIGIT
- if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var );
- else
#endif
- Conf_MaxConnectionsIP = atoi( Arg );
+ if (strcasecmp(Var, "ScrubCTCP") == 0) {
+ Conf_ScrubCTCP = Check_ArgIsTrue(Arg);
+ return;
+ }
+#ifdef SSL_SUPPORT
+ if (strcasecmp(Var, "SSLCertFile") == 0) {
+ assert(Conf_SSLOptions.CertFile == NULL);
+ Conf_SSLOptions.CertFile = strdup_warn(Arg);
+ return;
+ }
+ if (strcasecmp(Var, "SSLDHFile") == 0) {
+ assert(Conf_SSLOptions.DHFile == NULL);
+ Conf_SSLOptions.DHFile = strdup_warn(Arg);
+ return;
+ }
+ if (strcasecmp(Var, "SSLKeyFile") == 0) {
+ assert(Conf_SSLOptions.KeyFile == NULL);
+ Conf_SSLOptions.KeyFile = 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, "SSLPorts") == 0) {
+ ports_parse(&Conf_SSLOptions.ListenPorts, Line, Arg);
return;
}
- if( strcasecmp( Var, "MaxJoins" ) == 0 )
- {
- /* Maximum number of channels a user can join. Values <= 0 are equal to "no limit". */
-#ifdef HAVE_ISDIGIT
- if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var );
- else
#endif
- Conf_MaxJoins = atoi( Arg );
+#ifdef SYSLOG
+ if (strcasecmp(Var, "SyslogFacility") == 0) {
+ Conf_SyslogFacility = ngt_SyslogFacilityID(Arg,
+ Conf_SyslogFacility);
return;
}
- if( strcasecmp( Var, "Listen" ) == 0 )
- {
- /* IP-Address to bind sockets */
- if( strlcpy( Conf_ListenAddress, Arg, sizeof( Conf_ListenAddress )) >= sizeof( Conf_ListenAddress ))
- {
- Config_Error_TooLong( Line, Var );
- }
+#endif
+ if (strcasecmp(Var, "WebircPassword") == 0) {
+ len = strlcpy(Conf_WebircPwd, Arg, sizeof(Conf_WebircPwd));
+ if (len >= sizeof(Conf_WebircPwd))
+ Config_Error_TooLong(Line, Var);
return;
}
- Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var );
-} /* Handle_GLOBAL */
-
+ Config_Error_Section(Line, Var, "Options");
+}
-LOCAL void
+/**
+ * Handle variable in [Operator] configuration section.
+ *
+ * @param Line Line numer in configuration file.
+ * @param Var Variable name.
+ * @param Arg Variable argument.
+ */
+static void
Handle_OPERATOR( int Line, char *Var, char *Arg )
{
+ size_t len;
+ struct Conf_Oper *op;
+
assert( Line > 0 );
assert( Var != NULL );
assert( Arg != NULL );
assert( Conf_Oper_Count > 0 );
- if( strcasecmp( Var, "Name" ) == 0 )
- {
+ op = array_alloc(&Conf_Opers, sizeof(*op), Conf_Oper_Count - 1);
+ if (!op) {
+ Config_Error(LOG_ERR, "Could not allocate memory for operator (%d:%s = %s)", Line, Var, Arg);
+ return;
+ }
+
+ if (strcasecmp(Var, "Name") == 0) {
/* Name of IRC operator */
- if( strlcpy( Conf_Oper[Conf_Oper_Count - 1].name, Arg, sizeof( Conf_Oper[Conf_Oper_Count - 1].name )) >= sizeof( Conf_Oper[Conf_Oper_Count - 1].name )) Config_Error_TooLong( Line, Var );
+ len = strlcpy(op->name, Arg, sizeof(op->name));
+ if (len >= sizeof(op->name))
+ Config_Error_TooLong(Line, Var);
return;
}
- if( strcasecmp( Var, "Password" ) == 0 )
- {
+ if (strcasecmp(Var, "Password") == 0) {
/* Password of IRC operator */
- if( strlcpy( Conf_Oper[Conf_Oper_Count - 1].pwd, Arg, sizeof( Conf_Oper[Conf_Oper_Count - 1].pwd )) >= sizeof( Conf_Oper[Conf_Oper_Count - 1].pwd )) Config_Error_TooLong( Line, Var );
+ len = strlcpy(op->pwd, Arg, sizeof(op->pwd));
+ if (len >= sizeof(op->pwd))
+ Config_Error_TooLong(Line, Var);
return;
}
- if( strcasecmp( Var, "Mask" ) == 0 )
- {
- if (Conf_Oper[Conf_Oper_Count - 1].mask) return; /* Hostname already configured */
- Conf_Oper[Conf_Oper_Count - 1].mask = strdup( Arg );
- if (! Conf_Oper[Conf_Oper_Count - 1].mask) {
- Config_Error( LOG_ERR, "%s, line %d: Cannot allocate memory for operator mask: %s", NGIRCd_ConfFile, Line, strerror(errno) );
- return;
- }
-
+ if (strcasecmp(Var, "Mask") == 0) {
+ if (op->mask)
+ return; /* Hostname already configured */
+ op->mask = strdup_warn( Arg );
return;
}
- Config_Error( LOG_ERR, "%s, line %d (section \"Operator\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var );
-} /* Handle_OPERATOR */
+ Config_Error_Section(Line, Var, "Operator");
+}
-LOCAL void
+/**
+ * Handle variable in [Server] configuration section.
+ *
+ * @param Line Line numer in configuration file.
+ * @param Var Variable name.
+ * @param Arg Variable argument.
+ */
+static void
Handle_SERVER( int Line, char *Var, char *Arg )
{
long port;
-
+ size_t len;
+
assert( Line > 0 );
assert( Var != NULL );
assert( Arg != NULL );
/* Ignore server block if no space is left in server configuration structure */
if( New_Server_Idx <= NONE ) return;
- if( strcasecmp( Var, "Host" ) == 0 )
- {
+ if( strcasecmp( Var, "Host" ) == 0 ) {
/* Hostname of the server */
- if( strlcpy( New_Server.host, Arg, sizeof( New_Server.host )) >= sizeof( New_Server.host ))
+ len = strlcpy( New_Server.host, Arg, sizeof( New_Server.host ));
+ if (len >= sizeof( New_Server.host ))
Config_Error_TooLong ( Line, Var );
-
return;
}
- if( strcasecmp( Var, "Name" ) == 0 )
- {
+ if( strcasecmp( Var, "Name" ) == 0 ) {
/* Name of the server ("Nick"/"ID") */
- if( strlcpy( New_Server.name, Arg, sizeof( New_Server.name )) >= sizeof( New_Server.name ))
+ len = strlcpy( New_Server.name, Arg, sizeof( New_Server.name ));
+ if (len >= sizeof( New_Server.name ))
Config_Error_TooLong( Line, Var );
return;
}
- if( strcasecmp( Var, "MyPassword" ) == 0 )
- {
+ if (strcasecmp(Var, "Bind") == 0) {
+ if (ng_ipaddr_init(&New_Server.bind_addr, Arg, 0))
+ return;
+
+ Config_Error(LOG_ERR, "%s, line %d (section \"Server\"): Can't parse IP address \"%s\"",
+ NGIRCd_ConfFile, Line, Arg);
+ return;
+ }
+ if( strcasecmp( Var, "MyPassword" ) == 0 ) {
/* Password of this server which is sent to the peer */
- if( strlcpy( New_Server.pwd_in, Arg, sizeof( New_Server.pwd_in )) >= sizeof( New_Server.pwd_in )) Config_Error_TooLong( Line, Var );
+ if (*Arg == ':') {
+ Config_Error(LOG_ERR,
+ "%s, line %d (section \"Server\"): MyPassword must not start with ':'!",
+ NGIRCd_ConfFile, Line);
+ }
+ len = strlcpy( New_Server.pwd_in, Arg, sizeof( New_Server.pwd_in ));
+ if (len >= sizeof( New_Server.pwd_in ))
+ Config_Error_TooLong( Line, Var );
return;
}
- if( strcasecmp( Var, "PeerPassword" ) == 0 )
- {
+ if( strcasecmp( Var, "PeerPassword" ) == 0 ) {
/* Passwort of the peer which must be received */
- if( strlcpy( New_Server.pwd_out, Arg, sizeof( New_Server.pwd_out )) >= sizeof( New_Server.pwd_out )) Config_Error_TooLong( Line, Var );
+ len = strlcpy( New_Server.pwd_out, Arg, sizeof( New_Server.pwd_out ));
+ if (len >= sizeof( New_Server.pwd_out ))
+ Config_Error_TooLong( Line, Var );
return;
}
- if( strcasecmp( Var, "Port" ) == 0 )
- {
+ if( strcasecmp( Var, "Port" ) == 0 ) {
/* Port to which this server should connect */
port = atol( Arg );
- if( port > 0 && port < 0xFFFF ) New_Server.port = (UINT16)port;
- else Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Illegal port number %ld!", NGIRCd_ConfFile, Line, port );
+ if (port >= 0 && port < 0xFFFF)
+ New_Server.port = (UINT16)port;
+ else
+ Config_Error(LOG_ERR,
+ "%s, line %d (section \"Server\"): Illegal port number %ld!",
+ NGIRCd_ConfFile, Line, port );
return;
}
- if( strcasecmp( Var, "Group" ) == 0 )
- {
- /* Server group */
-#ifdef HAVE_ISDIGIT
- if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var );
- else
+#ifdef SSL_SUPPORT
+ if( strcasecmp( Var, "SSLConnect" ) == 0 ) {
+ New_Server.SSLConnect = Check_ArgIsTrue(Arg);
+ return;
+ }
#endif
+ if( strcasecmp( Var, "Group" ) == 0 ) {
+ /* Server group */
New_Server.group = atoi( Arg );
+ if (!New_Server.group && strcmp(Arg, "0"))
+ Config_Error_NaN(Line, Var);
+ return;
+ }
+ if( strcasecmp( Var, "Passive" ) == 0 ) {
+ if (Check_ArgIsTrue(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 */
+ Config_Error_Section(Line, Var, "Server");
+}
-LOCAL void
-Handle_CHANNEL( int Line, char *Var, char *Arg )
+/**
+ * Copy channel name into channel structure.
+ *
+ * If the channel name is not valid because of a missing prefix ('#', '&'),
+ * a default prefix of '#' will be added.
+ *
+ * @param new_chan New already allocated channel structure.
+ * @param name Name of the new channel.
+ * @returns true on success, false otherwise.
+ */
+static bool
+Handle_Channelname(struct Conf_Channel *new_chan, const char *name)
{
+ size_t size = sizeof(new_chan->name);
+ char *dest = new_chan->name;
+
+ if (!Channel_IsValidName(name)) {
+ /*
+ * maybe user forgot to add a '#'.
+ * This is only here for user convenience.
+ */
+ *dest = '#';
+ --size;
+ ++dest;
+ }
+ return size > strlcpy(dest, name, size);
+}
+
+/**
+ * Handle variable in [Channel] configuration section.
+ *
+ * @param Line Line numer in configuration file.
+ * @param Var Variable name.
+ * @param Arg Variable argument.
+ */
+static void
+Handle_CHANNEL(int Line, char *Var, char *Arg)
+{
+ size_t len;
+ size_t chancount;
+ struct Conf_Channel *chan;
+
assert( Line > 0 );
assert( Var != NULL );
assert( Arg != NULL );
+ assert(Conf_Channel_Count > 0);
- if( strcasecmp( Var, "Name" ) == 0 )
- {
- /* Name of the channel */
- if( strlcpy( Conf_Channel[Conf_Channel_Count - 1].name, Arg, sizeof( Conf_Channel[Conf_Channel_Count - 1].name )) >= sizeof( Conf_Channel[Conf_Channel_Count - 1].name ))
- 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, "Modes" ) == 0 )
- {
+ if (strcasecmp(Var, "Name") == 0) {
+ if (!Handle_Channelname(chan, Arg))
+ Config_Error_TooLong(Line, Var);
+ return;
+ }
+ if (strcasecmp(Var, "Modes") == 0) {
/* Initial modes */
- if( strlcpy( Conf_Channel[Conf_Channel_Count - 1].modes, Arg, sizeof( Conf_Channel[Conf_Channel_Count - 1].modes )) >= sizeof( Conf_Channel[Conf_Channel_Count - 1].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 )
- {
+ if( strcasecmp( Var, "Topic" ) == 0 ) {
/* Initial topic */
- if( strlcpy( Conf_Channel[Conf_Channel_Count - 1].topic, Arg, sizeof( Conf_Channel[Conf_Channel_Count - 1].topic )) >= sizeof( Conf_Channel[Conf_Channel_Count - 1].topic ))
+ 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(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 */
+ chan->maxusers = (unsigned long) atol(Arg);
+ if (!chan->maxusers && strcmp(Arg, "0"))
+ Config_Error_NaN(Line, Var);
+ return;
+ }
+ if (strcasecmp(Var, "KeyFile") == 0) {
+ /* channel keys */
+ len = strlcpy(chan->keyfile, Arg, sizeof(chan->keyfile));
+ if (len >= sizeof(chan->keyfile))
+ Config_Error_TooLong(Line, Var);
return;
}
- Config_Error( LOG_ERR, "%s, line %d (section \"Channel\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var );
-} /* Handle_CHANNEL */
-
+ Config_Error_Section(Line, Var, "Channel");
+}
-LOCAL void
-Validate_Config( bool Configtest )
+/**
+ * Validate server configuration.
+ *
+ * Please note that this function uses exit(1) on fatal errors and therefore
+ * can result in ngIRCd terminating!
+ *
+ * @param Configtest true if the daemon has been called with "--configtest".
+ * @param Rehash true if re-reading configuration on runtime.
+ * @returns true if configuration is valid.
+ */
+static bool
+Validate_Config(bool Configtest, bool Rehash)
{
/* Validate configuration settings. */
#ifdef DEBUG
int i, servers, servers_once;
#endif
+ bool config_valid = true;
+ char *ptr;
- if( ! Conf_ServerName[0] )
- {
+ /* Validate configured server name, see RFC 2812 section 2.3.1 */
+ ptr = Conf_ServerName;
+ do {
+ if (*ptr >= 'a' && *ptr <= 'z') continue;
+ if (*ptr >= 'A' && *ptr <= 'Z') continue;
+ if (*ptr >= '0' && *ptr <= '9') continue;
+ if (ptr > Conf_ServerName) {
+ if (*ptr == '.' || *ptr == '-')
+ continue;
+ }
+ Conf_ServerName[0] = '\0';
+ break;
+ } while (*(++ptr));
+
+ if (!Conf_ServerName[0]) {
/* No server name configured! */
- Config_Error( LOG_ALERT, "No server name configured in \"%s\" (section 'Global': 'Name')!", NGIRCd_ConfFile );
- if( ! Configtest )
- {
- Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
- exit( 1 );
+ config_valid = false;
+ Config_Error(LOG_ALERT,
+ "No (valid) server name configured in \"%s\" (section 'Global': 'Name')!",
+ NGIRCd_ConfFile);
+ if (!Configtest && !Rehash) {
+ Config_Error(LOG_ALERT,
+ "%s exiting due to fatal errors!",
+ PACKAGE_NAME);
+ exit(1);
}
}
-
- if( Conf_ServerName[0] && ! strchr( Conf_ServerName, '.' ))
- {
+
+ if (Conf_ServerName[0] && !strchr(Conf_ServerName, '.')) {
/* No dot in server name! */
- Config_Error( LOG_ALERT, "Invalid server name configured in \"%s\" (section 'Global': 'Name'): Dot missing!", NGIRCd_ConfFile );
- if( ! Configtest )
- {
- Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
- exit( 1 );
+ config_valid = false;
+ Config_Error(LOG_ALERT,
+ "Invalid server name configured in \"%s\" (section 'Global': 'Name'): Dot missing!",
+ NGIRCd_ConfFile);
+ if (!Configtest) {
+ Config_Error(LOG_ALERT,
+ "%s exiting due to fatal errors!",
+ PACKAGE_NAME);
+ exit(1);
}
}
#ifdef STRICT_RFC
- if( ! Conf_ServerAdminMail[0] )
- {
+ if (!Conf_ServerAdminMail[0]) {
/* No administrative contact configured! */
- Config_Error( LOG_ALERT, "No administrator email address configured in \"%s\" ('AdminEMail')!", NGIRCd_ConfFile );
- if( ! Configtest )
- {
- Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME );
- exit( 1 );
+ config_valid = false;
+ Config_Error(LOG_ALERT,
+ "No administrator email address configured in \"%s\" ('AdminEMail')!",
+ NGIRCd_ConfFile);
+ if (!Configtest) {
+ Config_Error(LOG_ALERT,
+ "%s exiting due to fatal errors!",
+ PACKAGE_NAME);
+ exit(1);
}
}
#endif
- if( ! Conf_ServerAdmin1[0] && ! Conf_ServerAdmin2[0] && ! Conf_ServerAdminMail[0] )
- {
+ if (!Conf_ServerAdmin1[0] && !Conf_ServerAdmin2[0]
+ && !Conf_ServerAdminMail[0]) {
/* No administrative information configured! */
- Config_Error( LOG_WARNING, "No administrative information configured but required by RFC!" );
- }
-#ifdef FD_SETSIZE
- if(( Conf_MaxConnections > (long)FD_SETSIZE ) || ( Conf_MaxConnections < 1 ))
- {
- Conf_MaxConnections = (long)FD_SETSIZE;
- Config_Error( LOG_ERR, "Setting MaxConnections to %ld, select() can't handle more file descriptors!", Conf_MaxConnections );
+ Config_Error(LOG_WARNING,
+ "No administrative information configured but required by RFC!");
}
-#else
- Config_Error( LOG_WARN, "Don't know how many file descriptors select() can handle on this system, don't set MaxConnections too high!" );
+
+#ifdef PAM
+ if (Conf_ServerPwd[0])
+ Config_Error(LOG_ERR,
+ "This server uses PAM, \"Password\" will be ignored!");
#endif
#ifdef DEBUG
servers = servers_once = 0;
- for( i = 0; i < MAX_SERVERS; i++ )
- {
- if( Conf_Server[i].name[0] )
- {
+ for (i = 0; i < MAX_SERVERS; i++) {
+ if (Conf_Server[i].name[0]) {
servers++;
- if( Conf_Server[i].flags & CONF_SFLAG_ONCE ) servers_once++;
+ if (Conf_Server[i].flags & CONF_SFLAG_ONCE)
+ servers_once++;
}
}
- Log( LOG_DEBUG, "Configuration: Operators=%d, Servers=%d[%d], Channels=%d", Conf_Oper_Count, servers, servers_once, Conf_Channel_Count );
+ Log(LOG_DEBUG,
+ "Configuration: Operators=%d, Servers=%d[%d], Channels=%d",
+ Conf_Oper_Count, servers, servers_once, Conf_Channel_Count);
#endif
-} /* Validate_Config */
+ return config_valid;
+}
-LOCAL void
+/**
+ * Output "line too long" warning.
+ *
+ * @param Line Line number in configuration file.
+ * @param Item Affected variable name.
+ */
+static void
Config_Error_TooLong ( const int Line, const char *Item )
{
Config_Error( LOG_WARNING, "%s, line %d: Value of \"%s\" too long!", NGIRCd_ConfFile, Line, Item );
}
-LOCAL void
+/**
+ * Output "unknown variable" warning.
+ *
+ * @param Line Line number in configuration file.
+ * @param Item Affected variable name.
+ * @param Section Section name.
+ */
+static void
+Config_Error_Section(const int Line, const char *Item, const char *Section)
+{
+ Config_Error(LOG_ERR, "%s, line %d (section \"%s\"): Unknown variable \"%s\"!",
+ NGIRCd_ConfFile, Line, Section, Item);
+}
+
+/**
+ * Output "not a number" warning.
+ *
+ * @param Line Line number in configuration file.
+ * @param Item Affected variable name.
+ */
+static void
Config_Error_NaN( const int Line, const char *Item )
{
- Config_Error( LOG_WARNING, "%s, line %d: Value of \"%s\" is not a number!", NGIRCd_ConfFile, Line, Item );
+ Config_Error( LOG_WARNING, "%s, line %d: Value of \"%s\" is not a number!",
+ NGIRCd_ConfFile, Line, Item );
}
+/**
+ * Output configuration error to console and/or logfile.
+ *
+ * On runtime, the normal log functions of the daemon are used. But when
+ * testing the configuration ("--configtest"), all messages go directly
+ * to the console.
+ *
+ * @param Level Severity level of the message.
+ * @param Format Format string; see printf() function.
+ */
#ifdef PROTOTYPES
-LOCAL void Config_Error( const int Level, const char *Format, ... )
+static void Config_Error( const int Level, const char *Format, ... )
#else
-LOCAL void Config_Error( Level, Format, va_alist )
+static void Config_Error( Level, Format, va_alist )
const int Level;
const char *Format;
va_dcl
#endif
{
- /* Error! Write to console and/or logfile. */
-
char msg[MAX_LOG_MSG_LEN];
va_list ap;
#endif
vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap );
va_end( ap );
-
- /* During "normal operations" the log functions of the daemon should
- * be used, but during testing of the configuration file, all messages
- * should go directly to the console: */
- if( Use_Log ) Log( Level, "%s", msg );
- else puts( msg );
-} /* Config_Error */
+ if (!Use_Log) {
+ if (Level <= LOG_WARNING)
+ printf(" - %s\n", msg);
+ else
+ puts(msg);
+ } else
+ Log(Level, "%s", msg);
+}
+
+#ifdef DEBUG
-LOCAL void
-Init_Server_Struct( CONF_SERVER *Server )
+/**
+ * Dump internal state of the "configuration module".
+ */
+GLOBAL void
+Conf_DebugDump(void)
{
- /* Initialize server configuration structur to default values */
+ int i;
+
+ Log(LOG_DEBUG, "Configured servers:");
+ for (i = 0; i < MAX_SERVERS; i++) {
+ if (! Conf_Server[i].name[0])
+ continue;
+ Log(LOG_DEBUG,
+ " - %s: %s:%d, last=%ld, group=%d, flags=%d, conn=%d",
+ Conf_Server[i].name, Conf_Server[i].host,
+ Conf_Server[i].port, Conf_Server[i].lasttry,
+ Conf_Server[i].group, Conf_Server[i].flags,
+ Conf_Server[i].conn_id);
+ }
+}
+
+#endif
+/**
+ * Initialize server configuration structur to default values.
+ *
+ * @param Server Pointer to server structure to initialize.
+ */
+static void
+Init_Server_Struct( CONF_SERVER *Server )
+{
assert( Server != NULL );
memset( Server, 0, sizeof (CONF_SERVER) );
if( NGIRCd_Passive ) Server->flags = CONF_SFLAG_DISABLED;
+ Proc_InitStruct(&Server->res_stat);
Server->conn_id = NONE;
-} /* Init_Server_Struct */
-
+ memset(&Server->bind_addr, 0, sizeof(&Server->bind_addr));
+}
/* -eof- */
projects / ngircd-alex.git / blobdiff