/*
* mr_server - SERVER message handler
- * parv[0] = sender prefix
* parv[1] = servername
* parv[2] = serverinfo/hopcount
* parv[3] = serverinfo
const char *name;
struct Client *target_p;
int hop;
+ unsigned int required_mask;
+ const char *missing;
name = parv[1];
hop = atoi(parv[2]);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Unauthorised server connection attempt from %s: "
"No entry for servername %s",
- client_p->name, name);
+ "[@255.255.255.255]", name);
ilog(L_SERVER, "Access denied, no connect block for server %s%s",
EmptyString(client_p->name) ? name : "",
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",
- client_p->name, name);
+ "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,
"Unauthorised server connection attempt from %s: "
"Invalid host for server %s",
- client_p->name, name);
+ "[@255.255.255.255]", name);
ilog(L_SERVER, "Access denied, invalid host for server %s%s",
EmptyString(client_p->name) ? name : "",
case -4:
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Invalid servername %s from %s",
- name, client_p->name);
+ name, "[@255.255.255.255]");
ilog(L_SERVER, "Access denied, invalid servername from %s",
log_client_name(client_p, SHOW_IP));
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)))
{
/*
* Definitely don't do that here. This is from an unregistered
* connect - A1kmm.
*/
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Attempt to re-introduce server %s from %s",
- name, client_p->name);
- ilog(L_SERVER, "Attempt to re-introduce server %s from %s",
- name, log_client_name(client_p, SHOW_IP));
+ if (target_p->servptr->flags & FLAGS_SERVICE)
+ {
+ /* Assume any servers introduced by services
+ * are jupes.
+ * -- jilles
+ */
+ sendto_one(client_p, "ERROR :Server juped.");
+ }
+ else
+ {
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "Attempt to re-introduce server %s from %s",
+ name, "[@255.255.255.255]");
+ ilog(L_SERVER, "Attempt to re-introduce server %s from %s",
+ name, log_client_name(client_p, SHOW_IP));
- sendto_one(client_p, "ERROR :Server already exists.");
+ sendto_one(client_p, "ERROR :Server already exists.");
+ }
exit_client(client_p, client_p, client_p, "Server Exists");
return 0;
}
/*
* ms_server - SERVER message handler
- * parv[0] = sender prefix
* parv[1] = servername
* parv[2] = serverinfo/hopcount
* parv[3] = serverinfo
ilog(L_SERVER, "Link %s cancelled, server %s already exists",
client_p->name, name);
- snprintf(squitreason, sizeof squitreason,
+ rb_snprintf(squitreason, sizeof squitreason,
"Server %s already exists",
name);
exit_client(client_p, client_p, &me, squitreason);
* add it to list and propagate word to my other
* server links...
*/
- if(parc == 1 || EmptyString(info))
- {
- sendto_one(client_p, "ERROR :No server info specified for %s", name);
- return 0;
- }
/*
* See if the newly found server is behind a guaranteed
* .edu's
*/
- /* Ok, check client_p can hub the new server, and make sure it's not a LL */
+ /* Ok, check client_p can hub the new server */
if(!hlined)
{
/* OOOPs nope can't HUB */
ilog(L_SERVER, "Non-Hub link %s introduced %s.",
client_p->name, name);
- exit_client(NULL, client_p, &me, "No matching hub_mask.");
+ rb_snprintf(squitreason, sizeof squitreason,
+ "No matching hub_mask for %s",
+ name);
+ exit_client(NULL, client_p, &me, squitreason);
return 0;
}
ilog(L_SERVER, "Link %s introduced leafed server %s.",
client_p->name, name);
- exit_client(NULL, client_p, &me, "Leafed Server.");
+ rb_snprintf(squitreason, sizeof squitreason,
+ "Matching leaf_mask for %s",
+ name);
+ exit_client(NULL, client_p, &me, squitreason);
return 0;
}
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)
{
ilog(L_SERVER, "Link %s cancelled, server %s already exists",
client_p->name, parv[1]);
- snprintf(squitreason, sizeof squitreason,
+ rb_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);
- snprintf(squitreason, sizeof squitreason,
+ rb_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);
/* no matching hub_mask */
if(!hlined)
{
- sendto_one(client_p, "ERROR :No matching hub_mask");
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Non-Hub link %s introduced %s.",
client_p->name, parv[1]);
ilog(L_SERVER, "Non-Hub link %s introduced %s.",
client_p->name, parv[1]);
- exit_client(NULL, client_p, &me, "No matching hub_mask.");
+
+ rb_snprintf(squitreason, sizeof squitreason,
+ "No matching hub_mask for %s",
+ parv[1]);
+ exit_client(NULL, client_p, &me, squitreason);
return 0;
}
/* matching leaf_mask */
if(llined)
{
- sendto_one(client_p, "ERROR :Matching leaf_mask");
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"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]);
- exit_client(NULL, client_p, &me, "Leafed Server.");
+
+ rb_snprintf(squitreason, sizeof squitreason,
+ "Matching leaf_mask for %s",
+ parv[1]);
+ exit_client(NULL, client_p, &me, squitreason);
return 0;
}
{
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)