[irc/evilnet/x3.git] / patches / srvx-bantypes.diff

diff -upr srvx-1.2rc3/src/chanserv.c Services/src/chanserv.c
--- src/chanserv.c	Sat Jan  4 07:16:40 2003
+++ src/chanserv.c	Mon Jul  7 18:18:27 2003
@@ -419,6 +419,8 @@ dict_t note_types;
 static dict_t sChannels;
 static dict_t plain_dnrs, mask_dnrs, handle_dnrs;
 
+extern const char *hidden_host_suffix;
+
 static struct
 {
     struct chanNode 	*debug_channel;
@@ -2859,12 +2861,103 @@ bad_channel_ban(struct chanNode *channel
     return 0;
 }
 
+#define i_isdigit(x) isdigit((int) (unsigned char) (x))
+
+int is_ipv4_address(const char *host)
+{
+    while (*host != '\0') {
+       if (*host != '.' && !i_isdigit(*host))
+       return 0;
+       host++;
+    }
+    return 1;
+}
+
+static char *get_domain_mask(char *host)
+{
+    char *ptr;
+
+    if (strchr(host, '.') == NULL) {
+       /* no dots - toplevel domain or IPv6 address */
+       ptr = strrchr(host, ':');
+       if (ptr != NULL) {
+          /* IPv6 address, ban the last 64k addresses */
+          if (ptr[1] != '\0') strcpy(ptr+1, "*");
+       }
+       return host;
+    }
+
+    if (is_ipv4_address(host)) {
+       /* it's an IP address, change last digit to * */
+       ptr = strrchr(host, '.');
+       if (ptr != NULL && i_isdigit(ptr[1]))
+           strcpy(ptr+1, "*");
+    } else {
+       /* if more than one dot, skip the first
+          (dyn123.blah.net -> *.blah.net) */
+          ptr = strchr(host, '.');
+          if (ptr != NULL && strchr(ptr+1, '.') != NULL) {
+             host = ptr-1;
+             host[0] = '*';
+          }
+    }
+    return host;
+}
+
+char *generate_ban_hostmask(struct userNode *user, const char banopt)
+{
+    char *nickname, *ident = "*", *hostname, *mask, *usemask;
+    int len;
+
+    /* figure out string parts */
+    if(IsHiddenHost(user) && user->handle_info && hidden_host_suffix) {
+       usemask = alloca(strlen(user->handle_info->handle) + strlen(hidden_host_suffix) + 2);
+       sprintf(usemask, "%s.%s", user->handle_info->handle, hidden_host_suffix);
+    } 
+    else {
+       usemask = user->hostname;
+    } 
+
+    if((banopt == 'f') || (banopt == 'h') || (banopt == 'i') || (banopt == 'j')) {
+       nickname = user->nick;
+    }
+    else {
+       nickname = "*";
+    }
+
+    if((banopt == 'd') || (banopt == 'e') || (banopt == 'i') || (banopt == 'j')) {
+        hostname = get_domain_mask(usemask);
+    } 
+    else {
+      hostname = usemask;
+    }
+
+    if((banopt == 'a') || (banopt == 'f')) {
+       ident = user->ident;
+    }
+    else if((banopt == 'b') || (banopt == 'd') || (banopt == 'i')) {
+        ident = malloc(strlen(user->ident)+1);
+        sprintf(ident, "*%s", user->ident);
+    }
+    else {
+        ident = "*";
+    }
+
+    /* Put it all together. */
+    len = strlen(ident) + strlen(hostname) + strlen(nickname) + 3;
+    mask = malloc(len);
+    sprintf(mask, "%s!%s@%s", nickname, ident, hostname);
+
+    return mask;
+}
+
 static int
 eject_user(struct userNode *user, struct chanNode *channel, unsigned int argc, unsigned char *argv[], struct svccmd *cmd, int action)
 {
     struct userNode *victim, **victims;
     unsigned int offset, n, victimCount = 0, duration = 0, present;
-    char *reason = CSMSG_KICK_REASON, *ban, *name;
+    char *reason = CSMSG_KICK_REASON, *ban, *name, banopt;
+    struct chanData *cData;
 
     offset = (action & ACTION_ADD_TIMED_BAN) ? 3 : 2;
     REQUIRE_PARAMS(offset); (void)cmd;
@@ -2910,7 +3003,19 @@ eject_user(struct userNode *user, struct
 	victims = &victim;
 	victimCount = 1;
 
-	ban = generate_hostmask(victim, GENMASK_STRICT_HOST|GENMASK_ANY_IDENT);
+    if(!(cData = channel->channel_info)) 
+    {
+       banopt = 'c';
+    }
+
+    if(!(cData->options[optBanType])) {
+       banopt = 'c';
+    }
+    else {
+       banopt = cData->options[optBanType];
+    }
+
+    ban = generate_ban_hostmask(victim, banopt);
 	name = victim->nick;
     }
     else
@@ -5507,6 +5612,30 @@ static CHANNEL_OPTION_FUNC(opt_topicrefr
     CHANNEL_MULTIPLE_OPTION("TopicRefresh ", "topic refresh", optTopicRefresh, -1);
 }
 
+static CHANNEL_OPTION_FUNC(opt_bantype)
+{
+    struct chanData *cData = channel->channel_info;
+
+    struct valueData values[] =
+    {
+       {"*!user@host", 'a'},
+       {"*!*user@host", 'b'},
+       {"*!*@host", 'c'},
+       {"*!*user@*.host", 'd'},
+       {"*!*@*.host", 'e'},
+       {"nick!user@host", 'f'},
+       {"nick!*@host", 'h'},
+       {"nick!*user@*.host", 'i'},
+       {"nick!*@*.host", 'j'},
+    };
+
+    if(!(cData->options[optBanType])) {
+        cData->options[optBanType] = values[2].value;
+     }
+
+     CHANNEL_MULTIPLE_OPTION("BanType ", "bantype", optBanType, -1);
+}
+
 static struct svccmd_list set_shows_list;
 
 static void
@@ -6538,6 +6667,7 @@ chanserv_conf_read(void)
             "DefaultTopic", "TopicMask", "Greeting", "UserGreeting", "Modes",
             "PubCmd", "StrictOp", "AutoOp", "EnfModes", "EnfTopic", "Protect",
             "Toys", "Setters", "TopicRefresh", "CtcpUsers", "CtcpReaction",
+            "BanType",
             /* binary options */
             "Voice", "UserInfo", "DynLimit", "TopicSnarf", "PeonInvite", "NoDelete",
             /* delimiter */
@@ -7320,6 +7450,7 @@ init_chanserv(const char *nick)
     DEFINE_CHANNEL_OPTION(ctcpusers);
     DEFINE_CHANNEL_OPTION(ctcpreaction);
     DEFINE_CHANNEL_OPTION(peoninvite);
+    DEFINE_CHANNEL_OPTION(bantype);
 
     /* Alias set topic to set defaulttopic for compatibility. */
     modcmd_register(chanserv_module, "set topic", chan_opt_defaulttopic, 1, 0, NULL);
diff -upr srvx-1.2rc3/src/chanserv.h Services/src/chanserv.h
--- src/chanserv.h	Mon Oct 21 04:34:58 2002
+++ src/chanserv.h	Mon Jul  7 18:16:21 2003
@@ -51,10 +51,11 @@ enum opt
     optTopicRefresh,
     optCTCPUsers,
     optCTCPReaction,
-    optMax
+    optMax,
+    optBanType
 };
 
-#define OPTION_STRING_SIZE	(optMax + 2)
+#define OPTION_STRING_SIZE	(optBanType + 2)
 #define FLAGS_STRING_LENGTH	5
 
 /* Flags are stored in base64, so a length of 5 gives us
@@ -76,7 +77,7 @@ enum opt
    will not work because FLAGS_STRING_LENGTH is 5. */
 
 #define CHANNEL_DEFAULT_FLAGS	(CHANNEL_INFO_LINES)
-#define CHANNEL_DEFAULT_OPTIONS	"lmoooanpcnat"
+#define CHANNEL_DEFAULT_OPTIONS	"lmoooanpcnatc"
 
 #define IsProtected(x)		((x)->flags & CHANNEL_NODELETE)
 #define IsSuspended(x)		((x)->flags & CHANNEL_SUSPENDED)
diff -upr srvx-1.2rc3/src/chanserv.help Services/src/chanserv.help
--- src/chanserv.help	Wed Jan  1 00:45:40 2003
+++ src/chanserv.help	Mon Jul  7 17:51:47 2003
@@ -322,6 +322,7 @@
         "DYNLIMIT:     Adjusts user limit (+l channel mode) to prevent join floods.",
         "TOPICSNARF:   Topics set manually (by /TOPIC #channel ...) change default $C topic",
         "PEONINVITE:   Indicates whether peons may use the $bINVITEME$b command.",
+        "BANTYPE:      Indicated what type of ban $C will set will case of a ban command.",
         "$bIRCOP ONLY$b:",
         "NODELETE:  Prevents channel deletion.",
         "$uSee Also:$u set pubcmd, set strictop, set autoop, set enfmodes, set enftopic, set protect, set toys, set setters, set topicrefresh, set ctcpusers, set ctcpreaction");
