- ngIRCd GIT Updates - lists.barton.de

Federico G. Schwindt : Rename XXX_Fingerprint to XXX_CertFp
by alex＠arthur.barton.de 04 Aug '13

04 Aug '13

Module: ngircd.git Branch: master Commit: 646a97de5fea240f8e06e1b38aa9e72ea50e0c8c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=646a97de… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Sun Aug 4 03:14:27 2013 +0100 Rename XXX_Fingerprint to XXX_CertFp --- src/ngircd/client.c | 4 ++-- src/ngircd/conn-ssl.c | 8 ++++---- src/ngircd/conn-ssl.h | 4 ++-- src/ngircd/conn.c | 12 ++++++------ src/ngircd/conn.h | 4 ++-- src/ngircd/irc-info.c | 8 ++++---- src/ngircd/irc-metadata.c | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 73dcfca..9358dbb 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -1596,11 +1596,11 @@ Client_Announce(CLIENT * Client, CLIENT * Prefix, CLIENT * User) return DISCONNECTED; } - if (Conn_GetFingerprint(Client_Conn(User))) { + if (Conn_GetCertFp(Client_Conn(User))) { if (!IRC_WriteStrClientPrefix(Client, Prefix, "METADATA %s certfp :%s", Client_ID(User), - Conn_GetFingerprint(Client_Conn(User)))) + Conn_GetCertFp(Client_Conn(User)))) return DISCONNECTED; } } diff --git a/src/ngircd/conn-ssl.c b/src/ngircd/conn-ssl.c index 7141eac..0bca933 100644 --- a/src/ngircd/conn-ssl.c +++ b/src/ngircd/conn-ssl.c @@ -633,7 +633,7 @@ ConnSSL_Connect( CONNECTION *c ) } static int -ConnSSL_InitFingerprint( CONNECTION *c ) +ConnSSL_InitCertFp( CONNECTION *c ) { const char hex[] = "0123456789abcdef"; int i; @@ -723,7 +723,7 @@ ConnectAccept( CONNECTION *c, bool connect) if (ret) return ConnSSL_HandleError(c, ret, "gnutls_handshake"); #endif /* _GNUTLS */ - (void)ConnSSL_InitFingerprint(c); + (void)ConnSSL_InitCertFp(c); Conn_OPTION_DEL(c, (CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ|CONN_SSL_CONNECT)); ConnSSL_LogCertInfo(c); @@ -817,13 +817,13 @@ ConnSSL_GetCipherInfo(CONNECTION *c, char *buf, size_t len) } char * -ConnSSL_GetFingerprint(CONNECTION *c) +ConnSSL_GetCertFp(CONNECTION *c) { return c->ssl_state.fingerprint; } bool -ConnSSL_SetFingerprint(CONNECTION *c, const char *fingerprint) +ConnSSL_SetCertFp(CONNECTION *c, const char *fingerprint) { assert (c != NULL); c->ssl_state.fingerprint = strdup(fingerprint); diff --git a/src/ngircd/conn-ssl.h b/src/ngircd/conn-ssl.h index fc705f1..1e995fd 100644 --- a/src/ngircd/conn-ssl.h +++ b/src/ngircd/conn-ssl.h @@ -26,8 +26,8 @@ GLOBAL ssize_t ConnSSL_Write PARAMS(( CONNECTION *c, const void *buf, size_t cou GLOBAL ssize_t ConnSSL_Read PARAMS(( CONNECTION *c, void *buf, size_t count)); GLOBAL bool ConnSSL_GetCipherInfo PARAMS(( CONNECTION *c, char *buf, size_t len )); -GLOBAL char *ConnSSL_GetFingerprint PARAMS(( CONNECTION *c )); -GLOBAL bool ConnSSL_SetFingerprint PARAMS(( CONNECTION *c, const char *fingerprint )); +GLOBAL char *ConnSSL_GetCertFp PARAMS(( CONNECTION *c )); +GLOBAL bool ConnSSL_SetCertFp PARAMS(( CONNECTION *c, const char *fingerprint )); #endif /* SSL_SUPPORT */ #endif /* conn_ssl_h */ diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 9c6baef..5967fd7 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -2613,22 +2613,22 @@ Conn_UsesSSL(CONN_ID Idx) GLOBAL char * -Conn_GetFingerprint(CONN_ID Idx) +Conn_GetCertFp(CONN_ID Idx) { if (Idx < 0) return NULL; assert(Idx < (int) array_length(&My_ConnArray, sizeof(CONNECTION))); - return ConnSSL_GetFingerprint(&My_Connections[Idx]); + return ConnSSL_GetCertFp(&My_Connections[Idx]); } GLOBAL bool -Conn_SetFingerprint(CONN_ID Idx, const char *fingerprint) +Conn_SetCertFp(CONN_ID Idx, const char *fingerprint) { if (Idx < 0) return false; assert(Idx < (int) array_length(&My_ConnArray, sizeof(CONNECTION))); - return ConnSSL_SetFingerprint(&My_Connections[Idx], fingerprint); + return ConnSSL_SetCertFp(&My_Connections[Idx], fingerprint); } #else GLOBAL bool @@ -2639,14 +2639,14 @@ Conn_UsesSSL(UNUSED CONN_ID Idx) GLOBAL char * -Conn_GetFingerprint(UNUSED CONN_ID Idx) +Conn_GetCertFp(UNUSED CONN_ID Idx) { return NULL; } GLOBAL bool -Conn_SetFingerprint(UNUSED CONN_ID Idx, UNUSED const char *fingerprint) +Conn_SetCertFp(UNUSED CONN_ID Idx, UNUSED const char *fingerprint) { return true; } diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index a6cf53a..c642541 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -139,8 +139,8 @@ GLOBAL CONN_ID Conn_GetFromProc PARAMS((int fd)); GLOBAL CLIENT* Conn_GetClient PARAMS((CONN_ID i)); GLOBAL PROC_STAT* Conn_GetProcStat PARAMS((CONN_ID i)); -GLOBAL char *Conn_GetFingerprint PARAMS((CONN_ID Idx)); -GLOBAL bool Conn_SetFingerprint PARAMS((CONN_ID Idx, const char *fingerprint)); +GLOBAL char *Conn_GetCertFp PARAMS((CONN_ID Idx)); +GLOBAL bool Conn_SetCertFp PARAMS((CONN_ID Idx, const char *fingerprint)); GLOBAL bool Conn_UsesSSL PARAMS((CONN_ID Idx)); #ifdef SSL_SUPPORT diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 22284cb..3769bef 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -387,11 +387,11 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) return DISCONNECTED; /* Certificate fingerprint? */ - if (Conn_GetFingerprint(Client_Conn(c)) && + if (Conn_GetCertFp(Client_Conn(c)) && from == c && !IRC_WriteStrClient(from, RPL_WHOISCERTFP_MSG, Client_ID(from), Client_ID(c), - Conn_GetFingerprint(Client_Conn(c)))) + Conn_GetCertFp(Client_Conn(c)))) return DISCONNECTED; } @@ -462,10 +462,10 @@ Show_MOTD_SSLInfo(CLIENT *Client) return false; } - if (Conn_GetFingerprint(Client_Conn(Client))) { + if (Conn_GetCertFp(Client_Conn(Client))) { snprintf(buf, sizeof(buf), "Your client certificate fingerprint is: %s", - Conn_GetFingerprint(Client_Conn(Client))); + Conn_GetCertFp(Client_Conn(Client))); if (!IRC_WriteStrClient(Client, RPL_MOTD_MSG, Client_ID(Client), buf)) return false; diff --git a/src/ngircd/irc-metadata.c b/src/ngircd/irc-metadata.c index d64ffb2..d185488 100644 --- a/src/ngircd/irc-metadata.c +++ b/src/ngircd/irc-metadata.c @@ -97,7 +97,7 @@ IRC_METADATA(CLIENT *Client, REQUEST *Req) else if (*Req->argv[2] && strcasecmp(Req->argv[1], "user") == 0) Client_SetUser(target, Req->argv[2], true); else if (*Req->argv[2] && strcasecmp(Req->argv[1], "certfp") == 0) - Conn_SetFingerprint(Client_Conn(target), Req->argv[2]); + Conn_SetCertFp(Client_Conn(target), Req->argv[2]); else Log(LOG_WARNING, "Ignored metadata update from \"%s\" for client \"%s\": \"%s=%s\" - unknown key!",

1 0

Federico G. Schwindt : Fix spelling
by alex＠arthur.barton.de 04 Aug '13

04 Aug '13

Module: ngircd.git Branch: master Commit: a95d3e05e7c01fb82981898cdcfe162d727952bc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a95d3e05… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Sun Aug 4 03:15:27 2013 +0100 Fix spelling --- src/ngircd/irc-server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index a8b82c9..8fc575f 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -155,7 +155,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) if (strchr(Client_Flags(Client), 'Z') && !Zip_InitConn(Client_Conn(Client))) { Conn_Close(Client_Conn(Client), - "Can't inizialize compression (zlib)!", + "Can't initialize compression (zlib)!", NULL, false ); return DISCONNECTED; }

