mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2024-12-12 09:50:29 +00:00
Code Issues Releases Wiki Activity

USER: servers and services can alter user information after registration.

Browse Source 
This is required to do RFC 1459 style user registration on server links,
and is used by some services packages, too. See RFC 1459 section 4.1.3.
This commit is contained in:
Alexander Barton 2008-08-13 02:24:06 +02:00
parent 068d43352d
commit 13f1d57e84
1 changed files with 63 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/ngircd/irc-login.c
View File

@ -368,48 +368,88 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
} /* IRC_NICK */ } /* IRC_NICK */
/**
* Handler for the IRC command "USER".
*/
GLOBAL bool GLOBAL bool
IRC_USER( CLIENT *Client, REQUEST *Req ) IRC_USER(CLIENT * Client, REQUEST * Req)
{ {
CLIENT *c;
#ifdef IDENTAUTH #ifdef IDENTAUTH
char *ptr; char *ptr;
#endif #endif
assert( Client != NULL ); assert(Client != NULL);
assert( Req != NULL ); assert(Req != NULL);
if (Client_Type(Client) == CLIENT_GOTNICK ||
#ifndef STRICT_RFC #ifndef STRICT_RFC
if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_UNKNOWN ) Client_Type(Client) == CLIENT_UNKNOWN ||
#else
if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS )
#endif #endif
Client_Type(Client) == CLIENT_GOTPASS)
{ {
/* Wrong number of parameters? */ /* New connection */
if( Req->argc != 4 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); if (Req->argc != 4)
return IRC_WriteStrClient(Client,
ERR_NEEDMOREPARAMS_MSG,
Client_ID(Client),
Req->command);
/* User name */ /* User name */
#ifdef IDENTAUTH #ifdef IDENTAUTH
ptr = Client_User( Client ); ptr = Client_User(Client);
if( ! ptr || ! *ptr || *ptr == '~' ) Client_SetUser( Client, Req->argv[0], false ); if (!ptr || !*ptr || *ptr == '~')
Client_SetUser(Client, Req->argv[0], false);
#else #else
Client_SetUser( Client, Req->argv[0], false ); Client_SetUser(Client, Req->argv[0], false);
#endif #endif
/* "Real name" or user info text: Don't set it to the empty string, the original ircd /* "Real name" or user info text: Don't set it to the empty
* can't deal with such "real names" (e. g. "USER user * * :") ... */ * string, the original ircd can't deal with such "real names"
if( *Req->argv[3] ) Client_SetInfo( Client, Req->argv[3] ); * (e. g. "USER user * * :") ... */
else Client_SetInfo( Client, "-" ); 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 )); LogDebug("Connection %d: got valid USER command ...",
if( Client_Type( Client ) == CLIENT_GOTNICK ) return Hello_User( Client ); Client_Conn(Client));
else Client_SetType( Client, CLIENT_GOTUSER ); if (Client_Type(Client) == CLIENT_GOTNICK)
return Hello_User(Client);
else
Client_SetType(Client, CLIENT_GOTUSER);
return CONNECTED; 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));
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 */ } /* IRC_USER */