mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-01-08 06:40:28 +00:00
Code Issues Releases Wiki Activity

Validate "ServerName" variable.

Browse Source
This commit is contained in:
Alexander Barton 2006-07-23 16:42:45 +00:00
parent c8fd051e06
commit f1f94f07e1
2 changed files with 63 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -12,6 +12,7 @@
ngIRCd CVSHEAD ngIRCd CVSHEAD
- Validate "ServerName" (see RFC 2812, section 2.3.1).
- Enhanced DIE to accept a single parameter ("comment text") which is sent - Enhanced DIE to accept a single parameter ("comment text") which is sent
to all locally connected clients before the server goes down. to all locally connected clients before the server goes down.
- The ngIRCd handles time shifts backwards more gracefully now (the - The ngIRCd handles time shifts backwards more gracefully now (the
@ -653,4 +654,4 @@ ngIRCd 0.0.1, 31.12.2001
-- --
$Id: ChangeLog,v 1.301 2006/07/23 15:47:26 alex Exp $ $Id: ChangeLog,v 1.302 2006/07/23 16:42:45 alex Exp $

89
src/ngircd/conf.c
View File

@ -14,7 +14,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: conf.c,v 1.91 2006/05/10 21:24:01 alex Exp $"; static char UNUSED id[] = "$Id: conf.c,v 1.92 2006/07/23 16:42:45 alex Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -58,7 +58,7 @@ static int New_Server_Idx;
static void Set_Defaults PARAMS(( bool InitServers )); static void Set_Defaults PARAMS(( bool InitServers ));
static void Read_Config PARAMS(( void )); static void Read_Config PARAMS(( void ));
static void Validate_Config PARAMS(( bool TestOnly )); static void Validate_Config PARAMS(( bool TestOnly, bool Rehash ));
static void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg )); static void Handle_GLOBAL PARAMS(( int Line, char *Var, char *Arg ));
static void Handle_OPERATOR PARAMS(( int Line, char *Var, char *Arg )); static void Handle_OPERATOR PARAMS(( int Line, char *Var, char *Arg ));
@ -136,7 +136,7 @@ Conf_Init( void )
{ {
Set_Defaults( true ); Set_Defaults( true );
Read_Config( ); Read_Config( );
Validate_Config( false ); Validate_Config(false, false);
} /* Config_Init */ } /* Config_Init */
@ -145,7 +145,7 @@ Conf_Rehash( void )
{ {
Set_Defaults( false ); Set_Defaults( false );
Read_Config( ); Read_Config( );
Validate_Config( false ); Validate_Config(false, true);
} /* Config_Rehash */ } /* Config_Rehash */
@ -163,7 +163,7 @@ Conf_Test( void )
Set_Defaults( true ); Set_Defaults( true );
Read_Config( ); Read_Config( );
Validate_Config( true ); Validate_Config(true, false);
/* If stdin and stdout ("you can read our nice message and we can /* 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: */ * read in your keypress") are valid tty's, wait for a key: */
@ -951,58 +951,89 @@ Handle_CHANNEL( int Line, char *Var, char *Arg )
static void static void
Validate_Config( bool Configtest ) Validate_Config(bool Configtest, bool Rehash)
{ {
/* Validate configuration settings. */ /* Validate configuration settings. */
#ifdef DEBUG #ifdef DEBUG
int i, servers, servers_once; int i, servers, servers_once;
#endif #endif
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 >= '1' && *ptr <= '0') continue;
if (ptr > Conf_ServerName) {
if (*ptr == '.' || *ptr == '-')
continue;
}
Conf_ServerName[0] = '\0';
break;
} while (*(++ptr));
if (!Conf_ServerName[0]) {
/* No server name configured! */ /* No server name configured! */
Config_Error( LOG_ALERT, "No server name configured in \"%s\" (section 'Global': 'Name')!", Config_Error(LOG_ALERT,
NGIRCd_ConfFile ); "No (valid) server name configured in \"%s\" (section 'Global': 'Name')!",
if( ! Configtest ) { NGIRCd_ConfFile);
Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); if (!Configtest && !Rehash) {
exit( 1 ); 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! */ /* No dot in server name! */
Config_Error( LOG_ALERT, "Invalid server name configured in \"%s\" (section 'Global': 'Name'): Dot missing!", NGIRCd_ConfFile ); Config_Error(LOG_ALERT,
if( ! Configtest ) { "Invalid server name configured in \"%s\" (section 'Global': 'Name'): Dot missing!",
Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); NGIRCd_ConfFile);
exit( 1 ); if (!Configtest) {
Config_Error(LOG_ALERT,
"%s exiting due to fatal errors!",
PACKAGE_NAME);
exit(1);
} }
} }
#ifdef STRICT_RFC #ifdef STRICT_RFC
if( ! Conf_ServerAdminMail[0] ) { if (!Conf_ServerAdminMail[0]) {
/* No administrative contact configured! */ /* No administrative contact configured! */
Config_Error( LOG_ALERT, "No administrator email address configured in \"%s\" ('AdminEMail')!", NGIRCd_ConfFile ); Config_Error(LOG_ALERT,
if( ! Configtest ) { "No administrator email address configured in \"%s\" ('AdminEMail')!",
Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); NGIRCd_ConfFile);
exit( 1 ); if (!Configtest) {
Config_Error(LOG_ALERT,
"%s exiting due to fatal errors!",
PACKAGE_NAME);
exit(1);
} }
} }
#endif #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! */ /* No administrative information configured! */
Config_Error( LOG_WARNING, "No administrative information configured but required by RFC!" ); Config_Error(LOG_WARNING,
"No administrative information configured but required by RFC!");
} }
#ifdef DEBUG #ifdef DEBUG
servers = servers_once = 0; servers = servers_once = 0;
for( i = 0; i < MAX_SERVERS; i++ ) { for (i = 0; i < MAX_SERVERS; i++) {
if( Conf_Server[i].name[0] ) { if (Conf_Server[i].name[0]) {
servers++; 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", Log(LOG_DEBUG,
Conf_Oper_Count, servers, servers_once, Conf_Channel_Count ); "Configuration: Operators=%d, Servers=%d[%d], Channels=%d",
Conf_Oper_Count, servers, servers_once, Conf_Channel_Count);
#endif #endif
} /* Validate_Config */ } /* Validate_Config */