X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nationalchars.cpp;h=6889e388f30670b5c36e09e9420895aa17544ba6;hb=1d020d132ff6d05ffd865d025cf161d7637f10d8;hp=bf214f79e7c3da31e1750362b5edf8ce0d1d6027;hpb=f74980ad05d8107d358efef86fec4fe6f20f85bd;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp old mode 100755 new mode 100644 index bf214f79e..6889e388f --- a/src/modules/m_nationalchars.cpp +++ b/src/modules/m_nationalchars.cpp @@ -1,36 +1,48 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2009 Dennis Friis + * Copyright (C) 2009 Craig Edwards + * Copyright (C) 2009 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + /* Contains a code of Unreal IRCd + Bynets patch ( http://www.unrealircd.com/ and http://www.bynets.org/ ) - Changed at 2008-06-15 - 2008-12-15 + Original patch is made by Dmitry "Killer{R}" Kononko. ( http://killprog.com/ ) + Changed at 2008-06-15 - 2009-02-11 by Chernov-Phoenix Alexey (Phoenix@RusNet) mailto:phoenix /email address separator/ pravmail.ru */ #include "inspircd.h" -#include "caller.h" #include -/* $ModDesc: Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING */ - -DEFINE_HANDLER2(lwbNickHandler, bool, const char*, size_t); +class lwbNickHandler : public HandlerBase1 +{ + public: + bool Call(const std::string&); +}; /*,m_reverse_additionalUp[256];*/ -static unsigned char m_reverse_additional[256],m_additionalMB[256],m_additionalUtf8[256],m_additionalUtf8range[256]; +static unsigned char m_reverse_additional[256],m_additionalMB[256],m_additionalUtf8[256],m_additionalUtf8range[256],m_additionalUtf8interval[256]; char utf8checkrest(unsigned char * mb, unsigned char cnt) { for (unsigned char * tmp=mb; tmp 191)) + /* & is faster! -- Phoenix (char & b11000000 == b10000000) */ + if ((*tmp & 192) != 128) return -1; } return cnt + 1; @@ -54,11 +66,12 @@ char utf8size(unsigned char * mb) /* Conditions added */ -bool lwbNickHandler::Call(const char* n, size_t max) +bool lwbNickHandler::Call(const std::string& nick) { - if (!n || !*n) + if (nick.empty()) return false; + const char* n = nick.c_str(); unsigned int p = 0; for (const char* i = n; *i; i++, p++) { @@ -100,7 +113,7 @@ bool lwbNickHandler::Call(const char* n, size_t max) continue; /* 3.1. Check against a simple UTF-8 characters enumeration */ - int cursize, ncursize = utf8size((unsigned char *)i); + int cursize, cursize2, ncursize = utf8size((unsigned char *)i); /* do check only if current multibyte character is valid UTF-8 only */ if (ncursize != -1) { @@ -123,25 +136,39 @@ bool lwbNickHandler::Call(const char* n, size_t max) if (found) continue; - /* 3.2. Check against an UTF-8 ranges: and . - Also char. is to be checked if it is a valid UTF-8 one */ + /* 3.2. Check against an UTF-8 ranges: and . */ found = false; for (unsigned char * mb = m_additionalUtf8range; (utf8size(mb) != -1) && (mb < m_additionalUtf8range + sizeof(m_additionalUtf8range)); mb += cursize + 1) { cursize = utf8size(mb); - /* Size differs? Pick the next! */ + /* Size differs (or lengthbyte is zero)? Pick the next! */ if ((cursize != ncursize) || (!mb[cursize])) continue; - unsigned char uright[5] = {0,0,0,0,0}; - + unsigned char uright[5] = {0,0,0,0,0}, range = mb[cursize] - 1; strncpy((char* ) uright, (char *) mb, cursize); - if ((uright[cursize-1] + mb[cursize]-1>0xff) && (cursize != 1)) + for (int temp = cursize - 1; (temp >= 0) && range; --temp) { - uright[cursize - 2]+=1; + /* all but the first char are 64-based */ + if (temp) + { + char part64 = range & 63; /* i.e. % 64 */ + /* handle carrying over */ + if (uright[temp] + part64 - 1 > 191) + { + uright[temp] -= 64; + range += 64; + } + uright[temp] += part64; + range >>= 6; /* divide it on a 64 */ + } + /* the first char of UTF-8 doesn't follow the rule */ + else + { + uright[temp] += range; + } } - uright[cursize - 1] = (uright[cursize - 1]+mb[cursize] - 1) % 0x100; if ((strncmp(i, (char *) mb, cursize) >= 0) && (strncmp(i, (char *) uright, cursize) <= 0)) { @@ -153,6 +180,30 @@ bool lwbNickHandler::Call(const char* n, size_t max) } if (found) continue; + + /* 3.3. Check against an UTF-8 intervals: and . */ + found = false; + for (unsigned char * mb = m_additionalUtf8interval; (utf8size(mb) != -1) && (utf8size(mb+utf8size(mb)) != -1) + && (mb < m_additionalUtf8interval + sizeof(m_additionalUtf8interval)); mb += (cursize+cursize2) ) + { + cursize = utf8size(mb); + cursize2= utf8size(mb+cursize); + + int minlen = cursize > ncursize ? ncursize : cursize; + int minlen2 = cursize2 > ncursize ? ncursize : cursize2; + + unsigned char* uright = mb + cursize; + + if ((strncmp(i, (char *) mb, minlen) >= 0) && (strncmp(i, (char *) uright, minlen2) <= 0)) + { + i += cursize - 1; + p += cursize - 1; + found = true; + break; + } + } + if (found) + continue; } /* invalid character! abort */ @@ -160,60 +211,49 @@ bool lwbNickHandler::Call(const char* n, size_t max) } /* too long? or not -- pointer arithmetic rocks */ - return (p < max); + return (p < ServerInstance->Config->Limits.NickMax); } class ModuleNationalChars : public Module { - private: - - InspIRCd* ServerInstance; - lwbNickHandler* myhandler; + lwbNickHandler myhandler; std::string charset, casemapping; unsigned char m_additional[256], m_additionalUp[256], m_lower[256], m_upper[256]; - caller2 * rememberer; + caller1 rememberer; bool forcequit; const unsigned char * lowermap_rememberer; public: - ModuleNationalChars(InspIRCd* Me) : Module(Me) + ModuleNationalChars() + : rememberer(ServerInstance->IsNick), lowermap_rememberer(national_case_insensitive_map) { - rememberer = (caller2 *) malloc(sizeof(rememberer)); + } - lowermap_rememberer = national_case_insensitive_map; + void init() CXX11_OVERRIDE + { memcpy(m_lower, rfc_case_insensitive_map, 256); national_case_insensitive_map = m_lower; - ServerInstance = Me; - - *rememberer = ServerInstance->IsNick; - myhandler = new lwbNickHandler(ServerInstance); - ServerInstance->IsNick = myhandler; - - Implementation eventlist[] = { I_OnRehash, I_On005Numeric }; - ServerInstance->Modules->Attach(eventlist, this, 2); - OnRehash(NULL, ""); + ServerInstance->IsNick = &myhandler; } - virtual void On005Numeric(std::string &output) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - std::string tmp(casemapping); - tmp.insert(0, "CASEMAPPING="); - SearchAndReplace(output, std::string("CASEMAPPING=rfc1459"), tmp); + tokens["CASEMAPPING"] = casemapping; } - virtual void OnRehash(User* user, const std::string ¶meter) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ConfigReader* conf = new ConfigReader(ServerInstance); - charset = conf->ReadValue("nationalchars", "file", 0); - casemapping = conf->ReadValue("nationalchars", "casemapping", charset, 0, false); - charset.insert(0, "../locales/"); - unsigned char * tables[7] = { m_additional, m_additionalMB, m_additionalUp, m_lower, m_upper, m_additionalUtf8, m_additionalUtf8range }; - loadtables(charset, tables, 7, 5); - forcequit = conf->ReadFlag("nationalchars", "forcequit", 0); + ConfigTag* tag = ServerInstance->Config->ConfValue("nationalchars"); + charset = tag->getString("file"); + casemapping = tag->getString("casemapping", charset); + if(charset[0] != '/') + charset.insert(0, "../locales/"); + unsigned char * tables[8] = { m_additional, m_additionalMB, m_additionalUp, m_lower, m_upper, m_additionalUtf8, m_additionalUtf8range, m_additionalUtf8interval }; + loadtables(charset, tables, 8, 5); + forcequit = tag->getBool("forcequit"); CheckForceQuit("National character set changed"); - delete conf; } void CheckForceQuit(const char * message) @@ -221,31 +261,25 @@ class ModuleNationalChars : public Module if (!forcequit) return; - std::vector purge; - for (std::vector::iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter) + for (LocalUserList::const_iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter) { /* Fix by Brain: Dont quit UID users */ - if (!isdigit((*iter)->nick[0]) && !ServerInstance->IsNick((*iter)->nick.c_str(), ServerInstance->Config->Limits.NickMax)) - purge.push_back(*iter); - } - for (std::vector::iterator iter = purge.begin();iter!=purge.end();++iter) - { - ServerInstance->Users->QuitUser((*iter), message); + User* n = *iter; + if (!isdigit(n->nick[0]) && !ServerInstance->IsNick(n->nick)) + ServerInstance->Users->QuitUser(n, message); } } - virtual ~ModuleNationalChars() + ~ModuleNationalChars() { - delete myhandler; - ServerInstance->IsNick = *rememberer; - free(rememberer); + ServerInstance->IsNick = rememberer; national_case_insensitive_map = lowermap_rememberer; CheckForceQuit("National characters module unloaded"); } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id: m_nationalchars.cpp 0 2008-12-15 14:24:12SAMT phoenix $",VF_COMMON,API_VERSION); + return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING", VF_VENDOR | VF_COMMON, charset); } /*make an array to check against it 8bit characters a bit faster. Whether allowed or uppercase (for your needs).*/ @@ -259,10 +293,10 @@ class ModuleNationalChars : public Module /*so Bynets Unreal distribution stuff*/ void loadtables(std::string filename, unsigned char ** tables, unsigned char cnt, char faillimit) { - std::ifstream ifs(filename.c_str()); + std::ifstream ifs(ServerInstance->Config->Paths.PrependConfig(filename).c_str()); if (ifs.fail()) { - ServerInstance->Logs->Log("m_nationalchars",DEFAULT,"loadtables() called for missing file: %s", filename.c_str()); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "loadtables() called for missing file: %s", filename.c_str()); return; } @@ -277,7 +311,7 @@ class ModuleNationalChars : public Module { if (loadtable(ifs, tables[n], 255) && (n < faillimit)) { - ServerInstance->Logs->Log("m_nationalchars",DEFAULT,"loadtables() called for illegal file: %s (line %d)", filename.c_str(), n+1); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "loadtables() called for illegal file: %s (line %d)", filename.c_str(), n+1); return; } } @@ -316,7 +350,7 @@ class ModuleNationalChars : public Module if (buf[0] == '.') /* simple plain-text string after dot */ { i = buf.size() - 1; - + if (i > (maxindex + 1)) i = maxindex + 1;