- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Only log "IDENT ... no result" when IDENT was looked up
by alex＠arthur.barton.de 02 Sep '13

02 Sep '13

Module: ngircd.git Branch: master Commit: 4102e8fdfea33a5d8c398c98db90914c5dc29610 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4102e8fd… Author: Alexander Barton <alex(a)barton.de> Date: Mon Sep 2 16:37:50 2013 +0200 Only log "IDENT ... no result" when IDENT was looked up Without this patch, ngIRCd logged the "IDENT lookup for connection X: no result"-message even when IDENT lookups have been disabled using the "Ident = no" configuration option, which is a little bit misleading. Reported by "btwe" in #ngircd. --- src/ngircd/conn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 8d72c1c..3b09278 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -2454,9 +2454,9 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) *ptr ? "" : ": ", *ptr ? "" : identptr); } - } else { + } else if(Conf_Ident) { Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i); - if (Conf_NoticeAuth && Conf_Ident) + if (Conf_NoticeAuth) (void)Conn_WriteStr(i, "NOTICE AUTH :*** No ident response"); }

1 0

Florian Westphal : ngircd: use setgid/setuid errno value in error path
by fw＠arthur.barton.de 31 Aug '13

31 Aug '13

Module: ngircd.git Branch: master Commit: f8f8a9a04146fb7a4e1570ce0474ea86806879ed URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f8f8a9a0… Author: Florian Westphal <fw(a)strlen.de> Date: Sat Aug 31 22:42:56 2013 +0200 ngircd: use setgid/setuid errno value in error path Need to use saved errno value as strerror argument, else you get bogus output ('success') in the log message. --- src/ngircd/ngircd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index e26ac3b..f0cb150 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -720,7 +720,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) grp = getgrgid(Conf_GID); Log(LOG_ERR, "Can't change group ID to %s(%u): %s!", grp ? grp->gr_name : "?", Conf_GID, - strerror(errno)); + strerror(real_errno)); if (real_errno != EPERM) goto out; } @@ -741,7 +741,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) pwd = getpwuid(Conf_UID); Log(LOG_ERR, "Can't change user ID to %s(%u): %s!", pwd ? pwd->pw_name : "?", Conf_UID, - strerror(errno)); + strerror(real_errno)); if (real_errno != EPERM) goto out; }

1 0

Alexander Barton : Show connection flag "s" (SSL) in RPL_TRACE{LINK|SERVER}
by alex＠arthur.barton.de 31 Aug '13

31 Aug '13

Module: ngircd.git Branch: master Commit: 04b947cdc3ad1f3370aae2ba2e7308587bea0dda URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=04b947cd… Author: Alexander Barton <alex(a)barton.de> Date: Sat Aug 31 14:15:09 2013 +0200 Show connection flag "s" (SSL) in RPL_TRACE{LINK|SERVER} Now you can check if a server-to-server link is SSL-encrypted or not using the IRC "TRACE" command. Idea by Götz Hoffart, thanks! --- src/ngircd/irc.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index d1e1d41..968bcea 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -450,6 +450,12 @@ Help(CLIENT *Client, const char *Topic) return CONNECTED; } +/** + * Get pointer to a static string representing the connection "options". + * + * @param Idx Connection index. + * @return Pointer to static (global) string buffer. + */ static char * #ifdef ZLIB Option_String(CONN_ID Idx) @@ -460,16 +466,22 @@ Option_String(UNUSED CONN_ID Idx) static char option_txt[8]; #ifdef ZLIB UINT16 options; - - options = Conn_Options(Idx); #endif + assert(Idx != NONE); + + options = Conn_Options(Idx); strcpy(option_txt, "F"); /* No idea what this means, but the * original ircd sends it ... */ +#ifdef SSL_SUPPORT + if(options & CONN_SSL) /* SSL encrypted link */ + strlcat(option_txt, "s", sizeof(option_txt)); +#endif #ifdef ZLIB - if(options & CONN_ZIP) /* zlib compression supported. */ - strcat(option_txt, "z"); + if(options & CONN_ZIP) /* zlib compression enabled */ + strlcat(option_txt, "z", sizeof(option_txt)); #endif + LogDebug(" *** %d: %d = %s", Idx, options, option_txt); return option_txt; } /* Option_String */

1 0

Federico G. Schwindt : Change away to be allocated dynamically
by alex＠arthur.barton.de 27 Aug '13

27 Aug '13

