adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-02 16:02:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't use the same or overlapping NickPrefix as StatusPrefix in the crypt module

Browse Source 
Don't use a key which is a valid nickname, now changed to "@nick-prefix@" instead.
If you had loaded the crypt module before, the old settings will be converted.

Also check if the nick-prefix and status-prefix aren't the same or overlapping, "*" or "." are then used depending on either value. If they would be the same, you would be messaging a module instead of a user.
And if they'd overlap, depending on the nick, you could be messaging a module as well.
This commit is contained in:
Cizzle
2017-02-22 16:25:08 +01:00
committed by Alexey Sokolov
parent 96dcde4329
commit fc450cb486
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/crypt.cpp
+29 -2
View File
@@ -45,12 +45,26 @@
#include <znc/IRCNetwork.h>
#define REQUIRESSL 1
#define NICK_PREFIX_KEY "[nick-prefix]"
// To be removed in future versions
#define NICK_PREFIX_OLD_KEY "[nick-prefix]"
#define NICK_PREFIX_KEY "@nick-prefix@"
class CCryptMod : public CModule {
CString NickPrefix() {
MCString::iterator it = FindNV(NICK_PREFIX_KEY);
return it != EndNV() ? it->second : "*";
/*
* Check for different Prefixes to not confuse modules with nicknames
* Also check for overlap for rare cases like:
* SP = "*"; NP = "*s"; "tatus" sends an encrypted message appearing at "*status"
*/
CString sStatusPrefix = GetUser()->GetStatusPrefix();
if (it != EndNV()) {
size_t sp = sStatusPrefix.size();
size_t np = it->second.size();
if (sStatusPrefix.CaseCmp(it->second, std::min(sp, np)) != 0)
return it->second;
}
return sStatusPrefix.StartsWith("*") ? "." : "*";
}
public:
@@ -69,6 +83,19 @@ class CCryptMod : public CModule {
~CCryptMod() override {}
bool OnLoad(const CString& sArgsi, CString& sMessage) override {
MCString::iterator it = FindNV(NICK_PREFIX_KEY);
if (it == EndNV()) {
/* Don't have the new prefix key yet */
it = FindNV(NICK_PREFIX_OLD_KEY);
if (it != EndNV()) {
SetNV(NICK_PREFIX_KEY, it->second);
DelNV(NICK_PREFIX_OLD_KEY);
}
}
return true;
}
EModRet OnUserMsg(CString& sTarget, CString& sMessage) override {
sTarget.TrimPrefix(NickPrefix());