August 2012 - ngIRCd GIT Updates

DNS777 : Recognize user mode "R"
by alex＠arthur.barton.de 27 Aug '12

27 Aug '12

Module: ngircd.git Branch: master Commit: 8349a1c0d94eab61b872bb4625cbdc55feb0b86f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8349a1c0… Author: DNS777 <dns(a)rbose.org> Date: Thu Aug 23 09:25:30 2012 +0000 Recognize user mode "R" This allows users to unset the user mode "R". --- src/ngircd/irc-mode.c | 9 +++++++++ src/ngircd/messages.h | 1 + 2 files changed, 10 insertions(+) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index fa35cdd..1776936 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -256,6 +256,15 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) ERR_RESTRICTED_MSG, Client_ID(Origin)); break; + case 'R': /* Registered (only unsettable) */ + if (!set || Client_Type(Client) == CLIENT_SERVICE + || Client_Type(Client) == CLIENT_SERVER) + x[0] = 'R'; + else + ok = IRC_WriteStrClient(Origin, + ERR_NICKREGISTER_MSG, + Client_ID(Origin)); + break; case 'x': /* Cloak hostname */ if (Client_HasMode(Client, 'r')) ok = IRC_WriteStrClient(Origin, diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 9ad6be1..4aed70f 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -138,6 +138,7 @@ #define ERR_CHANOPRIVSNEEDED_MSG "482 %s %s :You are not channel operator" #define ERR_CANTKILLSERVER_MSG "483 %s :You can't kill a server!" #define ERR_RESTRICTED_MSG "484 %s :Your connection is restricted" +#define ERR_NICKREGISTER_MSG "484 %s :Cannot set user mode (+R) -- Use IRC services" #define ERR_NOOPERHOST_MSG "491 %s :Not configured for your host" #define ERR_NOTONSAMECHANNEL_MSG "493 %s :You must share a common channel with %s"

1 0

Alexander Barton : ngt_RandomStr(): : make it buildable with pre-ANSI C compilers
by alex＠arthur.barton.de 27 Aug '12

27 Aug '12

Module: ngircd.git Branch: master Commit: 74be9040183c113d5cb62ad25782099479a5c450 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=74be9040… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 27 22:42:52 2012 +0200 ngt_RandomStr(): : make it buildable with pre-ANSI C compilers --- src/tool/tool.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/tool/tool.c b/src/tool/tool.c index df10918..eb6c131 100644 --- a/src/tool/tool.c +++ b/src/tool/tool.c @@ -135,24 +135,20 @@ ngt_TrimLastChr( char *String, const char Chr) * Fill a String with random chars */ GLOBAL char * -ngt_RandomStr( char *String, const size_t len) +ngt_RandomStr(char *String, const size_t len) { - assert(String != NULL); + static const char chars[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!\"#$&'()*+,-./:;<=>?@[\\]^_`"; + struct timeval t; + size_t i; - static const char chars[] = - "0123456789ABCDEFGHIJKLMNO" - "PQRSTUVWXYZabcdefghijklmn" - "opqrstuvwxyz!\"#$&'()*+,-" - "./:;<=>?@[\\]^_`"; + assert(String != NULL); - struct timeval t; gettimeofday(&t, NULL); srand((unsigned)(t.tv_usec * t.tv_sec)); - for (size_t i = 0; i < len; ++i) { + for (i = 0; i < len; ++i) { String[i] = chars[rand() % (sizeof(chars) - 1)]; } - String[len] = '\0'; return String;

1 0

Alexander Barton : Get_CAP_String(): make it buildable with pre-ANSI C compilers
by alex＠arthur.barton.de 27 Aug '12

27 Aug '12

Module: ngircd.git Branch: master Commit: 298cd9a327dca9717ff352d78f964dd49ca5f9f4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=298cd9a3… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 27 22:42:04 2012 +0200 Get_CAP_String(): make it buildable with pre-ANSI C compilers --- src/ngircd/irc-cap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c index 2ea4c9a..af34c38 100644 --- a/src/ngircd/irc-cap.c +++ b/src/ngircd/irc-cap.c @@ -275,8 +275,8 @@ Parse_CAP(int Capabilities, char *Args) * @param Capabilities Capability flags (bitmask). * @return Pointer to textual representation. */ -char -*Get_CAP_String(int Capabilities) +char * +Get_CAP_String(int Capabilities) { static char txt[COMMAND_LEN];

1 0

Alexander Barton : Enhance "NOTICE AUTH": show hostname and IDENT reply
by alex＠arthur.barton.de 27 Aug '12

27 Aug '12

Module: ngircd.git Branch: master Commit: 414bfe65ebe8ac1076476b25ed0bb91faad74f47 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=414bfe65… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 27 22:05:55 2012 +0200 Enhance "NOTICE AUTH": show hostname and IDENT reply --- src/ngircd/conn.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index e57aa24..fd17597 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -2257,7 +2257,8 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) Client_SetHostname(c, readbuf); if (Conf_NoticeAuth) (void)Conn_WriteStr(i, - "NOTICE AUTH :*** Found your hostname"); + "NOTICE AUTH :*** Found your hostname: %s", + My_Connections[i].host); #ifdef IDENTAUTH ++identptr; if (*identptr) { @@ -2282,8 +2283,10 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) } if (Conf_NoticeAuth) { (void)Conn_WriteStr(i, - "NOTICE AUTH :*** Got %sident response", - *ptr ? "invalid " : ""); + "NOTICE AUTH :*** Got %sident response%s%s", + *ptr ? "invalid " : "", + *ptr ? "" : ": ", + *ptr ? "" : identptr); } } else { Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i);

1 0

Alexander Barton : Merge branch 'cmode-M'
by alex＠arthur.barton.de 27 Aug '12

27 Aug '12

Module: ngircd.git Branch: master Commit: c519ba9920d2d9b12016d0825382cd236219112c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c519ba99… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 27 21:22:58 2012 +0200 Merge branch 'cmode-M' By Alexander Barton (2) and DNS777 (1) * cmode-M: Add new channel mode "M" to doc/Modes.txt Remove Can_Send_To_Channel_Identified() Implement channel mode "M" ---

1 0

Alexander Barton : Add new channel mode "M" to doc/Modes.txt
by alex＠arthur.barton.de 27 Aug '12

27 Aug '12

Module: ngircd.git Branch: master Commit: fee8ff37b3a8bedf1403e67d8384a7227c4f7b40 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fee8ff37… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 27 21:17:49 2012 +0200 Add new channel mode "M" to doc/Modes.txt --- doc/Modes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/Modes.txt b/doc/Modes.txt index e47e270..2b700f0 100644 --- a/doc/Modes.txt +++ b/doc/Modes.txt @@ -49,6 +49,7 @@ users to lists (e.g. "invite list", "ban list"), others have parameters k 0.6.0 Channel has a "key" (a password). l 0.6.0 Channel has a user limit. m 0.3.0 Channel is moderated, only "voiced" users can send messages. + M 20 Only registered users (and IRC Ops) can send messages. n 0.3.0 Channel doesn't allow messages of users not being members. O 18 Only IRC operators are allowed to join this channel. P 0.5.0 Channel is "persistent".

1 0

Alexander Barton : Remove Can_Send_To_Channel_Identified()
by alex＠arthur.barton.de 27 Aug '12

27 Aug '12

Module: ngircd.git Branch: master Commit: fee591b7597dfd9b438b6902d7971787dfd69d60 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fee591b7… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 26 16:51:34 2012 +0200 Remove Can_Send_To_Channel_Identified() Move the functionality directly into Can_Send_To_Channel() function. There should be no functional change ... --- src/ngircd/channel.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 1d1645f..0f21a45 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -832,26 +832,14 @@ Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From) if (strchr(Channel_Modes(Chan), 'n') && !is_member) return false; - if (is_op || has_voice) - return true; - - if (strchr(Channel_Modes(Chan), 'm')) + if (strchr(Channel_Modes(Chan), 'M') && !Client_HasMode(From, 'R') + && !Client_HasMode(From, 'o')) return false; - if (Lists_Check(&Chan->list_excepts, From)) - return true; - - return !Lists_Check(&Chan->list_bans, From); -} - - -static bool -Can_Send_To_Channel_Identified(CHANNEL *Chan, CLIENT *From) -{ - if ((Client_ThisServer() == From) || Client_HasMode(From, 'o')) + if (is_op || has_voice) return true; - if (strchr(Channel_Modes(Chan), 'M') && !Client_HasMode(From, 'R')) + if (strchr(Channel_Modes(Chan), 'm')) return false; if (Lists_Check(&Chan->list_excepts, From)) @@ -872,13 +860,6 @@ Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Command, Client_ID(From), Channel_Name(Chan)); } - if (!Can_Send_To_Channel_Identified(Chan, From)) { - if (! SendErrors) - return CONNECTED; - return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG, - Client_ID(From), Channel_Name(Chan)); - } - if (Client_Conn(From) > NONE) Conn_UpdateIdle(Client_Conn(From));

