* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
- *
- * $Id: m_server.c 3291 2007-03-28 14:30:10Z jilles $
*/
#include "stdinc.h"
#include "parse.h"
#include "modules.h"
-static int mr_server(struct Client *, struct Client *, int, const char **);
-static int ms_server(struct Client *, struct Client *, int, const char **);
-static int ms_sid(struct Client *, struct Client *, int, const char **);
+static int mr_server(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int ms_server(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int ms_sid(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static const char m_server_desc[] =
+ "Provides the TS6 commands to introduce a new server to the network";
struct Message server_msgtab = {
- "SERVER", 0, 0, 0, MFLG_SLOW | MFLG_UNREG,
+ "SERVER", 0, 0, 0, 0,
{{mr_server, 4}, mg_reg, mg_ignore, {ms_server, 4}, mg_ignore, mg_reg}
};
struct Message sid_msgtab = {
- "SID", 0, 0, 0, MFLG_SLOW,
+ "SID", 0, 0, 0, 0,
{mg_ignore, mg_reg, mg_ignore, {ms_sid, 5}, mg_ignore, mg_reg}
};
mapi_clist_av1 server_clist[] = { &server_msgtab, &sid_msgtab, NULL };
-DECLARE_MODULE_AV1(server, NULL, NULL, server_clist, NULL, NULL, "$Revision: 3291 $");
+DECLARE_MODULE_AV2(server, NULL, NULL, server_clist, NULL, NULL, NULL, NULL, m_server_desc);
int bogus_host(const char *host);
static int set_server_gecos(struct Client *, const char *);
* parv[3] = serverinfo
*/
static int
-mr_server(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mr_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
char info[REALLEN + 1];
const char *name;
struct Client *target_p;
int hop;
+ unsigned int required_mask;
+ const char *missing;
name = parv[1];
hop = atoi(parv[2]);
return 0;
}
- /*
+ /*
* Reject a direct nonTS server connection if we're TS_ONLY -orabidoo
*/
if(!DoesTS(client_p))
case -2:
sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
"Unauthorised server connection attempt from %s: "
- "Bad password for server %s",
+ "Bad credentials for server %s",
"[@255.255.255.255]", name);
- ilog(L_SERVER, "Access denied, invalid password for server %s%s",
+ ilog(L_SERVER, "Access denied, invalid credentials for server %s%s",
EmptyString(client_p->name) ? name : "",
log_client_name(client_p, SHOW_IP));
- exit_client(client_p, client_p, client_p, "Invalid password.");
+ exit_client(client_p, client_p, client_p, "Invalid credentials.");
return 0;
/* NOT REACHED */
break;
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Connection from servername %s requires SSL/TLS but is plaintext",
name);
- ilog(L_SERVER, "Access denied, requires SSL/TLS but is plaintext from %s",
+ ilog(L_SERVER, "Access denied, requires SSL/TLS but is plaintext from %s",
log_client_name(client_p, SHOW_IP));
exit_client(client_p, client_p, client_p, "Access denied, requires SSL/TLS but is plaintext");
return 0;
}
+ /* check to ensure any "required" caps are set. --nenolod */
+ required_mask = capability_index_get_required(serv_capindex);
+ if (!IsCapable(client_p, required_mask))
+ {
+ missing = capability_index_list(serv_capindex, required_mask &
+ ~client_p->localClient->caps);
+ sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
+ "Link %s dropped, required CAPABs [%s] are missing",
+ name, missing);
+ ilog(L_SERVER, "Link %s%s dropped, required CAPABs [%s] are missing",
+ EmptyString(client_p->name) ? name : "",
+ log_client_name(client_p, SHOW_IP), missing);
+ /* Do not use '[' in the below message because it would cause
+ * it to be considered potentially unsafe (might disclose IP
+ * addresses)
+ */
+ sendto_one(client_p, "ERROR :Missing required CAPABs (%s)", missing);
+ exit_client(client_p, client_p, client_p, "Missing required CAPABs");
+
+ return 0;
+ }
+
if((target_p = find_server(NULL, name)))
{
/*
* parv[3] = serverinfo
*/
static int
-ms_server(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+ms_server(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
char info[REALLEN + 1];
/* same size as in s_misc.c */
hop = atoi(parv[2]);
rb_strlcpy(info, parv[3], sizeof(info));
- if((target_p = find_server(NULL, name)))
+ if(find_server(NULL, name))
{
/*
* This link is trying feed me a server that I already have
* that already exists, then sends you a client burst, you squit the
* server, but you keep getting the burst of clients on a server that
* doesnt exist, although ircd can handle it, its not a realistic
- * solution.. --fl_
+ * solution.. --fl_
*/
ilog(L_SERVER, "Link %s cancelled, server %s already exists",
client_p->name, name);
- rb_snprintf(squitreason, sizeof squitreason,
+ snprintf(squitreason, sizeof squitreason,
"Server %s already exists",
name);
exit_client(client_p, client_p, &me, squitreason);
return 0;
}
- /*
+ /*
* User nicks never have '.' in them and server names
* must always have '.' in them.
*/
* name = "irc.bighub.net";
* hub_mask="*";
* ...
- *
+ *
* That would allow "irc.bighub.net" to introduce anything it wanted..
*
* However
ilog(L_SERVER, "Non-Hub link %s introduced %s.",
client_p->name, name);
- rb_snprintf(squitreason, sizeof squitreason,
+ snprintf(squitreason, sizeof squitreason,
"No matching hub_mask for %s",
name);
exit_client(NULL, client_p, &me, squitreason);
"Link %s introduced leafed server %s.",
client_p->name, name);
ilog(L_SERVER, "Link %s introduced leafed server %s.",
- client_p->name, name);
+ client_p->name, name);
- rb_snprintf(squitreason, sizeof squitreason,
+ snprintf(squitreason, sizeof squitreason,
"Matching leaf_mask for %s",
name);
exit_client(NULL, client_p, &me, squitreason);
}
static int
-ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+ms_sid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct Client *target_p;
struct remote_conf *hub_p;
hook_data_client hdata;
rb_dlink_node *ptr;
- int hop;
int hlined = 0;
int llined = 0;
char squitreason[160];
- hop = atoi(parv[2]);
-
/* collision on the name? */
- if((target_p = find_server(NULL, parv[1])) != NULL)
+ if(find_server(NULL, parv[1]) != NULL)
{
ilog(L_SERVER, "Link %s cancelled, server %s already exists",
client_p->name, parv[1]);
- rb_snprintf(squitreason, sizeof squitreason,
+ snprintf(squitreason, sizeof squitreason,
"Server %s already exists",
parv[1]);
exit_client(NULL, client_p, &me, squitreason);
ilog(L_SERVER, "Link %s cancelled, SID %s for server %s already in use by %s",
client_p->name, parv[3], parv[1], target_p->name);
- rb_snprintf(squitreason, sizeof squitreason,
+ snprintf(squitreason, sizeof squitreason,
"SID %s for %s already in use by %s",
parv[3], parv[1], target_p->name);
exit_client(NULL, client_p, &me, squitreason);
ilog(L_SERVER, "Non-Hub link %s introduced %s.",
client_p->name, parv[1]);
- rb_snprintf(squitreason, sizeof squitreason,
+ snprintf(squitreason, sizeof squitreason,
"No matching hub_mask for %s",
parv[1]);
exit_client(NULL, client_p, &me, squitreason);
"Link %s introduced leafed server %s.",
client_p->name, parv[1]);
ilog(L_SERVER, "Link %s introduced leafed server %s.",
- client_p->name, parv[1]);
+ client_p->name, parv[1]);
- rb_snprintf(squitreason, sizeof squitreason,
+ snprintf(squitreason, sizeof squitreason,
"Matching leaf_mask for %s",
parv[1]);
exit_client(NULL, client_p, &me, squitreason);
{
char *p;
char *s;
- char *t;
s = LOCAL_COPY(info);
*p = '\0';
/* check for a ] which would symbolise an [IP] */
- if((t = strchr(s, ']')))
+ if(strchr(s, ']'))
{
/* set s to after the first space */
if(p)
projects / solanum.git / blobdiff