iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-02 11:32:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove a footgun by decreasing the SASL API surface for modules

Browse Source 
Even without the bad vtable of mutex inside shared_ptr, if a module
creates a subclass of CAuthBase, but then unloads, we have the same
problem.
This commit is contained in:
Alexey Sokolov
2025-02-23 09:25:24 +00:00
parent af21753901
commit 4f07558a7d
3 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Client.cpp
View File

@@ -366,8 +366,8 @@ void CClient::AuthUser() {
return;
if (m_sSASLUser.empty()) {
StartPasswordCheck(
std::make_shared<CClientAuth>(this, m_sUser, m_sPass));
m_spAuth = std::make_shared<CClientAuth>(this, m_sUser, m_sPass);
CZNC::Get().AuthUser(m_spAuth);
} else {
// Already logged in, but the user could have been deleted meanwhile.
CUser* pUser = CZNC::Get().FindUser(m_sSASLUser);
@@ -379,8 +379,16 @@ void CClient::AuthUser() {
}
}
void CClient::StartPasswordCheck(std::shared_ptr<CAuthBase> spAuth) {
m_spAuth = spAuth;
/** Username+password auth, which reports success/failure to client via SASL. */
class CClientSASLAuth : public CClientAuth {
public:
using CClientAuth::CClientAuth;
void AcceptedLogin(CUser& User) override;
void RefusedLogin(const CString& sReason) override;
};
void CClient::StartSASLPasswordCheck(const CString& sUser, const CString& sPassword) {
m_spAuth = std::make_shared<CClientSASLAuth>(this, sUser, sPassword);
CZNC::Get().AuthUser(m_spAuth);
}
@@ -415,10 +423,6 @@ void CAuthBase::AcceptLogin(CUser& User) {
Invalidate();
}
std::shared_ptr<CAuthBase> CAuthBase::WrapPointer(CAuthBase* p) {
return std::shared_ptr<CAuthBase>(p);
}
void CAuthBase::RefuseLogin(const CString& sReason) {
if (!m_pSock) return;