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

Allow PASS syntax defined in RFC 1459 for server links, too. 

Removed client status CLIENT_GOTPASSSERVER.
This commit is contained in:
Alexander Barton 2006-10-01 19:05:00 +00:00
parent bed98979dc
commit 27d947fb7d
4 changed files with 112 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -12,6 +12,7 @@
ngIRCd HEAD ngIRCd HEAD
- Allow PASS syntax defined in RFC 1459 for server links, too.
- Enhanced ISUPPORT message (005 numeric). - Enhanced ISUPPORT message (005 numeric).
ngIRCd 0.10.0 (2006-10-01) ngIRCd 0.10.0 (2006-10-01)
@ -665,4 +666,4 @@ ngIRCd 0.0.1, 31.12.2001
-- --
$Id: ChangeLog,v 1.305 2006/10/01 19:03:05 alex Exp $ $Id: ChangeLog,v 1.306 2006/10/01 19:05:00 alex Exp $

9
src/ngircd/client.h
View File

@ -8,7 +8,7 @@
* (at your option) any later version. * (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information. * Please read the file COPYING, README and AUTHORS for more information.
* *
* $Id: client.h,v 1.42 2006/04/23 10:37:27 fw Exp $ * $Id: client.h,v 1.43 2006/10/01 19:05:02 alex Exp $
* *
* Client management (header) * Client management (header)
*/ */
@ -23,10 +23,9 @@
#define CLIENT_GOTNICK 4 /* client did send NICK */ #define CLIENT_GOTNICK 4 /* client did send NICK */
#define CLIENT_GOTUSER 8 /* client did send USER */ #define CLIENT_GOTUSER 8 /* client did send USER */
#define CLIENT_USER 16 /* client is an IRC user */ #define CLIENT_USER 16 /* client is an IRC user */
#define CLIENT_UNKNOWNSERVER 32 /* unregistered server connection */ #define CLIENT_SERVER 32 /* client is a server */
#define CLIENT_GOTPASSSERVER 64 /* client did send PASS in "server style" */ #define CLIENT_SERVICE 64 /* client is a service */
#define CLIENT_SERVER 128 /* client is a server */ #define CLIENT_UNKNOWNSERVER 128 /* unregistered server connection */
#define CLIENT_SERVICE 256 /* client is a service */
#define CLIENT_TYPE int #define CLIENT_TYPE int

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

@ -14,7 +14,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: irc-login.c,v 1.51 2006/10/01 19:03:05 alex Exp $"; static char UNUSED id[] = "$Id: irc-login.c,v 1.52 2006/10/01 19:05:02 alex Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -45,101 +45,120 @@ static bool Hello_User PARAMS(( CLIENT *Client ));
static void Kill_Nick PARAMS(( char *Nick, char *Reason )); static void Kill_Nick PARAMS(( char *Nick, char *Reason ));
/**
* Handler for the IRC command "PASS".
* See RFC 2813 section 4.1.1, and RFC 2812 section 3.1.1.
*/
GLOBAL bool GLOBAL bool
IRC_PASS( CLIENT *Client, REQUEST *Req ) IRC_PASS( CLIENT *Client, REQUEST *Req )
{ {
char *type, *orig_flags;
int protohigh, protolow;
assert( Client != NULL ); assert( Client != NULL );
assert( Req != NULL ); assert( Req != NULL );
/* Fehler liefern, wenn kein lokaler Client */ /* Return an error if this is not a local client */
if( Client_Conn( Client ) <= NONE ) return IRC_WriteStrClient( Client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( Client ), Req->command ); 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)) if (Client_Type(Client) == CLIENT_UNKNOWN && Req->argc == 1) {
{ /* Not yet registered "unknown" connection, PASS with one
/* noch nicht registrierte unbekannte Verbindung */ * argument: either a regular client, service, or server
Log( LOG_DEBUG, "Connection %d: got PASS command ...", Client_Conn( Client )); * using the old RFC 1459 section 4.1.1 syntax. */
LogDebug("Connection %d: got PASS command ...",
/* Passwort speichern */ Client_Conn(Client));
Client_SetPassword( Client, Req->argv[0] ); } else if ((Client_Type(Client) == CLIENT_UNKNOWN ||
Client_Type(Client) == CLIENT_UNKNOWNSERVER) &&
Client_SetType( Client, CLIENT_GOTPASS ); (Req->argc == 3 || Req->argc == 4)) {
return CONNECTED; /* 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) ...",
Client_Conn(Client));
} else if (Client_Type(Client) == CLIENT_UNKNOWN ||
Client_Type(Client) == CLIENT_UNKNOWNSERVER) {
/* Unregistered connection, but wrong number of arguments: */
return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
Client_ID(Client), Req->command);
} else {
/* Registered connection, PASS command is not allowed! */
return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG,
Client_ID(Client));
} }
else if((( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER )) && (( Req->argc == 3 ) || ( Req->argc == 4 )))
{
char c2, c4, *type, *impl, *serverver, *flags, *ptr, *ircflags;
int protohigh, protolow;
/* noch nicht registrierte Server-Verbindung */ Client_SetPassword(Client, Req->argv[0]);
Log( LOG_DEBUG, "Connection %d: got PASS command (new server link) ...", Client_Conn( Client )); Client_SetType(Client, CLIENT_GOTPASS);
/* Passwort speichern */ /* Protocol version */
Client_SetPassword( Client, Req->argv[0] ); if (Req->argc >= 2 && strlen(Req->argv[1]) >= 4) {
int c2, c4;
/* Protokollversion ermitteln */ c2 = Req->argv[1][2];
if( strlen( Req->argv[1] ) >= 4 ) c4 = Req->argv[1][4];
{
c2 = Req->argv[1][2];
c4 = Req->argv[1][4];
Req->argv[1][4] = '\0'; Req->argv[1][4] = '\0';
protolow = atoi( &Req->argv[1][2] ); protolow = atoi(&Req->argv[1][2]);
Req->argv[1][2] = '\0'; Req->argv[1][2] = '\0';
protohigh = atoi( Req->argv[1] ); protohigh = atoi(Req->argv[1]);
Req->argv[1][2] = c2; Req->argv[1][2] = c2;
Req->argv[1][4] = c4; Req->argv[1][4] = c4;
} } else
else protohigh = protolow = 0; protohigh = protolow = 0;
/* Protokoll-Typ */ /* Protocol type, see doc/Protocol.txt */
if( strlen( Req->argv[1] ) > 4 ) type = &Req->argv[1][4]; if (Req->argc >= 2 && strlen(Req->argv[1]) > 4)
else type = NULL; type = &Req->argv[1][4];
else
type = NULL;
/* Protocol flags/options */
if (Req->argc >= 4)
orig_flags = Req->argv[3];
else
orig_flags = "";
/* IRC-Flags (nach RFC 2813) */ /* Implementation, version and IRC+ flags */
if( Req->argc >= 4 ) ircflags = Req->argv[3]; if (Req->argc >= 3) {
else ircflags = ""; char *impl, *ptr, *serverver, *flags;
int _unused_var;
/* Implementation, Version und ngIRCd-Flags */
impl = Req->argv[2]; impl = Req->argv[2];
ptr = strchr( impl, '|' ); ptr = strchr(impl, '|');
if( ptr ) *ptr = '\0'; if (ptr)
*ptr = '\0';
if( type && ( strcmp( type, PROTOIRCPLUS ) == 0 )) if (type && strcmp(type, PROTOIRCPLUS) == 0) {
{ /* The peer seems to be a server which supports the
/* auf der anderen Seite laeuft ein Server, der * IRC+ protocol (see doc/Protocol.txt). */
* ebenfalls das IRC+-Protokoll versteht */
serverver = ptr + 1; serverver = ptr + 1;
flags = strchr( serverver, ':' ); flags = strchr(serverver, ':');
if( flags ) if (flags) {
{
*flags = '\0'; *flags = '\0';
flags++; flags++;
} } else
else flags = ""; flags = "";
Log( LOG_INFO, "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", impl, serverver, protohigh, protolow, flags ); Log(LOG_INFO,
} "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").",
else impl, serverver, protohigh, protolow, flags);
{ } else {
/* auf der anderen Seite laeuft ein Server, der /* The peer seems to be a server supporting the
* nur das Originalprotokoll unterstuetzt */ * "original" IRC protocol (RFC 2813). */
serverver = ""; serverver = "";
if( strchr( ircflags, 'Z' )) flags = "Z"; if (strchr(orig_flags, 'Z'))
else flags = ""; flags = "Z";
Log( LOG_INFO, "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", impl, protohigh, protolow, flags ); else
flags = "";
Log(LOG_INFO,
"Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").",
impl, protohigh, protolow, flags);
} }
Client_SetFlags(Client, flags);
Client_SetType( Client, CLIENT_GOTPASSSERVER );
Client_SetFlags( Client, flags );
return CONNECTED;
} }
else if(( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER ))
{ return CONNECTED;
/* Falsche Anzahl Parameter? */
return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
}
else return IRC_WriteStrClient( Client, ERR_ALREADYREGISTRED_MSG, Client_ID( Client ));
} /* IRC_PASS */ } /* IRC_PASS */