Module: ngircd.git Branch: master Commit: be2e611680834cf469c31ff0a230f1bf6d55c554 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=be2e6116… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Mon Aug 26 22:52:23 2013 +0100 Change away to be allocated dynamically --- src/ngircd/client.c | 10 ++++++++-- src/ngircd/client.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 2835b46..37b97d6 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -221,7 +221,7 @@ Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, Generate_MyToken(client); if (Client_HasMode(client, 'a')) - strlcpy(client->away, DEFAULT_AWAY_MSG, sizeof(client->away)); + client->away = strndup(DEFAULT_AWAY_MSG, CLIENT_AWAY_LEN - 1); client->next = (POINTER *)My_Clients; My_Clients = client; @@ -500,7 +500,11 @@ Client_SetAway( CLIENT *Client, const char *Txt ) assert( Client != NULL ); assert( Txt != NULL ); - strlcpy( Client->away, Txt, sizeof( Client->away )); + if (Client->away) + free(Client->away); + + Client->away = strndup(Txt, CLIENT_AWAY_LEN - 1); + LogDebug("%s \"%s\" is away: %s", Client_TypeText(Client), Client_Mask(Client), Txt); } /* Client_SetAway */ @@ -1441,6 +1445,8 @@ Free_Client(CLIENT **Client) if ((*Client)->account_name) free((*Client)->account_name); + if ((*Client)->away) + free((*Client)->away); if ((*Client)->cloaked) free((*Client)->cloaked); if ((*Client)->ipa_text) diff --git a/src/ngircd/client.h b/src/ngircd/client.h index 71d413b..c104a75 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -58,7 +58,7 @@ typedef struct _CLIENT char modes[CLIENT_MODE_LEN]; /* client modes */ int hops, token, mytoken; /* "hops" and "Token" (see SERVER command) */ bool oper_by_me; /* client is local IRC operator on this server? */ - char away[CLIENT_AWAY_LEN]; /* AWAY text (valid if mode 'a' is set) */ + char *away; /* AWAY text (valid if mode 'a' is set) */ char flags[CLIENT_FLAGS_LEN]; /* flags of the client */ char *account_name; /* login account (for services) */ int capabilities; /* enabled IRC capabilities */

1 0

Alexander Barton : Ignore "operation not permitted" while dropping groups
by alex＠arthur.barton.de 27 Aug '13

27 Aug '13

Module: ngircd.git Branch: master Commit: 41f75b69740bd205864bd34afbb65ab0a3776136 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=41f75b69… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 27 00:39:59 2013 +0200 Ignore "operation not permitted" while dropping groups Without this exception, you can't start ngIRCd as user any more, it is analog to setting the user and group ID. --- src/ngircd/ngircd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 4099719..e26ac3b 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -725,9 +725,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) goto out; } if (setgroups(0, NULL) != 0) { - Log(LOG_ERR, "Can't drop supplementary group ids: %s!", + real_errno = errno; + Log(LOG_ERR, "Can't drop supplementary group IDs: %s!", strerror(errno)); - goto out; + if (real_errno != EPERM) + goto out; } } #endif

1 0

Florian Westphal : ngircd: discard supplementary group ids on startup
by fw＠arthur.barton.de 27 Aug '13

27 Aug '13

Module: ngircd.git Branch: master Commit: e009ccbe66f67a4c5344d6a1f415c50b699765ad URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e009ccbe… Author: Florian Westphal <fw(a)strlen.de> Date: Tue Aug 27 00:19:31 2013 +0200 ngircd: discard supplementary group ids on startup The intention was to switch to JUST uid:gid, but setgid is not sufficient. Reported-by: Michael Scherer <misc(a)zarb.org> --- src/ngircd/ngircd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index e075e0a..4099719 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -724,6 +724,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) if (real_errno != EPERM) goto out; } + if (setgroups(0, NULL) != 0) { + Log(LOG_ERR, "Can't drop supplementary group ids: %s!", + strerror(errno)); + goto out; + } } #endif

1 0

Alexander Barton : Xcode: update project settings for Xcode 5
by alex＠arthur.barton.de 26 Aug '13

26 Aug '13

