X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nationalchars.cpp;h=bf95f0f9f3992b70de15db10c427eb0ef2f1996e;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=6647c618543b3a26dd107ef35e5658f35d7d893f;hpb=a6d924bf70d389583b8706e9774f056dd6af9fc3;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 6647c6185..bf95f0f9f --- a/src/modules/m_nationalchars.cpp +++ b/src/modules/m_nationalchars.cpp @@ -1,18 +1,28 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 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" @@ -21,31 +31,26 @@ /* $ModDesc: Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING */ -DEFINE_HANDLER2(lwbNickHandler, bool, const char*, size_t); - - /*,m_reverse_additionalUp[256];*/ -static unsigned char m_reverse_additional[256],m_additionalMB[256],m_additionalUtf8[256],m_additionalUtf8range[256]; - -void SearchAndReplace(std::string& newline, const std::string &find, const std::string &replace) +class lwbNickHandler : public HandlerBase2 { - std::string::size_type x = newline.find(find); - while (x != std::string::npos) - { - newline.erase(x, find.length()); - newline.insert(x, replace); - x = newline.find(find); - } -} + public: + lwbNickHandler() { } + virtual ~lwbNickHandler() { } + virtual bool Call(const char*, size_t); +}; + /*,m_reverse_additionalUp[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; tmp191)) + /* & is faster! -- Phoenix (char & b11000000 == b10000000) */ + if ((*tmp & 192) != 128) return -1; } - return cnt+1; + return cnt + 1; } @@ -55,12 +60,12 @@ char utf8size(unsigned char * mb) return -1; if (!(*mb & 128)) return 1; - if ((*mb & 224)==192) - return utf8checkrest(mb+1,1); - if ((*mb & 240)==224) - return utf8checkrest(mb+1,2); - if ((*mb & 248)==240) - return utf8checkrest(mb+1,3); + if ((*mb & 224) == 192) + return utf8checkrest(mb + 1,1); + if ((*mb & 240) == 224) + return utf8checkrest(mb + 1,2); + if ((*mb & 248) == 240) + return utf8checkrest(mb + 1,3); return -1; } @@ -78,18 +83,19 @@ bool lwbNickHandler::Call(const char* n, size_t max) /* 1.1. 16bit char. areas, e.g. chinese:*/ /* if current character is the last, we DO NOT check it against multibyte table */ - /* if there are mbtable ranges, use ONLY them. No 8bit at all */ + /* if there are mbtable ranges, use ONLY them. No 8bit at all */ if (i[1] && m_additionalMB[0]) { /* otherwise let's take a look at the current character and the following one */ - bool found=false; - for(unsigned char * mb=m_additionalMB; (*mb) && (mb=mb[0]) && (i[0]<=mb[1]) && (i[1]>=mb[2]) && (i[1]<=mb[3]) ) + if ( (i[0] >= mb[0]) && (i[0] <= mb[1]) && (i[1] >= mb[2]) && (i[1] <= mb[3]) ) { /* multibyte range character found */ - i++;p++; - found=true; + i++; + p++; + found = true; break; } } @@ -102,72 +108,101 @@ bool lwbNickHandler::Call(const char* n, size_t max) } /* 2. 8bit character support */ - - if ( ((*i >= 'A') && (*i <= '}')) - || m_reverse_additional[(unsigned char)*i]) - { + if (((*i >= 'A') && (*i <= '}')) || m_reverse_additional[(unsigned char)*i]) /* "A"-"}" can occur anywhere in a nickname */ continue; - } if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i > n)) - { /* "0"-"9", "-" can occur anywhere BUT the first char of a nickname */ continue; - } /* 3.1. Check against a simple UTF-8 characters enumeration */ - char cursize,ncursize; /*size of a current character*/ - 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) + if (ncursize != -1) { - bool found=false; - for(unsigned char * mb=m_additionalUtf8; - (utf8size(mb)!=-1) && (mb and . - Also char. is to be checked if it is a valid UTF-8 one */ - found=false; - for(unsigned char * mb=m_additionalUtf8range; - (utf8size(mb)!=-1) && (mb 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! */ - if ((cursize!=ncursize)||(!mb[cursize])) + cursize = utf8size(mb); + /* Size differs (or lengthbyte is zero)? Pick the next! */ + if ((cursize != ncursize) || (!mb[cursize])) continue; - unsigned char uright[5]={0,0,0,0,0}; - strncpy((char *)uright,(char *)mb, cursize); + unsigned char uright[5] = {0,0,0,0,0}, range = mb[cursize] - 1; + strncpy((char* ) uright, (char *) mb, cursize); + + for (int temp = cursize - 1; (temp >= 0) && range; --temp) + { + /* 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; + } + } - if((uright[cursize-1]+mb[cursize]-1>0xff) && (cursize!=1)) + if ((strncmp(i, (char *) mb, cursize) >= 0) && (strncmp(i, (char *) uright, cursize) <= 0)) { - uright[cursize-2]+=1; + i += cursize - 1; + p += cursize - 1; + found = true; + break; } - uright[cursize-1]=(uright[cursize-1]+mb[cursize]-1) % 0x100; + } + 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); - if ((strncmp(i,(char *)mb,cursize)>=0) && (strncmp(i,(char *)uright,cursize)<=0)) + 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; + i += cursize - 1; + p += cursize - 1; + found = true; break; } } @@ -186,219 +221,231 @@ bool lwbNickHandler::Call(const char* n, size_t max) class ModuleNationalChars : public Module { - private: - InspIRCd* ServerInstance; - lwbNickHandler * myhandler; - std::string charset,casemapping; - unsigned char m_additional[256],m_additionalUp[256],m_lower[256], m_upper[256]; - caller2 * rememberer; - bool forcequit; - const unsigned char * lowermap_rememberer; - public: - ModuleNationalChars(InspIRCd* Me) - : Module(Me) - { - rememberer=(caller2 *) malloc(sizeof(rememberer)); - lowermap_rememberer=national_case_insensitive_map; - 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, ""); - } + private: + lwbNickHandler myhandler; + std::string charset, casemapping; + unsigned char m_additional[256], m_additionalUp[256], m_lower[256], m_upper[256]; + caller2 rememberer; + bool forcequit; + const unsigned char * lowermap_rememberer; + unsigned char prev_map[256]; + + void CheckRehash() + { + // See if anything changed + if (!memcmp(prev_map, national_case_insensitive_map, sizeof(prev_map))) + return; - virtual void On005Numeric(std::string &output) - { - std::string tmp(casemapping); - tmp.insert(0,"CASEMAPPING="); - SearchAndReplace(output,"CASEMAPPING=rfc1459",tmp); - } + memcpy(prev_map, national_case_insensitive_map, sizeof(prev_map)); + + ServerInstance->RehashUsersAndChans(); + + // The OnGarbageCollect() method in m_watch rebuilds the hashmap used by it + Module* mod = ServerInstance->Modules->Find("m_watch.so"); + if (mod) + mod->OnGarbageCollect(); - virtual void OnRehash(User* user, const std::string ¶meter) + // Send a Request to m_spanningtree asking it to rebuild its hashmaps + mod = ServerInstance->Modules->Find("m_spanningtree.so"); + if (mod) { - 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); - CheckForceQuit("National character set changed"); - delete conf; + Request req(this, mod, "rehash"); + req.Send(); } + } - void CheckForceQuit(const char * message) - { - if (!forcequit) - return; + public: + ModuleNationalChars() + : rememberer(ServerInstance->IsNick), lowermap_rememberer(national_case_insensitive_map) + { + memcpy(prev_map, national_case_insensitive_map, sizeof(prev_map)); + } - std::vector purge; - std::vector::iterator iter; - purge.clear(); - for (iter=ServerInstance->Users->local_users.begin();iter!=ServerInstance->Users->local_users.end();++iter) - { - if (!ServerInstance->IsNick((*iter)->nick.c_str(), ServerInstance->Config->Limits.NickMax)) - purge.push_back(*iter); - } - for (iter=purge.begin();iter!=purge.end();++iter) - { - ServerInstance->Users->QuitUser((*iter), message); - } - } - virtual ~ModuleNationalChars() + void init() + { + memcpy(m_lower, rfc_case_insensitive_map, 256); + national_case_insensitive_map = m_lower; + + ServerInstance->IsNick = &myhandler; + + Implementation eventlist[] = { I_OnRehash, I_On005Numeric }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + OnRehash(NULL); + } + + virtual void On005Numeric(std::string &output) + { + std::string tmp(casemapping); + tmp.insert(0, "CASEMAPPING="); + SearchAndReplace(output, std::string("CASEMAPPING=rfc1459"), tmp); + } + + virtual void OnRehash(User* user) + { + 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"); + CheckRehash(); + } + + void CheckForceQuit(const char * message) + { + if (!forcequit) + return; + + for (LocalUserList::const_iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter) { - delete myhandler; - ServerInstance->IsNick= *rememberer; - free(rememberer); - national_case_insensitive_map=lowermap_rememberer; - CheckForceQuit("National characters module unloaded"); + /* Fix by Brain: Dont quit UID users */ + User* n = *iter; + if (!isdigit(n->nick[0]) && !ServerInstance->IsNick(n->nick.c_str(), ServerInstance->Config->Limits.NickMax)) + ServerInstance->Users->QuitUser(n, message); } + } - virtual Version GetVersion() + virtual ~ModuleNationalChars() + { + ServerInstance->IsNick = rememberer; + national_case_insensitive_map = lowermap_rememberer; + CheckForceQuit("National characters module unloaded"); + CheckRehash(); + } + + virtual Version GetVersion() + { + 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).*/ + void makereverse(unsigned char * from, unsigned char * to, unsigned int cnt) + { + memset(to, 0, cnt); + for(unsigned char * n=from; (*n) && ((*n)Logs->Log("m_nationalchars",DEFAULT,"loadtables() called for missing file: %s", filename.c_str()); + return; } - /*make an array to check against it 8bit characters a bit faster. Whether allowed or uppercase (for your needs).*/ - - void makereverse(unsigned char * from, unsigned char * to, unsigned int cnt) + for (unsigned char n=0; n< cnt; n++) { - memset(to, 0, cnt); - for(unsigned char * n=from; (*n) && ((*n)Logs->Log("m_nationalchars",DEFAULT,"loadtables() called for missing file: %s", filename.c_str()); + ServerInstance->Logs->Log("m_nationalchars",DEFAULT,"loadtables() called for illegal file: %s (line %d)", filename.c_str(), n+1); return; } + } - unsigned char n; - for (n=0;n= 'a') + current = current - 'a' + 10; + else + current = current - '0'; + tmp+=current; + t++; + } + return tmp; + } - for (n=0;nLogs->Log("m_nationalchars",DEFAULT,"loadtables() called for illegal file: %s (line %d)", filename.c_str(), n+1); - return; - } - } - /* ServerInstance->Logs->Log("m_nationalchars",DEFAULT,"loadtables() : %s", ((char *)national_case_insensitive_map)+1);*/ + int loadtable(std::ifstream &ifs , unsigned char *chartable, unsigned int maxindex) + { + std::string buf; + getline(ifs, buf); - makereverse(m_additional, m_reverse_additional, sizeof(m_additional)); - /* Do you need faster access to additional 8bit uppercase table? No? Oh, sorry :( Let's comment this out */ - /* makereverse(m_additionalUp, m_reverse_additionalUp, sizeof(m_additional)); */ - } + unsigned int i = 0; + int fail = 0; - unsigned char symtoi(const char *t,unsigned char base) - /* base = 16 for hexadecimal, 10 for decimal, 8 for octal ;) */ - { - unsigned char tmp=0,current; - while ((*t)&&(*t!=' ')&&(*t!=13)&&(*t!=10)&&(*t!=',')) - { - tmp*=base; - current=ascii_case_insensitive_map[(unsigned char)*t]; - if (current>='a') - current=current-'a'+10; - else - current=current-'0'; - tmp+=current; - t++; - } - return tmp; - } + buf.erase(buf.find_last_not_of("\n") + 1); - int loadtable(std::ifstream &ifs , unsigned char *chartable, unsigned int maxindex) + if (buf[0] == '.') /* simple plain-text string after dot */ { - std::string buf; - getline(ifs, buf); - - unsigned int i=0; - int fail=0; + i = buf.size() - 1; - buf.erase(buf.find_last_not_of("\n")+1); + if (i > (maxindex + 1)) + i = maxindex + 1; - if (buf[0]=='.') /* simple plain-text string after dot */ - { - i=buf.size()-1; - if (i>(maxindex+1)) i=maxindex+1; - memcpy(chartable,buf.c_str()+1,i); - } - else + memcpy(chartable, buf.c_str() + 1, i); + } + else + { + const char * p = buf.c_str(); + while (*p) { - const char * p=buf.c_str(); - while (*p) + if (i > maxindex) + { + fail = 1; + break; + } + + if (*p != '\'') /* decimal or hexadecimal char code */ { - if (i>maxindex) + if (*p == '0') { - fail=1; - break; + if (p[1] == 'x') + /* hex with the leading "0x" */ + chartable[i] = symtoi(p + 2, 16); + else + chartable[i] = symtoi(p + 1, 8); } - - if (*p!='\'')/* decimal or hexadecimal char code */ + /* hex form */ + else if (*p == 'x') { - if (*p=='0') - { - if (p[1]=='x') - /* hex with the leading "0x" */ - chartable[i] = symtoi(p+2,16); - else - chartable[i] = symtoi(p+1,8); - } - /* hex form */ - else if (*p=='x') - { - chartable[i] = symtoi(p+1,16); - }else /* decimal form */ - { - chartable[i] = symtoi(p,10); - } - } else /* plain-text char between '' */ + chartable[i] = symtoi(p + 1, 16); + }else /* decimal form */ { - if (*(p+1)=='\\') - { - chartable[i] = *(p+2); - p+=3; - }else - { - chartable[i] = *(p+1); - p+=2; - } + chartable[i] = symtoi(p, 10); } - - while (*p&& (*p!=',')&&(*p!=' ')&&(*p!=13)&&(*p!=10) ) p++; - while (*p&&((*p==',')||(*p==' ')||(*p==13)||(*p==10))) p++; - - i++; - } + else /* plain-text char between '' */ + { + if (*(p + 1) == '\\') + { + chartable[i] = *(p + 2); + p += 3; + }else + { + chartable[i] = *(p + 1); + p += 2; + } + } + while (*p && (*p != ',') && (*p != ' ') && (*p != 13) && (*p != 10)) + p++; + while (*p && ((*p == ',') || (*p == ' ') || (*p == 13) || (*p == 10))) + p++; + i++; } - - return fail; } - + return fail; + } }; MODULE_INIT(ModuleNationalChars)