1 0

DNS777 : Implement channel mode "M"
by alex＠arthur.barton.de 27 Aug '12

27 Aug '12

Module: ngircd.git Branch: master Commit: 1aaf54ac24e8e24d5a3ce5b7b00a775f5237d7a9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1aaf54ac… Author: DNS777 <dns(a)rbose.org> Date: Thu Aug 23 09:25:30 2012 +0000 Implement channel mode "M" Only the server, identified users and IRC operators are able to talk. --- src/ngircd/channel.c | 23 +++++++++++++++++++++++ src/ngircd/defines.h | 2 +- src/ngircd/irc-mode.c | 1 + src/ngircd/messages.h | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index ff47024..1d1645f 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -845,6 +845,22 @@ Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From) } +static bool +Can_Send_To_Channel_Identified(CHANNEL *Chan, CLIENT *From) +{ + if ((Client_ThisServer() == From) || Client_HasMode(From, 'o')) + return true; + + if (strchr(Channel_Modes(Chan), 'M') && !Client_HasMode(From, 'R')) + return false; + + if (Lists_Check(&Chan->list_excepts, From)) + return true; + + return !Lists_Check(&Chan->list_bans, From); +} + + GLOBAL bool Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Command, bool SendErrors, const char *Text) @@ -856,6 +872,13 @@ Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Command, Client_ID(From), Channel_Name(Chan)); } + if (!Can_Send_To_Channel_Identified(Chan, From)) { + if (! SendErrors) + return CONNECTED; + return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG, + Client_ID(From), Channel_Name(Chan)); + } + if (Client_Conn(From) > NONE) Conn_UpdateIdle(Client_Conn(From)); diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index cd0a166..310e069 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -164,7 +164,7 @@ #define USERMODES "acCiorRswx" /** Supported channel modes. */ -#define CHANMODES "beiIklmnoOPrRstvz" +#define CHANMODES "beiIklmMnoOPrRstvz" /** Away message for users connected to linked servers. */ #define DEFAULT_AWAY_MSG "Away" diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index fa35cdd..f91a28c 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -500,6 +500,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) switch (*mode_ptr) { /* --- Channel modes --- */ case 'i': /* Invite only */ + case 'M': /* Only identified nicks can write */ case 'm': /* Moderated */ case 'n': /* Only members can write */ case 'R': /* Registered users only */ diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 9ad6be1..0c36f60 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -21,7 +21,7 @@ #define RPL_YOURHOST_MSG "002 %s :Your host is %s, running version ngircd-%s (%s/%s/%s)" #define RPL_CREATED_MSG "003 %s :This server has been started %s" #define RPL_MYINFO_MSG "004 %s %s ngircd-%s %s %s" -#define RPL_ISUPPORT1_MSG "005 %s RFC2812 IRCD=ngIRCd CASEMAPPING=ascii PREFIX=(ov)@+ CHANTYPES=#&+ CHANMODES=beI,k,l,imnOPRstz CHANLIMIT=#&+:%d :are supported on this server" +#define RPL_ISUPPORT1_MSG "005 %s RFC2812 IRCD=ngIRCd CASEMAPPING=ascii PREFIX=(ov)@+ CHANTYPES=#&+ CHANMODES=beI,k,l,imMnOPRstz CHANLIMIT=#&+:%d :are supported on this server" #define RPL_ISUPPORT2_MSG "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d MODES=%d MAXLIST=beI:%d EXCEPTS=e INVEX=I PENALTY :are supported on this server" #define RPL_TRACELINK_MSG "200 %s Link %s-%s %s %s V%s %ld %d %d"

