X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/92bdd4adfe46aec246f0da9280f51e5d80a73fe8..dc83edfac4cf3f5725f7e1f8ba512a524953bce6:/src/hostmask.c

diff --git a/src/hostmask.c b/src/hostmask.c
index 772b020..aba2277 100644
--- a/src/hostmask.c
+++ b/src/hostmask.c
@@ -31,9 +31,9 @@
 #include "hostmask.h"
 #include "numeric.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 
-#ifdef IPV6
+#ifdef RB_IPV6
 static unsigned long hash_ipv6(struct sockaddr *, int);
 #endif
 static unsigned long hash_ipv4(struct sockaddr *, int);
@@ -63,7 +63,7 @@ parse_netmask(const char *text, struct sockaddr  *naddr, int *nb)
 	else
 		addr = (struct rb_sockaddr_storage *)naddr;
 	
-#ifdef IPV6
+#ifdef RB_IPV6
 	if(strchr(ip, ':'))
 	{	
 		if((ptr = strchr(ip, '/')))
@@ -75,7 +75,7 @@ parse_netmask(const char *text, struct sockaddr  *naddr, int *nb)
 				*b = 128;
 		} else
 			*b = 128;
-		if(inetpton_sock(ip, (struct sockaddr *)addr) > 0)
+		if(rb_inet_pton_sock(ip, (struct sockaddr *)addr) > 0)
 			return HM_IPV6;
 		else
 			return HM_HOST;
@@ -92,7 +92,7 @@ parse_netmask(const char *text, struct sockaddr  *naddr, int *nb)
 				*b = 32;
 		} else
 			*b = 32;
-		if(inetpton_sock(ip, (struct sockaddr *)addr) > 0)
+		if(rb_inet_pton_sock(ip, (struct sockaddr *)addr) > 0)
 			return HM_IPV4;
 		else
 			return HM_HOST;
@@ -133,7 +133,7 @@ hash_ipv4(struct sockaddr *saddr, int bits)
  * Output: A hash value of the IP address.
  * Side effects: None
  */
-#ifdef IPV6
+#ifdef RB_IPV6
 static unsigned long
 hash_ipv6(struct sockaddr *saddr, int bits)
 {
@@ -208,7 +208,7 @@ struct ConfItem *
 find_conf_by_address(const char *name, const char *sockhost,
 			const char *orighost,
 			struct sockaddr *addr, int type, int fam, 
-			const char *username)
+			const char *username, const char *auth_user)
 {
 	unsigned long hprecv = 0;
 	struct ConfItem *hprec = NULL;
@@ -221,7 +221,7 @@ find_conf_by_address(const char *name, const char *sockhost,
 	if(addr)
 	{
 		/* Check for IPV6 matches... */
-#ifdef IPV6
+#ifdef RB_IPV6
 		if(fam == AF_INET6)
 		{
 
@@ -231,12 +231,11 @@ find_conf_by_address(const char *name, const char *sockhost,
 					if(arec->type == (type & ~0x1) &&
 					   arec->masktype == HM_IPV6 &&
 					   comp_with_mask_sock(addr, (struct sockaddr *)&arec->Mask.ipa.addr,
-							       arec->Mask.ipa.bits) && (type & 0x1
-											||
-											match(arec->
-											      username,
-											      username))
-					   && arec->precedence > hprecv)
+						arec->Mask.ipa.bits) && 
+						(type & 0x1 || match(arec-> username, username)) && 
+						(type != CONF_CLIENT || !arec->auth_user || 
+						(auth_user && match(arec->auth_user, auth_user))) && 
+						arec->precedence > hprecv) 
 					{
 						hprecv = arec->precedence;
 						hprec = arec->aconf;
@@ -252,10 +251,12 @@ find_conf_by_address(const char *name, const char *sockhost,
 				for (arec = atable[hash_ipv4(addr, b)]; arec; arec = arec->next)
 					if(arec->type == (type & ~0x1) &&
 					   arec->masktype == HM_IPV4 &&
-					   arec->precedence > hprecv && 
 					   comp_with_mask_sock(addr, (struct sockaddr *)&arec->Mask.ipa.addr,
 							       arec->Mask.ipa.bits) && 
-					   (type & 0x1 || match(arec->username, username)))
+						(type & 0x1 || match(arec->username, username)) && 
+						(type != CONF_CLIENT || !arec->auth_user || 
+						(auth_user && match(arec->auth_user, auth_user))) && 
+						arec->precedence > hprecv) 
 					{
 						hprecv = arec->precedence;
 						hprec = arec->aconf;
@@ -276,6 +277,8 @@ find_conf_by_address(const char *name, const char *sockhost,
 				   (arec->masktype == HM_HOST) &&
 				   arec->precedence > hprecv &&
 				   match(arec->Mask.hostname, orighost) &&
+				   (type != CONF_CLIENT || !arec->auth_user || 
+				   (auth_user && match(arec->auth_user, auth_user))) && 
 				   (type & 0x1 || match(arec->username, username)))
 				{
 					hprecv = arec->precedence;
@@ -294,6 +297,8 @@ find_conf_by_address(const char *name, const char *sockhost,
 			   arec->precedence > hprecv && 
 			   (match(arec->Mask.hostname, orighost) ||
 			    (sockhost && match(arec->Mask.hostname, sockhost))) &&
+			    (type != CONF_CLIENT || !arec->auth_user || 
+			    (auth_user && match(arec->auth_user, auth_user))) && 
 			   (type & 0x1 || match(arec->username, username)))
 			{
 				hprecv = arec->precedence;
@@ -314,6 +319,8 @@ find_conf_by_address(const char *name, const char *sockhost,
 				   (arec->masktype == HM_HOST) &&
 				   arec->precedence > hprecv &&
 				   match(arec->Mask.hostname, name) &&
+				   (type != CONF_CLIENT || !arec->auth_user || 
+				   (auth_user && match(arec->auth_user, auth_user))) && 
 				   (type & 0x1 || match(arec->username, username)))
 				{
 					hprecv = arec->precedence;
@@ -332,6 +339,8 @@ find_conf_by_address(const char *name, const char *sockhost,
 			   arec->precedence > hprecv && 
 			   (match(arec->Mask.hostname, name) ||
 			    (sockhost && match(arec->Mask.hostname, sockhost))) &&
+			    (type != CONF_CLIENT || !arec->auth_user || 
+			    (auth_user && match(arec->auth_user, auth_user))) && 
 			   (type & 0x1 || match(arec->username, username)))
 			{
 				hprecv = arec->precedence;
@@ -350,13 +359,13 @@ find_conf_by_address(const char *name, const char *sockhost,
  */
 struct ConfItem *
 find_address_conf(const char *host, const char *sockhost, const char *user, 
-		const char *notildeuser, struct sockaddr *ip, int aftype)
+		const char *notildeuser, struct sockaddr *ip, int aftype, char *auth_user)
 {
 	struct ConfItem *iconf, *kconf;
 	const char *vuser;
 
 	/* Find the best I-line... If none, return NULL -A1kmm */
-	if(!(iconf = find_conf_by_address(host, sockhost, NULL, ip, CONF_CLIENT, aftype, user)))
+	if(!(iconf = find_conf_by_address(host, sockhost, NULL, ip, CONF_CLIENT, aftype, user, auth_user)))
 		return NULL;
 	/* Find what their visible username will be.
 	 * Note that the username without tilde may contain one char more.
@@ -368,7 +377,7 @@ find_address_conf(const char *host, const char *sockhost, const char *user,
 		return iconf;
 
 	/* Find the best K-line... -A1kmm */
-	kconf = find_conf_by_address(host, sockhost, NULL, ip, CONF_KILL, aftype, user);
+	kconf = find_conf_by_address(host, sockhost, NULL, ip, CONF_KILL, aftype, user, NULL);
 
 	/* If they are K-lined, return the K-line */
 	if(kconf)
@@ -385,11 +394,11 @@ find_address_conf(const char *host, const char *sockhost, const char *user,
 		if(p)
 		{
 			*p = '\0';
-			kconf = find_conf_by_address(p+1, NULL, NULL, ip, CONF_KILL, aftype, iconf->name);
+			kconf = find_conf_by_address(p+1, NULL, NULL, ip, CONF_KILL, aftype, iconf->name, NULL);
 			*p = '@';
 		}
 		else
-			kconf = find_conf_by_address(iconf->name, NULL, NULL, ip, CONF_KILL, aftype, vuser);
+			kconf = find_conf_by_address(iconf->name, NULL, NULL, ip, CONF_KILL, aftype, vuser, NULL);
 
 		if(kconf)
 			return kconf;
@@ -399,23 +408,29 @@ find_address_conf(const char *host, const char *sockhost, const char *user,
 	 * -- jilles */
 	if(user != vuser)
 	{
-		kconf = find_conf_by_address(host, sockhost, NULL, ip, CONF_KILL, aftype, vuser);
+		kconf = find_conf_by_address(host, sockhost, NULL, ip, CONF_KILL, aftype, vuser, NULL);
 		if(kconf)
 			return kconf;
 	}
 
-	/* hunt for a gline */
-	if(ConfigFileEntry.glines)
-	{
-		kconf = find_conf_by_address(host, sockhost, NULL, ip, CONF_GLINE, aftype, user);
-
-		if((kconf != NULL) && !IsConfExemptGline(iconf))
-			return kconf;
-	}
-
 	return iconf;
 }
 
+/* struct ConfItem* find_dline(struct rb_sockaddr_storage*, int)
+ * Input: An address, an address family.
+ * Output: The best matching D-line or exempt line.
+ * Side effects: None.
+ */
+struct ConfItem *
+find_dline(struct sockaddr *addr, int aftype)
+{
+	struct ConfItem *eline;
+	eline = find_conf_by_address(NULL, NULL, NULL, addr, CONF_EXEMPTDLINE | 1, aftype, NULL, NULL);
+	if(eline)
+		return eline;
+	return find_conf_by_address(NULL, NULL, NULL, addr, CONF_DLINE | 1, aftype, NULL, NULL);
+}
+
 /* void find_exact_conf_by_address(const char*, int, const char *)
  * Input: 
  * Output: ConfItem if found
@@ -431,9 +446,8 @@ find_exact_conf_by_address(const char *address, int type, const char *username)
 
 	if(address == NULL)
 		address = "/NOMATCH!/";
-	arec = rb_malloc(sizeof(struct AddressRec));
 	masktype = parse_netmask(address, (struct sockaddr *)&addr, &bits);
-#ifdef IPV6
+#ifdef RB_IPV6
 	if(masktype == HM_IPV6)
 	{
 		/* We have to do this, since we do not re-hash for every bit -A1kmm. */
@@ -479,7 +493,7 @@ find_exact_conf_by_address(const char *address, int type, const char *username)
  * Side-effects: Adds this entry to the hash table.
  */
 void
-add_conf_by_address(const char *address, int type, const char *username, struct ConfItem *aconf)
+add_conf_by_address(const char *address, int type, const char *username, const char *auth_user, struct ConfItem *aconf)
 {
 	static unsigned long prec_value = 0xFFFFFFFF;
 	int masktype, bits;
@@ -492,7 +506,7 @@ add_conf_by_address(const char *address, int type, const char *username, struct
 	masktype = parse_netmask(address, (struct sockaddr *)&arec->Mask.ipa.addr, &bits);
 	arec->Mask.ipa.bits = bits;
 	arec->masktype = masktype;
-#ifdef IPV6
+#ifdef RB_IPV6
 	if(masktype == HM_IPV6)
 	{
 		/* We have to do this, since we do not re-hash for every bit -A1kmm. */
@@ -516,6 +530,7 @@ add_conf_by_address(const char *address, int type, const char *username, struct
 		atable[hv] = arec;
 	}
 	arec->username = username;
+	arec->auth_user = auth_user;
 	arec->aconf = aconf;
 	arec->precedence = prec_value--;
 	arec->type = type;
@@ -535,7 +550,7 @@ delete_one_address_conf(const char *address, struct ConfItem *aconf)
 	struct AddressRec *arec, *arecl = NULL;
 	struct rb_sockaddr_storage addr;
 	masktype = parse_netmask(address, (struct sockaddr *)&addr, &bits);
-#ifdef IPV6
+#ifdef RB_IPV6
 	if(masktype == HM_IPV6)
 	{
 		/* We have to do this, since we do not re-hash for every bit -A1kmm. */
@@ -668,8 +683,6 @@ show_iline_prefix(struct Client *sptr, struct ConfItem *aconf, char *name)
 		*prefix_ptr++ = '=';
 	if(IsOper(sptr) && IsConfExemptFlood(aconf))
 		*prefix_ptr++ = '|';
-	if(IsOper(sptr) && IsConfExemptGline(aconf) && !IsConfExemptKline(aconf))
-		*prefix_ptr++ = '_';
 	if(IsOper(sptr) && IsConfExemptDNSBL(aconf) && !IsConfExemptKline(aconf))
 		*prefix_ptr++ = '$';
 	if(IsOper(sptr) && IsConfExemptKline(aconf))
@@ -706,10 +719,13 @@ report_auth(struct Client *client_p)
 
 				get_printable_conf(aconf, &name, &host, &pass, &user, &port,
 						   &classname);
+				
+				if(!EmptyString(aconf->spasswd))
+					pass = aconf->spasswd;
 
 				sendto_one_numeric(client_p, RPL_STATSILINE, 
 						   form_str(RPL_STATSILINE),
-						   name, show_iline_prefix(client_p, aconf, user),
+						   name, pass, show_iline_prefix(client_p, aconf, user),
 						   show_ip_conf(aconf, client_p) ? host : "255.255.255.255",
 						   port, classname);
 			}