ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

Alexander Barton : ngircd.conf.5: document "ClientHost" and "ClientUserNick "
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: c0d13c47135adb32be36226b64367447330b3d43 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c0d13c47… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 16 23:44:00 2011 +0100 ngircd.conf.5: document "ClientHost" and "ClientUserNick" --- man/ngircd.conf.5.tmpl | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index c8bab5f..3282476 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -236,6 +236,14 @@ Default: 10. Maximum length of an user nick name (Default: 9, as in RFC 2812). Please note that all servers in an IRC network MUST use the same maximum nick name length! +.TP +\fBClientHost\fR +Set this hostname for every client instead of the real one. Default: empty, +don't change. +.TP +\fBClientUserNick\fR +Set every clients' user name to their nick name and hide the one supplied +by the IRC client. Default: no. .SH [OPERATOR] .I [Operator] sections are used to define IRC Operators. There may be more than one

1 0

Alexander Barton : Move IRC_QUIT_HTTP() below IRC_QUIT()
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: 77cff9e47c33d1b1bc22d1fba09607e347e55e8a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=77cff9e4… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 16 23:56:27 2011 +0100 Move IRC_QUIT_HTTP() below IRC_QUIT() --- src/ngircd/irc-login.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 3c4eb18..518c9f1 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -683,6 +683,14 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req ) } /* IRC_QUIT */ +GLOBAL bool +IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req ) +{ + Req->argc = 0; + return IRC_QUIT(Client, Req); +} /* IRC_QUIT_HTTP */ + + /** * Handler for the IRC "PING" command. * @@ -693,14 +701,6 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req ) * @returns CONNECTED or DISCONNECTED. */ GLOBAL bool -IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req ) -{ - Req->argc = 0; - return IRC_QUIT(Client, Req); -} - - -GLOBAL bool IRC_PING(CLIENT *Client, REQUEST *Req) { CLIENT *target, *from;

1 0

Alexander Barton : IRC_QUIT_HTTP(): enhance error message
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: dbb66695c938a7c13e0d399937f191456c7b1119 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dbb66695… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 16 23:58:01 2011 +0100 IRC_QUIT_HTTP(): enhance error message --- src/ngircd/irc-login.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 518c9f1..7e75217 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -686,7 +686,8 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req ) GLOBAL bool IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req ) { - Req->argc = 0; + Req->argc = 1; + Req->argv[0] = "Oops, HTTP request received? This is IRC!"; return IRC_QUIT(Client, Req); } /* IRC_QUIT_HTTP */

1 0

Alexander Barton : Don't use IRC_QUIT_HTTP() if STRICT_RFC is #define'd
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: 38747b40dcadd320220bb050974d5e5860a8ecbb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=38747b40… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 16 23:58:39 2011 +0100 Don't use IRC_QUIT_HTTP() if STRICT_RFC is #define'd --- src/ngircd/irc-login.c | 14 ++++++++++++++ src/ngircd/parse.c | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 7e75217..92d54ab 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -683,6 +683,18 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req ) } /* IRC_QUIT */ +#ifndef STRICT_RFC + +/** + * Handler for HTTP command, e.g. GET and POST + * + * We handle these commands here to avoid the quite long timeout when + * some user tries to access this IRC daemon using an web browser ... + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @returns CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req ) { @@ -691,6 +703,8 @@ IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req ) return IRC_QUIT(Client, Req); } /* IRC_QUIT_HTTP */ +#endif + /** * Handler for the IRC "PING" command. diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 51149da..11bb3d1 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -85,8 +85,6 @@ static COMMAND My_Commands[] = { "PONG", IRC_PONG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "QUIT", IRC_QUIT, 0xFFFF, 0, 0, 0 }, - { "GET", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 }, - { "POST", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 }, { "REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0 }, { "RESTART", IRC_RESTART, CLIENT_USER, 0, 0, 0 }, { "SERVER", IRC_SERVER, 0xFFFF, 0, 0, 0 }, @@ -111,6 +109,10 @@ static COMMAND My_Commands[] = #ifdef IRCPLUS { "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, 0, 0 }, #endif +#ifndef STRICT_RFC + { "GET", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 }, + { "POST", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 }, +#endif { NULL, NULL, 0x0, 0, 0, 0 } /* Ende-Marke */ };

1 0

