- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Add more penalty times in error paths
by alex＠arthur.barton.de 30 Jul '13

30 Jul '13

Module: ngircd.git Branch: master Commit: 3bd973037a1664387161a465f801b78ff0180fa1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3bd97303… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jul 30 22:05:00 2013 +0200 Add more penalty times in error paths This patch changes the handlers of the "PASS", "NICK", "USER", and "SERVICE" commands to enforce a 2 second penalty when an error like "need more/other parameters" occurs. More functions should follow, I think ... --- src/ngircd/irc-login.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 27e11c4..cfb94f6 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -81,10 +81,12 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) } else if (Client_Type(Client) == CLIENT_UNKNOWN || Client_Type(Client) == CLIENT_UNKNOWNSERVER) { /* Unregistered connection, but wrong number of arguments: */ + IRC_SetPenalty(Client, 2); return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); } else { /* Registered connection, PASS command is not allowed! */ + IRC_SetPenalty(Client, 2); return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG, Client_ID(Client)); } @@ -207,11 +209,12 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) Req->argv[0] ); } else { /* Is this a restricted client? */ - if( Client_HasMode( Client, 'r' )) + if (Client_HasMode(Client, 'r')) { + IRC_SetPenalty(Client, 2); return IRC_WriteStrClient( Client, ERR_RESTRICTED_MSG, Client_ID( Client )); - + } target = Client; } @@ -487,10 +490,12 @@ IRC_USER(CLIENT * Client, REQUEST * Req) return CONNECTED; } else if (Client_Type(Client) == CLIENT_USER) { /* Already registered connection */ + IRC_SetPenalty(Client, 2); return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG, Client_ID(Client)); } else { /* Unexpected/invalid connection state? */ + IRC_SetPenalty(Client, 2); return IRC_WriteStrClient(Client, ERR_NOTREGISTERED_MSG, Client_ID(Client)); } @@ -518,9 +523,11 @@ IRC_SERVICE(CLIENT *Client, REQUEST *Req) assert(Req != NULL); if (Client_Type(Client) != CLIENT_GOTPASS && - Client_Type(Client) != CLIENT_SERVER) + Client_Type(Client) != CLIENT_SERVER) { + IRC_SetPenalty(Client, 2); return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG, Client_ID(Client)); + } _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 6)

1 0

Alexander Barton : Add penalty times in error paths of generic IRC helper macros
by alex＠arthur.barton.de 30 Jul '13

30 Jul '13

Module: ngircd.git Branch: master Commit: 313881d0c1466e6b8f52b4456b66a2477ccba9cf URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=313881d0… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jul 30 22:08:04 2013 +0200 Add penalty times in error paths of generic IRC helper macros Add a 2 second penalty time when the number of parameters is invalid. --- src/ngircd/irc-macros.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/ngircd/irc-macros.h b/src/ngircd/irc-macros.h index f0c0f36..abb93f0 100644 --- a/src/ngircd/irc-macros.h +++ b/src/ngircd/irc-macros.h @@ -24,9 +24,11 @@ * return from the function. */ #define _IRC_ARGC_EQ_OR_RETURN_(Client, Req, Count) \ -if (Req->argc != Count) \ +if (Req->argc != Count) { \ + IRC_SetPenalty(Client, 2); \ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \ - Client_ID(Client), Req->command); + Client_ID(Client), Req->command); \ +} /** * Make sure that number of passed parameters is less or equal than Max. @@ -35,9 +37,11 @@ if (Req->argc != Count) \ * return from the function. */ #define _IRC_ARGC_LE_OR_RETURN_(Client, Req, Max) \ -if (Req->argc > Max) \ +if (Req->argc > Max) { \ + IRC_SetPenalty(Client, 2); \ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \ - Client_ID(Client), Req->command); + Client_ID(Client), Req->command); \ +} /** * Make sure that number of passed parameters is greater or equal than Min. @@ -46,9 +50,11 @@ if (Req->argc > Max) \ * return from the function. */ #define _IRC_ARGC_GE_OR_RETURN_(Client, Req, Min) \ -if (Req->argc < Min) \ +if (Req->argc < Min) { \ + IRC_SetPenalty(Client, 2); \ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \ - Client_ID(Client), Req->command); + Client_ID(Client), Req->command); \ +} /** * Make sure that number of passed parameters is in between Min and Max. @@ -57,9 +63,11 @@ if (Req->argc < Min) \ * parameters, send an error to the client and return from the function. */ #define _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, Min, Max) \ -if (Req->argc < Min || Req->argc > Max) \ +if (Req->argc < Min || Req->argc > Max) { \ + IRC_SetPenalty(Client, 2); \ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \ - Client_ID(Client), Req->command); + Client_ID(Client), Req->command); \ +} /** * Get sender of an IRC command.