@@ -440,6 +441,17 @@
         "$b2$b  Short timed ban (defaults to 3 minutes) on disallowed CTCPs.",
         "$b3$b  Long timed ban (defaults to 1 hour) on disallowed CTCPs.",
         "$uSee Also:$u set, set ctcpusers");
+"SET BANTYPE" ("/msg $C SET <#channel> BANTYPE <value>",
+        "This settings control what banmask $C sets upon a ban command. Valid settings are:",
+        "$b0$b *!user@host",
+        "$b1$b *!*user@host",
+        "$b2$b *!*@host",
+        "$b3$b *!*user@*.host",
+        "$b4$b *!*@*.host",
+        "$b5$b nick!user@host",
+        "$b6$b nick!*@host",
+        "$b7$b nick!*user@*.host",
+        "$b8$b nick!*@*.host");
 "SETINFO" ("/msg $C SETINFO <#channel> <info>",
         "This command will set a user defined information message to be displayed when you join the channel. By setting the message to '*', you will clear your message.",
         "$uSee Also:$u access");
Commit	Line	Data
d76ed9a9	1	diff -upr srvx-1.2rc3/src/chanserv.c Services/src/chanserv.c
	2	--- src/chanserv.c Sat Jan 4 07:16:40 2003
	3	+++ src/chanserv.c Mon Jul 7 18:18:27 2003
	4	@@ -419,6 +419,8 @@ dict_t note_types;
	5	static dict_t sChannels;
	6	static dict_t plain_dnrs, mask_dnrs, handle_dnrs;
	7
	8	+extern const char *hidden_host_suffix;
	9	+
	10	static struct
	11	{
	12	struct chanNode *debug_channel;
	13	@@ -2859,12 +2861,103 @@ bad_channel_ban(struct chanNode *channel
	14	return 0;
	15	}
	16
	17	+#define i_isdigit(x) isdigit((int) (unsigned char) (x))
	18	+
	19	+int is_ipv4_address(const char *host)
	20	+{
	21	+ while (*host != '\0') {
	22	+ if (host != '.' && !i_isdigit(host))
	23	+ return 0;
	24	+ host++;
	25	+ }
	26	+ return 1;
	27	+}
	28	+
	29	+static char get_domain_mask(char host)
	30	+{
	31	+ char *ptr;
	32	+
	33	+ if (strchr(host, '.') == NULL) {
	34	+ /* no dots - toplevel domain or IPv6 address */
	35	+ ptr = strrchr(host, ':');
	36	+ if (ptr != NULL) {
	37	+ /* IPv6 address, ban the last 64k addresses */
	38	+ if (ptr[1] != '\0') strcpy(ptr+1, "*");
	39	+ }
	40	+ return host;
	41	+ }
	42	+
	43	+ if (is_ipv4_address(host)) {
	44	+ /* it's an IP address, change last digit to * */
	45	+ ptr = strrchr(host, '.');
	46	+ if (ptr != NULL && i_isdigit(ptr[1]))
	47	+ strcpy(ptr+1, "*");
	48	+ } else {
	49	+ /* if more than one dot, skip the first
	50	+ (dyn123.blah.net -> .blah.net) /
	51	+ ptr = strchr(host, '.');
	52	+ if (ptr != NULL && strchr(ptr+1, '.') != NULL) {
	53	+ host = ptr-1;
	54	+ host[0] = '*';
	55	+ }
	56	+ }
	57	+ return host;
	58	+}
	59	+
	60	+char generate_ban_hostmask(struct userNode user, const char banopt)
	61	+{
	62	+ char nickname, ident = "", hostname, mask, usemask;
	63	+ int len;
	64	+
65	+ /* figure out string parts */
66	+ if(IsHiddenHost(user) && user->handle_info && hidden_host_suffix) {
67	+ usemask = alloca(strlen(user->handle_info->handle) + strlen(hidden_host_suffix) + 2);
68	+ sprintf(usemask, "%s.%s", user->handle_info->handle, hidden_host_suffix);
69	+ }
70	+ else {
71	+ usemask = user->hostname;
72	+ }
73	+
74	+ if((banopt == 'f') \|\| (banopt == 'h') \|\| (banopt == 'i') \|\| (banopt == 'j')) {
75	+ nickname = user->nick;
76	+ }
77	+ else {
78	+ nickname = "*";
79	+ }
80	+
81	+ if((banopt == 'd') \|\| (banopt == 'e') \|\| (banopt == 'i') \|\| (banopt == 'j')) {
82	+ hostname = get_domain_mask(usemask);
83	+ }
84	+ else {
85	+ hostname = usemask;
86	+ }
87	+
88	+ if((banopt == 'a') \|\| (banopt == 'f')) {
89	+ ident = user->ident;
90	+ }
91	+ else if((banopt == 'b') \|\| (banopt == 'd') \|\| (banopt == 'i')) {
92	+ ident = malloc(strlen(user->ident)+1);
93	+ sprintf(ident, "*%s", user->ident);
94	+ }
95	+ else {
96	+ ident = "*";
97	+ }
98	+
99	+ /* Put it all together. */
100	+ len = strlen(ident) + strlen(hostname) + strlen(nickname) + 3;
101	+ mask = malloc(len);
102	+ sprintf(mask, "%s!%s@%s", nickname, ident, hostname);
103	+
104	+ return mask;
105	+}
106	+
107	static int
108	eject_user(struct userNode user, struct chanNode channel, unsigned int argc, unsigned char argv[], struct svccmd cmd, int action)
109	{
110	struct userNode victim, *victims;
111	unsigned int offset, n, victimCount = 0, duration = 0, present;
112	- char reason = CSMSG_KICK_REASON, ban, *name;
113	+ char reason = CSMSG_KICK_REASON, ban, *name, banopt;
114	+ struct chanData *cData;
115
116	offset = (action & ACTION_ADD_TIMED_BAN) ? 3 : 2;
117	REQUIRE_PARAMS(offset); (void)cmd;
118	@@ -2910,7 +3003,19 @@ eject_user(struct userNode *user, struct
119	victims = &victim;
120	victimCount = 1;
121
122	- ban = generate_hostmask(victim, GENMASK_STRICT_HOST\|GENMASK_ANY_IDENT);
123	+ if(!(cData = channel->channel_info))
124	+ {
125	+ banopt = 'c';
126	+ }
127	+
128	+ if(!(cData->options[optBanType])) {
129	+ banopt = 'c';
130	+ }
131	+ else {
132	+ banopt = cData->options[optBanType];
133	+ }
134	+
135	+ ban = generate_ban_hostmask(victim, banopt);
136	name = victim->nick;
137	}
138	else
139	@@ -5507,6 +5612,30 @@ static CHANNEL_OPTION_FUNC(opt_topicrefr
140	CHANNEL_MULTIPLE_OPTION("TopicRefresh ", "topic refresh", optTopicRefresh, -1);
141	}
142
143	+static CHANNEL_OPTION_FUNC(opt_bantype)
144	+{
145	+ struct chanData *cData = channel->channel_info;
146	+
147	+ struct valueData values[] =
148	+ {
149	+ {"*!user@host", 'a'},
150	+ {"!user@host", 'b'},
151	+ {"!@host", 'c'},
152	+ {"!user@*.host", 'd'},
153	+ {"!@*.host", 'e'},
154	+ {"nick!user@host", 'f'},
155	+ {"nick!*@host", 'h'},
156	+ {"nick!user@.host", 'i'},
157	+ {"nick!@.host", 'j'},
158	+ };
159	+
160	+ if(!(cData->options[optBanType])) {
161	+ cData->options[optBanType] = values[2].value;
162	+ }
163	+
164	+ CHANNEL_MULTIPLE_OPTION("BanType ", "bantype", optBanType, -1);
165	+}
166	+
167	static struct svccmd_list set_shows_list;
168
169	static void
170	@@ -6538,6 +6667,7 @@ chanserv_conf_read(void)
171	"DefaultTopic", "TopicMask", "Greeting", "UserGreeting", "Modes",
172	"PubCmd", "StrictOp", "AutoOp", "EnfModes", "EnfTopic", "Protect",
173	"Toys", "Setters", "TopicRefresh", "CtcpUsers", "CtcpReaction",
174	+ "BanType",
175	/* binary options */
176	"Voice", "UserInfo", "DynLimit", "TopicSnarf", "PeonInvite", "NoDelete",
177	/* delimiter */
178	@@ -7320,6 +7450,7 @@ init_chanserv(const char *nick)
179	DEFINE_CHANNEL_OPTION(ctcpusers);
180	DEFINE_CHANNEL_OPTION(ctcpreaction);
181	DEFINE_CHANNEL_OPTION(peoninvite);
182	+ DEFINE_CHANNEL_OPTION(bantype);
183
184	/* Alias set topic to set defaulttopic for compatibility. */
185	modcmd_register(chanserv_module, "set topic", chan_opt_defaulttopic, 1, 0, NULL);
186	diff -upr srvx-1.2rc3/src/chanserv.h Services/src/chanserv.h
187	--- src/chanserv.h Mon Oct 21 04:34:58 2002
188	+++ src/chanserv.h Mon Jul 7 18:16:21 2003
189	@@ -51,10 +51,11 @@ enum opt
190	optTopicRefresh,
191	optCTCPUsers,
192	optCTCPReaction,
193	- optMax
194	+ optMax,
195	+ optBanType
196	};
197
198	-#define OPTION_STRING_SIZE (optMax + 2)
199	+#define OPTION_STRING_SIZE (optBanType + 2)
200	#define FLAGS_STRING_LENGTH 5
201
202	/* Flags are stored in base64, so a length of 5 gives us
203	@@ -76,7 +77,7 @@ enum opt
204	will not work because FLAGS_STRING_LENGTH is 5. */
205
206	#define CHANNEL_DEFAULT_FLAGS (CHANNEL_INFO_LINES)
207	-#define CHANNEL_DEFAULT_OPTIONS "lmoooanpcnat"
208	+#define CHANNEL_DEFAULT_OPTIONS "lmoooanpcnatc"
209
210	#define IsProtected(x) ((x)->flags & CHANNEL_NODELETE)
211	#define IsSuspended(x) ((x)->flags & CHANNEL_SUSPENDED)
212	diff -upr srvx-1.2rc3/src/chanserv.help Services/src/chanserv.help
213	--- src/chanserv.help Wed Jan 1 00:45:40 2003
214	+++ src/chanserv.help Mon Jul 7 17:51:47 2003
215	@@ -322,6 +322,7 @@
216	"DYNLIMIT: Adjusts user limit (+l channel mode) to prevent join floods.",
217	"TOPICSNARF: Topics set manually (by /TOPIC #channel ...) change default $C topic",
218	"PEONINVITE: Indicates whether peons may use the $bINVITEME$b command.",
219	+ "BANTYPE: Indicated what type of ban $C will set will case of a ban command.",
220	"$bIRCOP ONLY$b:",
221	"NODELETE: Prevents channel deletion.",
222	"$uSee Also:$u set pubcmd, set strictop, set autoop, set enfmodes, set enftopic, set protect, set toys, set setters, set topicrefresh, set ctcpusers, set ctcpreaction");
223	@@ -440,6 +441,17 @@
224	"$b2$b Short timed ban (defaults to 3 minutes) on disallowed CTCPs.",
225	"$b3$b Long timed ban (defaults to 1 hour) on disallowed CTCPs.",
226	"$uSee Also:$u set, set ctcpusers");
227	+"SET BANTYPE" ("/msg $C SET <#channel> BANTYPE <value>",
228	+ "This settings control what banmask $C sets upon a ban command. Valid settings are:",
229	+ "$b0$b *!user@host",
230	+ "$b1$b !user@host",
231	+ "$b2$b !@host",
232	+ "$b3$b !user@*.host",
233	+ "$b4$b !@*.host",
234	+ "$b5$b nick!user@host",
235	+ "$b6$b nick!*@host",
236	+ "$b7$b nick!user@.host",
237	+ "$b8$b nick!@.host");
238	"SETINFO" ("/msg $C SETINFO <#channel> <info>",
239	"This command will set a user defined information message to be displayed when you join the channel. By setting the message to '*', you will clear your message.",
240	"$uSee Also:$u access");