Alexander Barton : Only "handle" HTTP commands on unregistered connections
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: b19f7d73cb3759630072d28d1db5219dc656348b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b19f7d73… Author: Alexander Barton <alex(a)barton.de> Date: Thu Mar 17 00:03:10 2011 +0100 Only "handle" HTTP commands on unregistered connections --- src/ngircd/parse.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 11bb3d1..8203dd0 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -110,8 +110,8 @@ static COMMAND My_Commands[] = { "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, 0, 0 }, #endif #ifndef STRICT_RFC - { "GET", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 }, - { "POST", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 }, + { "GET", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 }, + { "POST", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 }, #endif { NULL, NULL, 0x0, 0, 0, 0 } /* Ende-Marke */ };

1 0

Alexander Barton : Don't use "the.net" in sample-ngircd.conf, use "example. net"
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: fc55c945dbec745ff7b82652dd5f5b3b69096c82 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fc55c945… Author: Alexander Barton <alex(a)barton.de> Date: Fri Mar 18 10:45:16 2011 +0100 Don't use "the.net" in sample-ngircd.conf, use "example.net" "the.net" is an existing domain of the Texas Higher Education Network ... See RFC 2606. --- doc/sample-ngircd.conf.tmpl | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 8591759..fee3570 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -22,7 +22,7 @@ # Server name in the IRC network, must contain at least one dot # (".") and be unique in the IRC network. Required! - Name = irc.the.net + Name = irc.example.net # Info text of the server. This will be shown by WHOIS and # LINKS requests for example. @@ -155,7 +155,7 @@ ;MaxNickLength = 9 # Set this hostname for every client instead of the real one - ;ClientHost = irc.the.net + ;ClientHost = irc.example.net # Set every clients' user name to their nick name ;ClientUserNick = yes @@ -202,11 +202,11 @@ # IRC name of the remote server, must match the "Name" variable in # the [Global] section of the other server (when using ngIRCd). - ;Name = irc2.the.net + ;Name = irc2.example.net # Internet host name or IP address of the peer (only required when # this server should establish the connection). - ;Host = connect-to-host.the.net + ;Host = connect-to-host.example.net # IP address to use as _source_ address for the connection. if # unspecified, ngircd will let the operating system pick an address.

1 0

Florian Westphal : Add support for up to 3 targets in WHOIS queries.
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: ff2a425ab899a782145186d4e9a829ea9950fb47 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ff2a425a… Author: Florian Westphal <fw(a)strlen.de> Date: Mon Feb 18 15:24:01 2008 +0100 Add support for up to 3 targets in WHOIS queries. also allow up to one wildcard query from local hosts. Follows ircd 2.10 implementation rather than RFC 2812. At most 10 entries are returned per wildcard expansion. WHOIS test cases by Dana Dahlstrom. --- src/ngircd/irc-info.c | 245 ++++++++++++++++++++++++++++++--------------- src/testsuite/Makefile.am | 7 +- 2 files changed, 169 insertions(+), 83 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=ff2a…

1 0

Alexander Barton : Add "whois-test" to testsuite and distribution archive
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: d1f604ab89f34412cbe44aaf323b450b800a49d9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d1f604ab… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 14:52:07 2011 +0100 Add "whois-test" to testsuite and distribution archive Test script proposed by Dana Dahlstrom, 2008-02-17. See <https://arthur.barton.de/bugzilla/show_bug.cgi?id=72> ... --- src/testsuite/.gitignore | 1 + src/testsuite/Makefile.am | 2 +- src/testsuite/whois-test.e | 53 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletions(-) diff --git a/src/testsuite/.gitignore b/src/testsuite/.gitignore index fd628e3..5884a48 100644 --- a/src/testsuite/.gitignore +++ b/src/testsuite/.gitignore @@ -11,6 +11,7 @@ mode-test opless-channel-test server-link-test who-test +whois-test ngircd-test1.log ngircd-test2.log ngircd-test1.motd diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am index 52cc31a..9dc76a7 100644 --- a/src/testsuite/Makefile.am +++ b/src/testsuite/Makefile.am @@ -20,7 +20,7 @@ EXTRA_DIST = \ test-loop.sh wait-tests.sh \ channel-test.e connect-test.e check-idle.e invite-test.e \ join-test.e kick-test.e message-test.e misc-test.e mode-test.e \ - opless-channel-test.e server-link-test.e who-test.e \ + opless-channel-test.e server-link-test.e who-test.e whois-test.e \ stress-A.e stress-B.e \ start-server1 stop-server1 ngircd-test1.conf \ start-server2 stop-server2 ngircd-test2.conf diff --git a/src/testsuite/whois-test.e b/src/testsuite/whois-test.e new file mode 100644 index 0000000..7024d5f --- /dev/null +++ b/src/testsuite/whois-test.e @@ -0,0 +1,53 @@ +# ngIRCd test suite +# WHOIS test + +spawn telnet localhost 6789 +expect { + timeout { exit 1 } + "Connected" +} + +send "nick nick\r" +send "user user . . :Real Name\r" +expect { + timeout { exit 1 } + "376" +} + +send "whois nick\r" +expect { + timeout { exit 1 } + "311 nick nick ~user localhost \* :Real Name\r" +} + +send "whois *\r" +expect { + timeout { exit 1 } + "311 nick nick ~user localhost \* :Real Name\r" +} + +send "whois n*\r" +expect { + timeout { exit 1 } + "311 nick nick ~user localhost \* :Real Name\r" +} + +send "whois ?ick\r" +expect { + timeout { exit 1 } + "311 nick nick ~user localhost \* :Real Name\r" +} + +send "whois ????,n?*k\r" +expect { + timeout { exit 1 } + "311 nick nick ~user localhost \* :Real Name\r" +} + +send "quit\r" +expect { + timeout { exit 1 } + "ERROR" +} + +# -eof-

1 0

Gabor Adam Toth : quit on HTTP commands: GET & POST
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: 33e8c2480649193799d88d003b9257873aaf2b31 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=33e8c248… Author: Gabor Adam Toth <tg(a)tgbit.net> Date: Mon Dec 20 02:01:25 2010 +0100 quit on HTTP commands: GET & POST --- src/ngircd/irc-login.c | 8 ++++++++ src/ngircd/irc-login.h | 1 + src/ngircd/parse.c | 2 ++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index f76a627..3c4eb18 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -693,6 +693,14 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req ) * @returns CONNECTED or DISCONNECTED. */ GLOBAL bool +IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req ) +{ + Req->argc = 0; + return IRC_QUIT(Client, Req); +} + + +GLOBAL bool IRC_PING(CLIENT *Client, REQUEST *Req) { CLIENT *target, *from; diff --git a/src/ngircd/irc-login.h b/src/ngircd/irc-login.h index 7ba5357..f3138f6 100644 --- a/src/ngircd/irc-login.h +++ b/src/ngircd/irc-login.h @@ -25,6 +25,7 @@ GLOBAL bool IRC_WEBIRC PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_PING PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_PONG PARAMS((CLIENT *Client, REQUEST *Req)); GLOBAL bool IRC_QUIT PARAMS((CLIENT *Client, REQUEST *Req)); +GLOBAL bool IRC_QUIT_HTTP PARAMS((CLIENT *Client, REQUEST *Req)); #endif diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 7c56a03..51149da 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -85,6 +85,8 @@ static COMMAND My_Commands[] = { "PONG", IRC_PONG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "QUIT", IRC_QUIT, 0xFFFF, 0, 0, 0 }, + { "GET", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 }, + { "POST", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 }, { "REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0 }, { "RESTART", IRC_RESTART, CLIENT_USER, 0, 0, 0 }, { "SERVER", IRC_SERVER, 0xFFFF, 0, 0, 0 },

1 0

Gabor Adam Toth : ClientHost setting
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: 52f59149adf4dbbb7c917225a7c66ac4aa053700 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=52f59149… Author: Gabor Adam Toth <tg(a)tgbit.net> Date: Mon Feb 14 16:16:07 2011 +0100 ClientHost setting --- doc/sample-ngircd.conf.tmpl | 3 +++ src/ngircd/client.c | 6 +++++- src/ngircd/conf.c | 9 +++++++++ src/ngircd/conf.h | 3 +++ 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 58696be..bb93501 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -24,6 +24,9 @@ # (".") and be unique in the IRC network. Required! Name = irc.the.net + # Set this hostname for every client instead of the real one + ;ClientHost = irc.the.net + # Info text of the server. This will be shown by WHOIS and # LINKS requests for example. Info = Server Info Text diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 0bfe73d..11decc8 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -319,7 +319,11 @@ Client_SetHostname( CLIENT *Client, const char *Hostname ) assert( Client != NULL ); assert( Hostname != NULL ); - strlcpy( Client->host, Hostname, sizeof( Client->host )); + if (strlen(Conf_ClientHost)) { + strlcpy( Client->host, Conf_ClientHost, sizeof( Client->host )); + } else { + strlcpy( Client->host, Hostname, sizeof( Client->host )); + } } /* Client_SetHostname */ diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 3ff5ddd..622cb9f 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -295,6 +295,7 @@ Conf_Test( void ) puts( "[GLOBAL]" ); printf(" Name = %s\n", Conf_ServerName); + printf(" ClientHost = %s\n", Conf_ClientHost); printf(" Info = %s\n", Conf_ServerInfo); #ifndef PAM printf(" Password = %s\n", Conf_ServerPwd); @@ -590,6 +591,7 @@ Set_Defaults(bool InitServers) int i; strcpy(Conf_ServerName, ""); + strcpy(Conf_ClientHost, ""); snprintf(Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s", PACKAGE_NAME, PACKAGE_VERSION); strcpy(Conf_ServerPwd, ""); @@ -970,6 +972,13 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) Config_Error_TooLong( Line, Var ); return; } + if( strcasecmp( Var, "ClientHost" ) == 0 ) { + /* Client hostname */ + len = strlcpy( Conf_ClientHost, Arg, sizeof( Conf_ClientHost )); + if (len >= sizeof( Conf_ClientHost )) + Config_Error_TooLong( Line, Var ); + return; + } if( strcasecmp( Var, "Info" ) == 0 ) { /* Info text of server */ len = strlcpy( Conf_ServerInfo, Arg, sizeof( Conf_ServerInfo )); diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 8c6aea8..1747139 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -97,6 +97,9 @@ struct Conf_Channel { /** Name (ID, "nick") of this server */ GLOBAL char Conf_ServerName[CLIENT_ID_LEN]; +/** Hostname of the clients */ +GLOBAL char Conf_ClientHost[CLIENT_ID_LEN]; + /** Server info text */ GLOBAL char Conf_ServerInfo[CLIENT_INFO_LEN];

1 0

Springe zur Seite:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates