X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/14f12985df1d081387a92b816042e43bf4fca03c..c52df12552267b27943cfd7d89c7c206e66c895b:/extensions/m_webirc.c

diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index 584de673..1aeba3ca 100644
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -67,10 +67,9 @@ DECLARE_MODULE_AV1(webirc, NULL, NULL, webirc_clist, NULL, NULL, "$Revision: 207
 
 /*
  * mr_webirc - webirc message handler
- *      parv[0] = sender prefix
  *      parv[1] = password
  *      parv[2] = fake username (we ignore this)
- *	parv[3] = fake hostname 
+ *	parv[3] = fake hostname
  *	parv[4] = fake ip
  */
 static int
@@ -78,21 +77,24 @@ mr_webirc(struct Client *client_p, struct Client *source_p, int parc, const char
 {
 	struct ConfItem *aconf;
 	const char *encr;
+	struct rb_sockaddr_storage addr;
 
-	if (!strchr(parv[4], '.') && !strchr(parv[4], ':'))
+	if ((!strchr(parv[4], '.') && !strchr(parv[4], ':')) ||
+			strlen(parv[4]) + (*parv[4] == ':') >=
+			sizeof(source_p->sockhost))
 	{
 		sendto_one(source_p, "NOTICE * :Invalid IP");
 		return 0;
 	}
 
-	aconf = find_address_conf(client_p->host, client_p->sockhost, 
+	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,
 				client_p->localClient->ip.ss_family, NULL);
 	if (aconf == NULL || !(aconf->status & CONF_CLIENT))
 		return 0;
-	if (!IsConfDoSpoofIp(aconf) || irccmp(aconf->name, "webirc."))
+	if (!IsConfDoSpoofIp(aconf) || irccmp(aconf->info.name, "webirc."))
 	{
 		/* XXX */
 		sendto_one(source_p, "NOTICE * :Not a CGI:IRC auth block");
@@ -107,28 +109,41 @@ mr_webirc(struct Client *client_p, struct Client *source_p, int parc, const char
 	if (EmptyString(parv[1]))
 		encr = "";
 	else if (IsConfEncrypted(aconf))
-		encr = crypt(parv[1], aconf->passwd);
+		encr = rb_crypt(parv[1], aconf->passwd);
 	else
 		encr = parv[1];
 
-	if (strcmp(encr, aconf->passwd))
+	if (encr == NULL || strcmp(encr, aconf->passwd))
 	{
 		sendto_one(source_p, "NOTICE * :CGI:IRC password incorrect");
 		return 0;
 	}
 
+	if (rb_inet_pton_sock(parv[4], (struct sockaddr *)&addr) <= 0)
+	{
+		sendto_one(source_p, "NOTICE * :Invalid IP");
+		return 0;
+	}
 
-	rb_strlcpy(source_p->sockhost, parv[4], sizeof(source_p->sockhost));
+	if (*parv[4] == ':')
+	{
+		source_p->sockhost[0] = '0';
+		rb_strlcpy(source_p->sockhost + 1, parv[4],
+				sizeof(source_p->sockhost) - 1);
+	}
+	else
+		rb_strlcpy(source_p->sockhost, parv[4],
+				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));
-	
-	rb_inet_pton_sock(parv[4], (struct sockaddr *)&source_p->localClient->ip);
+
+	source_p->localClient->ip = addr;
 
 	/* Check dlines now, klines will be checked on registration */
-	if((aconf = find_dline((struct sockaddr *)&source_p->localClient->ip, 
+	if((aconf = find_dline((struct sockaddr *)&source_p->localClient->ip,
 			       source_p->localClient->ip.ss_family)))
 	{
 		if(!(aconf->status & CONF_EXEMPTDLINE))