pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-02 19:43:13 +02:00
Code Activity

Deduplicate code for checking if a user is securely connected.

Browse Source
This commit is contained in:
Sadie Powell
2021-08-01 19:23:48 +01:00
parent 561b205c4a
commit e7e8447fa3
5 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/users.h
+5
View File
@@ -226,6 +226,11 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
*/
bool IsRecognized(bool check_secure = true) const;
/** Check if the user is connected securely.
* @return True if the user is connected securely; otherwise, false.
*/
bool IsSecurelyConnected() const;
/** Check if the user is a services oper
* @return true if they are an oper
*/
modules/commands/cs_enforce.cpp
+1 -1
View File
@@ -119,7 +119,7 @@ class CommandCSEnforce : public Command
if (user->IsProtected())
continue;
if (!user->HasMode("SSL") && !user->HasExt("ssl"))
if (!user->IsSecurelyConnected())
users.push_back(user);
}
modules/commands/ns_ajoin.cpp
+1 -1
View File
@@ -356,7 +356,7 @@ class NSAJoin : public Module
continue;
else if (c->HasMode("ADMINONLY") && !u->HasMode("ADMIN"))
continue;
else if (c->HasMode("SSL") && !(u->HasMode("SSL") || u->HasExt("ssl")))
else if (c->HasMode("SSL") && !u->IsSecurelyConnected())
continue;
else if (c->MatchesList(u, "BAN") == true && c->MatchesList(u, "EXCEPT") == false)
need_invite = true;
modules/extra/stats/irc2sql/irc2sql.cpp
+2 -2
View File
@@ -107,7 +107,7 @@ void IRC2SQL::OnUserConnect(User *u, bool &exempt)
query.SetValue("ip", u->ip.addr());
query.SetValue("ident", u->GetIdent());
query.SetValue("vident", u->GetVIdent());
query.SetValue("secure", u->HasMode("SSL") || u->HasExt("ssl") ? "Y" : "N");
query.SetValue("secure", u->IsSecurelyConnected() ? "Y" : "N");
query.SetValue("account", u->Account() ? u->Account()->display : "");
query.SetValue("fingerprint", u->fingerprint);
query.SetValue("signon", u->signon);
@@ -152,7 +152,7 @@ void IRC2SQL::OnUserAway(User *u, const Anope::string &message)
void IRC2SQL::OnFingerprint(User *u)
{
query = "UPDATE `" + prefix + "user` SET secure=@secure@, fingerprint=@fingerprint@ WHERE nick=@nick@";
query.SetValue("secure", u->HasMode("SSL") || u->HasExt("ssl") ? "Y" : "N");
query.SetValue("secure", u->IsSecurelyConnected() ? "Y" : "N");
query.SetValue("fingerprint", u->fingerprint);
query.SetValue("nick", u->nick);
this->RunQuery(query);
src/users.cpp
+5
View File
@@ -448,6 +448,11 @@ bool User::IsRecognized(bool check_secure) const
return on_access;
}
bool User::IsSecurelyConnected() const
{
return HasMode("SSL") || HasExt("ssl");
}
bool User::IsServicesOper()
{
if (!this->nc || !this->nc->IsServicesOper())