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=943612edf03f06ef7204890e27fa0fdbe1544670;hp=4a2ebe226f446501bbdb88c8e9d87f586bca40f5;hb=0e4e22a7a671d1e8efbc44bffd80062191f75c38;hpb=13f1d57e84c0c95876d69bde3b9990fb6c9ebaeb diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 4a2ebe22..943612ed 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -40,6 +40,9 @@ static bool Hello_User PARAMS(( CLIENT *Client )); static void Kill_Nick PARAMS(( char *Nick, char *Reason )); +static void Introduce_Client PARAMS((CLIENT *To, CLIENT *Client, int Type)); +static void cb_introduceClient PARAMS((CLIENT *Client, CLIENT *Prefix, + void *i)); /** @@ -64,7 +67,7 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) /* 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) && @@ -72,7 +75,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) { @@ -86,7 +89,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,8 +104,12 @@ IRC_PASS( CLIENT *Client, REQUEST *Req ) 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) @@ -174,22 +180,17 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); -#ifndef STRICT_RFC /* Some IRC clients, for example BitchX, send the NICK and USER * commands in the wrong order ... */ - if( Client_Type( Client ) == CLIENT_UNKNOWN - || Client_Type( Client ) == CLIENT_GOTPASS - || Client_Type( Client ) == CLIENT_GOTNICK - || Client_Type( Client ) == CLIENT_GOTUSER - || Client_Type( Client ) == CLIENT_USER - || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 )) -#else - if( Client_Type( Client ) == CLIENT_UNKNOWN - || Client_Type( Client ) == CLIENT_GOTPASS - || Client_Type( Client ) == CLIENT_GOTNICK - || Client_Type( Client ) == CLIENT_USER - || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 )) + if(Client_Type(Client) == CLIENT_UNKNOWN + || Client_Type(Client) == CLIENT_GOTPASS + || Client_Type(Client) == CLIENT_GOTNICK +#ifndef STRICT_RFC + || Client_Type(Client) == CLIENT_GOTUSER #endif + || Client_Type(Client) == CLIENT_USER + || Client_Type(Client) == CLIENT_SERVICE + || (Client_Type(Client) == CLIENT_SERVER && Req->argc == 1)) { /* User registration or change of nickname */ @@ -237,9 +238,9 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) return CONNECTED; } - if(( Client_Type( target ) != CLIENT_USER ) - && ( Client_Type( target ) != CLIENT_SERVER )) - { + if (Client_Type(target) != CLIENT_USER && + Client_Type(target) != CLIENT_SERVICE && + Client_Type(target) != CLIENT_SERVER) { /* New client */ Log( LOG_DEBUG, "Connection %d: got valid NICK command ...", Client_Conn( Client )); @@ -253,25 +254,22 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) return Hello_User( Client ); else Client_SetType( Client, CLIENT_GOTNICK ); - } - else - { + } else { /* Nickname change */ 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]); + "%s \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".", + Client_TypeText(target), Client_Mask(target), + Client_Conn(target), Client_ID(target), + Req->argv[0]); Conn_UpdateIdle(Client_Conn(target)); - } - else - { + } else { /* Remote client */ - Log( LOG_DEBUG, - "User \"%s\" changed nick: \"%s\" -> \"%s\".", - Client_Mask( target ), Client_ID( target ), - Req->argv[0] ); + LogDebug("%s \"%s\" changed nick: \"%s\" -> \"%s\".", + Client_TypeText(target), + Client_Mask(target), Client_ID(target), + Req->argv[0]); } /* Inform all users and servers (which have to know) @@ -305,6 +303,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) 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]; @@ -313,6 +312,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) modes = Req->argv[5] + 1; info = Req->argv[6]; } else { + /* RFC 1459 compatible syntax */ nick = Req->argv[0]; hops = 1; user = Req->argv[0]; @@ -355,12 +355,16 @@ 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) { + LogDebug("Client \"%s\" is beeing registered (RFC 1459) ...", + Client_Mask(c)); + Client_SetType(c, CLIENT_GOTNICK); + } else + Introduce_Client(Client, c, CLIENT_USER); return CONNECTED; } @@ -440,6 +444,12 @@ IRC_USER(CLIENT * Client, REQUEST * Req) LogDebug("Connection %d: got valid USER command for \"%s\".", Client_Conn(Client), Client_Mask(c)); + + /* RFC 1459 style user registration? + * Introduce client to network: */ + if (Client_Type(c) == CLIENT_GOTNICK) + Introduce_Client(Client, c, CLIENT_USER); + return CONNECTED; } else if (Client_Type(Client) == CLIENT_USER) { /* Already registered connection */ @@ -454,17 +464,25 @@ IRC_USER(CLIENT * Client, REQUEST * Req) /** - * Service registration. - * ngIRCd does not support services at the moment, so this function is a - * dummy that returns ERR_ERRONEUSNICKNAME on each call. + * Handler for the IRC command "SERVICE". + * This function implements IRC Services registration using the SERVICE command + * defined in RFC 2812 3.1.6 and RFC 2813 4.1.4. + * At the moment ngIRCd doesn't support directly linked services, so this + * function returns ERR_ERRONEUSNICKNAME when the SERVICE command has not been + * received from a peer server. */ GLOBAL bool IRC_SERVICE(CLIENT *Client, REQUEST *Req) { + CLIENT *c, *intr_c; + char *nick, *user, *host, *info, *modes, *ptr; + int token, hops; + assert(Client != NULL); assert(Req != NULL); - if (Client_Type(Client) != CLIENT_GOTPASS) + if (Client_Type(Client) != CLIENT_GOTPASS && + Client_Type(Client) != CLIENT_SERVER) return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG, Client_ID(Client)); @@ -472,8 +490,74 @@ IRC_SERVICE(CLIENT *Client, REQUEST *Req) return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); - return IRC_WriteStrClient(Client, ERR_ERRONEUSNICKNAME_MSG, + if (Client_Type(Client) != CLIENT_SERVER) + return IRC_WriteStrClient(Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID(Client), Req->argv[0]); + + /* Bad number of parameters? */ + if (Req->argc != 6) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + + nick = Req->argv[0]; + user = NULL; host = NULL; + token = atoi(Req->argv[1]); + hops = atoi(Req->argv[4]); + info = Req->argv[5]; + + /* Validate service name ("nick name") */ + c = Client_Search(nick); + if(c) { + /* Nick name collission: disconnect (KILL) both clients! */ + Log(LOG_ERR, "Server %s introduces already registered service \"%s\"!", + Client_ID(Client), nick); + Kill_Nick(nick, "Nick collision"); + return CONNECTED; + } + + /* Get the server to which the service is connected */ + intr_c = Client_GetFromToken(Client, token); + if (! intr_c) { + Log(LOG_ERR, "Server %s introduces service \"%s\" on unknown server!?", + Client_ID(Client), nick); + Kill_Nick(nick, "Unknown server"); + return CONNECTED; + } + + /* Get user and host name */ + ptr = strchr(nick, '@'); + if (ptr) { + *ptr = '\0'; + host = ++ptr; + } + if (!host) + host = Client_Hostname(intr_c); + ptr = strchr(nick, '!'); + if (ptr) { + *ptr = '\0'; + user = ++ptr; + } + if (!user) + user = nick; + + /* According to RFC 2812/2813 parameter 4 "is currently reserved + * for future usage"; but we use it to transfer the modes and check + * that the first character is a '+' sign and ignore it otherwise. */ + modes = (Req->argv[3][0] == '+') ? ++Req->argv[3] : ""; + + c = Client_NewRemoteUser(intr_c, nick, hops, user, host, + token, modes, info, true); + if (! c) { + /* Couldn't create client structure, so KILL the service to + * keep network status consistent ... */ + Log(LOG_ALERT, "Can't create client structure! (on connection %d)", + Client_Conn(Client)); + Kill_Nick(nick, "Server error"); + return CONNECTED; + } + + Introduce_Client(Client, c, CLIENT_SERVICE); + return CONNECTED; } /* IRC_SERVICE */ @@ -662,20 +746,13 @@ Hello_User(CLIENT * Client) if (strcmp(Client_Password(Client), Conf_ServerPwd) != 0) { /* Bad password! */ Log(LOG_ERR, - "User \"%s\" rejected (connection %d): Bad password!", + "Client \"%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)); - - /* 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)); + Introduce_Client(NULL, Client, CLIENT_USER); if (!IRC_WriteStrClient (Client, RPL_WELCOME_MSG, Client_ID(Client), Client_Mask(Client))) @@ -699,8 +776,6 @@ Hello_User(CLIENT * Client) if (!IRC_Send_ISUPPORT(Client)) return DISCONNECTED; - Client_SetType(Client, CLIENT_USER); - if (!IRC_Send_LUSERS(Client)) return DISCONNECTED; if (!IRC_Show_MOTD(Client)) @@ -731,4 +806,74 @@ Kill_Nick( char *Nick, char *Reason ) } /* Kill_Nick */ +static void +Introduce_Client(CLIENT *From, CLIENT *Client, int Type) +{ + /* Set client type (user or service) */ + Client_SetType(Client, Type); + + if (From) { + if (Conf_IsService(Conf_GetServer(Client_Conn(From)), + Client_ID(Client))) + Client_SetType(Client, CLIENT_SERVICE); + LogDebug("%s \"%s\" (+%s) registered (via %s, on %s, %d hop%s).", + Client_TypeText(Client), Client_Mask(Client), + Client_Modes(Client), Client_ID(From), + Client_ID(Client_Introducer(Client)), + Client_Hops(Client), Client_Hops(Client) > 1 ? "s": ""); + } else + Log(LOG_NOTICE, "%s \"%s\" registered (connection %d).", + Client_TypeText(Client), Client_Mask(Client), + Client_Conn(Client)); + + /* Inform other servers */ + IRC_WriteStrServersPrefixFlag_CB(From, + From != NULL ? From : Client_ThisServer(), + '\0', cb_introduceClient, (void *)Client); +} /* Introduce_Client */ + + +static void +cb_introduceClient(CLIENT *To, CLIENT *Prefix, void *data) +{ + CLIENT *c = (CLIENT *)data; + CONN_ID conn; + char *modes, *user, *host; + + modes = Client_Modes(c); + user = Client_User(c) ? Client_User(c) : "-"; + host = Client_Hostname(c) ? Client_Hostname(c) : "-"; + + conn = Client_Conn(To); + if (Conn_Options(conn) & CONN_RFC1459) { + /* RFC 1459 mode: separate NICK and USER commands */ + Conn_WriteStr(conn, "NICK %s :%d", Client_ID(c), + Client_Hops(c) + 1); + Conn_WriteStr(conn, ":%s USER %s %s %s :%s", + Client_ID(c), user, host, + Client_ID(Client_Introducer(c)), Client_Info(c)); + if (modes[0]) + Conn_WriteStr(conn, ":%s MODE %s +%s", + Client_ID(c), Client_ID(c), modes); + } else { + /* RFC 2813 mode: one combined NICK or SERVICE command */ + if (Client_Type(c) == CLIENT_SERVICE + && strchr(Client_Flags(To), 'S')) + IRC_WriteStrClientPrefix(To, Prefix, + "SERVICE %s %d * +%s %d :%s", + Client_Mask(c), + Client_MyToken(Client_Introducer(c)), + Client_Modes(c), Client_Hops(c) + 1, + Client_Info(c)); + else + IRC_WriteStrClientPrefix(To, Prefix, + "NICK %s %d %s %s %d +%s :%s", + Client_ID(c), Client_Hops(c) + 1, + user, host, + Client_MyToken(Client_Introducer(c)), + modes, Client_Info(c)); + } +} /* cb_introduceClient */ + + /* -eof- */