-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathkXmode.patch
321 lines (308 loc) · 12.4 KB
/
kXmode.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
# HG changeset patch
# Parent 82274ef17f3290bcfbea13c35461fc5544a90cdf
diff -r 82274ef17f32 include/client.h
--- a/include/client.h Sat Jul 20 14:45:57 2013 +0100
+++ b/include/client.h Sat Jul 20 14:46:31 2013 +0100
@@ -90,7 +90,7 @@
#define FlagClr(set,flag) ((set)->bits[FLAGSET_INDEX(flag)] &= ~FLAGSET_MASK(flag))
/** String containing valid user modes, in no particular order. */
-#define infousermodes "diOoswkgxR"
+#define infousermodes "diOoswkgxRXIn"
/** Operator privileges. */
enum Priv
@@ -168,6 +168,10 @@
FLAG_ACCOUNTONLY, /**< ASUKA_R: hide privmsgs/notices if
user is not authed or opered */
FLAG_HIDDENHOST, /**< user's host is hidden */
+ FLAG_NOCHAN, /**< user's channels are hidden */
+ FLAG_NOIDLE, /**< user's idletime is hidden */
+ FLAG_XTRAOP, /**< oper has special powers */
+
FLAG_LAST_FLAG, /**< number of flags */
FLAG_LOCAL_UMODES = FLAG_LOCOP, /**< First local mode flag */
FLAG_GLOBAL_UMODES = FLAG_OPER /**< First global mode flag */
@@ -583,6 +587,12 @@
#define IsAccount(x) HasFlag(x, FLAG_ACCOUNT)
/** Return non-zero if the client has set mode +x (hidden host). */
#define IsHiddenHost(x) HasFlag(x, FLAG_HIDDENHOST)
+/** Return non-zero if the client has set mode +X (xtraop) */
+#define IsXtraOp(x) HasFlag(x, FLAG_XTRAOP)
+/** Return non-zero if the client has set mode +n (hide channels) */
+#define IsNoChan(x) HasFlag(x, FLAG_NOCHAN)
+/** Return non-zero if the client has set mode +I (hide idletime) */
+#define IsNoIdle(x) HasFlag(x, FLAG_NOIDLE)
/** Return non-zero if the client has an active PING request. */
#define IsPingSent(x) HasFlag(x, FLAG_PINGSENT)
/** Return non-zero if the client should not receive privmsgs/notices
@@ -632,6 +642,12 @@
#define SetAccount(x) SetFlag(x, FLAG_ACCOUNT)
/** Mark a client as having mode +x (hidden host). */
#define SetHiddenHost(x) SetFlag(x, FLAG_HIDDENHOST)
+/** Mark a client as having mode +X (xtraop). */
+#define SetXtraOp(x) SetFlag(x, FLAG_XTRAOP)
+/** Mark a client as having mode +n (hide channels). */
+#define SetNoChan(x) SetFlag(x, FLAG_NOCHAN)
+/** Mark a client as having mode +I (hide idletime). */
+#define SetNoIdle(x) SetFlag(x, FLAG_NOIDLE)
/** Mark a client as having a pending PING. */
#define SetPingSent(x) SetFlag(x, FLAG_PINGSENT)
/** Mark a client as having mode +R (account only). */
@@ -667,6 +683,12 @@
#define ClearServNotice(x) ClrFlag(x, FLAG_SERVNOTICE)
/** Remove mode +x (hidden host) from the client. */
#define ClearHiddenHost(x) ClrFlag(x, FLAG_HIDDENHOST)
+/** Remove mode +X (xtraop) from a client. */
+#define ClearXtraOp(x) ClrFlag(x, FLAG_XTRAOP)
+/** Remove mode +n (hide channels) from a client. */
+#define ClearNoChan(x) ClrFlag(x, FLAG_NOCHAN)
+/** Remove mode +I (hide idletime) from a client. */
+#define ClearNoIdle(x) ClrFlag(x, FLAG_NOIDLE)
/** Clear the client's pending PING flag. */
#define ClearPingSent(x) ClrFlag(x, FLAG_PINGSENT)
/** Clear the client's HUB flag. */
diff -r 82274ef17f32 include/ircd_features.h
--- a/include/ircd_features.h Sat Jul 20 14:45:57 2013 +0100
+++ b/include/ircd_features.h Sat Jul 20 14:46:31 2013 +0100
@@ -56,6 +56,7 @@
FEAT_HIDDEN_IP,
FEAT_AUTOINVISIBLE,
FEAT_CONNEXIT_NOTICES,
+ FEAT_USER_HIDECHANS,
FEAT_OPLEVELS,
FEAT_ZANNELS,
FEAT_LOCAL_CHANNELS,
diff -r 82274ef17f32 include/numeric.h
--- a/include/numeric.h Sat Jul 20 14:45:57 2013 +0100
+++ b/include/numeric.h Sat Jul 20 14:46:31 2013 +0100
@@ -410,6 +410,7 @@
/* ERR_DESYNC 484 Dalnet,PTlink */
/* ERR_ATTACKDENY 484 unreal */
/* ERR_RESTRICTED 484 IRCnet extension */
+#define ERR_ISREALSERVICE 485 /* QuakeNet/ASUKA extension */
/* ERR_UNIQOPRIVSNEEDED 485 IRCnet extension */
/* ERR_KILLDENY 485 unreal */
/* ERR_CANTKICKADMIN 485 PTlink */
diff -r 82274ef17f32 ircd/channel.c
--- a/ircd/channel.c Sat Jul 20 14:45:57 2013 +0100
+++ b/ircd/channel.c Sat Jul 20 14:46:31 2013 +0100
@@ -743,7 +743,7 @@
/*
* Servers can always speak on channels.
*/
- if (IsServer(cptr))
+ if (IsServer(cptr) || IsXtraOp(cptr))
return 1;
member = find_channel_member(cptr, chptr);
@@ -3119,17 +3119,29 @@
if ((state->cli_change[i].flag & (MODE_DEL | MODE_CHANOP)) ==
(MODE_DEL | MODE_CHANOP)) {
/* prevent +k users from being deopped */
- if (IsChannelService(state->cli_change[i].client)) {
+ /*
+ * ASUKA_X:
+ * Allow +X'ed users to mess with +k'ed.
+ * --Bigfoot
+ */
+ if ((IsChannelService(state->cli_change[i].client) && IsService(cli_user(state->cli_change[i].client)->server)) || (IsChannelService(state->cli_change[i].client) && !IsXtraOp(state->sptr))) {
if (state->flags & MODE_PARSE_FORCE) /* it was forced */
sendto_opmask_butone(0, SNO_HACK4, "Deop of +k user on %H by %s",
state->chptr,
(IsServer(state->sptr) ? cli_name(state->sptr) :
cli_name((cli_user(state->sptr))->server)));
- else if (MyUser(state->sptr) && state->flags & MODE_PARSE_SET) {
- send_reply(state->sptr, ERR_ISCHANSERVICE,
- cli_name(state->cli_change[i].client),
- state->chptr->chname);
+ else if (MyUser(state->sptr) && state->flags & MODE_PARSE_SET && (state->sptr != state->cli_change[i].client)) {
+ if(IsService(cli_user(state->cli_change[i].client)->server) && IsChannelService(state->cli_change[i].client)){
+ send_reply(state->sptr, ERR_ISREALSERVICE,
+ cli_name(state->cli_change[i].client),
+ state->chptr->chname);
+ }else{
+ send_reply(state->sptr, ERR_ISCHANSERVICE,
+ cli_name(state->cli_change[i].client),
+ state->chptr->chname);
+ }
+
continue;
}
}
diff -r 82274ef17f32 ircd/ircd_features.c
--- a/ircd/ircd_features.c Sat Jul 20 14:45:57 2013 +0100
+++ b/ircd/ircd_features.c Sat Jul 20 14:46:31 2013 +0100
@@ -321,6 +321,7 @@
F_S(HIDDEN_IP, 0, "127.0.0.1", 0),
F_B(AUTOINVISIBLE, 0, 1, 0),
F_B(CONNEXIT_NOTICES, 0, 0, 0),
+ F_B(USER_HIDECHANS, 0, 0, 0),
F_B(OPLEVELS, 0, 1, 0),
F_B(ZANNELS, 0, 1, 0),
F_B(LOCAL_CHANNELS, 0, 1, 0),
diff -r 82274ef17f32 ircd/m_join.c
--- a/ircd/m_join.c Sat Jul 20 14:45:57 2013 +0100
+++ b/ircd/m_join.c Sat Jul 20 14:46:31 2013 +0100
@@ -207,6 +207,14 @@
else if (*chptr->mode.key && (!key || strcmp(key, chptr->mode.key)))
err = ERR_BADCHANNELKEY;
+ /*
+ * ASUKA_X:
+ * Allow XtraOpers to join all channels.
+ * --Bigfoot
+ */
+ if (IsXtraOp(sptr))
+ err = 0;
+
/* An oper with WALK_LCHAN privilege can join a local channel
* he otherwise could not join by using "OVERRIDE" as the key.
* This will generate a HACK(4) notice, but fails if the oper
diff -r 82274ef17f32 ircd/m_kick.c
--- a/ircd/m_kick.c Sat Jul 20 14:45:57 2013 +0100
+++ b/ircd/m_kick.c Sat Jul 20 14:46:31 2013 +0100
@@ -131,7 +131,15 @@
return 0; /* find_chasing sends the reply for us */
/* Don't allow the channel service to be kicked */
- if (IsChannelService(who))
+ /*
+ * ASUKA_X:
+ * Allow +X'ed users to kick +k'ed, but not U-lined services.
+ * --Bigfoot
+ */
+ if (IsChannelService(who) && IsService(cli_user(who)->server))
+ return send_reply(sptr, ERR_ISREALSERVICE, cli_name(who), chptr->chname);
+
+ if (IsChannelService(who) && !IsXtraOp(sptr) && (who!=sptr))
return send_reply(sptr, ERR_ISCHANSERVICE, cli_name(who), chptr->chname);
/* Prevent kicking opers from local channels -DM- */
diff -r 82274ef17f32 ircd/m_kill.c
--- a/ircd/m_kill.c Sat Jul 20 14:45:57 2013 +0100
+++ b/ircd/m_kill.c Sat Jul 20 14:46:31 2013 +0100
@@ -277,7 +277,15 @@
/*
* if the user is +k, prevent a kill from local user
*/
- if (IsChannelService(victim))
+ /*
+ * ASUKA_X:
+ * Allow +X'ed users to kill +k'ed, but not U-lined services.
+ * --Bigfoot
+ */
+ if (IsChannelService(victim) && IsService(cli_user(victim)->server))
+ return send_reply(sptr, ERR_ISREALSERVICE, "KILL", cli_name(victim));
+
+ if (IsChannelService(victim) && !IsXtraOp(sptr) && !(victim==sptr))
return send_reply(sptr, ERR_ISCHANSERVICE, "KILL", cli_name(victim));
diff -r 82274ef17f32 ircd/m_whois.c
--- a/ircd/m_whois.c Sat Jul 20 14:45:57 2013 +0100
+++ b/ircd/m_whois.c Sat Jul 20 14:46:31 2013 +0100
@@ -144,7 +144,7 @@
cli_info(acptr));
/* Display the channels this user is on. */
- if (!IsChannelService(acptr))
+ if ((!IsChannelService(acptr) && !IsNoChan(acptr)) || (acptr==sptr))
{
struct Membership* chan;
mlen = strlen(cli_name(&me)) + strlen(cli_name(sptr)) + 12 + strlen(name);
@@ -219,8 +219,10 @@
* probably a good place to add them :)
*/
- if (MyConnect(acptr) && (!feature_bool(FEAT_HIS_WHOIS_IDLETIME) ||
- (sptr == acptr || IsAnOper(sptr) || parc >= 3)))
+ if (MyConnect(acptr) &&
+ (IsAnOper(sptr) ||
+ (!IsNoIdle(acptr) && (!feature_bool(FEAT_HIS_WHOIS_IDLETIME) ||
+ sptr == acptr || parc >= 3))))
send_reply(sptr, RPL_WHOISIDLE, name, CurrentTime - user->last,
cli_firsttime(acptr));
}
diff -r 82274ef17f32 ircd/s_err.c
--- a/ircd/s_err.c Sat Jul 20 14:45:57 2013 +0100
+++ b/ircd/s_err.c Sat Jul 20 14:46:31 2013 +0100
@@ -1000,9 +1000,9 @@
/* 483 */
{ ERR_CANTKILLSERVER, ":You cant kill a server!", "483" },
/* 484 */
- { ERR_ISCHANSERVICE, "%s %s :Cannot kill, kick or deop a network service", "484" },
+ { ERR_ISCHANSERVICE, "%s %s :Cannot kill, kick or deop an IRC operator", "484" },
/* 485 */
- { 0 },
+ { ERR_ISREALSERVICE, "%s %s :Cannot kill, kick or deop a network service", "485" },
/* 486 */
{ ERR_ACCOUNTONLY, "%s :You must be authed in order to message this user", "486" },
/* 487 */
diff -r 82274ef17f32 ircd/s_user.c
--- a/ircd/s_user.c Sat Jul 20 14:45:57 2013 +0100
+++ b/ircd/s_user.c Sat Jul 20 14:46:31 2013 +0100
@@ -503,7 +503,10 @@
{ FLAG_DEBUG, 'g' },
{ FLAG_ACCOUNT, 'r' },
{ FLAG_HIDDENHOST, 'x' },
- { FLAG_ACCOUNTONLY, 'R' }
+ { FLAG_ACCOUNTONLY, 'R' },
+ { FLAG_XTRAOP, 'X' },
+ { FLAG_NOCHAN, 'n' },
+ { FLAG_NOIDLE, 'I' }
};
/** Length of #userModeList. */
@@ -580,7 +583,7 @@
if (MyUser(sptr)) {
const char* channel_name;
struct Membership *member;
- if ((channel_name = find_no_nickchange_channel(sptr))) {
+ if ((channel_name = find_no_nickchange_channel(sptr)) && !IsXtraOp(sptr)) {
return send_reply(cptr, ERR_BANNICKCHANGE, channel_name);
}
/*
@@ -1072,6 +1075,24 @@
else
ClearChannelService(sptr);
break;
+ case 'X':
+ if (what == MODE_ADD)
+ SetXtraOp(sptr);
+ else
+ ClearXtraOp(sptr);
+ break;
+ case 'n':
+ if (what == MODE_ADD)
+ SetNoChan(sptr);
+ else
+ ClearNoChan(sptr);
+ break;
+ case 'I':
+ if (what == MODE_ADD)
+ SetNoIdle(sptr);
+ else
+ ClearNoIdle(sptr);
+ break;
case 'g':
if (what == MODE_ADD)
SetDebug(sptr);
@@ -1117,8 +1138,15 @@
* new umode; servers can set it, local users cannot;
* prevents users from /kick'ing or /mode -o'ing
*/
- if (!FlagHas(&setflags, FLAG_CHSERV))
+ if (!FlagHas(&setflags, FLAG_CHSERV) && !IsOper(sptr))
ClearChannelService(sptr);
+ if (!FlagHas(&setflags, FLAG_XTRAOP) && !IsOper(sptr))
+ ClearXtraOp(sptr);
+ if (!FlagHas(&setflags, FLAG_NOCHAN) && !(IsOper(sptr) || feature_bool(FEAT_USER_HIDECHANS)))
+ ClearNoChan(sptr);
+ if (!FlagHas(&setflags, FLAG_NOIDLE) && !IsOper(sptr))
+ ClearNoIdle(sptr);
+
/*
* only send wallops to opers
*/
diff -r 82274ef17f32 ircd/whocmds.c
--- a/ircd/whocmds.c Sat Jul 20 14:45:57 2013 +0100
+++ b/ircd/whocmds.c Sat Jul 20 14:46:31 2013 +0100
@@ -90,7 +90,7 @@
chan = find_channel_member(acptr, repchan);
}
else if ((!fields || (fields & (WHO_FIELD_CHA | WHO_FIELD_FLA)))
- && !IsChannelService(acptr))
+ && !IsChannelService(acptr) && !IsNoChan(acptr))
{
for (chan = cli_user(acptr)->channel; chan; chan = chan->next_channel)
if (PubChannel(chan->channel) &&