X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/66e1914beb3c8290b6537ec9aaa5c80be63f75e0..6cac5cce0fedf3f0ed0de91d51539c8b8629fd9f:/extensions/m_webirc.c

diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index 99f66b5b..04f59c96 100644
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -64,7 +64,13 @@ struct Message webirc_msgtab = {
 
 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[] = {
+	{ "new_local_user", (hookfn) new_local_user },
+	{ NULL, NULL }
+};
+
+DECLARE_MODULE_AV2(webirc, NULL, NULL, webirc_clist, NULL, webirc_hfnlist, NULL, NULL, webirc_desc);
 
 /*
  * mr_webirc - webirc message handler
@@ -80,13 +86,7 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 	const char *encr;
 	struct rb_sockaddr_storage addr;
 
-	if ((!strchr(parv[4], '.') && !strchr(parv[4], ':')) ||
-			strlen(parv[4]) + (*parv[4] == ':') >=
-			sizeof(source_p->sockhost))
-	{
-		sendto_one(source_p, "NOTICE * :Invalid IP");
-		return;
-	}
+	int secure = 0;
 
 	aconf = find_address_conf(client_p->host, client_p->sockhost,
 				IsGotId(client_p) ? client_p->username : "webirc",
@@ -106,6 +106,11 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 		sendto_one(source_p, "NOTICE * :CGI:IRC auth blocks must have a password");
 		return;
 	}
+	if (!IsSSL(source_p) && aconf->flags & CONF_FLAGS_NEED_SSL)
+	{
+		sendto_one(source_p, "NOTICE * :Your CGI:IRC block requires TLS");
+		return;
+	}
 
 	if (EmptyString(parv[1]))
 		encr = "";
@@ -120,29 +125,42 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 		return;
 	}
 
-	if (rb_inet_pton_sock(parv[4], (struct sockaddr *)&addr) <= 0)
+	if (rb_inet_pton_sock(parv[4], &addr) <= 0)
 	{
 		sendto_one(source_p, "NOTICE * :Invalid IP");
 		return;
 	}
 
-	if (*parv[4] == ':')
+	source_p->localClient->ip = addr;
+
+	if (parc >= 6)
 	{
-		source_p->sockhost[0] = '0';
-		rb_strlcpy(source_p->sockhost + 1, parv[4],
-				sizeof(source_p->sockhost) - 1);
+		const char *s;
+		for (s = parv[5]; s != NULL; (s = strchr(s, ' ')) && s++)
+		{
+			if (!ircncmp(s, "secure", 6) && (s[6] == '=' || s[6] == ' ' || s[6] == '\0'))
+				secure = 1;
+		}
 	}
-	else
-		rb_strlcpy(source_p->sockhost, parv[4],
-				sizeof(source_p->sockhost));
+
+	if (secure && !IsSSL(source_p))
+	{
+		sendto_one(source_p, "NOTICE * :CGI:IRC is not connected securely; marking you as insecure");
+		secure = 0;
+	}
+
+	if (!secure)
+	{
+		SetInsecure(source_p);
+	}
+
+	rb_inet_ntop_sock((struct sockaddr *)&source_p->localClient->ip, source_p->sockhost, sizeof(source_p->sockhost));
 
 	if(strlen(parv[3]) <= HOSTLEN)
 		rb_strlcpy(source_p->host, parv[3], sizeof(source_p->host));
 	else
 		rb_strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
 
-	source_p->localClient->ip = addr;
-
 	/* Check dlines now, klines will be checked on registration */
 	if((aconf = find_dline((struct sockaddr *)&source_p->localClient->ip,
 			       GET_SS_FAMILY(&source_p->localClient->ip))))
@@ -156,3 +174,13 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
 
 	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 (!irccmp(aconf->info.name, "webirc."))
+		exit_client(source_p, source_p, &me, "Cannot log in using a WEBIRC block");
+}