22
src/ngircd/irc-server.c
View File

@ -14,7 +14,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: irc-server.c,v 1.39 2006/04/30 21:31:43 alex Exp $"; static char UNUSED id[] = "$Id: irc-server.c,v 1.40 2006/10/01 19:05:02 alex Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -41,6 +41,10 @@ static char UNUSED id[] = "$Id: irc-server.c,v 1.39 2006/04/30 21:31:43 alex Exp
#include "irc-server.h" #include "irc-server.h"
/**
* Handler for the IRC command "SERVER".
* See RFC 2813 section 4.1.2.
*/
GLOBAL bool GLOBAL bool
IRC_SERVER( CLIENT *Client, REQUEST *Req ) IRC_SERVER( CLIENT *Client, REQUEST *Req )
{ {
@ -55,13 +59,17 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
assert( Client != NULL ); assert( Client != NULL );
assert( Req != NULL ); assert( Req != NULL );
/* Fehler liefern, wenn kein lokaler Client */ /* Return an error if this is not a local client */
if( Client_Conn( Client ) <= NONE ) return IRC_WriteStrClient( Client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( Client ), Req->command ); if (Client_Conn(Client) <= NONE)
return IRC_WriteStrClient(Client, ERR_UNKNOWNCOMMAND_MSG,
Client_ID(Client), Req->command);
if( Client_Type( Client ) == CLIENT_GOTPASSSERVER ) if (Client_Type(Client) == CLIENT_GOTPASS) {
{ /* We got a PASS command from the peer, and now a SERVER
/* Verbindung soll als Server-Server-Verbindung registriert werden */ * command: the peer tries to register itself as a server. */
Log( LOG_DEBUG, "Connection %d: got SERVER command (new server link) ...", Client_Conn( Client )); Log(LOG_DEBUG,
"Connection %d: got SERVER command (new server link) ...",
Client_Conn(Client));
/* Falsche Anzahl Parameter? */ /* Falsche Anzahl Parameter? */
if(( Req->argc != 2 ) && ( Req->argc != 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); if(( Req->argc != 2 ) && ( Req->argc != 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );