February 2014 - ngIRCd GIT Updates

Alexander Barton : Merge pull request #6 from norrs/pam_server_password_fix
by alex＠arthur.barton.de 28 Feb '14

28 Feb '14

Module: ngircd.git Branch: master Commit: af9161a9bc32817c44fe6f743b402d554e60ddf2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=af9161a9… Author: Alexander Barton <alex(a)barton.de> Date: Fri Feb 28 22:26:41 2014 +0100 Merge pull request #6 from norrs/pam_server_password_fix Validate server password when PAM is disabled. ---

1 0

Roy Sindre Norangshol : Use server password when PAM is compiled in but disabled
by alex＠arthur.barton.de 28 Feb '14

28 Feb '14

Module: ngircd.git Branch: master Commit: 485d0aec813db9966922f17aae044df2d82b0b67 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=485d0aec… Author: Roy Sindre Norangshol <roy.sindre(a)norangshol.no> Date: Thu Feb 27 00:21:18 2014 +0100 Use server password when PAM is compiled in but disabled --- src/ngircd/conf.c | 7 +++---- src/ngircd/login.c | 51 ++++++++++++++++++++++++++------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index bdbb506..34abbad 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -370,9 +370,8 @@ Conf_Test( void ) ? (const char*) array_start(&Conf_Motd) : ""); } printf(" Network = %s\n", Conf_Network); -#ifndef PAM - printf(" Password = %s\n", Conf_ServerPwd); -#endif + if (!Conf_PAM) + printf(" Password = %s\n", Conf_ServerPwd); printf(" PidFile = %s\n", Conf_PidFile); printf(" Ports = "); ports_puts(&Conf_ListenPorts); @@ -2259,7 +2258,7 @@ Validate_Config(bool Configtest, bool Rehash) } #ifdef PAM - if (Conf_ServerPwd[0]) + if (Conf_PAM && Conf_ServerPwd[0]) Config_Error(LOG_ERR, "This server uses PAM, \"Password\" in [Global] section will be ignored!"); #endif diff --git a/src/ngircd/login.c b/src/ngircd/login.c index 4011b8b..23c3b68 100644 --- a/src/ngircd/login.c +++ b/src/ngircd/login.c @@ -91,13 +91,12 @@ Login_User(CLIENT * Client) #ifdef PAM if (!Conf_PAM) { - /* Don't do any PAM authentication at all, instead emulate - * the behavior of the daemon compiled without PAM support: - * because there can't be any "server password", all - * passwords supplied are classified as "wrong". */ - if(Conn_Password(conn)[0] == '\0') + /* Don't do any PAM authentication at all if PAM is not + * enabled, instead emulate the behavior of the daemon + * compiled without PAM support. */ + if (strcmp(Conn_Password(conn), Conf_ServerPwd) == 0) return Login_User_PostAuth(Client); - Client_Reject(Client, "Non-empty password", false); + Client_Reject(Client, "Bad server password", false); return DISCONNECTED; } @@ -111,25 +110,27 @@ Login_User(CLIENT * Client) return Login_User_PostAuth(Client); } - /* Fork child process for PAM authentication; and make sure that the - * process timeout is set higher than the login timeout! */ - pid = Proc_Fork(Conn_GetProcStat(conn), pipefd, - cb_Read_Auth_Result, Conf_PongTimeout + 1); - if (pid > 0) { - LogDebug("Authenticator for connection %d created (PID %d).", - conn, pid); - return CONNECTED; - } else { - /* Sub process */ - Log_Init_Subprocess("Auth"); - Conn_CloseAllSockets(NONE); - result = PAM_Authenticate(Client); - if (write(pipefd[1], &result, sizeof(result)) != sizeof(result)) - Log_Subprocess(LOG_ERR, - "Failed to pipe result to parent!"); - Log_Exit_Subprocess("Auth"); - exit(0); - } + if (Conf_PAM) { + /* Fork child process for PAM authentication; and make sure that the + * process timeout is set higher than the login timeout! */ + pid = Proc_Fork(Conn_GetProcStat(conn), pipefd, + cb_Read_Auth_Result, Conf_PongTimeout + 1); + if (pid > 0) { + LogDebug("Authenticator for connection %d created (PID %d).", + conn, pid); + return CONNECTED; + } else { + /* Sub process */ + Log_Init_Subprocess("Auth"); + Conn_CloseAllSockets(NONE); + result = PAM_Authenticate(Client); + if (write(pipefd[1], &result, sizeof(result)) != sizeof(result)) + Log_Subprocess(LOG_ERR, + "Failed to pipe result to parent!"); + Log_Exit_Subprocess("Auth"); + exit(0); + } + } else return CONNECTED; #else /* Check global server password ... */ if (strcmp(Conn_Password(conn), Conf_ServerPwd) != 0) {

