albino/ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ServerMode'

Browse Source 
* ServerMode:
  Handle channel user modes 'a', 'h', and 'q' from remote servers
  Handle unknown channel modes on server links
  Handle unknown user modes on server links
  IRC_MODE(), Client_Mode(): code cleanup [2/2]
  Enlarge client user mode buffer, reduce client flags buffer
  Infom clients when other servers change their user modes
  IRC_MODE(), Client_Mode(): code cleanup [1/2]
This commit is contained in:
Alexander Barton 2011-08-13 21:04:01 +02:00
commit 7795b07c53
2 changed files with 218 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ngircd/defines.h
View File

@ -44,10 +44,10 @@
see RFC 2812, section 1.2.1 */ see RFC 2812, section 1.2.1 */
#define CLIENT_NAME_LEN 32 /* Max. length of "real names" */ #define CLIENT_NAME_LEN 32 /* Max. length of "real names" */
#define CLIENT_HOST_LEN 64 /* Max. host name length */ #define CLIENT_HOST_LEN 64 /* Max. host name length */
#define CLIENT_MODE_LEN 9 /* Max. lenth of all client modes */ #define CLIENT_MODE_LEN 16 /* Max. lenth of all client modes */
#define CLIENT_INFO_LEN 64 /* Max. length of server info texts */ #define CLIENT_INFO_LEN 64 /* Max. length of server info texts */
#define CLIENT_AWAY_LEN 128 /* Max. length of away messages */ #define CLIENT_AWAY_LEN 128 /* Max. length of away messages */
#define CLIENT_FLAGS_LEN 100 /* Max. length of client flags */ #define CLIENT_FLAGS_LEN 16 /* Max. length of client flags */
#define CHANNEL_NAME_LEN 51 /* Max. length of a channel name, see #define CHANNEL_NAME_LEN 51 /* Max. length of a channel name, see
RFC 2812 section 1.3 */ RFC 2812 section 1.3 */

357
src/ngircd/irc-mode.c
View File