1 0

Alexander Barton : Merge branch 'better-chan-errors'
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: 55859c1befa7cd04a130f1816cb73a9629637105 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=55859c1b… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 26 19:42:08 2012 +0200 Merge branch 'better-chan-errors' By Alexander Barton (1) and DNS777 (1) * better-chan-errors: Remove unused ERR_CANNOTSENDTOCHAN2_MSG message Add some more information to channel error numerics ---

1 0

Alexander Barton : Remove unused ERR_CANNOTSENDTOCHAN2_MSG message
by alex＠arthur.barton.de 26 Aug '12

26 Aug '12

Module: ngircd.git Branch: master Commit: a5984c702ae3d141d0fff70b0b634b47dade72c3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a5984c70… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 26 16:15:44 2012 +0200 Remove unused ERR_CANNOTSENDTOCHAN2_MSG message --- src/ngircd/messages.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index df6f6bc..d2e04db 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -132,7 +132,6 @@ #define ERR_INVITEONLYCHAN_MSG "473 %s %s :Cannot join channel (+i) -- Invited users only" #define ERR_BANNEDFROMCHAN_MSG "474 %s %s :Cannot join channel (+b) -- You are banned" #define ERR_BADCHANNELKEY_MSG "475 %s %s :Cannot join channel (+k) -- Wrong channel key" -#define ERR_CANNOTSENDTOCHAN2_MSG "477 %s %s :Cannot send to channel (+M) -- Registered/Identified nicks only" #define ERR_NOCHANMODES_MSG "477 %s %s :Channel doesn't support modes" #define ERR_LISTFULL_MSG "478 %s %s %s: Channel list is full (%d)" #define ERR_NOPRIVILEGES_MSG "481 %s :Permission denied"

1 0