mapi_clist_av1 webirc_clist[] = { &webirc_msgtab, NULL };
-DECLARE_MODULE_AV2(webirc, NULL, NULL, webirc_clist, NULL, NULL, NULL, NULL, webirc_desc);
+static void new_local_user(void *data);
+mapi_hfn_list_av1 webirc_hfnlist[] = {
+ /* unintuitive but correct--we want to be called first */
+ { "new_local_user", (hookfn) new_local_user, HOOK_LOWEST },
+ { NULL, NULL }
+};
+
+DECLARE_MODULE_AV2(webirc, NULL, NULL, webirc_clist, NULL, webirc_hfnlist, NULL, NULL, webirc_desc);
/*
* mr_webirc - webirc message handler
- * parv[1] = password
- * parv[2] = fake username (we ignore this)
+ * parv[1] = password
+ * parv[2] = fake username (we ignore this)
* parv[3] = fake hostname
* parv[4] = fake ip
*/
int secure = 0;
+ if (source_p->flags & FLAGS_SENTUSER || !EmptyString(source_p->name))
+ {
+ exit_client(client_p, source_p, &me, "WEBIRC may not follow NICK/USER");
+ }
+
aconf = find_address_conf(client_p->host, client_p->sockhost,
IsGotId(client_p) ? client_p->username : "webirc",
IsGotId(client_p) ? client_p->username : "webirc",
(struct sockaddr *) &client_p->localClient->ip,
GET_SS_FAMILY(&client_p->localClient->ip), NULL);
+
if (aconf == NULL || !(aconf->status & CONF_CLIENT))
return;
+
if (!IsConfDoSpoofIp(aconf) || irccmp(aconf->info.name, "webirc."))
{
/* XXX */
sendto_one(source_p, "NOTICE * :CGI:IRC auth blocks must have a password");
return;
}
- if (!IsSSL(source_p) && aconf->flags & CONF_FLAGS_NEED_SSL)
+ if (!IsSecure(source_p) && aconf->flags & CONF_FLAGS_NEED_SSL)
{
- sendto_one(source_p, "NOTICE * :Your CGI:IRC block requires SSL");
+ sendto_one(source_p, "NOTICE * :Your CGI:IRC block requires TLS");
return;
}
}
source_p->localClient->ip = addr;
+ source_p->username[0] = '\0';
+ ClearGotId(source_p);
if (parc >= 6)
{
- char *s;
- for (s = strtok(parv[5], " "); s != NULL; s = strtok(NULL, " "))
+ const char *s;
+ for (s = parv[5]; s != NULL; (s = strchr(s, ' ')) && s++)
{
- if (!ircncmp(s, "secure", 6) && (s[6] == '=' || s[6] == '\0'))
+ if (!ircncmp(s, "secure", 6) && (s[6] == '=' || s[6] == ' ' || s[6] == '\0'))
secure = 1;
}
}
- if (secure && !IsSSL(source_p))
+ if (secure && !IsSecure(source_p))
{
sendto_one(source_p, "NOTICE * :CGI:IRC is not connected securely; marking you as insecure");
- return 0;
+ secure = 0;
}
if (!secure)
{
- SetInsecure(source_p);
+ ClearSecure(source_p);
}
rb_inet_ntop_sock((struct sockaddr *)&source_p->localClient->ip, source_p->sockhost, sizeof(source_p->sockhost));
sendto_one(source_p, "NOTICE * :CGI:IRC host/IP set to %s %s", parv[3], parv[4]);
}
+
+static void
+new_local_user(void *data)
+{
+ struct Client *source_p = data;
+ struct ConfItem *aconf = source_p->localClient->att_conf;
+
+ if (aconf == NULL)
+ return;
+
+ if (!irccmp(aconf->info.name, "webirc."))
+ exit_client(source_p, source_p, &me, "Cannot log in using a WEBIRC block");
+}