X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconf.c;h=1c5ba624d5dd93e732b511d204dca4e8f6196244;hb=0d503945cb527e275ef6644a234a6876ff61322b;hp=bae5fa7ad7b8f96467eb200092d0a85440102d7a;hpb=b54e664a635bf20cdfcc09dfbc68a909f9344968;p=ngircd-alex.git diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index bae5fa7a..1c5ba624 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors. + * Copyright (c)2001-2019 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 @@ -16,9 +16,7 @@ * Configuration management (reading, parsing & validation) */ -#include "imp.h" #include -#include #include #ifdef PROTOTYPES # include @@ -29,23 +27,19 @@ #include #include #include +#include #include #include #include #include -#include #include -#include "array.h" #include "ngircd.h" #include "conn.h" #include "channel.h" -#include "defines.h" #include "log.h" #include "match.h" -#include "tool.h" -#include "exp.h" #include "conf.h" @@ -93,6 +87,12 @@ static void Init_Server_Struct PARAMS(( CONF_SERVER *Server )); #define DEFAULT_LISTEN_ADDRSTR "0.0.0.0" #endif +#ifdef HAVE_LIBSSL +#define DEFAULT_CIPHERS "HIGH:!aNULL:@STRENGTH:!SSLv3" +#endif +#ifdef HAVE_LIBGNUTLS +#define DEFAULT_CIPHERS "SECURE128:-VERS-SSL3.0" +#endif #ifdef SSL_SUPPORT @@ -117,6 +117,9 @@ ConfSSL_Init(void) array_free_wipe(&Conf_SSLOptions.KeyFilePassword); array_free(&Conf_SSLOptions.ListenPorts); + + free(Conf_SSLOptions.CipherList); + Conf_SSLOptions.CipherList = NULL; } /** @@ -207,7 +210,7 @@ ports_puts(array *a) * Parse a comma separated string into an array of port numbers (integers). */ static void -ports_parse(array *a, int Line, char *Arg) +ports_parse(array *a, const char *File, int Line, char *Arg) { char *ptr; int port; @@ -223,10 +226,10 @@ ports_parse(array *a, int Line, char *Arg) 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)); + File, Line, port, strerror(errno)); } else { Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Illegal port number %ld!", - NGIRCd_ConfFile, Line, port ); + File, Line, port ); } ptr = strtok( NULL, "," ); @@ -317,7 +320,7 @@ opers_puts(void) * 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 + * @return 0 on success, 1 on failure(s); therefore the result code can * directly be used by exit() when running "ngircd --configtest". */ GLOBAL int @@ -325,7 +328,7 @@ Conf_Test( void ) { struct passwd *pwd; struct group *grp; - unsigned int i; + unsigned int i, j; bool config_valid; size_t predef_channel_count; struct Conf_Channel *predef_chan; @@ -360,9 +363,9 @@ Conf_Test( void ) printf(" MotdPhrase = %s\n", array_bytes(&Conf_Motd) ? (const char*) array_start(&Conf_Motd) : ""); } -#ifndef PAM - printf(" Password = %s\n", Conf_ServerPwd); -#endif + printf(" Network = %s\n", Conf_Network); + if (!Conf_PAM) + printf(" Password = %s\n", Conf_ServerPwd); printf(" PidFile = %s\n", Conf_PidFile); printf(" Ports = "); ports_puts(&Conf_ListenPorts); @@ -385,12 +388,14 @@ Conf_Test( void ) printf(" MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP); printf(" MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1); printf(" MaxNickLength = %u\n", Conf_MaxNickLength - 1); + printf(" MaxPenaltyTime = %ld\n", Conf_MaxPenaltyTime); printf(" MaxListSize = %d\n", Conf_MaxListSize); printf(" PingTimeout = %d\n", Conf_PingTimeout); printf(" PongTimeout = %d\n", Conf_PongTimeout); puts(""); puts("[OPTIONS]"); + printf(" AllowedChannelTypes = %s\n", Conf_AllowedChannelTypes); printf(" AllowRemoteOper = %s\n", yesno_to_str(Conf_AllowRemoteOper)); printf(" ChrootDir = %s\n", Conf_Chroot); printf(" CloakHost = %s\n", Conf_CloakHost); @@ -401,21 +406,22 @@ Conf_Test( void ) printf(" ConnectIPv4 = %s\n", yesno_to_str(Conf_ConnectIPv6)); printf(" ConnectIPv6 = %s\n", yesno_to_str(Conf_ConnectIPv4)); #endif + printf(" DefaultUserModes = %s\n", Conf_DefaultUserModes); printf(" DNS = %s\n", yesno_to_str(Conf_DNS)); #ifdef IDENT printf(" Ident = %s\n", yesno_to_str(Conf_Ident)); #endif printf(" IncludeDir = %s\n", Conf_IncludeDir); printf(" MorePrivacy = %s\n", yesno_to_str(Conf_MorePrivacy)); - printf(" NoticeAuth = %s\n", yesno_to_str(Conf_NoticeAuth)); + printf(" NoticeBeforeRegistration = %s\n", yesno_to_str(Conf_NoticeBeforeRegistration)); printf(" OperCanUseMode = %s\n", yesno_to_str(Conf_OperCanMode)); printf(" OperChanPAutoOp = %s\n", yesno_to_str(Conf_OperChanPAutoOp)); printf(" OperServerMode = %s\n", yesno_to_str(Conf_OperServerMode)); #ifdef PAM printf(" PAM = %s\n", yesno_to_str(Conf_PAM)); printf(" PAMIsOptional = %s\n", yesno_to_str(Conf_PAMIsOptional)); + printf(" PAMServiceName = %s\n", Conf_PAMServiceName); #endif - printf(" PredefChannelsOnly = %s\n", yesno_to_str(Conf_PredefChannelsOnly)); #ifndef STRICT_RFC printf(" RequireAuthPing = %s\n", yesno_to_str(Conf_AuthPing)); #endif @@ -431,6 +437,8 @@ Conf_Test( void ) puts("[SSL]"); printf(" CertFile = %s\n", Conf_SSLOptions.CertFile ? Conf_SSLOptions.CertFile : ""); + printf(" CipherList = %s\n", Conf_SSLOptions.CipherList ? + Conf_SSLOptions.CipherList : DEFAULT_CIPHERS); printf(" DHFile = %s\n", Conf_SSLOptions.DHFile ? Conf_SSLOptions.DHFile : ""); printf(" KeyFile = %s\n", Conf_SSLOptions.KeyFile @@ -475,7 +483,8 @@ Conf_Test( void ) /* Valid "Channel" section */ puts( "[CHANNEL]" ); printf(" Name = %s\n", predef_chan->name); - printf(" Modes = %s\n", predef_chan->modes); + for(j = 0; j < predef_chan->modes_num; j++) + printf(" Modes = %s\n", predef_chan->modes[j]); printf(" Key = %s\n", predef_chan->key); printf(" MaxUsers = %lu\n", predef_chan->maxusers); printf(" Topic = %s\n", predef_chan->topic); @@ -521,7 +530,11 @@ Conf_UnsetServer( CONN_ID Idx ) /* "Short" connection, enforce "ConnectRetry" * but randomize it a little bit: 15 seconds. */ Conf_Server[i].lasttry = +#ifdef HAVE_ARC4RANDOM + t + (arc4random() % 15); +#else t + rand() / (RAND_MAX / 15); +#endif } } } @@ -608,6 +621,7 @@ Conf_EnablePassiveServer(const char *Name) && (Conf_Server[i].port > 0)) { /* BINGO! Enable server */ Conf_Server[i].flags &= ~CONF_SFLAG_DISABLED; + Conf_Server[i].lasttry = 0; return true; } } @@ -699,7 +713,6 @@ Conf_NickIsService(int ConfServer, const char *Nick) /** * Check if the given nickname is blocked for "normal client" use. * - * @param ConfServer The server index or NONE to check all configured servers. * @param Nick The nickname to check. * @returns true if the given nickname belongs to an "IRC service". */ @@ -733,6 +746,7 @@ Set_Defaults(bool InitServers) strcpy(Conf_ServerAdminMail, ""); snprintf(Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s", PACKAGE_NAME, PACKAGE_VERSION); + strcpy(Conf_Network, ""); free(Conf_ListenAddress); Conf_ListenAddress = NULL; array_free(&Conf_ListenPorts); @@ -753,11 +767,14 @@ Set_Defaults(bool InitServers) Conf_MaxConnectionsIP = 5; Conf_MaxJoins = 10; Conf_MaxNickLength = CLIENT_NICK_LEN_DEFAULT; + Conf_MaxPenaltyTime = -1; Conf_MaxListSize = 100; Conf_PingTimeout = 120; Conf_PongTimeout = 20; /* Options */ + strlcpy(Conf_AllowedChannelTypes, CHANTYPES, + sizeof(Conf_AllowedChannelTypes)); Conf_AllowRemoteOper = false; #ifndef STRICT_RFC Conf_AuthPing = false; @@ -774,6 +791,7 @@ Set_Defaults(bool InitServers) #else Conf_ConnectIPv6 = false; #endif + strcpy(Conf_DefaultUserModes, ""); Conf_DNS = true; #ifdef IDENTAUTH Conf_Ident = true; @@ -782,7 +800,7 @@ Set_Defaults(bool InitServers) #endif strcpy(Conf_IncludeDir, ""); Conf_MorePrivacy = false; - Conf_NoticeAuth = false; + Conf_NoticeBeforeRegistration = false; Conf_OperCanMode = false; Conf_OperChanPAutoOp = true; Conf_OperServerMode = false; @@ -792,9 +810,9 @@ Set_Defaults(bool InitServers) Conf_PAM = false; #endif Conf_PAMIsOptional = false; - Conf_PredefChannelsOnly = false; -#ifdef SYSLOG + strcpy(Conf_PAMServiceName, "ngircd"); Conf_ScrubCTCP = false; +#ifdef SYSLOG #ifdef LOG_LOCAL5 Conf_SyslogFacility = LOG_LOCAL5; #else @@ -829,13 +847,13 @@ no_listenports(void) * * This function is used to read the MOTD and help text file, for example. * - * @param filename Name of the file to read. + * @param Filename Name of the file to read. * @return true, when the file has been read in. */ static bool Read_TextFile(const char *Filename, const char *Name, array *Destination) { - char line[127]; + char line[COMMAND_LEN]; FILE *fp; int line_no = 1; @@ -871,9 +889,9 @@ Read_TextFile(const char *Filename, const char *Name, array *Destination) * 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. + * @param IsStarting 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 TestOnly, bool IsStarting) @@ -885,6 +903,8 @@ Read_Config(bool TestOnly, bool IsStarting) FILE *fd; DIR *dh; + Config_Error(LOG_INFO, "Using configuration file \"%s\" ...", NGIRCd_ConfFile); + /* Open configuration file */ fd = fopen( NGIRCd_ConfFile, "r" ); if( ! fd ) { @@ -1024,15 +1044,23 @@ Read_Config(bool TestOnly, bool IsStarting) CheckFileReadable("CertFile", Conf_SSLOptions.CertFile); CheckFileReadable("DHFile", Conf_SSLOptions.DHFile); CheckFileReadable("KeyFile", Conf_SSLOptions.KeyFile); + + /* Set the default ciphers if none were configured */ + if (!Conf_SSLOptions.CipherList) + Conf_SSLOptions.CipherList = strdup_warn(DEFAULT_CIPHERS); #endif return true; } /** - * ... + * Read in and handle a configuration file. + * + * @param File Name of the configuration file. + * @param fd File descriptor already opened for reading. */ -static void Read_Config_File(const char *File, FILE *fd) +static void +Read_Config_File(const char *File, FILE *fd) { char section[LINE_LEN], str[LINE_LEN], *var, *arg, *ptr; int i, line = 0; @@ -1041,7 +1069,7 @@ static void Read_Config_File(const char *File, FILE *fd) /* Read configuration file */ section[0] = '\0'; while (true) { - if (!fgets(str, LINE_LEN, fd)) + if (!fgets(str, sizeof(str), fd)) break; ngt_TrimStr(str); line++; @@ -1050,6 +1078,12 @@ static void Read_Config_File(const char *File, FILE *fd) if (str[0] == ';' || str[0] == '#' || str[0] == '\0') continue; + if (strlen(str) >= sizeof(str) - 1) { + Config_Error(LOG_WARNING, "%s, line %d too long!", + File, line); + continue; + } + /* Is this the beginning of a new section? */ if ((str[0] == '[') && (str[strlen(str) - 1] == ']')) { strlcpy(section, str, sizeof(section)); @@ -1119,7 +1153,7 @@ static void Read_Config_File(const char *File, FILE *fd) Config_Error(LOG_ERR, "%s, line %d: Unknown section \"%s\"!", - NGIRCd_ConfFile, line, section); + File, line, section); section[0] = 0x1; } if (section[0] == 0x1) @@ -1129,7 +1163,7 @@ static void Read_Config_File(const char *File, FILE *fd) ptr = strchr(str, '='); if (!ptr) { Config_Error(LOG_ERR, "%s, line %d: Syntax error!", - NGIRCd_ConfFile, line); + File, line); continue; } *ptr = '\0'; @@ -1157,7 +1191,7 @@ static void Read_Config_File(const char *File, FILE *fd) else Config_Error(LOG_ERR, "%s, line %d: Variable \"%s\" outside section!", - NGIRCd_ConfFile, line, var); + File, line, var); } } @@ -1189,7 +1223,7 @@ Check_ArgIsTrue(const char *Arg) * @returns New configured maximum nickname length. */ static unsigned int -Handle_MaxNickLength(int Line, const char *Arg) +Handle_MaxNickLength(const char *File, int Line, const char *Arg) { unsigned new; @@ -1197,13 +1231,13 @@ Handle_MaxNickLength(int Line, const char *Arg) if (new > CLIENT_NICK_LEN) { Config_Error(LOG_WARNING, "%s, line %d: Value of \"MaxNickLength\" exceeds %u!", - NGIRCd_ConfFile, Line, CLIENT_NICK_LEN - 1); + File, Line, CLIENT_NICK_LEN - 1); return CLIENT_NICK_LEN; } if (new < 2) { Config_Error(LOG_WARNING, "%s, line %d: Value of \"MaxNickLength\" must be at least 1!", - NGIRCd_ConfFile, Line); + File, Line); return 2; } return new; @@ -1213,14 +1247,14 @@ Handle_MaxNickLength(int Line, const char *Arg) * Output a warning messages if IDENT is configured but not compiled in. */ static void -WarnIdent(int UNUSED Line) +WarnIdent(const char UNUSED *File, 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); + File, Line); } #endif } @@ -1229,14 +1263,14 @@ WarnIdent(int UNUSED Line) * Output a warning messages if IPv6 is configured but not compiled in. */ static void -WarnIPv6(int UNUSED Line) +WarnIPv6(const char UNUSED *File, 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); + File, Line); } #endif } @@ -1245,127 +1279,17 @@ WarnIPv6(int UNUSED Line) * Output a warning messages if PAM is configured but not compiled in. */ static void -WarnPAM(int UNUSED Line) +WarnPAM(const char UNUSED *File, 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(const char *File, 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, "OperChanPAutoOp") == 0 - || strcasecmp(Var, "OperServerMode") == 0 - || strcasecmp(Var, "PredefChannelsOnly") == 0 - || strcasecmp(Var, "SyslogFacility") == 0 - || strcasecmp(Var, "WebircPassword") == 0) { - Handle_OPTIONS(File, Line, Var, Arg); - return "[Options]"; - } - if (strcasecmp(Var, "ConnectRetry") == 0 - || strcasecmp(Var, "IdleTimeout") == 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(File, Line, Var, Arg); - return "[Limits]"; - } -#ifdef SSL_SUPPORT - if (strcasecmp(Var, "SSLCertFile") == 0 - || strcasecmp(Var, "SSLDHFile") == 0 - || strcasecmp(Var, "SSLKeyFile") == 0 - || strcasecmp(Var, "SSLKeyFilePassword") == 0 - || strcasecmp(Var, "SSLPorts") == 0) { - Handle_SSL(File, Line, Var + 3, Arg); - return "[SSL]"; + File, Line); } #endif - - 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. @@ -1380,7 +1304,7 @@ Handle_GLOBAL(const char *File, int Line, char *Var, char *Arg ) struct passwd *pwd; struct group *grp; size_t len; - const char *section; + char *ptr; assert(File != NULL); assert(Line > 0); @@ -1452,17 +1376,30 @@ Handle_GLOBAL(const char *File, int Line, char *Var, char *Arg ) len = strlen(Arg); if (len == 0) return; - if (len >= LINE_LEN) { + if (len >= 127) { Config_Error_TooLong(File, 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)); + File, Line, strerror(errno)); Using_MotdFile = false; return; } + if (strcasecmp(Var, "Network") == 0) { + len = strlcpy(Conf_Network, Arg, sizeof(Conf_Network)); + if (len >= sizeof(Conf_Network)) + Config_Error_TooLong(File, Line, Var); + ptr = strchr(Conf_Network, ' '); + if (ptr) { + Config_Error(LOG_WARNING, + "%s, line %d: \"Network\" can't contain spaces!", + File, Line); + *ptr = '\0'; + } + return; + } if(strcasecmp(Var, "Password") == 0) { len = strlcpy(Conf_ServerPwd, Arg, sizeof(Conf_ServerPwd)); if (len >= sizeof(Conf_ServerPwd)) @@ -1476,7 +1413,7 @@ Handle_GLOBAL(const char *File, int Line, char *Var, char *Arg ) return; } if (strcasecmp(Var, "Ports") == 0) { - ports_parse(&Conf_ListenPorts, Line, Arg); + ports_parse(&Conf_ListenPorts, File, Line, Arg); return; } if (strcasecmp(Var, "ServerGID") == 0) { @@ -1488,7 +1425,7 @@ Handle_GLOBAL(const char *File, int Line, char *Var, char *Arg ) if (!Conf_GID && strcmp(Arg, "0")) Config_Error(LOG_WARNING, "%s, line %d: Value of \"%s\" is not a valid group name or ID!", - NGIRCd_ConfFile, Line, Var); + File, Line, Var); } return; } @@ -1501,37 +1438,7 @@ Handle_GLOBAL(const char *File, int Line, char *Var, char *Arg ) if (!Conf_UID && strcmp(Arg, "0")) Config_Error(LOG_WARNING, "%s, line %d: Value of \"%s\" is not a valid user name or ID!", - NGIRCd_ConfFile, Line, Var); - } - return; - } - - 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(File, 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"). */ - if (strncasecmp(Var, "SSL", 3) == 0) { - Config_Error(LOG_WARNING, - "%s, line %d (section \"Global\"): \"%s\" is deprecated here, move it to %s and rename to \"%s\"!", - NGIRCd_ConfFile, Line, Var, section, - Var + 3); - } else { - Config_Error(LOG_WARNING, - "%s, line %d (section \"Global\"): \"%s\" is deprecated here, move it to %s!", - NGIRCd_ConfFile, Line, Var, section); + File, Line, Var); } return; } @@ -1559,7 +1466,7 @@ Handle_LIMITS(const char *File, int Line, char *Var, char *Arg) if (Conf_ConnectRetry < 5) { Config_Error(LOG_WARNING, "%s, line %d: Value of \"ConnectRetry\" too low!", - NGIRCd_ConfFile, Line); + File, Line); Conf_ConnectRetry = 5; } return; @@ -1589,7 +1496,7 @@ Handle_LIMITS(const char *File, int Line, char *Var, char *Arg) return; } if (strcasecmp(Var, "MaxNickLength") == 0) { - Conf_MaxNickLength = Handle_MaxNickLength(Line, Arg); + Conf_MaxNickLength = Handle_MaxNickLength(File, Line, Arg); return; } if (strcasecmp(Var, "MaxListSize") == 0) { @@ -1598,12 +1505,18 @@ Handle_LIMITS(const char *File, int Line, char *Var, char *Arg) Config_Error_NaN(File, Line, Var); return; } + if (strcasecmp(Var, "MaxPenaltyTime") == 0) { + Conf_MaxPenaltyTime = atol(Arg); + if (Conf_MaxPenaltyTime < -1) + Conf_MaxPenaltyTime = -1; /* "unlimited" */ + 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); + File, Line); Conf_PingTimeout = 5; } return; @@ -1613,7 +1526,7 @@ Handle_LIMITS(const char *File, int Line, char *Var, char *Arg) if (Conf_PongTimeout < 5) { Config_Error(LOG_WARNING, "%s, line %d: Value of \"PongTimeout\" too low!", - NGIRCd_ConfFile, Line); + File, Line); Conf_PongTimeout = 5; } return; @@ -1633,12 +1546,37 @@ static void Handle_OPTIONS(const char *File, int Line, char *Var, char *Arg) { size_t len; + char *p; assert(File != NULL); assert(Line > 0); assert(Var != NULL); assert(Arg != NULL); + if (strcasecmp(Var, "AllowedChannelTypes") == 0) { + p = Arg; + Conf_AllowedChannelTypes[0] = '\0'; + while (*p) { + if (strchr(Conf_AllowedChannelTypes, *p)) { + /* Prefix is already included; ignore it */ + p++; + continue; + } + + if (strchr(CHANTYPES, *p)) { + len = strlen(Conf_AllowedChannelTypes) + 1; + assert(len < sizeof(Conf_AllowedChannelTypes)); + Conf_AllowedChannelTypes[len - 1] = *p; + Conf_AllowedChannelTypes[len] = '\0'; + } else { + Config_Error(LOG_WARNING, + "%s, line %d: Unknown channel prefix \"%c\" in \"AllowedChannelTypes\"!", + File, Line, *p); + } + p++; + } + return; + } if (strcasecmp(Var, "AllowRemoteOper") == 0) { Conf_AllowRemoteOper = Check_ArgIsTrue(Arg); return; @@ -1673,20 +1611,44 @@ Handle_OPTIONS(const char *File, int Line, char *Var, char *Arg) } if (strcasecmp(Var, "ConnectIPv6") == 0) { Conf_ConnectIPv6 = Check_ArgIsTrue(Arg); - WarnIPv6(Line); + WarnIPv6(File, Line); return; } if (strcasecmp(Var, "ConnectIPv4") == 0) { Conf_ConnectIPv4 = Check_ArgIsTrue(Arg); return; } + if (strcasecmp(Var, "DefaultUserModes") == 0) { + p = Arg; + Conf_DefaultUserModes[0] = '\0'; + while (*p) { + if (strchr(Conf_DefaultUserModes, *p)) { + /* Mode is already included; ignore it */ + p++; + continue; + } + + if (strchr(USERMODES, *p)) { + len = strlen(Conf_DefaultUserModes) + 1; + assert(len < sizeof(Conf_DefaultUserModes)); + Conf_DefaultUserModes[len - 1] = *p; + Conf_DefaultUserModes[len] = '\0'; + } else { + Config_Error(LOG_WARNING, + "%s, line %d: Unknown user mode \"%c\" in \"DefaultUserModes\"!", + File, Line, *p); + } + p++; + } + return; + } if (strcasecmp(Var, "DNS") == 0) { Conf_DNS = Check_ArgIsTrue(Arg); return; } if (strcasecmp(Var, "Ident") == 0) { Conf_Ident = Check_ArgIsTrue(Arg); - WarnIdent(Line); + WarnIdent(File, Line); return; } if (strcasecmp(Var, "IncludeDir") == 0) { @@ -1705,8 +1667,8 @@ Handle_OPTIONS(const char *File, int Line, char *Var, char *Arg) Conf_MorePrivacy = Check_ArgIsTrue(Arg); return; } - if (strcasecmp(Var, "NoticeAuth") == 0) { - Conf_NoticeAuth = Check_ArgIsTrue(Arg); + if (strcasecmp(Var, "NoticeBeforeRegistration") == 0) { + Conf_NoticeBeforeRegistration = Check_ArgIsTrue(Arg); return; } if (strcasecmp(Var, "OperCanUseMode") == 0) { @@ -1723,15 +1685,17 @@ Handle_OPTIONS(const char *File, int Line, char *Var, char *Arg) } if (strcasecmp(Var, "PAM") == 0) { Conf_PAM = Check_ArgIsTrue(Arg); - WarnPAM(Line); + WarnPAM(File, Line); return; } if (strcasecmp(Var, "PAMIsOptional") == 0 ) { Conf_PAMIsOptional = Check_ArgIsTrue(Arg); return; } - if (strcasecmp(Var, "PredefChannelsOnly") == 0) { - Conf_PredefChannelsOnly = Check_ArgIsTrue(Arg); + if (strcasecmp(Var, "PAMServiceName") == 0) { + len = strlcpy(Conf_PAMServiceName, Arg, sizeof(Conf_PAMServiceName)); + if (len >= sizeof(Conf_PAMServiceName)) + Config_Error_TooLong(File, Line, Var); return; } #ifndef STRICT_RFC @@ -1802,7 +1766,12 @@ Handle_SSL(const char *File, int Line, char *Var, char *Arg) return; } if (strcasecmp(Var, "Ports") == 0) { - ports_parse(&Conf_SSLOptions.ListenPorts, Line, Arg); + ports_parse(&Conf_SSLOptions.ListenPorts, File, Line, Arg); + return; + } + if (strcasecmp(Var, "CipherList") == 0) { + assert(Conf_SSLOptions.CipherList == NULL); + Conf_SSLOptions.CipherList = strdup_warn(Arg); return; } @@ -1898,15 +1867,15 @@ Handle_SERVER(const char *File, int Line, char *Var, char *Arg ) return; Config_Error(LOG_ERR, "%s, line %d (section \"Server\"): Can't parse IP address \"%s\"", - NGIRCd_ConfFile, Line, Arg); + File, Line, Arg); return; } if( strcasecmp( Var, "MyPassword" ) == 0 ) { /* Password of this server which is sent to the peer */ if (*Arg == ':') { Config_Error(LOG_ERR, - "%s, line %d (section \"Server\"): MyPassword must not start with ':'!", - NGIRCd_ConfFile, Line); + "%s, line %d (section \"Server\"): MyPassword must not start with ':'!", + File, Line); } len = strlcpy( New_Server.pwd_in, Arg, sizeof( New_Server.pwd_in )); if (len >= sizeof( New_Server.pwd_in )) @@ -1927,8 +1896,8 @@ Handle_SERVER(const char *File, int Line, char *Var, char *Arg ) New_Server.port = (UINT16)port; else Config_Error(LOG_ERR, - "%s, line %d (section \"Server\"): Illegal port number %ld!", - NGIRCd_ConfFile, Line, port ); + "%s, line %d (section \"Server\"): Illegal port number %ld!", + File, Line, port ); return; } #ifdef SSL_SUPPORT @@ -2018,8 +1987,12 @@ Handle_CHANNEL(const char *File, int Line, char *Var, char *Arg) } if (strcasecmp(Var, "Modes") == 0) { /* Initial modes */ - len = strlcpy(chan->modes, Arg, sizeof(chan->modes)); - if (len >= sizeof(chan->modes)) + if(chan->modes_num >= sizeof(chan->modes)) { + Config_Error(LOG_ERR, "Too many Modes, option ignored."); + return; + } + chan->modes[chan->modes_num++] = strndup(Arg, COMMAND_LEN); + if(strlen(Arg) >= COMMAND_LEN) Config_Error_TooLong(File, Line, Var); return; } @@ -2035,6 +2008,9 @@ Handle_CHANNEL(const char *File, int Line, char *Var, char *Arg) len = strlcpy(chan->key, Arg, sizeof(chan->key)); if (len >= sizeof(chan->key)) Config_Error_TooLong(File, Line, Var); + Config_Error(LOG_WARNING, + "%s, line %d (section \"Channel\"): \"%s\" is deprecated here, use \"Modes = +k \"!", + File, Line, Var); return; } if( strcasecmp( Var, "MaxUsers" ) == 0 ) { @@ -2042,6 +2018,9 @@ Handle_CHANNEL(const char *File, int Line, char *Var, char *Arg) chan->maxusers = (unsigned long) atol(Arg); if (!chan->maxusers && strcmp(Arg, "0")) Config_Error_NaN(File, Line, Var); + Config_Error(LOG_WARNING, + "%s, line %d (section \"Channel\"): \"%s\" is deprecated here, use \"Modes = +l \"!", + File, Line, Var); return; } if (strcasecmp(Var, "KeyFile") == 0) { @@ -2097,7 +2076,8 @@ Validate_Config(bool Configtest, bool Rehash) break; } while (*(++ptr)); - if (!Conf_ServerName[0]) { + if (!Conf_ServerName[0] || !strchr(Conf_ServerName, '.')) + { /* No server name configured! */ config_valid = false; Config_Error(LOG_ALERT, @@ -2111,20 +2091,6 @@ 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); - if (!Configtest) { - Config_Error(LOG_ALERT, - "%s exiting due to fatal errors!", - PACKAGE_NAME); - exit(1); - } - } - #ifdef STRICT_RFC if (!Conf_ServerAdminMail[0]) { /* No administrative contact configured! */ @@ -2149,11 +2115,16 @@ Validate_Config(bool Configtest, bool Rehash) } #ifdef PAM - if (Conf_ServerPwd[0]) + if (Conf_PAM && Conf_ServerPwd[0]) Config_Error(LOG_ERR, "This server uses PAM, \"Password\" in [Global] section will be ignored!"); #endif + if (Conf_MaxPenaltyTime != -1) + Config_Error(LOG_WARNING, + "Maximum penalty increase ('MaxPenaltyTime') is set to %ld, this is not recommended!", + Conf_MaxPenaltyTime); + #ifdef DEBUG servers = servers_once = 0; for (i = 0; i < MAX_SERVERS; i++) { @@ -2281,7 +2252,7 @@ Conf_DebugDump(void) #endif /** - * Initialize server configuration structur to default values. + * Initialize server configuration structure to default values. * * @param Server Pointer to server structure to initialize. */