X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-login.c;h=e709612a97adc04873f1822880530b163bd92d66;hp=1f7038ee8761853c1db69c11427cae7782a22e58;hb=a60465be3ec6e6960a981c5e2c21846839359653;hpb=42db159d26519da751896cbf83bcf0d5def1df59 diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 1f7038ee..e709612a 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2008 Alexander Barton (alex@barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,8 +14,6 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-login.c,v 1.55 2008/02/05 11:46:55 fw Exp $"; - #include "imp.h" #include #include @@ -35,14 +33,30 @@ static char UNUSED id[] = "$Id: irc-login.c,v 1.55 2008/02/05 11:46:55 fw Exp $" #include "irc.h" #include "irc-info.h" #include "irc-write.h" -#include "cvs-version.h" #include "exp.h" #include "irc-login.h" +typedef struct _INTRO_INFO { + char *nick; /* Nick name */ + int hopcount; /* Hop count */ + char *user; /* User name */ + char *host; /* Host name */ + CLIENT *server; /* Server the client is connected to */ + char *mode; /* User modes */ + char *name; /* Real name */ +} INTRO_INFO; + + static bool Hello_User PARAMS(( CLIENT *Client )); static void Kill_Nick PARAMS(( char *Nick, char *Reason )); +static void Introduce_Client PARAMS((CLIENT *From, char *Nick, + const int HopCount, char *User, + char *Host, CLIENT *Server, + char *Mode, char *Name )); +static void cb_introduceClient PARAMS((CLIENT *Client, CLIENT *Prefix, + void *i)); /** @@ -62,12 +76,12 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) if (Client_Conn(Client) <= NONE) return IRC_WriteStrClient(Client, ERR_UNKNOWNCOMMAND_MSG, Client_ID(Client), Req->command); - + if (Client_Type(Client) == CLIENT_UNKNOWN && Req->argc == 1) { /* Not yet registered "unknown" connection, PASS with one * argument: either a regular client, service, or server * using the old RFC 1459 section 4.1.1 syntax. */ - LogDebug("Connection %d: got PASS command ...", + LogDebug("Connection %d: got PASS command (RFC 1459) ...", Client_Conn(Client)); } else if ((Client_Type(Client) == CLIENT_UNKNOWN || Client_Type(Client) == CLIENT_UNKNOWNSERVER) && @@ -75,7 +89,7 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) /* Not yet registered "unknown" connection or outgoing server * link, PASS with three or four argument: server using the * RFC 2813 section 4.1.1 syntax. */ - LogDebug("Connection %d: got PASS command (new server link) ...", + LogDebug("Connection %d: got PASS command (RFC 2813, new server link) ...", Client_Conn(Client)); } else if (Client_Type(Client) == CLIENT_UNKNOWN || Client_Type(Client) == CLIENT_UNKNOWNSERVER) { @@ -89,7 +103,6 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) } Client_SetPassword(Client, Req->argv[0]); - Client_SetType(Client, CLIENT_GOTPASS); /* Protocol version */ if (Req->argc >= 2 && strlen(Req->argv[1]) >= 4) { @@ -102,18 +115,22 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) protolow = atoi(&Req->argv[1][2]); Req->argv[1][2] = '\0'; protohigh = atoi(Req->argv[1]); - + Req->argv[1][2] = c2; Req->argv[1][4] = c4; - } else + + Client_SetType(Client, CLIENT_GOTPASS_2813); + } else { protohigh = protolow = 0; + Client_SetType(Client, CLIENT_GOTPASS); + } /* Protocol type, see doc/Protocol.txt */ if (Req->argc >= 2 && strlen(Req->argv[1]) > 4) type = &Req->argv[1][4]; else type = NULL; - + /* Protocol flags/options */ if (Req->argc >= 4) orig_flags = Req->argv[3]; @@ -171,7 +188,8 @@ GLOBAL bool IRC_NICK( CLIENT *Client, REQUEST *Req ) { CLIENT *intr_c, *target, *c; - char *modes; + char *nick, *user, *hostname, *modes, *info; + int token, hops; assert( Client != NULL ); assert( Req != NULL ); @@ -259,13 +277,13 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) else { /* Nickname change */ - if( Client_Conn( target ) > NONE ) - { + if (Client_Conn(target) > NONE) { /* Local client */ - Log( LOG_INFO, - "User \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".", - Client_Mask( target ), Client_Conn( target ), - Client_ID( target ), Req->argv[0] ); + Log(LOG_INFO, + "User \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".", + Client_Mask(target), Client_Conn(target), + Client_ID(target), Req->argv[0]); + Conn_UpdateIdle(Client_Conn(target)); } else { @@ -297,18 +315,38 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) } return CONNECTED; - } - else if( Client_Type( Client ) == CLIENT_SERVER ) - { - /* Server introduces new client */ - - /* Falsche Anzahl Parameter? */ - if( Req->argc != 7 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + } else if(Client_Type(Client) == CLIENT_SERVER || + Client_Type(Client) == CLIENT_SERVICE) { + /* Server or service introduces new client */ + + /* Bad number of parameters? */ + if (Req->argc != 2 && Req->argc != 7) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + + if (Req->argc >= 7) { + /* RFC 2813 compatible syntax */ + nick = Req->argv[0]; + hops = atoi(Req->argv[1]); + user = Req->argv[2]; + hostname = Req->argv[3]; + token = atoi(Req->argv[4]); + modes = Req->argv[5] + 1; + info = Req->argv[6]; + } else { + /* RFC 1459 compatible syntax */ + nick = Req->argv[0]; + hops = 1; + user = Req->argv[0]; + hostname = Client_ID(Client); + token = atoi(Req->argv[1]); + modes = ""; + info = Req->argv[0]; + } /* Nick ueberpruefen */ - c = Client_Search( Req->argv[0] ); - if( c ) - { + c = Client_Search(nick); + if(c) { /* Der neue Nick ist auf diesem Server bereits registriert: * sowohl der neue, als auch der alte Client muessen nun * disconnectiert werden. */ @@ -318,7 +356,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) } /* Server, zu dem der Client connectiert ist, suchen */ - intr_c = Client_GetFromToken( Client, atoi( Req->argv[4] )); + intr_c = Client_GetFromToken(Client, token); if( ! intr_c ) { Log( LOG_ERR, "Server %s introduces nick \"%s\" on unknown server!?", Client_ID( Client ), Req->argv[0] ); @@ -327,7 +365,8 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) } /* Neue Client-Struktur anlegen */ - c = Client_NewRemoteUser( intr_c, Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], atoi( Req->argv[4] ), Req->argv[5] + 1, Req->argv[6], true); + c = Client_NewRemoteUser(intr_c, nick, hops, user, hostname, + token, modes, info, true); if( ! c ) { /* Eine neue Client-Struktur konnte nicht angelegt werden. @@ -338,12 +377,25 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) return CONNECTED; } - modes = Client_Modes( c ); - if( *modes ) Log( LOG_DEBUG, "User \"%s\" (+%s) registered (via %s, on %s, %d hop%s).", Client_Mask( c ), modes, Client_ID( Client ), Client_ID( intr_c ), Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" ); - else Log( LOG_DEBUG, "User \"%s\" registered (via %s, on %s, %d hop%s).", Client_Mask( c ), Client_ID( Client ), Client_ID( intr_c ), Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" ); - - /* Andere Server, ausser dem Introducer, informieren */ - IRC_WriteStrServersPrefix( Client, Client, "NICK %s %d %s %s %d %s :%s", Req->argv[0], atoi( Req->argv[1] ) + 1, Req->argv[2], Req->argv[3], Client_MyToken( intr_c ), Req->argv[5], Req->argv[6] ); + /* RFC 2813: client is now fully registered, inform all the + * other servers about the new user. + * RFC 1459: announce the new client only after receiving the + * USER command, first we need more information! */ + if (Req->argc >= 7) { + modes = Client_Modes(c); + LogDebug("User \"%s\" (+%s) registered (via %s, on %s, %d hop%s).", + Client_Mask(c), modes, Client_ID(Client), + Client_ID(intr_c), Client_Hops(c), + Client_Hops(c) > 1 ? "s": ""); + + Introduce_Client(Client, Req->argv[0], + atoi(Req->argv[1]) + 1, Req->argv[2], + Req->argv[3], intr_c, Req->argv[5], Req->argv[6]); + } else { + LogDebug("User \"%s\" is beeing registered (RFC 1459) ...", + Client_Mask(c)); + Client_SetType(c, CLIENT_GOTNICK); + } return CONNECTED; } @@ -351,60 +403,140 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) } /* IRC_NICK */ +/** + * Handler for the IRC command "USER". + */ GLOBAL bool -IRC_USER( CLIENT *Client, REQUEST *Req ) +IRC_USER(CLIENT * Client, REQUEST * Req) { + CLIENT *c; + char modes[CLIENT_MODE_LEN + 1] = "+"; #ifdef IDENTAUTH char *ptr; #endif - assert( Client != NULL ); - assert( Req != NULL ); + assert(Client != NULL); + assert(Req != NULL); + if (Client_Type(Client) == CLIENT_GOTNICK || #ifndef STRICT_RFC - if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_UNKNOWN ) -#else - if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS ) + Client_Type(Client) == CLIENT_UNKNOWN || #endif + Client_Type(Client) == CLIENT_GOTPASS) { - /* Wrong number of parameters? */ - if( Req->argc != 4 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + /* New connection */ + if (Req->argc != 4) + return IRC_WriteStrClient(Client, + ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), + Req->command); /* User name */ #ifdef IDENTAUTH - ptr = Client_User( Client ); - if( ! ptr || ! *ptr || *ptr == '~' ) Client_SetUser( Client, Req->argv[0], false ); + ptr = Client_User(Client); + if (!ptr || !*ptr || *ptr == '~') + Client_SetUser(Client, Req->argv[0], false); #else - Client_SetUser( Client, Req->argv[0], false ); + Client_SetUser(Client, Req->argv[0], false); #endif - /* "Real name" or user info text: Don't set it to the empty string, the original ircd - * can't deal with such "real names" (e. g. "USER user * * :") ... */ - if( *Req->argv[3] ) Client_SetInfo( Client, Req->argv[3] ); - else Client_SetInfo( Client, "-" ); + /* "Real name" or user info text: Don't set it to the empty + * string, the original ircd can't deal with such "real names" + * (e. g. "USER user * * :") ... */ + if (*Req->argv[3]) + Client_SetInfo(Client, Req->argv[3]); + else + Client_SetInfo(Client, "-"); - Log( LOG_DEBUG, "Connection %d: got valid USER command ...", Client_Conn( Client )); - if( Client_Type( Client ) == CLIENT_GOTNICK ) return Hello_User( Client ); - else Client_SetType( Client, CLIENT_GOTUSER ); + LogDebug("Connection %d: got valid USER command ...", + Client_Conn(Client)); + if (Client_Type(Client) == CLIENT_GOTNICK) + return Hello_User(Client); + else + Client_SetType(Client, CLIENT_GOTUSER); return CONNECTED; + + } else if (Client_Type(Client) == CLIENT_SERVER || + Client_Type(Client) == CLIENT_SERVICE) { + /* Server/service updating an user */ + if (Req->argc != 4) + return IRC_WriteStrClient(Client, + ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), + Req->command); + c = Client_Search(Req->prefix); + if (!c) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), + Req->prefix); + + Client_SetUser(c, Req->argv[0], true); + Client_SetHostname(c, Req->argv[1]); + Client_SetInfo(c, Req->argv[3]); + + LogDebug("Connection %d: got valid USER command for \"%s\".", + Client_Conn(Client), Client_Mask(c)); + + /* RFC 1459 style user registration? Inform other servers! */ + if (Client_Type(c) == CLIENT_GOTNICK) { + strlcat(modes, Client_Modes(c), sizeof(modes)); + Introduce_Client(Client, Client_ID(c), Client_Hops(c), + Client_User(c), Client_Hostname(c), + Client_Introducer(c), modes, + Client_Info(c)); + LogDebug("User \"%s\" (%s) registered (via %s, on %s, %d hop%s).", + Client_Mask(c), modes, Client_ID(Client), + Client_ID(Client_Introducer(c)), Client_Hops(c), + Client_Hops(c) > 1 ? "s": ""); + Client_SetType(c, CLIENT_USER); + } + + return CONNECTED; + } else if (Client_Type(Client) == CLIENT_USER) { + /* Already registered connection */ + return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG, + Client_ID(Client)); + } else { + /* Unexpected/invalid connection state? */ + return IRC_WriteStrClient(Client, ERR_NOTREGISTERED_MSG, + Client_ID(Client)); } - else if( Client_Type( Client ) == CLIENT_USER || Client_Type( Client ) == CLIENT_SERVER || Client_Type( Client ) == CLIENT_SERVICE ) - { - return IRC_WriteStrClient( Client, ERR_ALREADYREGISTRED_MSG, Client_ID( Client )); - } - else return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); } /* IRC_USER */ +/** + * Service registration. + * ngIRCd does not support services at the moment, so this function is a + * dummy that returns ERR_ERRONEUSNICKNAME on each call. + */ +GLOBAL bool +IRC_SERVICE(CLIENT *Client, REQUEST *Req) +{ + assert(Client != NULL); + assert(Req != NULL); + + if (Client_Type(Client) != CLIENT_GOTPASS) + return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG, + Client_ID(Client)); + + if (Req->argc != 6) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + + return IRC_WriteStrClient(Client, ERR_ERRONEUSNICKNAME_MSG, + Client_ID(Client), Req->argv[0]); +} /* IRC_SERVICE */ + + GLOBAL bool IRC_QUIT( CLIENT *Client, REQUEST *Req ) { CLIENT *target; char quitmsg[LINE_LEN]; - + assert( Client != NULL ); assert( Req != NULL ); - + /* Wrong number of arguments? */ if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); @@ -438,7 +570,7 @@ IRC_QUIT( CLIENT *Client, REQUEST *Req ) /* User, Service, oder noch nicht registriert */ Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argc == 1 ? quitmsg : NULL, true); - + return DISCONNECTED; } } /* IRC_QUIT */ @@ -507,7 +639,7 @@ IRC_PING(CLIENT *Client, REQUEST *Req) Client_ID(from), Client_ID(Client)); #else /* Some clients depend on the argument being returned in the PONG - * reply (not mentioned in any RFC, though) */ + * reply (not mentioned in any RFC, though) */ return IRC_WriteStrClient(Client, "PONG %s :%s", Client_ID(from), Req->argv[0]); #endif @@ -573,61 +705,62 @@ IRC_PONG(CLIENT *Client, REQUEST *Req) static bool -Hello_User( CLIENT *Client ) +Hello_User(CLIENT * Client) { -#ifdef CVSDATE - char ver[12], vertxt[30]; -#endif + char modes[CLIENT_MODE_LEN + 1] = "+"; - assert( Client != NULL ); + assert(Client != NULL); /* Check password ... */ - if( strcmp( Client_Password( Client ), Conf_ServerPwd ) != 0 ) - { + if (strcmp(Client_Password(Client), Conf_ServerPwd) != 0) { /* Bad password! */ - Log( LOG_ERR, "User \"%s\" rejected (connection %d): Bad password!", Client_Mask( Client ), Client_Conn( Client )); - Conn_Close( Client_Conn( Client ), NULL, "Bad password", true); + Log(LOG_ERR, + "User \"%s\" rejected (connection %d): Bad password!", + Client_Mask(Client), Client_Conn(Client)); + Conn_Close(Client_Conn(Client), NULL, "Bad password", true); return DISCONNECTED; } - Log( LOG_NOTICE, "User \"%s\" registered (connection %d).", Client_Mask( Client ), Client_Conn( Client )); + Log(LOG_NOTICE, "User \"%s\" registered (connection %d).", + Client_Mask(Client), Client_Conn(Client)); /* Inform other servers */ - IRC_WriteStrServers( NULL, "NICK %s 1 %s %s 1 +%s :%s", Client_ID( Client ), Client_User( Client ), Client_Hostname( Client ), Client_Modes( Client ), Client_Info( Client )); - - /* Welcome :-) */ - if( ! IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ))) return false; - - /* Version and system type */ -#ifdef CVSDATE - strlcpy( ver, CVSDATE, sizeof( ver )); - memmove( ver + 4, ver + 5, 2 ); - memmove( ver + 6, ver + 8, 3 ); - snprintf( vertxt, sizeof( vertxt ), "%s(%s)", PACKAGE_VERSION, ver ); - if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), vertxt, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return false; -#else - if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return false; -#endif - - if( ! IRC_WriteStrClient( Client, RPL_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr )) return false; -#ifdef CVSDATE - if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), vertxt, USERMODES, CHANMODES )) return false; -#else - if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, USERMODES, CHANMODES )) return false; -#endif + strlcat(modes, Client_Modes(Client), sizeof(modes)); + Introduce_Client(NULL, Client_ID(Client), 1, Client_User(Client), + Client_Hostname(Client), NULL, modes, + Client_Info(Client)); + + if (!IRC_WriteStrClient + (Client, RPL_WELCOME_MSG, Client_ID(Client), Client_Mask(Client))) + return false; + if (!IRC_WriteStrClient + (Client, RPL_YOURHOST_MSG, Client_ID(Client), + Client_ID(Client_ThisServer()), PACKAGE_VERSION, TARGET_CPU, + TARGET_VENDOR, TARGET_OS)) + return false; + if (!IRC_WriteStrClient + (Client, RPL_CREATED_MSG, Client_ID(Client), NGIRCd_StartStr)) + return false; + if (!IRC_WriteStrClient + (Client, RPL_MYINFO_MSG, Client_ID(Client), + Client_ID(Client_ThisServer()), PACKAGE_VERSION, USERMODES, + CHANMODES)) + return false; /* Features supported by this server (005 numeric, ISUPPORT), * see for details. */ - if (! IRC_Send_ISUPPORT(Client)) + if (!IRC_Send_ISUPPORT(Client)) return DISCONNECTED; - Client_SetType( Client, CLIENT_USER ); + Client_SetType(Client, CLIENT_USER); - if( ! IRC_Send_LUSERS( Client )) return DISCONNECTED; - if( ! IRC_Show_MOTD( Client )) return DISCONNECTED; + if (!IRC_Send_LUSERS(Client)) + return DISCONNECTED; + if (!IRC_Show_MOTD(Client)) + return DISCONNECTED; /* Suspend the client for a second ... */ - IRC_SetPenalty( Client, 1 ); + IRC_SetPenalty(Client, 1); return CONNECTED; } /* Hello_User */ @@ -651,4 +784,48 @@ Kill_Nick( char *Nick, char *Reason ) } /* Kill_Nick */ +static void +Introduce_Client(CLIENT *From, char *Nick, const int HopCount, char *User, + char *Host, CLIENT *Server, char *Mode, char *Name) +{ + INTRO_INFO i; + + i.nick = Nick; + i.hopcount = HopCount; + i.user = User ? User : "-"; + i.host = Host ? Host : "-"; + i.server = Server ? Server : Client_ThisServer(); + i.mode = Mode ? Mode : "+"; + i.name = Name ? Name : ""; + + IRC_WriteStrServersPrefixFlag_CB(From, + From != NULL ? From : Client_ThisServer(), + '\0', cb_introduceClient, (void *)(&i)); +} /* Introduce_Client */ + + +static void +cb_introduceClient(CLIENT *Client, CLIENT *Prefix, void *data) +{ + INTRO_INFO *i = (INTRO_INFO *)data; + CONN_ID conn; + + conn = Client_Conn(Client); + if (Conn_Options(conn) & CONN_RFC1459) { + /* RFC 1459 mode: separate NICK and USER commands */ + Conn_WriteStr(conn, "NICK %s :%d", i->nick, i->hopcount); + Conn_WriteStr(conn, ":%s USER %s %s %s :%s", + i->nick, i->user, i->host, + Client_ID(i->server), i->name); + } else { + /* RFC 2813 mode: one combined NICK command */ + IRC_WriteStrClientPrefix(Client, Prefix, + "NICK %s %d %s %s %d %s :%s", + i->nick, i->hopcount, i->user, i->host, + Client_MyToken(i->server), i->mode, + i->name); + } +} /* cb_introduceClient */ + + /* -eof- */