Module: ngircd.git Branch: master Commit: 46d43dc09c82e05762ec05585eed65ba953e6887 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=46d43dc0… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 26 23:23:12 2013 +0200 Xcode: update project settings for Xcode 5 --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index c74dcd7..babe5bc 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -302,8 +302,12 @@ FA2D567A11EA1AB300D37A35 /* libpam.dylib */, FA322DC00CEF77CB001761B3 /* libz.dylib */, ); + indentWidth = 8; name = ngIRCd; sourceTree = "<group>"; + tabWidth = 8; + usesTabs = 1; + wrapsLines = 0; }; 1AB674ADFE9D54B511CA2CBB /* Products */ = { isa = PBXGroup;

1 0

Alexander Barton : Merge branch 'bug159-WebircIPA'
by alex＠arthur.barton.de 26 Aug '13

26 Aug '13

Module: ngircd.git Branch: master Commit: 44698e44e8a9bf9f3a1211e10b4d59e00be5864f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=44698e44… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 26 23:22:20 2013 +0200 Merge branch 'bug159-WebircIPA' * bug159-WebircIPA: Introduce Free_Client() function to free CLIENT structure Save client IP address text for "WebIRC" users ---

1 0

Alexander Barton : Introduce Free_Client() function to free CLIENT structure
by alex＠arthur.barton.de 26 Aug '13

26 Aug '13

Module: ngircd.git Branch: master Commit: 0ff33777febca1ac06417c976a4a3e76b68c93d8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0ff33777… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 26 22:55:00 2013 +0200 Introduce Free_Client() function to free CLIENT structure --- src/ngircd/client.c | 51 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 26d4929..2835b46 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -62,6 +62,8 @@ static CLIENT *New_Client_Struct PARAMS(( void )); static void Generate_MyToken PARAMS(( CLIENT *Client )); static void Adjust_Counters PARAMS(( CLIENT *Client )); +static void Free_Client PARAMS(( CLIENT **Client )); + static CLIENT *Init_New_Client PARAMS((CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, int Type, const char *ID, const char *User, const char *Hostname, const char *Info, @@ -120,20 +122,15 @@ Client_Exit( void ) cnt = 0; c = My_Clients; - while( c ) - { + while(c) { cnt++; next = (CLIENT *)c->next; - if (c->account_name) - free(c->account_name); - if (c->cloaked) - free(c->cloaked); - if (c->ipa_text) - free(c->ipa_text); - free( c ); + Free_Client(&c); c = next; } - if( cnt ) Log( LOG_INFO, "Freed %d client structure%s.", cnt, cnt == 1 ? "" : "s" ); + if (cnt) + Log(LOG_INFO, "Freed %d client structure%s.", + cnt, cnt == 1 ? "" : "s"); } /* Client_Exit */ @@ -324,13 +321,7 @@ Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool Sen } } - if (c->account_name) - free(c->account_name); - if (c->cloaked) - free(c->cloaked); - if (c->ipa_text) - free(c->ipa_text); - free( c ); + Free_Client(&c); break; } last = c; @@ -1410,6 +1401,11 @@ MyCount( CLIENT_TYPE Type ) } /* MyCount */ +/** + * Allocate and initialize new CLIENT strcuture. + * + * @return Pointer to CLIENT structure or NULL on error. + */ static CLIENT * New_Client_Struct( void ) { @@ -1432,8 +1428,27 @@ New_Client_Struct( void ) c->mytoken = -1; return c; -} /* New_Client */ +} +/** + * Free a CLIENT structure and its member variables. + */ +static void +Free_Client(CLIENT **Client) +{ + assert(Client != NULL); + assert(*Client != NULL); + + if ((*Client)->account_name) + free((*Client)->account_name); + if ((*Client)->cloaked) + free((*Client)->cloaked); + if ((*Client)->ipa_text) + free((*Client)->ipa_text); + + free(*Client); + *Client = NULL; +} static void Generate_MyToken( CLIENT *Client )

1 0

Alexander Barton : Save client IP address text for "WebIRC" users
by alex＠arthur.barton.de 26 Aug '13

26 Aug '13

Module: ngircd.git Branch: master Commit: 1dc93286a0d5b80259604b4f25021fcc5a730b5b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1dc93286… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 26 22:54:00 2013 +0200 Save client IP address text for "WebIRC" users This patch introduces a new field in the CLIENT structure, "ipa_text", which points to an optional textual representation of the client IP address (or NULL) which can be used to store the "real" IP address information of a client using the "WEBIRC" protocol. Without this patch, ngIRCd ignored the <ip-address> paramater ... In addition, the functions Client_SetIPAText() and Client_IPAText() have been introduced to set and get the textual representation of the client IP address. Client_IPAText() can be used even when no "IP address text" has been set before, it then returns the real IP address of the connection. Closes bug #159. --- src/ngircd/client.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/ngircd/client.h | 5 ++++- src/ngircd/irc-info.c | 4 ++-- src/ngircd/irc-login.c | 2 ++ 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 72774ca..26d4929 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -128,6 +128,8 @@ Client_Exit( void ) free(c->account_name); if (c->cloaked) free(c->cloaked); + if (c->ipa_text) + free(c->ipa_text); free( c ); c = next; } @@ -326,6 +328,8 @@ Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool Sen free(c->account_name); if (c->cloaked) free(c->cloaked); + if (c->ipa_text) + free(c->ipa_text); free( c ); break; } @@ -368,6 +372,27 @@ Client_SetHostname( CLIENT *Client, const char *Hostname ) } /* Client_SetHostname */ +/** + * Set IP address to display for a client. + * + * @param Client The client. + * @param IPAText Textual representation of the IP address or NULL to unset. + */ +GLOBAL void +Client_SetIPAText(CLIENT *Client, const char *IPAText) +{ + assert(Client != NULL); + + if (Client->ipa_text) + free(Client->ipa_text); + + if (*IPAText) + Client->ipa_text = strndup(IPAText, CLIENT_HOST_LEN - 1); + else + Client->ipa_text = NULL; +} + + GLOBAL void Client_SetID( CLIENT *Client, const char *ID ) { @@ -789,6 +814,21 @@ Client_HostnameDisplayed(CLIENT *Client) return Client->cloaked; } +GLOBAL const char * +Client_IPAText(CLIENT *Client) +{ + assert(Client != NULL); + + /* Not a local client? */ + if (Client_Conn(Client) <= NONE) + return "0.0.0.0"; + + if (!Client->ipa_text) + return Conn_GetIPAInfo(Client_Conn(Client)); + else + return Client->ipa_text; +} + /** * Update (and generate, if necessary) the cloaked hostname of a client. * diff --git a/src/ngircd/client.h b/src/ngircd/client.h index 702f114..71d413b 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2013 Alexander Barton (alex(a)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 @@ -49,6 +49,7 @@ typedef struct _CLIENT struct _CLIENT *topserver; /* toplevel servers (only valid if client is a server) */ char host[CLIENT_HOST_LEN]; /* hostname of the client */ char *cloaked; /* cloaked hostname of the client */ + char *ipa_text; /* textual representaton of IP address */ char user[CLIENT_USER_LEN]; /* user name ("login") */ #if defined(PAM) && defined(IDENTAUTH) char orig_user[CLIENT_USER_LEN];/* user name supplied by USER command */ @@ -114,6 +115,7 @@ GLOBAL char *Client_OrigUser PARAMS(( CLIENT *Client )); GLOBAL char *Client_Hostname PARAMS(( CLIENT *Client )); GLOBAL char *Client_HostnameCloaked PARAMS((CLIENT *Client)); GLOBAL char *Client_HostnameDisplayed PARAMS(( CLIENT *Client )); +GLOBAL const char *Client_IPAText PARAMS(( CLIENT *Client )); GLOBAL char *Client_Modes PARAMS(( CLIENT *Client )); GLOBAL char *Client_Flags PARAMS(( CLIENT *Client )); GLOBAL CLIENT *Client_Introducer PARAMS(( CLIENT *Client )); @@ -131,6 +133,7 @@ GLOBAL bool Client_HasMode PARAMS(( CLIENT *Client, char Mode )); GLOBAL bool Client_HasFlag PARAMS(( CLIENT *Client, char Flag )); GLOBAL void Client_SetHostname PARAMS(( CLIENT *Client, const char *Hostname )); +GLOBAL void Client_SetIPAText PARAMS(( CLIENT *Client, const char *IPAText )); GLOBAL void Client_SetID PARAMS(( CLIENT *Client, const char *Nick )); GLOBAL void Client_SetUser PARAMS(( CLIENT *Client, const char *User, bool Idented )); GLOBAL void Client_SetOrigUser PARAMS(( CLIENT *Client, const char *User )); diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 47a3797..3d77237 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -407,8 +407,8 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) (from == c || (!Conf_MorePrivacy && Client_HasMode(from, 'o')))) { /* Client hostname */ if (!IRC_WriteStrClient(from, RPL_WHOISHOST_MSG, - Client_ID(from), Client_ID(c), Client_Hostname(c), - Conn_GetIPAInfo(Client_Conn(c)))) + Client_ID(from), Client_ID(c), + Client_Hostname(c), Client_IPAText(c))) return DISCONNECTED; /* Client modes */ if (!IRC_WriteStrClient(from, RPL_WHOISMODES_MSG, diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 26dae6b..88804ef 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -610,6 +610,8 @@ IRC_WEBIRC(CLIENT *Client, REQUEST *Req) Client_SetUser(Client, Req->argv[1], true); Client_SetOrigUser(Client, Req->argv[1]); Client_SetHostname(Client, Req->argv[2]); + Client_SetIPAText(Client, Req->argv[3]); + return CONNECTED; } /* IRC_WEBIRC */

1 0