1 0

Alexander Barton : Update irc-login.c to use irc-macros.h
by alex＠arthur.barton.de 30 Jul '13

30 Jul '13

Module: ngircd.git Branch: master Commit: f494023b0d99be0e4b07701b983b71ecf4920465 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f494023b… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jul 30 21:18:42 2013 +0200 Update irc-login.c to use irc-macros.h This includes code cleanups, too :-) --- src/ngircd/irc-login.c | 187 +++++++++++++++--------------------------------- 1 file changed, 59 insertions(+), 128 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=f494…

1 0

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

30 Jul '13

Module: ngircd.git Branch: master Commit: 659d1264607e780708ace76181b0dc556b54e39a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=659d1264… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jul 30 21:12:24 2013 +0200 Commands.txt: Update more descriptions Update descriptions of "NICK", "PASS", "PING", "PONG", "QUIT", "USER", "WEBIRC", "SERVICE", and "SVSNICK". --- doc/Commands.txt | 134 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 114 insertions(+), 20 deletions(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index c54a724..7765d3a 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -101,49 +101,117 @@ Connection Handling Commands - doc/Protocol.txt - NICK - NICK <nick> + NICK <nickname> + NICK <nickname> [<hops>] + NICK <nickname> <hops> <username> <host> <servertoken> <usermodes> <realname> . - Change your nickname to <nick>. + Set or change the <nickname> of a client (first form) and register + remote clients (second and third form; servers only). + + References: + - RFC 1459, 4.1.2 "Nick message" (old client and server protocol) + - RFC 2812, 3.1.2 "Nick message" (client protocol) + - RFC 2813, 4.1.3 "Nick" (server protocol) - PASS + PASS <password> PASS <password> <version> <flags> [<options>] . - Set a connection <password>. This command must be sent before the - NICK/USER registration combination. + Set a connection <password>. This command must be the first command + sent to the server, even before the NICK/USER or SERVER commands. . - See doc/Protocol.txt for more info. + The first form is used by user sessions or (old) RFC 1459 servers, + the second form is used by RFC 2812 or IRC+ compliant servers and + enables the server to indicate its version and supported protocol + features. + + References: + - RFC 1459, 4.1.1 "Password message" (old client and server protocol) + - RFC 2812, 3.1.1 "Password message" (client protocol) + - RFC 2813, 4.1.1 "Password message" (server protocol) + - doc/Protocol.txt - PING - PING <server1> [<server2>] + PING <token> [<target>] . - Tests the presence of a connection. A PING message results in a PONG - reply. If <server2> is specified, the message gets passed on to it. + Tests the presence of a connection to a client or server. + . + If no <target> has been given, the local server is used. User clients + can only use other servers as <target>, no user clients. + . + A PING message results in a PONG reply containing the <token>, which + can be arbitrary text. + + Please note: + The RFCs state that the <token> parameter is used to specify the + origin of the PING command when forwared in the network, but this + is not the case: the sender is specified using the prefix as usual, + and the parameter is used to identify the PONG reply in practice. + + References: + - RFC 2812, 3.7.2 "Ping message" - PONG - PONG <server1> [<server2>] + PONG <target> [<token>] + . + Reply to a "PING" command, indicate that the connection is alive. . - This command is a reply to the PING command and works in much the - same way. + The <token> is the arbitrary text received in the "PING" command and + can be used to identify the correct PONG sent as answer. + . + When the "PONG" command is received from a user session, the <target> + parameter is ignored; otherwise the PONG is forwarded to this client. + + References: + - RFC 2812, 3.7.3 "Pong message" - QUIT QUIT [<quit-message>] . - End IRC session and disconnect from the server. + Terminate a user session. + . + When received from a user, the server acknowledges this by sending + an "ERROR" message back to the client and terminates the connection. . - If a <quit-message> has been given, it is displayed to all the - channels that you are a member of when leaving. + When a <quit-message> has been given, it is sent to all the channels + that the client is a member of when leaving. + + References: + - RFC 2812, 3.1.7 "Quit" + - RFC 2813, 4.1.5 "Quit" - USER - USER <user> <modes> <realname> + USER <username> <hostname> <unused> <realname> . - This command is used at the beginning of a connection to specify the - <user>name, hostname, <realname> and initial user <modes> of the - connecting client. + Register (and authenticate) a new user session with a short <username> + and a human-readable <realname>. . - <realname> may contain spaces, and thus must be prefixed with a colon. + The parameter <hostname> is only used when received by an other server + and ignored otherwise; and the parameter <unused> is always ignored. + But both parameters are required on each invocation by the protocol + and can be set to arbitrary characters/text when not used. + . + If <username> contains an "@" character, the full <username> is used + for authentication, but only the first part up to this character is + set as "user name" for this session. + + References: + - RFC 2812, 3.1.3 "User message" - WEBIRC - See doc/Protocol.txt + WEBIRC <password> <username> <hostname> <ip-address> + . + Allow Web-to-IRC gateway software (for example) to set the correct + user name and host name of users instead of their own. + . + It must be the very first command sent to the server, even before + USER and NICK commands! + . + The <password> must be set in the server configuration file to prevent + unauthorized clients to fake their identity; it is an arbitrary string. + + References: + - doc/Protocol.txt, II.4: "Update webchat/proxy client information" General Commands @@ -598,6 +666,20 @@ IRC Service Commands ~~~~~~~~~~~~~~~~~~~~ - SERVICE + SERVICE <name> <reserved1> <distribution> <type> <reserved2> <info> + SERVICE <name> <servertoken> <distribution> {<type>|+<modes>} <hops> <info> + . + Register a new service in the network. + . + The first form is used by directly linked services and isn't supported + by ngIRCd at the moment. The second form announces services connected + to remote "pseudo-servers" ("services hubs"). + . + The <distribution> and <type> parameters are ignored by ngIRCd. + + References: + - RFC 2812, 3.1.6 "Service message" + - RFC 2813, 4.1.4 "Service message" - SERVLIST SERVLIST [<mask> [<type>]] @@ -635,6 +717,18 @@ IRC Service Commands - RFC 2812, 3.3.2 "Notice" - SVSNICK + SVSNICK <oldnick> <newnick> + . + Forcefully change foreign user nicknames. This command is allowed + for servers only. + . + The "SVSNICK" command is forwarded to the server to which the user + with nickname <oldnick> is connected to, which in turn generates a + regular "NICK" command that then is sent to the client, so no special + support in the client software is required. + + References: + - ngIRCd GIT commit e3f300d3231f Server Protocol Commands

1 0

Alexander Barton : Commands.txt: Update description of "PRIVMSG", "NOTICE", and "SQUERY"
by alex＠arthur.barton.de 19 Jul '13

19 Jul '13

Module: ngircd.git Branch: master Commit: 76dcb08266de81ff37aab7aeb25d6378150ed7da URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=76dcb082… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jul 19 18:16:12 2013 +0200 Commands.txt: Update description of "PRIVMSG", "NOTICE", and "SQUERY" --- doc/Commands.txt | 74 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 8 deletions(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index 26e37d4..c54a724 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -184,21 +184,60 @@ General Commands See doc/Modes.txt for more information. - NOTICE - NOTICE <target> <notice> + NOTICE <target>[,<target>[,...]] <message> . - Send <notice> to <target> (nick or channel). + Send a <message> to a given <target>, which can be a user or a + channel, but DON'T report any error. . - This command works similarly to PRIVMSG, except automatic replies must - never be sent in reply to NOTICE messages. + The "NOTICE" command exactly behaves like the "PRIVMSG" command, but + doesn't report any errors it encounters (like an unknown <target>). + Please see the help text of the "PRIVMSG" command for a detailed + description of the parameters! + + References: + - RFC 2812, 2.3.1 "Message format in Augmented BNF" + - RFC 2812, 3.3 "Sending messages" + - RFC 2812, 3.3.2 "Notice" - PRIVMSG - PRIVMSG <target> <message> + PRIVMSG <target>[,<target>[,...]] <message> + . + Send a <message> to a given <target>, which can be a user or a + channel, and report all errors. + . + The <target> must follow one of these syntax variants: + . + - <nickname> + - <channel> + - <user>[%<host>]@<server> + - <user>%<host> + - <nickname>!<user>@<host> + . + If the <target> is a user, a private message is sent directly to this + user; if it resolves to a channel name, a public message is sent + to all the members of that channel. + . + In addition, IRC Ops can use these two forms to specify the <target>: + . + - #<hostmask> + - #<servermask> . - Send <message> to <target> (nick or channel). + The <mask> can contain the wildcard characters "*" and "?", but must + contain at least one dot (".") and no wildcard after the last one. + Then, the <message> is sent to all users matching this <mask>. . - Common IRC clients use MSG as PRIVMSG alias. - (Some clients use "QUERY <nick> [<message>]" to open a private chat.) + All warnings and errors are reported back to the initiator using + numeric status codes, which is the only difference to the "NOTICE" + command, which doesn't report back any errors or warnings at all. + . + Please note that clients often use "MSG" as an alias to PRIVMSG, and + a command "QUERY <nick> [<message>]" to initiate private chats. Both + are command extensions of the client and never sent to the server. + References: + - RFC 2812, 2.3.1 "Message format in Augmented BNF" + - RFC 2812, 3.3 "Sending messages" + - RFC 2812, 3.3.1 "Private messages" Status and Informational Commands ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -575,6 +614,25 @@ IRC Service Commands - RFC 2812, 3.5.1 "Servlist message" - SQUERY + SQUERY <target>[,<target>[,...]] <message> + . + Send a <message> to a given <target> IRC service, and report all + errors. + . + The "SQUERY" command exactly behaves like the "PRIVMSG" command, but + enforces that the <target> of the <message> is an IRC service. + Please see the help text of the "PRIVMSG" command for a detailed + description of the parameters! + . + If a user wants to interact with IRC services, he should use "SQUERY" + instead of "PRIVMSG" or "NOTICE": only "SQUERY makes sure that no + regular user, which uses the nickname of an IRC service, receives + the command in error, for example during a "net split"! + + References: + - RFC 2812, 2.3.1 "Message format in Augmented BNF" + - RFC 2812, 3.3 "Sending messages" + - RFC 2812, 3.3.2 "Notice" - SVSNICK

1 0

Alexander Barton : Add "compile" to .gitignore file
by alex＠arthur.barton.de 18 Jul '13

18 Jul '13

Module: ngircd.git Branch: master Commit: 4cb2edf020286719f8ab65d57771f7fefcdbef00 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4cb2edf0… Author: Alexander Barton <alex(a)barton.de> Date: Thu Jul 18 23:43:12 2013 +0200 Add "compile" to .gitignore file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e7ab758..b4d402e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ ansi2knr.h ar-lib autom4te.cache build-stamp-ngircd* +compile config.log config.status configure

1 0

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

18 Jul '13

Module: ngircd.git Branch: master Commit: fa15eb169814c1ca434e49464d6f5d150057ae31 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fa15eb16… Author: Alexander Barton <alex(a)barton.de> Date: Thu Jul 18 23:35:33 2013 +0200 Update irc.c to use irc-macros.h This includes code cleanups and better documentation for some functions, too. --- src/ngircd/irc.c | 189 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 105 insertions(+), 84 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=fa15…

1 0

Alexander Barton : Commands.txt: Update description of the "ERROR" command
by alex＠arthur.barton.de 18 Jul '13

18 Jul '13

Module: ngircd.git Branch: master Commit: 720eb874a9397672de06055947a057db8cf62007 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=720eb874… Author: Alexander Barton <alex(a)barton.de> Date: Thu Jul 18 23:42:00 2013 +0200 Commands.txt: Update description of the "ERROR" command --- doc/Commands.txt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/doc/Commands.txt b/doc/Commands.txt index 4058f3d..26e37d4 100644 --- a/doc/Commands.txt +++ b/doc/Commands.txt @@ -593,11 +593,18 @@ Server Protocol Commands - ERROR ERROR [<message> [<> [...]]] . - Return an error message to the server. The first parameter, if given, - will be logged by the server, all further parameters are silently - ignored. + Inform a client or a server about an error condition. The first + parameter, if given, is logged by the server receiving the message, + all other parameters are silently ignored. . - This command is silently ignored on non-server and non-service links. + This command is silently ignored on non-server and non-service links + and shouldn't be used by regular IRC clients. + . + The ERROR message is also sent before terminating a regular client + connection. + + References: + - RFC 2812, 3.7.4 "Error message" - METADATA METADATA <target> <key> <value>

1 0

Federico G. Schwindt : Fix spelling
by alex＠arthur.barton.de 18 Jul '13

18 Jul '13

Module: ngircd.git Branch: master Commit: 5021977bb1bf6c13323b7ef2a73f64e9533a379a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5021977b… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Jul 18 17:51:02 2013 +0100 Fix spelling --- src/ngircd/conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index aad64b3..bae5fa7 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -827,7 +827,7 @@ no_listenports(void) /** * Read contents of a text file into an array. * - * This function is used to read the MOTD and help text file, for exampe. + * This function is used to read the MOTD and help text file, for example. * * @param filename Name of the file to read. * @return true, when the file has been read in.

1 0

Federico G. Schwindt : Handle services in IRC_WHOIS_SendReply()
by alex＠arthur.barton.de 18 Jul '13

18 Jul '13

Module: ngircd.git Branch: master Commit: 7adc4b8e99c64c150861c6ad5a197d88141afa13 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=7adc4b8e… Author: Federico G. Schwindt <fgsch(a)lodoss.net> Date: Thu Jul 18 19:52:17 2013 +0100 Handle services in IRC_WHOIS_SendReply() If the target is a service, advertise it as such and ignore operator mode. --- src/ngircd/irc-info.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 668f5ed..046648f 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -361,8 +361,15 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) return DISCONNECTED; } + /* IRC-Services? */ + if (Client_Type(c) == CLIENT_SERVICE && + !IRC_WriteStrClient(from, RPL_WHOISSERVICE_MSG, + Client_ID(from), Client_ID(c))) + return DISCONNECTED; + /* IRC-Operator? */ - if (Client_HasMode(c, 'o') && + if (Client_Type(c) != CLIENT_SERVICE && + Client_HasMode(c, 'o') && !IRC_WriteStrClient(from, RPL_WHOISOPERATOR_MSG, Client_ID(from), Client_ID(c))) return DISCONNECTED;

1 0