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
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
|
/* +------------------------------------+
* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
* InspIRCd: (C) 2002-2007 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
*
* ---------------------------------------------------
*/
/* $Core: libIRCDxline */
#include "inspircd.h"
#include "wildcard.h"
#include "xline.h"
/*
* This is now version 3 of the XLine subsystem, let's see if we can get it as nice and
* efficient as we can this time so we can close this file and never ever touch it again ..
*
* Background:
* Version 1 stored all line types in one list (one for g, one for z, etc). This was fine,
* but both version 1 and 2 suck at applying lines efficiently. That is, every time a new line
* was added, it iterated every existing line for every existing user. Ow. Expiry was also
* expensive, as the lists were NOT sorted.
*
* Version 2 moved permanent lines into a seperate list from non-permanent to help optimize
* matching speed, but matched in the same way.
* Expiry was also sped up by sorting the list by expiry (meaning just remove the items at the
* head of the list that are outdated.)
*
* This was fine and good, but it looked less than ideal in code, and matching was still slower
* than it could have been, something which we address here.
*
* VERSION 3:
* All lines are (as in v1) stored together -- no seperation of perm and non-perm. Expiry will
* still use a sorted list, and we'll just ignore anything permanent.
*
* Application will be by a list of lines 'pending' application, meaning only the newly added lines
* will be gone over. Much faster.
*
* More of course is to come.
*/
/* Version two, now with optimized expiry!
*
* Because the old way was horrendously slow, the new way of expiring xlines is very
* very efficient. I have improved the efficiency of the algorithm in two ways:
*
* (1) There are now two lists of items for each linetype. One list holds temporary
* items, and the other list holds permanent items (ones which will expire).
* Items which are on the permanent list are NEVER checked at all by the
* expire_lines() function.
* (2) The temporary xline lists are always kept in strict numerical order, keyed by
* current time + duration. This means that the line which is due to expire the
* soonest is always pointed at by vector::begin(), so a simple while loop can
* very efficiently, very quickly and above all SAFELY pick off the first few
* items in the vector which need zapping.
*
* -- Brain
*/
bool XLine::Matches(User *u)
{
return false;
}
/*
* Checks what users match a given vector of ELines and sets their ban exempt flag accordingly.
*/
void XLineManager::CheckELines(std::map<std::string, XLine *> &ELines)
{
if (ELines.empty())
return;
for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
{
User* u = (User*)(*u2);
for (std::map<std::string, XLine *>::iterator i = ELines.begin(); i != ELines.end(); i++)
{
XLine *e = i->second;
u->exempt = e->Matches(u);
}
}
}
// this should probably be moved to configreader, but atm it relies on CheckELines above.
bool DoneELine(ServerConfig* conf, const char* tag)
{
for (std::vector<User*>::const_iterator u2 = conf->GetInstance()->local_users.begin(); u2 != conf->GetInstance()->local_users.end(); u2++)
{
User* u = (User*)(*u2);
u->exempt = false;
}
conf->GetInstance()->XLines->CheckELines(conf->GetInstance()->XLines->lookup_lines['E']);
return true;
}
IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
{
IdentHostPair n = std::make_pair<std::string,std::string>("*","*");
std::string::size_type x = ident_and_host.find('@');
if (x != std::string::npos)
{
n.second = ident_and_host.substr(x + 1,ident_and_host.length());
n.first = ident_and_host.substr(0, x);
if (!n.first.length())
n.first.assign("*");
if (!n.second.length())
n.second.assign("*");
}
else
{
n.second = ident_and_host;
}
return n;
}
// adds a g:line
/*bool XLineManager::AddELine(long duration, const char* source, const char* reason, const char* hostmask)*/
bool XLineManager::AddLine(XLine* line)
{
/*IdentHostPair ih = IdentSplit(hostmask);*/
if (DelLine(hostmask, line->type, true))
return false;
/*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
active_lines.push_back(item);
sort(active_lines.begin(), active_lines.end(), XLineManager::XSortComparison);
lookup_lines[line->type][hostmask] = item;
line->OnAdd();
// XXX we really only need to check one line (the new one) - this is a bit wasteful!
// we should really create a temporary var here and pass that instead.
// hmm, perhaps we can merge this with line "application" somehow.. and just force a recheck on DelELine?
/*this->CheckELines(lookup_lines['E']);
return true;*/
}
/*bool XLineManager::AddZLine(long duration, const char* source, const char* reason, const char* ipaddr)
{
if (strchr(ipaddr,'@'))
{
while (*ipaddr != '@')
ipaddr++;
ipaddr++;
}*/
// deletes a g:line, returns true if the line existed and was removed
bool XLineManager::DelLine(const char* hostmask, char type, bool simulate)
{
IdentHostPair ih = IdentSplit(hostmask);
for (std::vector<XLine*>::iterator i = active_lines.begin(); i != active_lines.end(); i++)
{
if ((*i)->type == type)
{
if ((*i)->MatchesLiteral(hostmask))
{
if (!simulate)
{
(*i)->Unset();
delete *i;
active_lines.erase(i);
if (lookup_lines.find(type) != lookup_lines.end())
lookup_lines[type].erase(hostmask);
/* XXX: Should erase from pending lines here */
}
return true;
}
}
}
return false;
}
void ELine::Unset()
{
/* remove exempt from everyone and force recheck after deleting eline */
for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
{
User* u = (User*)(*u2);
u->exempt = false;
}
if (ServerInstance->XLines->lookup_lines.find('E') != ServerInstance->XLines->lookup_lines.end())
ServerInstance->XLines->CheckELines(ServerInstance->XLines->lookup_lines['E']);
}
// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
QLine* XLineManager::matches_qline(const char* nick)
{
if (lookup_lines.find('Q') == lookup_lines.end())
return NULL;
if (lookup_lines.find('Q') != lookup_lines.end() && lookup_lines['Q'].empty())
return NULL;
for (std::vector<XLine*>::iterator i = active_lines.begin(); i != active_lines.end(); i++)
if ((*i)->type == 'Q' && (*i)->Matches(nick))
return (QLine*)(*i);
return NULL;
}
// returns a pointer to the reason if a host matches a gline, NULL if it didnt match
GLine* XLineManager::matches_gline(User* user)
{
if (lookup_lines.find('G') == lookup_lines.end())
return NULL;
if (lookup_lines.find('G') != lookup_lines.end() && lookup_lines['G'].empty())
return NULL;
for (std::vector<XLine*>::iterator i = active_lines.begin(); i != active_lines.end(); i++)
if ((*i)->type == 'G' && (*i)->Matches(user))
return (GLine*)(*i);
return NULL;
}
ELine* XLineManager::matches_exception(User* user)
{
if (lookup_lines.find('E') == lookup_lines.end())
return NULL;
if (lookup_lines.find('E') != lookup_lines.end() && lookup_lines['E'].empty())
return NULL;
for (std::vector<XLine*>::iterator i = active_lines.begin(); i != active_lines.end(); i++)
{
if ((*i)->type == 'E' && (*i)->Matches(user))
return (ELine*)(*i);
}
return NULL;
}
void XLineManager::gline_set_creation_time(const char* host, time_t create_time)
{
/*for (std::vector<XLine*>::iterator i = glines.begin(); i != glines.end(); i++)
{
if (!strcasecmp(host,(*i)->hostmask))
{
(*i)->set_time = create_time;
(*i)->expiry = create_time + (*i)->duration;
return;
}
}*/
return ;
}
void XLineManager::eline_set_creation_time(const char* host, time_t create_time)
{
/*for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
{
if (!strcasecmp(host,(*i)->hostmask))
{
(*i)->set_time = create_time;
(*i)->expiry = create_time + (*i)->duration;
return;
}
}*/
return;
}
void XLineManager::qline_set_creation_time(const char* nick, time_t create_time)
{
/*for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
{
if (!strcasecmp(nick,(*i)->nick))
{
(*i)->set_time = create_time;
(*i)->expiry = create_time + (*i)->duration;
return;
}
}*/
return;
}
void XLineManager::zline_set_creation_time(const char* ip, time_t create_time)
{
/*for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
{
if (!strcasecmp(ip,(*i)->ipaddr))
{
(*i)->set_time = create_time;
(*i)->expiry = create_time + (*i)->duration;
return;
}
}*/
return;
}
// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match
ZLine* XLineManager::matches_zline(User *u)
{
if (lookup_lines.find('Z') == lookup_lines.end())
return NULL;
if (lookup_lines.find('Z') != lookup_lines.end() && lookup_lines['Z'].empty())
return NULL;
for (std::vector<XLine*>::iterator i = active_lines.begin(); i != active_lines.end(); i++)
if ((*i)->type == 'Z' && (*i)->Matches(u))
return (ZLine*)(*i);
return NULL;
}
// returns a pointer to the reason if a host matches a kline, NULL if it didnt match
KLine* XLineManager::matches_kline(User* user)
{
if (lookup_lines.find('K') == lookup_lines.end())
return NULL;
if (lookup_lines.find('K') != lookup_lines.end() && lookup_lines['K'].empty())
return NULL;
for (std::vector<XLine*>::iterator i = active_lines.begin(); i != active_lines.end(); i++)
if ((*i)->Matches(user))
return (KLine*)(*i);
return NULL;
}
bool XLineManager::XSortComparison(const XLine *one, const XLine *two)
{
// account for permanent lines
if (one->expiry == 0)
{
return false;
}
return (one->expiry) < (two->expiry);
}
// removes lines that have expired
void XLineManager::expire_lines()
{
time_t current = ServerInstance->Time();
/* Because we now store all our XLines in sorted order using ((*i)->duration + (*i)->set_time) as a key, this
* means that to expire the XLines we just need to do a while, picking off the top few until there are
* none left at the head of the queue that are after the current time.
*/
while ((active_lines.size()) && (current > (*active_lines.begin())->expiry) && ((*active_lines.begin())->duration != 0))
{
std::vector<XLine*>::iterator i = active_lines.begin();
(*i)->DisplayExpiry();
(*i)->Unset();
active_lines.erase(i);
delete *i;
}
}
// applies lines, removing clients and changing nicks etc as applicable
void XLineManager::ApplyLines()
{
for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
{
User* u = (User*)(*u2);
for (std::vector<XLine *>::iterator i = pending_lines.begin(); i != pending_lines.end(); i++)
{
XLine *x = *i;
if (x->Matches(u))
x->Apply(u);
}
}
pending_lines.clear();
}
void XLineManager::stats_k(User* user, string_list &results)
{
/*std::string sn = ServerInstance->Config->ServerName;
for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
results.push_back(sn+" 216 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);*/
}
void XLineManager::stats_g(User* user, string_list &results)
{
/*std::string sn = ServerInstance->Config->ServerName;
for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);*/
}
void XLineManager::stats_q(User* user, string_list &results)
{
/*std::string sn = ServerInstance->Config->ServerName;
for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
results.push_back(sn+" 217 "+user->nick+" :"+(*i)->nick+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);*/
}
void XLineManager::stats_z(User* user, string_list &results)
{
/*std::string sn = ServerInstance->Config->ServerName;
for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
results.push_back(sn+" 223 "+user->nick+" :"+(*i)->ipaddr+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);*/
}
void XLineManager::stats_e(User* user, string_list &results)
{
/*std::string sn = ServerInstance->Config->ServerName;
for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);*/
}
XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance)
{
}
void XLine::Apply(User* u)
{
}
void XLine::DefaultApply(User* u, char line)
{
char reason[MAXBUF];
snprintf(reason, MAXBUF, "%c-Lined: %s", line, this->reason);
if (*ServerInstance->Config->MoronBanner)
u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
if (ServerInstance->Config->HideBans)
User::QuitUser(ServerInstance, u, line + std::string("-Lined"), reason);
else
User::QuitUser(ServerInstance, u, reason);
}
bool KLine::Matches(User *u)
{
if (u->exempt)
return false;
if ((match(u->ident, this->identmask)))
{
if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
{
return true;
}
}
return false;
}
void KLine::Apply(User* u)
{
DefaultApply(u, 'K');
}
bool GLine::Matches(User *u)
{
if (u->exempt)
return false;
if ((match(u->ident, this->identmask)))
{
if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
{
return true;
}
}
return false;
}
void GLine::Apply(User* u)
{
DefaultApply(u, 'G');
}
bool ELine::Matches(User *u)
{
if (u->exempt)
return false;
if ((match(u->ident, this->identmask)))
{
if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
{
return true;
}
}
return false;
}
bool ZLine::Matches(User *u)
{
if (u->exempt)
return false;
if (match(u->GetIPString(), this->ipaddr, true))
return true;
else
return false;
}
void ZLine::Apply(User* u)
{
DefaultApply(u, 'Z');
}
bool QLine::Matches(User *u)
{
if (u->exempt)
return false;
if (match(u->nick, this->nick))
return true;
return false;
}
void QLine::Apply(User* u)
{
/* Can we force the user to their uid here instead? */
DefaultApply(u, 'Q');
}
bool ZLine::Matches(const std::string &str)
{
if (match(str.c_str(), this->ipaddr, true))
return true;
else
return false;
}
bool QLine::Matches(const std::string &str)
{
if (match(str.c_str(), this->nick))
return true;
return false;
}
bool ELine::Matches(const std::string &str)
{
return ((match(str.c_str(), matchtext.c_str(), true)));
}
bool KLine::Matches(const std::string &str)
{
return ((match(str.c_str(), matchtext.c_str(), true)));
}
bool GLine::Matches(const std::string &str)
{
return ((match(str.c_str(), matchtext.c_str(), true)));
}
virtual bool ELine::MatchesLiteral(const std::string &str)
{
return (assign(str) == irc::string(this->identmask) + '@' + this->hostmask);
}
virtual bool ZLine::MatchesLiteral(const std::string &str)
{
return (assign(str) == this->ipmask);
}
virtual bool GLine::MatchesLiteral(const std::string &str)
{
return (assign(str) == irc::string(this->identmask) + '@' + this->hostmask);
}
virtual bool KLine::MatchesLiteral(const std::string &str)
{
return (assign(str) == irc::string(this->identmask) + '@' + this->hostmask);
}
virtual bool QLine::MatchesLiteral(const std::string &str)
{
return (assign(str) == this->nickmask);
}
virtual void ELine::OnAdd()
{
ServerInstance->XLines->CheckELines(ServerInstance->XLines->lookup_lines['E']);
}
void ELine::DisplayExpiry()
{
ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
}
void QLine::DisplayExpiry()
{
ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",this->nick,this->source,this->duration);
}
void ZLine::DisplayExpiry()
{
ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",this->ipaddr,this->source,this->duration);
}
void KLine::DisplayExpiry()
{
ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
}
void GLine::DisplayExpiry()
{
ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
}
|