@ -50,25 +50,39 @@ static bool Send_ListChange PARAMS((const char *Mode, CLIENT *Prefix,
CLIENT *Client, CHANNEL *Channel, const char *Mask)); CLIENT *Client, CHANNEL *Channel, const char *Mask));
/**
* Handler for the IRC "MODE" command.
*
* See RFC 2812 section 3.1.5 ("user mode message") and section 3.2.3
* ("channel mode message"), and RFC 2811 section 4 ("channel modes").
*
* @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 GLOBAL bool
IRC_MODE( CLIENT *Client, REQUEST *Req ) IRC_MODE( CLIENT *Client, REQUEST *Req )
{ {
CLIENT *cl, *origin; CLIENT *cl, *origin;
CHANNEL *chan; CHANNEL *chan;
assert( Client != NULL ); assert(Client != NULL);
assert( Req != NULL ); assert(Req != NULL);
/* No parameters? */ /* No parameters? */
if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); if (Req->argc < 1)
return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
Client_ID(Client), Req->command);
/* Origin for answers */ /* Origin for answers */
if( Client_Type( Client ) == CLIENT_SERVER ) if (Client_Type(Client) == CLIENT_SERVER) {
{ origin = Client_Search(Req->prefix);
origin = Client_Search( Req->prefix ); if (!origin)
if( ! origin ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
} Client_ID(Client),
else origin = Client; Req->prefix);
} else
origin = Client;
/* Channel or user mode? */ /* Channel or user mode? */
cl = NULL; chan = NULL; cl = NULL; chan = NULL;
@ -88,178 +102,222 @@ IRC_MODE( CLIENT *Client, REQUEST *Req )
} /* IRC_MODE */ } /* IRC_MODE */
/**
* Handle client mode requests
*
* @param Client The client from which this command has been received.
* @param Req Request structure with prefix and all parameters.
* @param Origin The originator of the MODE command (prefix).
* @param Target The target (client) of this MODE command.
* @returns CONNECTED or DISCONNECTED.
*/
static bool static bool
Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
{ {
/* Handle client mode requests */
char the_modes[COMMAND_LEN], x[2], *mode_ptr; char the_modes[COMMAND_LEN], x[2], *mode_ptr;
bool ok, set; bool ok, set;
int mode_arg; int mode_arg;
size_t len; size_t len;
/* Is the client allowed to request or change the modes? */ /* Is the client allowed to request or change the modes? */
if( Client_Type( Client ) == CLIENT_USER ) if (Client_Type(Client) == CLIENT_USER) {
{
/* Users are only allowed to manipulate their own modes! */ /* Users are only allowed to manipulate their own modes! */
if( Target != Client ) return IRC_WriteStrClient( Client, ERR_USERSDONTMATCH_MSG, Client_ID( Client )); if (Target != Client)
return IRC_WriteStrClient(Client,
ERR_USERSDONTMATCH_MSG,
Client_ID(Client));
} }
/* Mode request: let's answer it :-) */ /* Mode request: let's answer it :-) */
if( Req->argc == 1 ) return IRC_WriteStrClient( Origin, RPL_UMODEIS_MSG, Client_ID( Origin ), Client_Modes( Target )); if (Req->argc == 1)
return IRC_WriteStrClient(Origin, RPL_UMODEIS_MSG,
Client_ID(Origin),
Client_Modes(Target));
mode_arg = 1; mode_arg = 1;
mode_ptr = Req->argv[mode_arg]; mode_ptr = Req->argv[mode_arg];
/* Initial state: set or unset modes? */ /* Initial state: set or unset modes? */
if( *mode_ptr == '+' ) set = true; if (*mode_ptr == '+') {
else if( *mode_ptr == '-' ) set = false; set = true;
else return IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Origin )); strcpy(the_modes, "+");
} else if (*mode_ptr == '-') {
/* Prepare reply string */ set = false;
if( set ) strcpy( the_modes, "+" ); strcpy(the_modes, "-");
else strcpy( the_modes, "-" ); } else
return IRC_WriteStrClient(Origin, ERR_UMODEUNKNOWNFLAG_MSG,
Client_ID(Origin));
x[1] = '\0'; x[1] = '\0';
ok = CONNECTED; ok = CONNECTED;
while( mode_ptr ) while (mode_ptr) {
{
mode_ptr++; mode_ptr++;
if( ! *mode_ptr ) if (!*mode_ptr) {
{
/* Try next argument if there's any */ /* Try next argument if there's any */
mode_arg++; mode_arg++;
if( mode_arg < Req->argc ) mode_ptr = Req->argv[mode_arg]; if (mode_arg < Req->argc)
else break; mode_ptr = Req->argv[mode_arg];
else
break;
} }
switch( *mode_ptr ) switch(*mode_ptr) {
{ case '+':
case '+': case '-':
case '-': if ((*mode_ptr == '+' && !set)
if((( *mode_ptr == '+' ) && ( ! set )) || (( *mode_ptr == '-' ) && ( set ))) || (*mode_ptr == '-' && set)) {
{ /* Action modifier ("+"/"-") must be changed */
/* Action modifier ("+"/"-") must be changed ... */ len = strlen(the_modes) - 1;
len = strlen( the_modes ) - 1; if (the_modes[len] == '+'
if(( the_modes[len] == '+' ) || ( the_modes[len] == '-' )) || the_modes[len] == '-') {
{ /* Last character in the "result
/* Adjust last action modifier in result */ * string" was an "action", so just
the_modes[len] = *mode_ptr; * overwrite it with the new action */
} the_modes[len] = *mode_ptr;
else } else {
{ /* Append new modifier character to
/* Append modifier character to result string */ * the resulting mode string */
x[0] = *mode_ptr; x[0] = *mode_ptr;
strlcat( the_modes, x, sizeof( the_modes )); strlcat(the_modes, x,
} sizeof(the_modes));
if( *mode_ptr == '+' ) set = true;
else set = false;
} }
continue; if (*mode_ptr == '+')
set = true;
else
set = false;
}
continue;
} }
/* Validate modes */ /* Validate modes */
x[0] = '\0'; x[0] = '\0';
switch( *mode_ptr ) switch (*mode_ptr) {
{ case 'i': /* Invisible */
case 'i': /* Invisible */ case 's': /* Server messages */
case 's': /* Server messages */ case 'w': /* Wallops messages */
case 'w': /* Wallops messages */ x[0] = *mode_ptr;
x[0] = *mode_ptr; break;
break; case 'a': /* Away */
if (Client_Type(Client) == CLIENT_SERVER) {
case 'a': /* Away */ x[0] = 'a';
if( Client_Type( Client ) == CLIENT_SERVER ) Client_SetAway(Origin, DEFAULT_AWAY_MSG);
{ } else
x[0] = 'a'; ok = IRC_WriteStrClient(Origin,
Client_SetAway( Origin, DEFAULT_AWAY_MSG );
}
else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
break;
case 'c': /* Receive connect notices
* (only settable by IRC operators!) */
if(!set || Client_OperByMe(Origin)
|| Client_Type(Client) == CLIENT_SERVER)
x[0] = 'c';
else
ok = IRC_WriteStrClient(Origin,
ERR_NOPRIVILEGES_MSG, ERR_NOPRIVILEGES_MSG,
Client_ID(Origin)); Client_ID(Origin));
break; break;
case 'c': /* Receive connect notices
case 'o': /* IRC operator (only unsettable!) */ * (only settable by IRC operators!) */
if(( ! set ) || ( Client_Type( Client ) == CLIENT_SERVER )) if (!set || Client_Type(Client) == CLIENT_SERVER
{ || Client_OperByMe(Origin))
Client_SetOperByMe( Target, false ); x[0] = 'c';
x[0] = 'o'; else
} ok = IRC_WriteStrClient(Origin,
else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin )); ERR_NOPRIVILEGES_MSG,
break; Client_ID(Origin));
break;
case 'r': /* Restricted (only settable) */ case 'o': /* IRC operator (only unsettable!) */
if(( set ) || ( Client_Type( Client ) == CLIENT_SERVER )) x[0] = 'r'; if (!set || Client_Type(Client) == CLIENT_SERVER) {
else ok = IRC_WriteStrClient( Origin, ERR_RESTRICTED_MSG, Client_ID( Origin )); Client_SetOperByMe(Target, false);
break; x[0] = 'o';
} else
case 'x': /* Cloak hostname */ ok = IRC_WriteStrClient(Origin,
if (Client_HasMode(Client, 'r')) ERR_NOPRIVILEGES_MSG,
ok = IRC_WriteStrClient(Origin, Client_ID(Origin));
ERR_RESTRICTED_MSG, break;
Client_ID(Origin)); case 'r': /* Restricted (only settable) */
else if (set || Client_Type(Client) == CLIENT_SERVER)
x[0] = 'x'; x[0] = 'r';
break; else
ok = IRC_WriteStrClient(Origin,
default: ERR_RESTRICTED_MSG,
Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin )); Client_ID(Origin));
if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr ); break;
case 'x': /* Cloak hostname */
if (Client_HasMode(Client, 'r'))
ok = IRC_WriteStrClient(Origin,
ERR_RESTRICTED_MSG,
Client_ID(Origin));
else
x[0] = 'x';
break;
default:
if (Client_Type(Client) != CLIENT_SERVER) {
Log(LOG_DEBUG,
"Unknown mode \"%c%c\" from \"%s\"!?",
set ? '+' : '-', *mode_ptr,
Client_ID(Origin));
ok = IRC_WriteStrClient(Origin,
ERR_UMODEUNKNOWNFLAG2_MSG,
Client_ID(Origin),
set ? '+' : '-',
*mode_ptr);
x[0] = '\0'; x[0] = '\0';
goto client_exit; goto client_exit;
} else {
Log(LOG_DEBUG,
"Handling unknown mode \"%c%c\" from \"%s\" for \"%s\" ...",
set ? '+' : '-', *mode_ptr,
Client_ID(Origin), Client_ID(Target));
x[0] = *mode_ptr;
}
} }
if( ! ok ) break;
if (!ok)
break;
/* Is there a valid mode change? */ /* Is there a valid mode change? */
if( ! x[0] ) continue; if (!x[0])
continue;
if( set )
{
/* Set mode */
if( Client_ModeAdd( Target, x[0] )) strlcat( the_modes, x, sizeof( the_modes ));
if (set) {
if (Client_ModeAdd(Target, x[0]))
strlcat(the_modes, x, sizeof(the_modes));
} else {
if (Client_ModeDel(Target, x[0]))
strlcat(the_modes, x, sizeof(the_modes));
} }
else
{
/* Unset mode */
if( Client_ModeDel( Target, x[0] )) strlcat( the_modes, x, sizeof( the_modes ));
}
} }
client_exit: client_exit:
/* Are there changed modes? */
if( the_modes[1] )
{
/* Remoce needless action modifier characters */
len = strlen( the_modes ) - 1;
if(( the_modes[len] == '+' ) || ( the_modes[len] == '-' )) the_modes[len] = '\0';
if( Client_Type( Client ) == CLIENT_SERVER ) /* Are there changed modes? */
{ if (the_modes[1]) {
/* Remoce needless action modifier characters */
len = strlen(the_modes) - 1;
if (the_modes[len] == '+' || the_modes[len] == '-')
the_modes[len] = '\0';
if (Client_Type(Client) == CLIENT_SERVER) {
/* Forward modes to other servers */ /* Forward modes to other servers */
IRC_WriteStrServersPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes ); if (Client_Conn(Target) != NONE) {
} /* Remote server (service?) changed modes
else * for one of our clients. Inform it! */
{ IRC_WriteStrClientPrefix(Target, Origin,
"MODE %s :%s",
Client_ID(Target),
the_modes);
}
IRC_WriteStrServersPrefix(Client, Origin,
"MODE %s :%s",
Client_ID(Target),
the_modes);
} else {
/* Send reply to client and inform other servers */ /* Send reply to client and inform other servers */
ok = IRC_WriteStrClientPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes ); ok = IRC_WriteStrClientPrefix(Client, Origin,
IRC_WriteStrServersPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes ); "MODE %s :%s",
Client_ID(Target),
the_modes);
IRC_WriteStrServersPrefix(Client, Origin,
"MODE %s :%s",
Client_ID(Target),
the_modes);
} }
LogDebug("%s \"%s\": Mode change, now \"%s\".", LogDebug("%s \"%s\": Mode change, now \"%s\".",
Client_TypeText(Target), Client_Mask(Target), Client_TypeText(Target), Client_Mask(Target),
Client_Modes(Target)); Client_Modes(Target));
} }
IRC_SetPenalty( Client, 1 ); IRC_SetPenalty(Client, 1);
return ok; return ok;
} /* Client_Mode */ } /* Client_Mode */
@ -536,6 +594,16 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
Channel_Name(Channel)); Channel_Name(Channel));
break; break;
/* --- Channel user modes --- */ /* --- Channel user modes --- */
case 'a':
case 'h':
case 'q':
if (Client_Type(Client) != CLIENT_SERVER) {
connected = IRC_WriteStrClient(Origin,
ERR_CHANOPRIVSNEEDED_MSG,
Client_ID(Origin),
Channel_Name(Channel));
goto chan_exit;
}
case 'o': /* Channel operator */ case 'o': /* Channel operator */
case 'v': /* Voice */ case 'v': /* Voice */
if (arg_arg > mode_arg) { if (arg_arg > mode_arg) {
@ -592,18 +660,25 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
} }
break; break;
default: default:
Log(LOG_DEBUG, if (Client_Type(Client) != CLIENT_SERVER) {
"Unknown mode \"%c%c\" from \"%s\" on %s!?", Log(LOG_DEBUG,
set ? '+' : '-', *mode_ptr, Client_ID(Origin), "Unknown mode \"%c%c\" from \"%s\" on %s!?",
Channel_Name(Channel)); set ? '+' : '-', *mode_ptr,
if (Client_Type(Client) != CLIENT_SERVER) Client_ID(Origin), Channel_Name(Channel));
connected = IRC_WriteStrClient(Origin, connected = IRC_WriteStrClient(Origin,
ERR_UMODEUNKNOWNFLAG2_MSG, ERR_UMODEUNKNOWNFLAG2_MSG,
Client_ID(Origin), Client_ID(Origin),
set ? '+' : '-', *mode_ptr); set ? '+' : '-', *mode_ptr);
x[0] = '\0'; x[0] = '\0';
goto chan_exit; goto chan_exit;
} /* switch() */ } else {
Log(LOG_DEBUG,
"Handling unknown mode \"%c%c\" from \"%s\" on %s ...",
set ? '+' : '-', *mode_ptr,
Client_ID(Origin), Channel_Name(Channel));
x[0] = *mode_ptr;
}
}
if (!connected) if (!connected)
break; break;