#include "ngircd.h"
#include "conn-func.h"
+#include "class.h"
#include "conf.h"
#include "channel.h"
#include "io.h"
static bool Hello_User PARAMS(( CLIENT *Client ));
static bool Hello_User_PostAuth 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 Reject_Client PARAMS((CLIENT *Client));
-
-static void cb_introduceClient PARAMS((CLIENT *Client, CLIENT *Prefix,
- void *i));
-
#ifdef PAM
static void cb_Read_Auth_Result PARAMS((int r_fd, UNUSED short events));
#endif
Client_Mask(c));
Client_SetType(c, CLIENT_GOTNICK);
} else
- Introduce_Client(Client, c, CLIENT_USER);
+ Client_Introduce(Client, c, CLIENT_USER);
return CONNECTED;
}
/* RFC 1459 style user registration?
* Introduce client to network: */
if (Client_Type(c) == CLIENT_GOTNICK)
- Introduce_Client(Client, c, CLIENT_USER);
+ Client_Introduce(Client, c, CLIENT_USER);
return CONNECTED;
} else if (Client_Type(Client) == CLIENT_USER) {
return CONNECTED;
}
- Introduce_Client(Client, c, CLIENT_SERVICE);
+ Client_Introduce(Client, c, CLIENT_SERVICE);
return CONNECTED;
} /* IRC_SERVICE */
}
#endif
-#ifdef DEBUG
- if (conn > NONE)
- Log(LOG_DEBUG,
- "Connection %d: received PONG. Lag: %ld seconds.", conn,
- time(NULL) - Conn_LastPing(Client_Conn(Client)));
- else
- Log(LOG_DEBUG,
- "Connection %d: received PONG.", conn);
-#endif
+ if (Client_Type(Client) == CLIENT_SERVER && Conn_LastPing(conn) == 0) {
+ Log(LOG_INFO,
+ "Synchronization with \"%s\" done (connection %d): %ld seconds [%ld users, %ld channels]",
+ Client_ID(Client), conn, time(NULL) - Conn_GetSignon(conn),
+ Client_UserCount(), Channel_CountVisible(NULL));
+ Conn_UpdatePing(conn);
+ } else
+ LogDebug("Connection %d: received PONG. Lag: %ld seconds.",
+ conn, time(NULL) - Conn_LastPing(conn));
+
return CONNECTED;
} /* IRC_PONG */
* passwords supplied are classified as "wrong". */
if(Client_Password(Client)[0] == '\0')
return Hello_User_PostAuth(Client);
- Reject_Client(Client);
+ Client_Reject(Client, "Non-empty password", false);
return DISCONNECTED;
}
+ if (Conf_PAMIsOptional && strcmp(Client_Password(Client), "") == 0) {
+ /* Clients are not required to send a password and to be PAM-
+ * authenticated at all. If not, they won't become "identified"
+ * and keep the "~" in their supplied user name.
+ * Therefore it is sensible to either set Conf_PAMisOptional or
+ * to enable IDENT lookups -- not both. */
+ return Hello_User_PostAuth(Client);
+ }
+
/* Fork child process for PAM authentication; and make sure that the
* process timeout is set higher than the login timeout! */
pid = Proc_Fork(Conn_GetProcStat(conn), pipefd,
/* Check global server password ... */
if (strcmp(Client_Password(Client), Conf_ServerPwd) != 0) {
/* Bad password! */
- Reject_Client(Client);
+ Client_Reject(Client, "Bad server password", false);
return DISCONNECTED;
}
return Hello_User_PostAuth(Client);
if (len != sizeof(result)) {
Log(LOG_CRIT, "Auth: Got malformed result!");
- Reject_Client(client);
+ Client_Reject(client, "Internal error", false);
return;
}
Client_SetUser(client, Client_OrigUser(client), true);
(void)Hello_User_PostAuth(client);
} else
- Reject_Client(client);
+ Client_Reject(client, "Bad password", false);
}
#endif
-/**
- * Reject a client because of wrong password.
- *
- * This function is called either when the global server password or a password
- * checked using PAM has been wrong.
- *
- * @param Client The client to reject.
- */
-static void
-Reject_Client(CLIENT *Client)
-{
- Log(LOG_ERR,
- "User \"%s\" rejected (connection %d): Access denied!",
- Client_Mask(Client), Client_Conn(Client));
- Conn_Close(Client_Conn(Client), NULL,
- "Access denied! Bad password?", true);
-}
-
-
/**
* Finish client registration.
*
static bool
Hello_User_PostAuth(CLIENT *Client)
{
- Introduce_Client(NULL, Client, CLIENT_USER);
+ assert(Client != NULL);
+
+ if (Class_HandleServerBans(Client) != CONNECTED)
+ return DISCONNECTED;
+
+ Client_Introduce(NULL, Client, CLIENT_USER);
if (!IRC_WriteStrClient
(Client, RPL_WELCOME_MSG, Client_ID(Client), Client_Mask(Client)))
} /* Kill_Nick */
-/**
- * Introduce a new user or service client in the network.
- *
- * @param From Remote server introducing the client or NULL (local).
- * @param Client New client.
- * @param Type Type of the client (CLIENT_USER or CLIENT_SERVICE).
- */
-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));
- Log_ServerNotice('c', "Client connecting: %s (%s@%s) [%s] - %s",
- Client_ID(Client), Client_User(Client),
- Client_Hostname(Client),
- Conn_IPA(Client_Conn(Client)),
- Client_TypeText(Client));
- }
-
- /* Inform other servers */
- IRC_WriteStrServersPrefixFlag_CB(From,
- From != NULL ? From : Client_ThisServer(),
- '\0', cb_introduceClient, (void *)Client);
-} /* Introduce_Client */
-
-
-/**
- * Introduce a new user or service client to a remote server.
- *
- * This function differentiates between RFC1459 and RFC2813 server links and
- * generates the appropriate commands to register the new user or service.
- *
- * @param To The remote server to inform.
- * @param Prefix Prefix for the generated commands.
- * @param data CLIENT structure of the new 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- */