Oktober 2012 - ngIRCd GIT Updates

Alexander Barton : WHOIS: show RPL_WHOISHOST_MSG to all IRC Ops in the network
by alex＠arthur.barton.de 07 Okt '12

07 Okt '12

Module: ngircd.git Branch: master Commit: 161adbb1aa6235acda9677ab14edd19581d9fcf4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=161adbb1… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 7 00:05:25 2012 +0200 WHOIS: show RPL_WHOISHOST_MSG to all IRC Ops in the network Not only show RPL_WHOISHOST_MSG to local IRC opreators, but show it to all IRC operators in the network. And don't show it to anybody if the "more privacy" configuration option is enabled. This closes bug #134. --- src/ngircd/irc-info.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 89defc3..31a57c6 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1156,17 +1156,19 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) Client_ID(from), Client_ID(c))) return DISCONNECTED; + /* Local client and requester is the user itself or an IRC Op? */ if (Client_Conn(c) > NONE && - (from == c || (!Conf_MorePrivacy && Client_HasMode(from, 'o'))) && - !IRC_WriteStrClient(from, RPL_WHOISMODES_MSG, Client_ID(from), - Client_ID(c), Client_Modes(c))) - return DISCONNECTED; - - if (Client_Conn(c) > NONE && (Client_OperByMe(from) || from == c) && - !IRC_WriteStrClient(from, RPL_WHOISHOST_MSG, Client_ID(from), - Client_ID(c), Client_Hostname(c), - Conn_GetIPAInfo(Client_Conn(c)))) - return DISCONNECTED; + (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)))) + return DISCONNECTED; + /* Client modes */ + if (!IRC_WriteStrClient(from, RPL_WHOISMODES_MSG, + Client_ID(from), Client_ID(c), Client_Modes(c))) + return DISCONNECTED; + } /* Idle and signon time (local clients only!) */ if (!Conf_MorePrivacy && Client_Conn(c) > NONE &&

1 0

Alexander Barton : Test suite: make expect scripts more verbose
by alex＠arthur.barton.de 06 Okt '12

06 Okt '12

Module: ngircd.git Branch: master Commit: de2fa78d92447d2acc3d349b8044524f5b616f59 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=de2fa78d… Author: Alexander Barton <alex(a)barton.de> Date: Mon Sep 24 23:05:24 2012 +0200 Test suite: make expect scripts more verbose Now tests.sh transforms each expect script it executes using sed(1) and inserts a 'puts -nonewline stderr "."' in front of each "expect" command. --- src/testsuite/tests.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/testsuite/tests.sh b/src/testsuite/tests.sh index f820628..8ecf8ab 100755 --- a/src/testsuite/tests.sh +++ b/src/testsuite/tests.sh @@ -34,10 +34,21 @@ if [ $? -ne 0 ]; then echo "${name}: \"telnet\" not found."; exit 77 fi +# prepare expect script +e_in="${srcdir}/${test}.e" +e_tmp="${test}.e_" +e_exec="$e_in" +if test -t 1 2>/dev/null; then + sed -e 's|^expect |puts -nonewline stderr "."; expect |g' \ + "$e_in" >"$e_tmp" + [ $? -eq 0 ] && e_exec="$e_tmp" +fi + echo_n "running ${test} ..." -expect ${srcdir}/${test}.e > logs/${test}.log 2>&1; r=$? +expect "$e_tmp" > logs/${test}.log; r=$? [ $r -eq 0 ] && echo " ok." || echo " failure!" +rm -f "$e_tmp" exit $r # -eof-

1 0

Alexander Barton : Test suite: remove indentation of messages
by alex＠arthur.barton.de 06 Okt '12

06 Okt '12

Module: ngircd.git Branch: master Commit: 8bede388af99cee1b0b32c108ca4704548c0b790 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8bede388… Author: Alexander Barton <alex(a)barton.de> Date: Mon Sep 24 22:25:58 2012 +0200 Test suite: remove indentation of messages --- src/testsuite/start-server.sh | 2 +- src/testsuite/stop-server.sh | 2 +- src/testsuite/stress-server.sh | 12 ++++++------ src/testsuite/tests.sh | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/testsuite/start-server.sh b/src/testsuite/start-server.sh index 90832a3..0fd61ea 100755 --- a/src/testsuite/start-server.sh +++ b/src/testsuite/start-server.sh @@ -12,7 +12,7 @@ else id="1" fi -echo_n " starting server ${id} ..." +echo_n "starting server ${id} ..." # remove old logfiles, if this is the first server (ID 1) [ "$id" = "1" ] && rm -rf logs *.log diff --git a/src/testsuite/stop-server.sh b/src/testsuite/stop-server.sh index 7e6ee4f..c531137 100755 --- a/src/testsuite/stop-server.sh +++ b/src/testsuite/stop-server.sh @@ -12,7 +12,7 @@ else id="1" fi -echo_n " stopping server ${id} ..." +echo_n "stopping server ${id} ..." # stop test-server ... pid=`./getpid.sh T-ngircd${id}` diff --git a/src/testsuite/stress-server.sh b/src/testsuite/stress-server.sh index 15d6df1..1e82325 100755 --- a/src/testsuite/stress-server.sh +++ b/src/testsuite/stress-server.sh @@ -27,15 +27,15 @@ name=`basename $0` # test for required external tools type expect > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo " ${name}: \"expect\" not found."; exit 77 + echo "${name}: \"expect\" not found."; exit 77 fi type telnet > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo " ${name}: \"telnet\" not found."; exit 77 + echo "${name}: \"telnet\" not found."; exit 77 fi # hello world! :-) -echo " stressing server with $CLIENTS clients (be patient!):" +echo "stressing server with $CLIENTS clients (be patient!):" # read in functions . ${srcdir}/functions.inc @@ -50,7 +50,7 @@ while [ ${no} -lt $CLIENTS ]; do done # run first script and check if it succeeds -echo_n " checking stress script ..." +echo_n "checking stress script ..." expect tests/0.e > logs/stress-0.log 2> /dev/null if [ $? -ne 0 ]; then echo " failure!" @@ -64,12 +64,12 @@ while [ ${no} -lt $CLIENTS ]; do expect tests/${no}.e > logs/stress-${no}.log 2> /dev/null & no=`expr ${no} + 1` - echo " started client $no/$CLIENTS." + echo "started client $no/$CLIENTS." [ $MAX -gt 0 ] && $srcdir/wait-tests.sh $MAX done -echo_n " waiting for clients to complete: ." +echo_n "waiting for clients to complete: ." touch logs/check-idle.log while true; do expect ${srcdir}/check-idle.e >> logs/check-idle.log; res=$? diff --git a/src/testsuite/tests.sh b/src/testsuite/tests.sh index dc184ff..f820628 100755 --- a/src/testsuite/tests.sh +++ b/src/testsuite/tests.sh @@ -18,7 +18,7 @@ test=`echo ${name} | cut -d '.' -f 1` [ -d logs ] || mkdir logs if [ ! -r "$test" ]; then - echo " ${name}: test \"$test\" not found!"; exit 77 + echo "${name}: test \"$test\" not found!"; exit 77 exit 1 fi @@ -27,14 +27,14 @@ fi type expect > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo " ${name}: \"expect\" not found."; exit 77 + echo "${name}: \"expect\" not found."; exit 77 fi type telnet > /dev/null 2>&1 if [ $? -ne 0 ]; then - echo " ${name}: \"telnet\" not found."; exit 77 + echo "${name}: \"telnet\" not found."; exit 77 fi -echo_n " running ${test} ..." +echo_n "running ${test} ..." expect ${srcdir}/${test}.e > logs/${test}.log 2>&1; r=$? [ $r -eq 0 ] && echo " ok." || echo " failure!"

1 0

Alexander Barton : Merge branch 'bug141-ModesQq'
by alex＠arthur.barton.de 06 Okt '12

06 Okt '12

Module: ngircd.git Branch: master Commit: c9d166747d4ea161c55c765edc23e2cd3bd7dec4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c9d16674… Author: Alexander Barton <alex(a)barton.de> Date: Sat Oct 6 22:37:57 2012 +0200 Merge branch 'bug141-ModesQq' This closes bug #141. * bug141-ModesQq: KICK-protect IRC services Implement channel mode "Q" and user mode "q" Conflicts: src/ngircd/defines.h src/ngircd/messages.h ---

1 0

Alexander Barton : KICK-protect IRC services
by alex＠arthur.barton.de 06 Okt '12

06 Okt '12

Module: ngircd.git Branch: master Commit: 9ac94339dca746d830a877944e30d1cc9c45c47f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9ac94339… Author: Alexander Barton <alex(a)barton.de> Date: Sat Oct 6 19:23:05 2012 +0200 KICK-protect IRC services --- src/ngircd/channel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index c679dae..f3c74dc 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -330,7 +330,8 @@ Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name, /* Channel mode 'Q' and user mode 'q' on target: nobody but * IRC Operators and servers can kick the target user */ if ((strchr(Channel_Modes(chan), 'Q') - || Client_HasMode(Target, 'q')) + || Client_HasMode(Target, 'q') + || Client_Type(Target) == CLIENT_SERVICE) && !Client_HasMode(Origin, 'o')) { IRC_WriteStrClient(Origin, ERR_KICKDENY_MSG, Client_ID(Origin), Name,

1 0

Alexander Barton : Implement channel mode "Q" and user mode "q"
by alex＠arthur.barton.de 06 Okt '12

06 Okt '12

Module: ngircd.git Branch: master Commit: d3ae351236e605b400b94fcfa8e7670e26e19c89 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d3ae3512… Author: Alexander Barton <alex(a)barton.de> Date: Sat Oct 6 18:13:01 2012 +0200 Implement channel mode "Q" and user mode "q" Both modes protect users from channel kicks: only IRC operators and servers can kick users having mode "q" or in channels with mode "Q". Original patch by DNS777 <dns(a)rbose.org>, thanks! This closes bug #141. --- doc/Modes.txt | 2 ++ src/ngircd/channel.c | 11 +++++++++++ src/ngircd/defines.h | 4 ++-- src/ngircd/irc-mode.c | 10 ++++++++++ src/ngircd/messages.h | 3 ++- 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/doc/Modes.txt b/doc/Modes.txt index e3b754d..fb78451 100644 --- a/doc/Modes.txt +++ b/doc/Modes.txt @@ -27,6 +27,7 @@ channels he is using at the moment. C 19 Only users that share a channel are allowed to send messages. i 0.0.1 User is "invisible". o 0.0.1 User is IRC operator. + q 20 User is protected, can not be kicked from a channel. r 0.0.1 User is restricted. R (1) 19 User is registered (e.g. by NickServ). s 0.4.0 User wants to receive server notices. @@ -54,6 +55,7 @@ users to lists (e.g. "invite list", "ban list"), others have parameters 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". + Q 20 Nobody can be kicked from the channel. r (1) 19 Channel is "registered" (e.g. by ChanServ). R 19 Only registered users are allowed to join this channel. s 0.9.0 Channel is "secret". diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 10b0540..c679dae 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -327,6 +327,17 @@ Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name, } if(Client_Type(Peer) == CLIENT_USER) { + /* Channel mode 'Q' and user mode 'q' on target: nobody but + * IRC Operators and servers can kick the target user */ + if ((strchr(Channel_Modes(chan), 'Q') + || Client_HasMode(Target, 'q')) + && !Client_HasMode(Origin, 'o')) { + IRC_WriteStrClient(Origin, ERR_KICKDENY_MSG, + Client_ID(Origin), Name, + Client_ID(Target)); + return; + } + /* Check if client has the rights to kick target */ ptr = Channel_UserModes(chan, Peer); target_modes = Channel_UserModes(chan, Target); diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index ba7adf1..c0be813 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -161,10 +161,10 @@ #endif /** Supported user modes. */ -#define USERMODES "aBcCiorRswx" +#define USERMODES "aBcCioqrRswx" /** Supported channel modes. */ -#define CHANMODES "abehiIklmMnoOPqrRstvz" +#define CHANMODES "abehiIklmMnoOPqQrRstvz" /** 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 90f638d..7f04e9c 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -257,6 +257,15 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) ERR_NOPRIVILEGES_MSG, Client_ID(Origin)); break; + case 'q': /* KICK-protected user */ + if (!set || Client_Type(Client) == CLIENT_SERVER + || Client_OperByMe(Origin)) + x[0] = 'q'; + else + ok = IRC_WriteStrClient(Origin, + ERR_NOPRIVILEGES_MSG, + Client_ID(Origin)); + break; case 'r': /* Restricted (only settable) */ if (set || Client_Type(Client) == CLIENT_SERVER) x[0] = 'r'; @@ -569,6 +578,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) case 'M': /* Only identified nicks can write */ case 'm': /* Moderated */ case 'n': /* Only members can write */ + case 'Q': /* No kicks */ case 't': /* Topic locked */ if(is_oper || is_machine || is_owner || is_admin || is_op || is_halfop) diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index efc7524..ea24b2e 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=(qaohv)~&@%%+ CHANTYPES=#&+ CHANMODES=beI,k,l,imMnOPRstz CHANLIMIT=#&+:%d :are supported on this server" +#define RPL_ISUPPORT1_MSG "005 %s RFC2812 IRCD=ngIRCd CASEMAPPING=ascii PREFIX=(qaohv)~&@%%+ CHANTYPES=#&+ CHANMODES=beI,k,l,imMnOPQRstz 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" @@ -140,6 +140,7 @@ #define ERR_NOPRIVILEGES_MSG "481 %s :Permission denied" #define ERR_CHANOPRIVSNEEDED_MSG "482 %s %s :You are not channel operator" #define ERR_CHANOPPRIVTOOLOW_MSG "482 %s %s :Your privileges are too low" +#define ERR_KICKDENY_MSG "482 %s %s :Cannot kick, %s is protected" #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 modify user mode (+R) -- Use IRC services"

1 0

Alexander Barton : Define HAVE_SETSID for Mac OS X Xcode builds
by alex＠arthur.barton.de 06 Okt '12

06 Okt '12

Module: ngircd.git Branch: master Commit: 4790d78c980c79abfd71c064be1eb085717210f8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4790d78c… Author: Alexander Barton <alex(a)barton.de> Date: Sat Oct 6 17:58:44 2012 +0200 Define HAVE_SETSID for Mac OS X Xcode builds --- contrib/MacOSX/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index 5b47e9d..5a71278 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.h @@ -98,6 +98,8 @@ #define HAVE_GETNAMEINFO 1 /* Define to 1 if you have the `sigaction' function. */ #define HAVE_SIGACTION 1 +/* Define to 1 if you have the `setsid' function. */ +#define HAVE_SETSID 1 /* Define if socklen_t exists */ #define HAVE_socklen_t 1

1 0

Alexander Barton : Fix spelling: ERR_CHANOPPRIVTOLOW_MSG -> ERR_CHANOPPRIVTOOLOW_MSG
by alex＠arthur.barton.de 06 Okt '12

06 Okt '12

Module: ngircd.git Branch: master Commit: c66e20ce6e1b6fd333fc6fe13953178547470c44 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c66e20ce… Author: Alexander Barton <alex(a)barton.de> Date: Sat Oct 6 17:21:32 2012 +0200 Fix spelling: ERR_CHANOPPRIVTOLOW_MSG -> ERR_CHANOPPRIVTOOLOW_MSG Thanks to DNS for pointing this out, see bug #126! --- src/ngircd/channel.c | 2 +- src/ngircd/messages.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 59fe002..10b0540 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -364,7 +364,7 @@ Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name, } if(!can_kick) { - IRC_WriteStrClient(Origin, ERR_CHANOPPRIVTOLOW_MSG, + IRC_WriteStrClient(Origin, ERR_CHANOPPRIVTOOLOW_MSG, Client_ID(Origin), Name); return; } diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index b40f0fc..efc7524 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -139,7 +139,7 @@ #define ERR_LISTFULL_MSG "478 %s %s %s: Channel list is full (%d)" #define ERR_NOPRIVILEGES_MSG "481 %s :Permission denied" #define ERR_CHANOPRIVSNEEDED_MSG "482 %s %s :You are not channel operator" -#define ERR_CHANOPPRIVTOLOW_MSG "482 %s %s :Your privileges are to low" +#define ERR_CHANOPPRIVTOOLOW_MSG "482 %s %s :Your privileges are too low" #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 modify user mode (+R) -- Use IRC services"

1 0