1 0

Federico G. Schwindt : Add Client_HasFlag() to check if a client has certain flag
by alex＠arthur.barton.de 04 Aug '13

04 Aug '13

Module: ngircd.git Branch: master Commit: e03d8eb7284147f7d44ff192cec18ad9716fedff URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e03d8eb7… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Sun Aug 4 03:20:13 2013 +0100 Add Client_HasFlag() to check if a client has certain flag --- src/ngircd/client.c | 8 ++++++++ src/ngircd/client.h | 1 + src/ngircd/irc-metadata.c | 2 +- src/ngircd/irc-server.c | 4 ++-- src/ngircd/irc-write.c | 2 +- src/ngircd/numeric.c | 6 +++--- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 9358dbb..7821d3b 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -950,6 +950,14 @@ Client_HasMode( CLIENT *Client, char Mode ) } /* Client_HasMode */ +GLOBAL bool +Client_HasFlag( CLIENT *Client, char Flag ) +{ + assert( Client != NULL ); + return strchr( Client->flags, Flag ) != NULL; +} /* Client_HasFlag */ + + GLOBAL char * Client_Away( CLIENT *Client ) { diff --git a/src/ngircd/client.h b/src/ngircd/client.h index 68d411c..94ca4dc 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -126,6 +126,7 @@ GLOBAL char *Client_Away PARAMS(( CLIENT *Client )); GLOBAL time_t Client_StartTime PARAMS(( CLIENT *Client )); 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_SetID PARAMS(( CLIENT *Client, const char *Nick )); diff --git a/src/ngircd/irc-metadata.c b/src/ngircd/irc-metadata.c index d185488..3c8a4a8 100644 --- a/src/ngircd/irc-metadata.c +++ b/src/ngircd/irc-metadata.c @@ -70,7 +70,7 @@ IRC_METADATA(CLIENT *Client, REQUEST *Req) Req->argv[1], Req->argv[2]); /* Mark client: it has receiveda a METADATA command */ - if (!strchr(Client_Flags(target), 'M')) { + if (!Client_HasFlag(target, 'M')) { snprintf(new_flags, sizeof new_flags, "%sM", Client_Flags(target)); Client_SetFlags(target, new_flags); diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 8fc575f..d8e4b29 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -152,7 +152,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) Client_SetType(Client, CLIENT_UNKNOWNSERVER); #ifdef ZLIB - if (strchr(Client_Flags(Client), 'Z') + if (Client_HasFlag(Client, 'Z') && !Zip_InitConn(Client_Conn(Client))) { Conn_Close(Client_Conn(Client), "Can't initialize compression (zlib)!", @@ -162,7 +162,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) #endif #ifdef IRCPLUS - if (strchr(Client_Flags(Client), 'H')) { + if (Client_HasFlag(Client, 'H')) { LogDebug("Peer supports IRC+ extended server handshake ..."); if (!IRC_Send_ISUPPORT(Client)) return DISCONNECTED; diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c index 16aac9a..fd0f85a 100644 --- a/src/ngircd/irc-write.c +++ b/src/ngircd/irc-write.c @@ -311,7 +311,7 @@ IRC_WriteStrServersPrefixFlag_CB(CLIENT *ExceptOf, CLIENT *Prefix, char Flag, if (Client_Type(c) == CLIENT_SERVER && Client_Conn(c) > NONE && c != Client_ThisServer() && c != ExceptOf) { /* Found a target server, do the flags match? */ - if (Flag == '\0' || strchr(Client_Flags(c), Flag)) + if (Flag == '\0' || Client_HasFlag(c, Flag)) callback(c, Prefix, cb_data); } c = Client_Next(c); diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c index 01091ed..f2c61e8 100644 --- a/src/ngircd/numeric.c +++ b/src/ngircd/numeric.c @@ -52,7 +52,7 @@ Announce_Channel(CLIENT *Client, CHANNEL *Chan) /* Check features of remote server */ njoin = Conn_Options(Client_Conn(Client)) & CONN_RFC1459 ? false : true; - xop = strchr(Client_Flags(Client), 'X') ? true : false; + xop = Client_HasFlag(Client, 'X') ? true : false; /* Get all the members of this channel */ cl2chan = Channel_FirstMember(Chan); @@ -321,7 +321,7 @@ IRC_Num_ENDOFMOTD(CLIENT * Client, UNUSED REQUEST * Req) } #ifdef IRCPLUS /* Send CHANINFO if the peer supports it */ - if (strchr(Client_Flags(Client), 'C')) { + if (Client_HasFlag(Client, 'C')) { if (!Send_CHANINFO(Client, chan)) return DISCONNECTED; } @@ -335,7 +335,7 @@ IRC_Num_ENDOFMOTD(CLIENT * Client, UNUSED REQUEST * Req) } #ifdef IRCPLUS - if (strchr(Client_Flags(Client), 'L')) { + if (Client_HasFlag(Client, 'L')) { LogDebug("Synchronizing INVITE- and BAN-lists ..."); if (!Synchronize_Lists(Client)) return DISCONNECTED;

1 0

Federico G. Schwindt : Change cloaked hostname to be malloc'd on demand
by alex＠arthur.barton.de 04 Aug '13

04 Aug '13

Module: ngircd.git Branch: master Commit: bb8d207efa56b8dbdf366d980b848b0abd072a7d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bb8d207e… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Sun Aug 4 10:15:11 2013 +0100 Change cloaked hostname to be malloc'd on demand This shaves a few bytes when cloaked hostnames are not used and restricts the cloakhost announcement iif there is something to send. --- src/ngircd/client.c | 25 ++++++++++++++++--------- src/ngircd/client.h | 2 +- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 7821d3b..d70cfb4 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -318,6 +318,8 @@ Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool Sen } } + if (c->cloaked) + free(c->cloaked); free( c ); break; } @@ -744,8 +746,6 @@ Client_HostnameCloaked(CLIENT *Client) * Get (potentially cloaked) hostname of a client to display it to other users. * * If the client has not enabled cloaking, the real hostname is used. - * Please note that this function uses a global static buffer, so you can't - * nest invocations without overwriting earlier results! * * @param Client Pointer to client structure * @return Pointer to client hostname @@ -760,7 +760,7 @@ Client_HostnameDisplayed(CLIENT *Client) return Client_Hostname(Client); /* Use an already saved cloaked hostname, if there is one */ - if (Client->cloaked[0]) + if (Client->cloaked) return Client->cloaked; Client_UpdateCloakedHostname(Client, NULL, NULL); @@ -781,25 +781,32 @@ GLOBAL void Client_UpdateCloakedHostname(CLIENT *Client, CLIENT *Origin, const char *Hostname) { - static char Cloak_Buffer[CLIENT_HOST_LEN]; + char Cloak_Buffer[CLIENT_HOST_LEN]; assert(Client != NULL); if (!Origin) Origin = Client_ThisServer(); + if (!Client->cloaked) { + Client->cloaked = malloc(CLIENT_HOST_LEN); + if (!Client->cloaked) + return; + } + if (!Hostname) { /* Generate new cloaked hostname */ if (*Conf_CloakHostModeX) { - strlcpy(Cloak_Buffer, Client->host, CLIENT_HOST_LEN); + strlcpy(Cloak_Buffer, Client->host, + sizeof(Cloak_Buffer)); strlcat(Cloak_Buffer, Conf_CloakHostSalt, - CLIENT_HOST_LEN); - snprintf(Client->cloaked, sizeof(Client->cloaked), + sizeof(Cloak_Buffer)); + snprintf(Client->cloaked, CLIENT_HOST_LEN, Conf_CloakHostModeX, Hash(Cloak_Buffer)); } else strlcpy(Client->cloaked, Client_ID(Client->introducer), - sizeof(Client->cloaked)); + CLIENT_HOST_LEN); } else - strlcpy(Client->cloaked, Hostname, sizeof(Client->cloaked)); + strlcpy(Client->cloaked, Hostname, CLIENT_HOST_LEN); LogDebug("Cloaked hostname of \"%s\" updated to \"%s\"", Client_ID(Client), Client->cloaked); diff --git a/src/ngircd/client.h b/src/ngircd/client.h index 94ca4dc..6d5298f 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -48,7 +48,7 @@ typedef struct _CLIENT struct _CLIENT *introducer; /* ID of the servers which the client is connected to */ struct _CLIENT *topserver; /* toplevel servers (only valid if client is a server) */ char host[CLIENT_HOST_LEN]; /* hostname of the client */ - char cloaked[CLIENT_HOST_LEN]; /* cloaked hostname of the client */ + char *cloaked; /* cloaked hostname of the client */ 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 */

1 0

Federico G. Schwindt : Improved client announcement
by alex＠arthur.barton.de 04 Aug '13

04 Aug '13

Module: ngircd.git Branch: master Commit: 8e60fac73b791129b69d20c9e5b02ee1e89f6eaa URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8e60fac7… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Sun Aug 4 00:22:38 2013 +0100 Improved client announcement Move Announce_User() to client.c and rename it to Client_Announce(). Use this in cb_introduceClient() instead of duplicating the code. This fix the certificate fingerprint announcement for new clients. Also ensure the certificate fingerprint is only announced if the client supports it (`M' flag). --- src/ngircd/client.c | 108 +++++++++++++++++++++++++++++++++++--------------- src/ngircd/client.h | 2 + src/ngircd/numeric.c | 76 +---------------------------------- 3 files changed, 80 insertions(+), 106 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 37b168f..73dcfca 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -1513,9 +1513,6 @@ Destroy_UserOrService(CLIENT *Client, const char *Txt, const char *FwdMsg, bool /** * Introduce a new user or service client to a remote server. * - * This function differentiates between RFC1459 and RFC2813 server links and - * generates the appropriate commands to register the new user or service. - * * @param To The remote server to inform. * @param Prefix Prefix for the generated commands. * @param data CLIENT structure of the new client. @@ -1524,43 +1521,92 @@ static void cb_introduceClient(CLIENT *To, CLIENT *Prefix, void *data) { CLIENT *c = (CLIENT *)data; + + (void)Client_Announce(To, Prefix, c); + +} /* cb_introduceClient */ + + +/** + * Announce an user or service to a server. + * + * This function differentiates between RFC1459 and RFC2813 server links and + * generates the appropriate commands to register the user or service. + * + * @param Client Server + * @param Prefix Prefix for the generated commands + * @param User User to announce + */ +GLOBAL bool +Client_Announce(CLIENT * Client, CLIENT * Prefix, CLIENT * User) +{ CONN_ID conn; char *modes, *user, *host; - modes = Client_Modes(c); - user = Client_User(c) ? Client_User(c) : "-"; - host = Client_Hostname(c) ? Client_Hostname(c) : "-"; + modes = Client_Modes(User); + user = Client_User(User) ? Client_User(User) : "-"; + host = Client_Hostname(User) ? Client_Hostname(User) : "-"; - conn = Client_Conn(To); + conn = Client_Conn(Client); if (Conn_Options(conn) & CONN_RFC1459) { /* RFC 1459 mode: separate NICK and USER commands */ - Conn_WriteStr(conn, "NICK %s :%d", Client_ID(c), - Client_Hops(c) + 1); - Conn_WriteStr(conn, ":%s USER %s %s %s :%s", - Client_ID(c), user, host, - Client_ID(Client_Introducer(c)), Client_Info(c)); - if (modes[0]) - Conn_WriteStr(conn, ":%s MODE %s +%s", - Client_ID(c), Client_ID(c), modes); + if (! Conn_WriteStr(conn, "NICK %s :%d", + Client_ID(User), Client_Hops(User) + 1)) + return DISCONNECTED; + if (! Conn_WriteStr(conn, ":%s USER %s %s %s :%s", + Client_ID(User), user, host, + Client_ID(Client_Introducer(User)), + Client_Info(User))) + return DISCONNECTED; + if (modes[0]) { + if (! Conn_WriteStr(conn, ":%s MODE %s +%s", + Client_ID(User), Client_ID(User), + modes)) + return DISCONNECTED; + } } else { /* RFC 2813 mode: one combined NICK or SERVICE command */ - if (Client_Type(c) == CLIENT_SERVICE - && strchr(Client_Flags(To), 'S')) - IRC_WriteStrClientPrefix(To, Prefix, - "SERVICE %s %d * +%s %d :%s", - Client_Mask(c), - Client_MyToken(Client_Introducer(c)), - Client_Modes(c), Client_Hops(c) + 1, - Client_Info(c)); - else - IRC_WriteStrClientPrefix(To, Prefix, - "NICK %s %d %s %s %d +%s :%s", - Client_ID(c), Client_Hops(c) + 1, - user, host, - Client_MyToken(Client_Introducer(c)), - modes, Client_Info(c)); + if (Client_Type(User) == CLIENT_SERVICE + && strchr(Client_Flags(Client), 'S')) { + if (!IRC_WriteStrClientPrefix(Client, Prefix, + "SERVICE %s %d * +%s %d :%s", + Client_Mask(User), + Client_MyToken(Client_Introducer(User)), + modes, Client_Hops(User) + 1, + Client_Info(User))) + return DISCONNECTED; + } else { + if (!IRC_WriteStrClientPrefix(Client, Prefix, + "NICK %s %d %s %s %d +%s :%s", + Client_ID(User), Client_Hops(User) + 1, + user, host, + Client_MyToken(Client_Introducer(User)), + modes, Client_Info(User))) + return DISCONNECTED; + } } -} /* cb_introduceClient */ + + if (strchr(Client_Flags(Client), 'M')) { + /* Synchronize metadata */ + if (Client_HostnameCloaked(User)) { + if (!IRC_WriteStrClientPrefix(Client, Prefix, + "METADATA %s cloakhost :%s", + Client_ID(User), + Client_HostnameCloaked(User))) + return DISCONNECTED; + } + + if (Conn_GetFingerprint(Client_Conn(User))) { + if (!IRC_WriteStrClientPrefix(Client, Prefix, + "METADATA %s certfp :%s", + Client_ID(User), + Conn_GetFingerprint(Client_Conn(User)))) + return DISCONNECTED; + } + } + + return CONNECTED; +} /* Client_Announce */ #ifdef DEBUG diff --git a/src/ngircd/client.h b/src/ngircd/client.h index c248d1b..68d411c 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -93,6 +93,8 @@ GLOBAL CLIENT *Client_ThisServer PARAMS(( void )); GLOBAL CLIENT *Client_GetFromToken PARAMS(( CLIENT *Client, int Token )); +GLOBAL bool Client_Announce PARAMS(( CLIENT *Client, CLIENT *Prefix, CLIENT *User )); + GLOBAL CLIENT *Client_Search PARAMS(( const char *ID )); GLOBAL CLIENT *Client_SearchServer PARAMS(( const char *ID )); GLOBAL CLIENT *Client_First PARAMS(( void )); diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c index f7f3ac9..01091ed 100644 --- a/src/ngircd/numeric.c +++ b/src/ngircd/numeric.c @@ -150,80 +150,6 @@ Announce_Server(CLIENT * Client, CLIENT * Server) } /* Announce_Server */ -/** - * Announce existing user to a new server - * @param Client New server - * @param User Existing user in the network - */ -static bool -Announce_User(CLIENT * Client, CLIENT * User) -{ - CONN_ID conn; - char *modes; - - conn = Client_Conn(Client); - if (Conn_Options(conn) & CONN_RFC1459) { - /* RFC 1459 mode: separate NICK and USER commands */ - if (! Conn_WriteStr(conn, "NICK %s :%d", - Client_ID(User), Client_Hops(User) + 1)) - return DISCONNECTED; - if (! Conn_WriteStr(conn, ":%s USER %s %s %s :%s", - Client_ID(User), Client_User(User), - Client_Hostname(User), - Client_ID(Client_Introducer(User)), - Client_Info(User))) - return DISCONNECTED; - modes = Client_Modes(User); - if (modes[0]) { - return Conn_WriteStr(conn, ":%s MODE %s +%s", - Client_ID(User), Client_ID(User), - modes); - } - } else { - /* RFC 2813 mode: one combined NICK or SERVICE command */ - if (Client_Type(User) == CLIENT_SERVICE - && strchr(Client_Flags(Client), 'S')) { - if (!IRC_WriteStrClient(Client, - "SERVICE %s %d * +%s %d :%s", - Client_Mask(User), - Client_MyToken(Client_Introducer(User)), - Client_Modes(User), Client_Hops(User) + 1, - Client_Info(User))) - return DISCONNECTED; - } else { - if (!IRC_WriteStrClient(Client, - "NICK %s %d %s %s %d +%s :%s", - Client_ID(User), Client_Hops(User) + 1, - Client_User(User), Client_Hostname(User), - Client_MyToken(Client_Introducer(User)), - Client_Modes(User), Client_Info(User))) - return DISCONNECTED; - } - } - - if (strchr(Client_Flags(Client), 'M')) { - /* Synchronize metadata */ - if (Client_HostnameCloaked(User)) { - if (!IRC_WriteStrClient(Client, - "METADATA %s cloakhost :%s", - Client_ID(User), - Client_HostnameCloaked(User))) - return DISCONNECTED; - } - } - - if (Conn_GetFingerprint(conn)) { - if (!IRC_WriteStrClient(Client, - "METADATA %s certfp :%s", - Client_ID(User), - Conn_GetFingerprint(conn))) - return DISCONNECTED; - } - - return CONNECTED; -} /* Announce_User */ - - #ifdef IRCPLUS /** @@ -380,7 +306,7 @@ IRC_Num_ENDOFMOTD(CLIENT * Client, UNUSED REQUEST * Req) while (c) { if (Client_Type(c) == CLIENT_USER || Client_Type(c) == CLIENT_SERVICE) { - if (!Announce_User(Client, c)) + if (!Client_Announce(Client, Client_ThisServer(), c)) return DISCONNECTED; } c = Client_Next(c);

1 0

Federico G. Schwindt : Add certificate fingerprint support
by alex＠arthur.barton.de 03 Aug '13

03 Aug '13

Module: ngircd.git Branch: master Commit: 1254d315b9d33010035aaf7eba61ac4e8e1cc98f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1254d315… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Fri Aug 2 01:47:06 2013 +0100 Add certificate fingerprint support --- doc/Protocol.txt | 1 + src/ngircd/conf-ssl.h | 1 + src/ngircd/conn-ssl.c | 104 +++++++++++++++++++++++++++++++++++++++++++++ src/ngircd/conn-ssl.h | 3 ++ src/ngircd/conn.c | 39 +++++++++++++++++ src/ngircd/conn.h | 9 ++-- src/ngircd/irc-info.c | 43 +++++++++++++------ src/ngircd/irc-metadata.c | 2 + src/ngircd/messages.h | 1 + src/ngircd/numeric.c | 8 ++++ 10 files changed, 194 insertions(+), 17 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=1254…

1 0

Federico G. Schwindt : Simplify MOTD handling
by alex＠arthur.barton.de 03 Aug '13

03 Aug '13

Module: ngircd.git Branch: master Commit: bf8e03c46652100547755322a797f0bf8e2da586 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bf8e03c4… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Fri Aug 2 16:43:01 2013 +0100 Simplify MOTD handling Merge Show_MOTD_Start, Show_MOTD_Sendline and Show_MOTD_End into IRC_Show_MOTD. --- src/ngircd/irc-info.c | 52 ++++++++++++++++++------------------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index ad04040..22284cb 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -448,35 +448,9 @@ WHOWAS_EntryWrite(CLIENT *prefix, WHOWAS *entry) entry->id, entry->server, t_str); } -static bool -Show_MOTD_Start(CLIENT *Client) -{ - return IRC_WriteStrClient(Client, RPL_MOTDSTART_MSG, - Client_ID( Client ), Client_ID( Client_ThisServer( ))); -} - -static bool -Show_MOTD_Sendline(CLIENT *Client, const char *msg) -{ - return IRC_WriteStrClient(Client, RPL_MOTD_MSG, Client_ID( Client ), msg); -} - -static bool -Show_MOTD_End(CLIENT *Client) -{ - if (!IRC_WriteStrClient(Client, RPL_ENDOFMOTD_MSG, Client_ID(Client))) - return DISCONNECTED; - - if (*Conf_CloakHost) - return IRC_WriteStrClient(Client, RPL_HOSTHIDDEN_MSG, - Client_ID(Client), - Client_Hostname(Client)); - - return CONNECTED; -} - #ifdef SSL_SUPPORT -static bool Show_MOTD_SSLInfo(CLIENT *Client) +static bool +Show_MOTD_SSLInfo(CLIENT *Client) { char buf[COMMAND_LEN]; char c_str[128]; @@ -500,9 +474,11 @@ static bool Show_MOTD_SSLInfo(CLIENT *Client) return true; } #else -static inline bool +static bool Show_MOTD_SSLInfo(UNUSED CLIENT *c) -{ return true; } +{ + return true; +} #endif /* Global functions */ @@ -1496,7 +1472,8 @@ IRC_Show_MOTD( CLIENT *Client ) if (len_tot == 0 && !Conn_UsesSSL(Client_Conn(Client))) return IRC_WriteStrClient(Client, ERR_NOMOTD_MSG, Client_ID(Client)); - if (!Show_MOTD_Start(Client)) + if (!IRC_WriteStrClient(Client, RPL_MOTDSTART_MSG, Client_ID(Client), + Client_ID(Client_ThisServer()))) return DISCONNECTED; line = array_start(&Conf_Motd); @@ -1506,14 +1483,23 @@ IRC_Show_MOTD( CLIENT *Client ) assert(len_tot >= len_str); len_tot -= len_str; - if (!Show_MOTD_Sendline(Client, line)) + if (!IRC_WriteStrClient(Client, RPL_MOTD_MSG, Client_ID(Client), line)) return DISCONNECTED; line += len_str; } if (!Show_MOTD_SSLInfo(Client)) return DISCONNECTED; - return Show_MOTD_End(Client); + + if (!IRC_WriteStrClient(Client, RPL_ENDOFMOTD_MSG, Client_ID(Client))) + return DISCONNECTED; + + if (*Conf_CloakHost) + return IRC_WriteStrClient(Client, RPL_HOSTHIDDEN_MSG, + Client_ID(Client), + Client_Hostname(Client)); + + return CONNECTED; } /* IRC_Show_MOTD */ /**

1 0

Alexander Barton : Merge remote-tracking branch 'fgsch/certfp'
by alex＠arthur.barton.de 03 Aug '13

03 Aug '13

Module: ngircd.git Branch: master Commit: 69ce65bacb0155be5fb9159a3dfc5c8e3390cc0d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=69ce65ba… Author: Alexander Barton <alex(a)barton.de> Date: Sat Aug 3 00:29:12 2013 +0200 Merge remote-tracking branch 'fgsch/certfp' * fgsch/certfp: Simplify MOTD handling Add certificate fingerprint support ---

1 0

Alexander Barton : Update irc-server.c to use irc-macros.h
by alex＠arthur.barton.de 03 Aug '13

03 Aug '13

Module: ngircd.git Branch: master Commit: 4ec19c03323c872a576d6891b3c5fa3fe70261c4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4ec19c03… Author: Alexander Barton <alex(a)barton.de> Date: Sat Aug 3 00:00:47 2013 +0200 Update irc-server.c to use irc-macros.h And add some comments :-) --- src/ngircd/irc-server.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 0a9e930..a8b82c9 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2007 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 @@ -29,7 +29,6 @@ #include "conn-zip.h" #include "conf.h" #include "channel.h" -#include "irc-write.h" #include "lists.h" #include "log.h" #include "messages.h" @@ -37,15 +36,19 @@ #include "numeric.h" #include "ngircd.h" #include "irc-info.h" +#include "irc-macros.h" +#include "irc-write.h" #include "op.h" #include "exp.h" #include "irc-server.h" - /** - * Handler for the IRC command "SERVER". - * See RFC 2813 section 4.1.2. + * Handler for the IRC "SERVER" command. + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. */ GLOBAL bool IRC_SERVER( CLIENT *Client, REQUEST *Req ) @@ -214,7 +217,13 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) Client_ID(Client), Req->command); } /* IRC_SERVER */ - +/* + * Handler for the IRC "NJOIN" command. + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_NJOIN( CLIENT *Client, REQUEST *Req ) { @@ -226,7 +235,7 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2) strlcpy( nick_in, Req->argv[1], sizeof( nick_in )); strcpy( nick_out, "" ); @@ -288,15 +297,19 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) } /* forward to other servers */ - if( nick_out[0] != '\0' ) IRC_WriteStrServersPrefix( Client, Client_ThisServer( ), "NJOIN %s :%s", Req->argv[0], nick_out ); + if (nick_out[0] != '\0') + IRC_WriteStrServersPrefix(Client, Client_ThisServer(), + "NJOIN %s :%s", Req->argv[0], nick_out); return CONNECTED; } /* IRC_NJOIN */ - /** - * Handler for the IRC command "SQUIT". - * See RFC 2813 section 4.1.2 and RFC 2812 section 3.1.8. + * Handler for the IRC "SQUIT" command. + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. */ GLOBAL bool IRC_SQUIT(CLIENT * Client, REQUEST * Req) @@ -313,10 +326,7 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req) && !Client_HasMode(Client, 'o')) return Op_NoPrivileges(Client, Req); - /* Bad number of arguments? */ - if (Req->argc != 2) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2) if (Client_Type(Client) == CLIENT_SERVER && Req->prefix) { from = Client_Search(Req->prefix);

1 0

Alexander Barton : Commands.txt: Update more descriptions
by alex＠arthur.barton.de 03 Aug '13

03 Aug '13

Module: ngircd.git Branch: master Commit: 61a6691b364fbb58b49de62ad191855d7a1f06f4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=61a6691b… Author: Alexander Barton <alex(a)barton.de> Date: Fri Aug 2 23:59:32 2013 +0200 Commands.txt: Update more descriptions Update description of "CHANINFO", "METADATA", "NJOIN", "SERVER", "SQUIT", "GET", and "POST". --- doc/Commands.txt | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index 6bbd206..c43b50e 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -865,6 +865,8 @@ Server Protocol Commands . CHANINFO is used by servers to inform each other about a channel: its modes, channel key, user limits and its topic. + . + The CHANINFO command is allowed on server-links only. References: - IRC+, <http://ngircd.barton.de/doc/Protocol.txt> @@ -892,20 +894,50 @@ Server Protocol Commands The METADATA command is used on server-links to update "metadata" information of clients, like the hostname, the info text ("real name"), or the user name. + . + The METADATA command is allowed on server-links only. References: - IRC+, <http://ngircd.barton.de/doc/Protocol.txt> - IRC+, doc/Protocol.txt - NJOIN + NJOIN <channel> [<mode>]<nick>[,[<mode>]<nick>[,...]] + . + The NJOIN command is used on setver-links to add users with <nick> + and <mode> to a <channel> while peering. + . + The NJOIN command is allowed on server-links only. + + References: + - RFC 2813, 4.2.2 "Njoin message" - SERVER + SERVER <servername> <info> + SERVER <servername> <hopcount> <info> + SERVER <servername> <hopcount> <token> <info> + . + The first form registers the local connection as a new server in the + network, the second (RFC 1459) and third (RFC 2812) form announce a + new remote server in the network. + . + The SERVER command is allowed on unregistered or server-links only. + + References: + - RFC 1459, 4.1.4 "Server message" + - RFC 2813, 4.1.2 "Server message" - SQUIT - SQUIT <server> + SQUIT <server> <comment> . Disconnects an IRC Server from the network. + . + This command is used on server-links, but can be used by IRC Operators + to forcefully disconnect servers from the network, too. + References: + - RFC 2812, 3.1.8 "Squit" + - RFC 2813, 4.1.6 "Server quit message" Dummy Commands ~~~~~~~~~~~~~~ @@ -934,5 +966,19 @@ Dummy Commands - RFC 2812, 4.6 "Users" - GET + GET [...] + . + Fake HTTP GET command. When received, the connection is shut down + immediately again to protect against crazy web browsers ... + + References: + - ngIRCd GIT commit 33e8c2480649 - POST + POST [...] + . + Fake HTTP POST command. When received, the connection is shut down + immediately again to protect against crazy web browsers ... + + References: + - ngIRCd GIT commit 33e8c2480649

1 0