1 0

Alexander Barton : CHARCONV: Fix handling conversion errors
by alex＠arthur.barton.de 23 Feb '14

23 Feb '14

Module: ngircd.git Branch: master Commit: abf280d5bd5648817135c487a19941b2ef4b0701 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=abf280d5… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 23 18:20:47 2014 +0100 CHARCONV: Fix handling conversion errors Don't overwrite already converted text! --- src/ngircd/conn-encoding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/conn-encoding.c b/src/ngircd/conn-encoding.c index 98cd29a..d0c5630 100644 --- a/src/ngircd/conn-encoding.c +++ b/src/ngircd/conn-encoding.c @@ -125,7 +125,7 @@ Convert_Message(iconv_t Handle, char *Message) if (iconv(Handle, &Message, &in_left, &out, &out_left) == (size_t)(-1)) { /* An error occurred! */ LogDebug("Error converting message encoding!"); - strlcpy(Encoding_Buffer, Message, sizeof(Encoding_Buffer)); + strlcpy(out, Message, sizeof(Encoding_Buffer)); iconv(Handle, NULL, NULL, NULL, NULL); } else *out = '\0';

1 0

Alexander Barton : Streamline punctuation of log messages
by alex＠arthur.barton.de 09 Feb '14

09 Feb '14

Module: ngircd.git Branch: master Commit: ccc9e1baa41c2b81d641d87acaefbf07eb499ad4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ccc9e1ba… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 9 16:01:13 2014 +0100 Streamline punctuation of log messages See commit d38d153f for details. --- src/ngircd/irc-oper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 49768bc..88a9e43 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -48,7 +48,7 @@ static bool Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg) { - Log(LOG_WARNING, "Got invalid OPER from \"%s\": \"%s\" -- %s", + Log(LOG_WARNING, "Got invalid OPER from \"%s\": \"%s\" -- %s!", Client_Mask(Client), errtoken, errmsg); /* Increase penalty to slow down possible brute force attacks */ IRC_SetPenalty(Client, 10);

1 0

Alexander Barton : Services.txt: Update information for Anope 2.x
by alex＠arthur.barton.de 02 Feb '14

02 Feb '14

Module: ngircd.git Branch: master Commit: 755562d1477ed28e4e793fb42fa0cc0b295ea1b5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=755562d1… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 2 20:28:21 2014 +0100 Services.txt: Update information for Anope 2.x --- doc/Services.txt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/Services.txt b/doc/Services.txt index 2704f02..2cef778 100644 --- a/doc/Services.txt +++ b/doc/Services.txt @@ -41,8 +41,8 @@ Example: ServiceMask = *Serv -Setting up Anope 1.9.x -~~~~~~~~~~~~~~~~~~~~~~ +Setting up Anope 1.9.x & 2.x +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Anope 1.9.8 or later (<http://www.anope.org/>) can be used with ngIRCd using the "ngircd" protocol module. @@ -66,20 +66,28 @@ In conf/services.conf: } # Load ngIRCd protocol module - module { name = "ngircd" } + module + { + name = "ngircd" + } networkinfo { # Must be set to the "MaxNickLength" setting of ngIRCd! nicklen = 9 + # When not using "strict mode", which is the default: + userlen = 20 + chanlen = 50 } In conf/nickserv.conf: - nickserv + module { + name = "nickserv" + # not required if you are running ngIRCd with a higher nickname limit # ("MaxNickLength") than 11 characters, but REQUIRED by default! guestnickprefix = "G-"

1 0

Alexander Barton : IRC_INVITE(): Code cleanup
by alex＠arthur.barton.de 02 Feb '14

02 Feb '14

Module: ngircd.git Branch: master Commit: 384b27cee0c31ba26c58480b015ef2feb52c79f9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=384b27ce… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 2 00:27:24 2014 +0100 IRC_INVITE(): Code cleanup --- src/ngircd/irc-op.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index 449cecf..b08d739 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -170,7 +170,8 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req) /* Is the channel "invite-only"? */ if (Channel_HasMode(chan, 'i')) { - /* Yes. The user must be channel owner/admin/operator/halfop! */ + /* Yes. The user issuing the INVITE command must be + * channel owner/admin/operator/halfop! */ if (!Channel_UserHasMode(chan, from, 'q') && !Channel_UserHasMode(chan, from, 'a') && !Channel_UserHasMode(chan, from, 'o') && @@ -204,21 +205,22 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req) Req->argv[0], Req->argv[1]); /* - * RFC 2812 says: - * 'There is no requirement that the channel [..] must exist or be a valid channel' - * The problem with this is that this allows the "channel" to contain spaces, - * in which case we must prefix its name with a colon to make it clear that - * it is only a single argument. + * RFC 2812 states: + * 'There is no requirement that the channel [..] must exist or be a + * valid channel'. The problem with this is that this allows the + * "channel" to contain spaces, in which case we must prefix its name + * with a colon to make it clear that it is only a single argument. */ colon_if_necessary = strchr(Req->argv[1], ' ') ? ":":""; /* Inform target client */ IRC_WriteStrClientPrefix(target, from, "INVITE %s %s%s", Req->argv[0], - colon_if_necessary, Req->argv[1]); + colon_if_necessary, Req->argv[1]); if (Client_Conn(target) > NONE) { /* The target user is local, so we have to send the status code */ if (!IRC_WriteStrClientPrefix(from, target, RPL_INVITING_MSG, - Client_ID(from), Req->argv[0], colon_if_necessary, Req->argv[1])) + Client_ID(from), Req->argv[0], + colon_if_necessary, Req->argv[1])) return DISCONNECTED; if (Client_HasMode(target, 'a') &&

1 0

Alexander Barton : Streamline punctuation of log messages
by alex＠arthur.barton.de 02 Feb '14

02 Feb '14

Module: ngircd.git Branch: master Commit: 6496fa46554ce099a451eac338090bd6fe6554e1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6496fa46… Author: Alexander Barton <alex(a)barton.de> Date: Sun Feb 2 00:27:03 2014 +0100 Streamline punctuation of log messages See commit d38d153f for details. --- src/ngircd/op.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/op.c b/src/ngircd/op.c index 71e7cbc..868c17a 100644 --- a/src/ngircd/op.c +++ b/src/ngircd/op.c @@ -44,12 +44,12 @@ Op_NoPrivileges(CLIENT * Client, REQUEST * Req) from = Client_Search(Req->prefix); if (from) { - Log(LOG_NOTICE, "No privileges: client \"%s\" (%s), command \"%s\"", + Log(LOG_NOTICE, "No privileges: client \"%s\" (%s), command \"%s\"!", Req->prefix, Client_Mask(Client), Req->command); return IRC_WriteErrClient(from, ERR_NOPRIVILEGES_MSG, Client_ID(from)); } else { - Log(LOG_NOTICE, "No privileges: client \"%s\", command \"%s\"", + Log(LOG_NOTICE, "No privileges: client \"%s\", command \"%s\"!", Client_Mask(Client), Req->command); return IRC_WriteErrClient(Client, ERR_NOPRIVILEGES_MSG, Client_ID(Client));

1 0