August 2010 - ngIRCd GIT Updates

Alexander Barton : Implement user mode "x": hostname cloaking (closes: #102 )
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 2a4bf67aaceebd3567dcd0ac1db2b9027560f574 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2a4bf67a… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 21:05:06 2010 +0200 Implement user mode "x": hostname cloaking (closes: #102) When a client has user mode "x" set, its real hostname is cloaked by substituting it with the server name (as configured in ngircd.conf). Restricted clients (user mode "r") aren't allowed to change mode "x". Please note that hostname cloaking is only in effect in server-client communication! The server still uses the real hostname for its own logging and for all server-server communication -- therefore all servers in the network must support user mode "x" to prevent older servers from leaking the real hostname of a cloaked client! --- src/ngircd/defines.h | 2 +- src/ngircd/irc-mode.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 579d552..01b6037 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -80,7 +80,7 @@ #define RECONNECT_DELAY 3 /* Time to delay re-connect attempts in seconds. */ -#define USERMODES "aciorsw" /* Supported user modes. */ +#define USERMODES "aciorswx" /* Supported user modes. */ #define CHANMODES "biIklmnoPstvz" /* Supported channel modes. */ #define CONNECTED true /* Internal status codes. */ diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 45defeb..df464a7 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -185,6 +185,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) ERR_NOPRIVILEGES_MSG, Client_ID(Origin)); break; + case 'o': /* IRC operator (only unsettable!) */ if(( ! set ) || ( Client_Type( Client ) == CLIENT_SERVER )) { @@ -199,6 +200,15 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) else ok = IRC_WriteStrClient( Origin, ERR_RESTRICTED_MSG, Client_ID( Origin )); break; + case 'x': /* Cloak hostname */ + if (Client_HasMode(Client, 'r')) + IRC_WriteStrClient(Origin, + ERR_RESTRICTED_MSG, + Client_ID(Origin)); + else + x[0] = 'x'; + break; + default: Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin )); if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr );

1 0

Alexander Barton : WHOWAS: respect hostname cloaking
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 575485eb82698a926d38634be2b3e4dce4a5dfd6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=575485eb… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 21:02:39 2010 +0200 WHOWAS: respect hostname cloaking Store cloaked hostname if user mode "x" is set when the client disconnects from the server. --- src/ngircd/client.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index dd4113e..f73a2d1 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -1193,7 +1193,7 @@ Client_RegisterWhowas( CLIENT *Client ) sizeof( My_Whowas[slot].id )); strlcpy( My_Whowas[slot].user, Client_User( Client ), sizeof( My_Whowas[slot].user )); - strlcpy( My_Whowas[slot].host, Client_Hostname( Client ), + strlcpy( My_Whowas[slot].host, Client_HostnameCloaked( Client ), sizeof( My_Whowas[slot].host )); strlcpy( My_Whowas[slot].info, Client_Info( Client ), sizeof( My_Whowas[slot].info ));

1 0

Alexander Barton : WHOIS: respect hostname cloaking
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 3fd4f320b726e91f674c424e0c5ff5abce2c6f09 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3fd4f320… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 21:00:02 2010 +0200 WHOIS: respect hostname cloaking --- src/ngircd/irc-info.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index ad585fe..74530f7 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -939,8 +939,11 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) if(( Client_NextHop( target ) != Client_ThisServer( )) && ( Client_Type( Client_NextHop( target )) == CLIENT_SERVER )) return IRC_WriteStrClientPrefix( target, from, "WHOIS %s :%s", Req->argv[0], Req->argv[1] ); - /* Nick, user and name */ - if( ! IRC_WriteStrClient( from, RPL_WHOISUSER_MSG, Client_ID( from ), Client_ID( c ), Client_User( c ), Client_Hostname( c ), Client_Info( c ))) return DISCONNECTED; + /* Nick, user, hostname and client info */ + if (!IRC_WriteStrClient(from, RPL_WHOISUSER_MSG, Client_ID(from), + Client_ID(c), Client_User(c), + Client_HostnameCloaked(c), Client_Info(c))) + return DISCONNECTED; /* Server */ if( ! IRC_WriteStrClient( from, RPL_WHOISSERVER_MSG, Client_ID( from ), Client_ID( c ), Client_ID( Client_Introducer( c )), Client_Info( Client_Introducer( c )))) return DISCONNECTED;

1 0

Alexander Barton : Implement Client_HostnameCloaked() and Client_MaskCloaked()
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 6fdd3479f126a866c022c39dcd424d6042de6875 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6fdd3479… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 20:54:33 2010 +0200 Implement Client_HostnameCloaked() and Client_MaskCloaked() These two functions return the cloaked hostname, if the client has enabled hostname cloaking indicated by the -- still to implement -- user mode "x". See furter patches :-) --- src/ngircd/client.c | 43 +++++++++++++++++++++++++++++++++++++++++++ src/ngircd/client.h | 2 ++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index a067ef7..dd4113e 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -660,6 +660,23 @@ Client_Hostname(CLIENT *Client) } /* Client_Hostname */ +/** + * Get potentially cloaked hostname of a client. + * If the client has not enabled cloaking, the real hostname is used. + * @param Client Pointer to client structure + * @return Pointer to client hostname + */ +GLOBAL char * +Client_HostnameCloaked(CLIENT *Client) +{ + assert(Client != NULL); + if (Client_HasMode(Client, 'x')) + return Client_ID(Client->introducer); + else + return Client_Hostname(Client); +} /* Client_HostnameCloaked */ + + GLOBAL char * Client_Password( CLIENT *Client ) { @@ -756,6 +773,32 @@ Client_Mask( CLIENT *Client ) } /* Client_Mask */ +/** + * Return ID of a client with cloaked hostname: "client!user@server-name" + * This client ID is used for IRC prefixes, for example. + * Please note that this function uses a global static buffer, so you can't + * nest invocations without overwriting erlier results! + * If the client has not enabled cloaking, the real hostname is used. + * @param Client Pointer to client structure + * @return Pointer to global buffer containing the client ID + */ +GLOBAL char * +Client_MaskCloaked(CLIENT *Client) +{ + static char Mask_Buffer[GETID_LEN]; + + assert (Client != NULL); + + /* Is the client using cloaking at all? */ + if (!Client_HasMode(Client, 'x')) + return Client_Mask(Client); + + snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s", + Client->id, Client->user, Client_ID(Client->introducer)); + return Mask_Buffer; +} /* Client_MaskCloaked */ + + GLOBAL CLIENT * Client_Introducer( CLIENT *Client ) { diff --git a/src/ngircd/client.h b/src/ngircd/client.h index bd000a5..98a0d1a 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -93,12 +93,14 @@ GLOBAL int Client_Type PARAMS(( CLIENT *Client )); GLOBAL CONN_ID Client_Conn PARAMS(( CLIENT *Client )); GLOBAL char *Client_ID PARAMS(( CLIENT *Client )); GLOBAL char *Client_Mask PARAMS(( CLIENT *Client )); +GLOBAL char *Client_MaskCloaked PARAMS(( CLIENT *Client )); GLOBAL char *Client_Info PARAMS(( CLIENT *Client )); GLOBAL char *Client_User PARAMS(( CLIENT *Client )); #ifdef PAM GLOBAL char *Client_OrigUser PARAMS(( CLIENT *Client )); #endif GLOBAL char *Client_Hostname PARAMS(( CLIENT *Client )); +GLOBAL char *Client_HostnameCloaked PARAMS(( CLIENT *Client )); GLOBAL char *Client_Password PARAMS(( CLIENT *Client )); GLOBAL char *Client_Modes PARAMS(( CLIENT *Client )); GLOBAL char *Client_Flags PARAMS(( CLIENT *Client ));

1 0

Alexander Barton : Clean up an document Client_Hostname() and Client_Mask()
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 617640e0a358dc29c5e4f82eb6b828030ef21670 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=617640e0… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 20:51:14 2010 +0200 Clean up an document Client_Hostname() and Client_Mask() --- src/ngircd/client.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 96d40d2..a067ef7 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -647,10 +647,15 @@ Client_OrigUser(CLIENT *Client) { #endif +/** + * Return the hostname of a client. + * @param Client Pointer to client structure + * @return Pointer to client hostname + */ GLOBAL char * -Client_Hostname( CLIENT *Client ) +Client_Hostname(CLIENT *Client) { - assert( Client != NULL ); + assert (Client != NULL); return Client->host; } /* Client_Hostname */ @@ -727,20 +732,27 @@ Client_NextHop( CLIENT *Client ) /** - * return Client-ID ("client!user@host"), this ID is needed for e.g. - * prefixes. Returnes pointer to static buffer. + * Return ID of a client: "client!user@host" + * This client ID is used for IRC prefixes, for example. + * Please note that this function uses a global static buffer, so you can't + * nest invocations without overwriting erlier results! + * @param Client Pointer to client structure + * @return Pointer to global buffer containing the client ID */ GLOBAL char * Client_Mask( CLIENT *Client ) { - static char GetID_Buffer[GETID_LEN]; + static char Mask_Buffer[GETID_LEN]; - assert( Client != NULL ); + assert (Client != NULL); - if( Client->type == CLIENT_SERVER ) return Client->id; + /* Servers: return name only, there is no "mask" */ + if (Client->type == CLIENT_SERVER) + return Client->id; - snprintf(GetID_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, Client->host); - return GetID_Buffer; + snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s", + Client->id, Client->user, Client->host); + return Mask_Buffer; } /* Client_Mask */

1 0

Alexander Barton : Make configure switch "--docdir" work (closes: #108)
by alex＠arthur.barton.de 17 Aug '10

17 Aug '10

Module: ngircd.git Branch: master Commit: f72e22d3611161af79a7c3240ff4700c0d70eb26 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f72e22d3… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 15:59:54 2010 +0200 Make configure switch "--docdir" work (closes: #108) --- configure.in | 2 +- doc/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 79ab22a..bdc08e1 100644 --- a/configure.in +++ b/configure.in @@ -616,7 +616,7 @@ B=`eval echo ${bindir}` ; B=`eval echo ${B}` S=`eval echo ${sbindir}` ; S=`eval echo ${S}` C=`eval echo ${sysconfdir}` ; C=`eval echo ${C}` M=`eval echo ${mandir}` ; M=`eval echo ${M}` -D=`eval echo ${datadir}/doc/${PACKAGE}` ; D=`eval echo ${D}` +D=`eval echo ${docdir}` ; D=`eval echo ${D}` echo " Target: ${target}" test "$target" != "$host" && echo " Host: ${host}" diff --git a/doc/Makefile.am b/doc/Makefile.am index eba97d9..34dd9c9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST = FAQ.txt GIT.txt Protocol.txt Platforms.txt README-AUX.txt \ maintainer-clean-local: rm -f Makefile Makefile.in -docdir = $(datadir)/doc/$(PACKAGE) +docdir ?= $(datadir)/doc/$(PACKAGE) documents = $(EXTRA_DIST) ../AUTHORS ../COPYING ../ChangeLog ../INSTALL \ ../NEWS ../README

1 0

Alexander Barton : Reformat and update FAQ.txt a little bit
by alex＠arthur.barton.de 13 Aug '10

13 Aug '10

Module: ngircd.git Branch: master Commit: c65bf5d2ce2603df3d832f79d6365b064b8eb13f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c65bf5d2… Author: Alexander Barton <alex(a)barton.de> Date: Fri Aug 13 15:53:24 2010 +0200 Reformat and update FAQ.txt a little bit --- doc/FAQ.txt | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/doc/FAQ.txt b/doc/FAQ.txt index bf3628c..b7a1c94 100644 --- a/doc/FAQ.txt +++ b/doc/FAQ.txt @@ -1,7 +1,7 @@ ngIRCd - Next Generation IRC Server - (c)2001-2003 by Alexander Barton, + (c)2001-2010 by Alexander Barton, alex(a)barton.de, http://www.barton.de/ ngIRCd is free software and published under the @@ -12,9 +12,11 @@ I. General ~~~~~~~~~~ + Q: Is it possible to link the ngIRCd with non-ngIRCd servers? A: Yes. ngIRCd is compatible to the original ircd used by IRCNet. Actually - this is being tested with version 2.10.3p3. + this is being tested with version 2.10.3p3. Please note that newer + versions (2.11.x) aren't compatible any more! Q: Is there a homepage with further information and downloads? A: Yes. Please visit <http://ngircd.barton.de/>. @@ -26,6 +28,7 @@ A: ngIRCd offers several benefits: no problems with dynamic IPs, easy to II. Compilation ~~~~~~~~~~~~~~~ + Q: I did a "CVS checkout" but can't execute ./configure because the script is missing in the generated directory!? A: When using development versions via CVS, the configure script as well as @@ -55,27 +58,33 @@ III. Runtime ~~~~~~~~~~~~ Q: Where is the log file located? -A: ngIRCd does not write its own log file. Instead, ngIRCd uses - syslog(3). Check the files in /var/log/ and/or consult the - documentation for your system logger daemon. +A: ngIRCd does not write its own log file. Instead, ngIRCd uses syslog(3). + Check the files in /var/log/ and/or consult the documentation for your + system logger daemon. + Q: I cannot connect to remote peers when I use the chroot option, the following is logged: "Can't resolve example.com: unknown error!". A: On Linux/glibc with chroot enabled you need to put some libraries inside the chroot as well, notably libnss_dns; maybe others. Unfortunately, even - linking ngircd statically does not help this. The only known workaround + linking ngIRCd statically does not help this. The only known workaround is to either disable chroot support or to link against dietlibc instead of glibc. (tnx to Sebastian Siewior) + Q: I have added an [Oper] section, how do i log on as IRC operator? A: You can use the /OPER command in your IRC client to become an IRC operator. ngIRCd will also log all OPER requests (using syslog), if OPER fails you can look there to determine why it did not work (bad password, unauthorized host mask, etc.) + Q: I am an IRC operator, but MODE doesn't work! -A: You need to set 'OperCanUseMode = yes' in ngircd.conf to enable MODE for IRC - operators. +A: You need to set 'OperCanUseMode = yes' in ngircd.conf, then IRC operators + can use the MODE command for changing modes even when they are not joined + to the specific channel. + IV. Bugs!? ~~~~~~~~~~ + Q: Is there a list of known bugs and desired feature enhancements? A: Yes. Have a look at the bug tracking system (Bugzilla) for ngIRCd located at <http://ngircd.barton.de/bugzilla/index.cgi>. There you can file bug @@ -85,6 +94,3 @@ Q: What should I do if I found a bug? A: Please file a bug report at <http://ngircd.barton.de/bugzilla/index.cgi>! The author of the particular component will be notified automagically :-) - --- -$Id: FAQ.txt,v 1.12 2008/01/02 22:47:58 alex Exp $

1 0

Florian Westphal : INSTALL: mention SSL and IPv6
by fw＠arthur.barton.de 12 Aug '10

12 Aug '10

Module: ngircd.git Branch: master Commit: 9c6230e1773634b9633bd3ab9a31eb036919f476 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9c6230e1… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Aug 11 23:24:02 2010 +0200 INSTALL: mention SSL and IPv6 --- INSTALL | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/INSTALL b/INSTALL index 06be42f..b2c8180 100644 --- a/INSTALL +++ b/INSTALL @@ -194,6 +194,18 @@ standard locations. Enable support for PAM, the Pluggable Authentication Modules library. See doc/PAM.txt for details. +* SSL: + --with-openssl[=<path>] + --with-gnutls[=<path>] + + Enable support for SSL/TLS using OpenSSL or gnutls libraries. + See doc/SSL.txt for details. + +* IPv6: + --enable-ipv6 + + Adds support for version 6 of the Internet Protocol. + IV. Useful make-targets ~~~~~~~~~~~~~~~~~~~~~~~

1 0

Florian Westphal : INSTALL: mention changed handling of MotdFile.
by fw＠arthur.barton.de 12 Aug '10

12 Aug '10

Module: ngircd.git Branch: master Commit: 479a43b1c68d033a5ffe7a1e36dad31714a29cb1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=479a43b1… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Aug 11 23:19:23 2010 +0200 INSTALL: mention changed handling of MotdFile. --- INSTALL | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/INSTALL b/INSTALL index f84ee3f..06be42f 100644 --- a/INSTALL +++ b/INSTALL @@ -9,11 +9,15 @@ -- INSTALL -- - I. Upgrade Information ~~~~~~~~~~~~~~~~~~~~~~ +Differences to version 16 + +- Changes to the "MotdFile" specified in ngircd.conf now require a ngircd configuration + reload to take effect. + Differences to version 0.9.x - The option of the configure script to enable support for Zeroconf/Bonjour/

1 0

Florian Westphal : ngircd: change MOTD file handling
by fw＠arthur.barton.de 12 Aug '10

12 Aug '10

Module: ngircd.git Branch: master Commit: 056de78e315a79edc1166649514bf8dfeb18abb1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=056de78e… Author: Florian Westphal <fw(a)strlen.de> Date: Wed Aug 11 22:52:06 2010 +0200 ngircd: change MOTD file handling previously, the given MotdFile file was read whenever a client requested it. Change handling to read the MotdFile contents into memory once during config file parsing. Two side effects: - changes to the MOTD file do not have any effect until ngircds configuration is reloaded - MOTD file does no longer have to reside in the chroot directory (the MOTD contents will then not be re-read on reload in that case) --- doc/sample-ngircd.conf | 1 - man/ngircd.conf.5.tmpl | 5 +-- src/ngircd/conf.c | 53 +++++++++++++++++++++++++++++++++++++++++++---- src/ngircd/conf.h | 7 +---- src/ngircd/defines.h | 1 - src/ngircd/irc-info.c | 47 ++++++++++++++---------------------------- 6 files changed, 68 insertions(+), 46 deletions(-) diff --git a/doc/sample-ngircd.conf b/doc/sample-ngircd.conf index 645d1b8..fdeed35 100644 --- a/doc/sample-ngircd.conf +++ b/doc/sample-ngircd.conf @@ -73,7 +73,6 @@ ;MotdFile = /usr/local/etc/ngircd.motd # A simple Phrase (<256 chars) if you don't want to use a motd file. - # If it is set no MotdFile will be read at all. ;MotdPhrase = "Hello world!" # User ID under which the server should run; you can use the name diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index ad88871..71aaa1e 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -118,12 +118,11 @@ IP addresses and interfaces by default. .TP \fBMotdFile\fR Text file with the "message of the day" (MOTD). This message will be shown -to all users connecting to the server. +to all users connecting to the server. Changes made to this file +take effect when ngircd is instructed to re-read its configuration file. .TP \fBMotdPhrase\fR A simple Phrase (<256 chars) if you don't want to use a MOTD file. -If this variable is set, no \fBMotdFile\fR will be read at all which can be -handy if the daemon should run inside a chroot directory. .TP \fBServerUID\fR User ID under which the server should run; you can use the name of the user diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 834a1da..a70973e 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -55,6 +55,8 @@ static int New_Server_Idx; static size_t Conf_Oper_Count; static size_t Conf_Channel_Count; +static char Conf_MotdFile[FNAME_LEN]; + static void Set_Defaults PARAMS(( bool InitServers )); static bool Read_Config PARAMS(( bool ngircd_starting )); static bool Validate_Config PARAMS(( bool TestOnly, bool Rehash )); @@ -299,7 +301,7 @@ Conf_Test( void ) 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(" MotdPhrase = %.32s\n", array_bytes(&Conf_Motd) ? (const char*) array_start(&Conf_Motd) : ""); printf(" ChrootDir = %s\n", Conf_Chroot); printf(" PidFile = %s\n", Conf_PidFile); printf(" Listen = %s\n", Conf_ListenAddress); @@ -567,7 +569,6 @@ Set_Defaults(bool InitServers) strlcpy(Conf_MotdFile, SYSCONFDIR, sizeof(Conf_MotdFile)); strlcat(Conf_MotdFile, MOTD_FILE, sizeof(Conf_MotdFile)); - strlcpy(Conf_MotdPhrase, MOTD_PHRASE, sizeof(Conf_MotdPhrase)); Conf_UID = Conf_GID = 0; strlcpy(Conf_Chroot, CHROOT_DIR, sizeof(Conf_Chroot)); @@ -617,6 +618,36 @@ no_listenports(void) return cnt == 0; } +static void +Read_Motd(const char *filename) +{ + char line[127]; + FILE *fp; + + if (*filename == '\0') + return; + + fp = fopen(filename, "r"); + if (!fp) { + Log(LOG_WARNING, "Can't read MOTD file \"%s\": %s", + filename, strerror(errno)); + return; + } + + array_free(&Conf_Motd); + + 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); +} + static bool Read_Config( bool ngircd_starting ) { @@ -780,6 +811,10 @@ Read_Config( bool ngircd_starting ) 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); return true; } /* Read_Config */ @@ -816,6 +851,7 @@ static unsigned int Handle_MaxNickLength(int Line, const char *Arg) } /* Handle_MaxNickLength */ + static void Handle_GLOBAL( int Line, char *Var, char *Arg ) { @@ -882,17 +918,24 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) return; } if( strcasecmp( Var, "MotdFile" ) == 0 ) { - /* "Message of the day" (MOTD) file */ len = strlcpy( Conf_MotdFile, Arg, sizeof( Conf_MotdFile )); if (len >= sizeof( Conf_MotdFile )) Config_Error_TooLong( Line, Var ); + Read_Motd(Arg); return; } if( strcasecmp( Var, "MotdPhrase" ) == 0 ) { /* "Message of the day" phrase (instead of file) */ - len = strlcpy( Conf_MotdPhrase, Arg, sizeof( Conf_MotdPhrase )); - if (len >= sizeof( Conf_MotdPhrase )) + 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)); return; } if( strcasecmp( Var, "ChrootDir" ) == 0 ) { diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 74abc1d..e7b84d2 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -94,11 +94,8 @@ GLOBAL char Conf_ServerAdmin1[CLIENT_INFO_LEN]; GLOBAL char Conf_ServerAdmin2[CLIENT_INFO_LEN]; GLOBAL char Conf_ServerAdminMail[CLIENT_INFO_LEN]; -/* File with MOTD text */ -GLOBAL char Conf_MotdFile[FNAME_LEN]; - -/* Phrase with MOTD text */ -GLOBAL char Conf_MotdPhrase[LINE_LEN]; +/* Message of the Day */ +GLOBAL array Conf_Motd; /* Ports the server should listen on */ GLOBAL array Conf_ListenPorts; diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index b463c5f..579d552 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -93,7 +93,6 @@ #define CONFIG_FILE "/ngircd.conf" /* Configuration file name. */ #define MOTD_FILE "/ngircd.motd" /* Name of the MOTD file. */ -#define MOTD_PHRASE "" /* Default MOTD phrase string. */ #define CHROOT_DIR "" /* Default chroot() directory. */ #define PID_FILE "" /* Default file for the process ID. */ diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 0a50e9f..ad585fe 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1231,45 +1231,30 @@ static inline bool Show_MOTD_SSLInfo(UNUSED CLIENT *c) { return true; } GLOBAL bool IRC_Show_MOTD( CLIENT *Client ) { - char line[127]; - FILE *fd; + const char *line; + size_t len_tot, len_str; assert( Client != NULL ); - if (Conf_MotdPhrase[0]) { - if (!Show_MOTD_Start(Client)) - return DISCONNECTED; - if (!Show_MOTD_Sendline(Client, Conf_MotdPhrase)) - return DISCONNECTED; - goto out; - } + len_tot = array_bytes(&Conf_Motd); + if (len_tot == 0 && !Conn_UsesSSL(Client_Conn(Client))) + return IRC_WriteStrClient(Client, ERR_NOMOTD_MSG, Client_ID(Client)); - fd = fopen( Conf_MotdFile, "r" ); - if( ! fd ) { - Log( LOG_WARNING, "Can't read MOTD file \"%s\": %s", Conf_MotdFile, strerror( errno )); - if (Conn_UsesSSL(Client_Conn(Client))) { - if (!Show_MOTD_Start(Client)) - return DISCONNECTED; - goto out; - } - return IRC_WriteStrClient( Client, ERR_NOMOTD_MSG, Client_ID( Client ) ); - } + if (!Show_MOTD_Start(Client)) + return DISCONNECTED; - if (!Show_MOTD_Start( Client )) { - fclose(fd); - return false; - } + line = array_start(&Conf_Motd); + while (len_tot > 0) { + len_str = strlen(line) + 1; - while (fgets( line, (int)sizeof line, fd )) { - ngt_TrimLastChr( line, '\n'); + assert(len_tot >= len_str); + len_tot -= len_str; - if( ! Show_MOTD_Sendline( Client, line)) { - fclose( fd ); - return false; - } + if (!Show_MOTD_Sendline(Client, line)) + return DISCONNECTED; + line += len_str; } - fclose(fd); -out: + if (!Show_MOTD_SSLInfo(Client)) return DISCONNECTED; return Show_MOTD_End(Client);

1 0