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

Fixed an issue identified by Un1matr1x: If you were running two 0.090 ZNCs on the same IP,

Browse Source 
(but different ports), any web login session from ZNC #1 would overwrite the session from
ZNC #2. While doing this, also removed an unnecessary check in CHTTPSock::SendCookie and
CHTTPSock::GetRequestCookies (which doesn't transparently translate cookie names and has
never been used so far).


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2030 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
cflakes
2010-06-19 19:07:24 +00:00
parent b2f564aeaf
commit 114bb25aa8
4 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HTTPSock.cpp
+1 -9
View File
@@ -43,21 +43,13 @@ void CHTTPSock::ReadData(const char* data, size_t len) {
bool CHTTPSock::SendCookie(const CString& sKey, const CString& sValue) {
if (!sKey.empty() && !sValue.empty()) {
if (m_msRequestCookies.find(sKey) == m_msRequestCookies.end() ||
m_msRequestCookies[sKey].StrCmp(sValue) != 0)
{
m_msResponseCookies[sKey] = sValue;
}
m_msResponseCookies[sKey] = sValue;
return true;
}
return false;
}
const MCString& CHTTPSock::GetRequestCookies() const {
return m_msRequestCookies;
}
CString CHTTPSock::GetRequestCookie(const CString& sKey) const {
MCString::const_iterator it = m_msRequestCookies.find(sKey);
HTTPSock.h
-1
View File
@@ -52,7 +52,6 @@ public:
void GetPage();
// Cookies
const MCString& GetRequestCookies() const;
CString GetRequestCookie(const CString& sKey) const;
bool SendCookie(const CString& sKey, const CString& sValue);
// Cookies
WebModules.cpp
+9 -5
View File
@@ -458,25 +458,29 @@ bool CWebSock::ForceLogin() {
return false;
}
CString CWebSock::GetRequestCookie(const CString& sKey) const {
CString CWebSock::GetRequestCookie(const CString& sKey) {
const CString sPrefixedKey = CString(GetLocalPort()) + "-" + sKey;
CString sRet;
if (!m_sModName.empty()) {
sRet = CHTTPSock::GetRequestCookie("Mod::" + m_sModName + "::" + sKey);
sRet = CHTTPSock::GetRequestCookie("Mod-" + m_sModName + "-" + sPrefixedKey);
}
if (sRet.empty()) {
return CHTTPSock::GetRequestCookie(sKey);
return CHTTPSock::GetRequestCookie(sPrefixedKey);
}
return sRet;
}
bool CWebSock::SendCookie(const CString& sKey, const CString& sValue) {
const CString sPrefixedKey = CString(GetLocalPort()) + "-" + sKey;
if (!m_sModName.empty()) {
return CHTTPSock::SendCookie("Mod::" + m_sModName + "::" + sKey, sValue);
return CHTTPSock::SendCookie("Mod-" + m_sModName + "-" + sPrefixedKey, sValue);
}
return CHTTPSock::SendCookie(sKey, sValue);
return CHTTPSock::SendCookie(sPrefixedKey, sValue);
}
void CWebSock::OnPageRequest(const CString& sURI) {
WebModules.h
+1 -1
View File
@@ -154,7 +154,7 @@ public:
size_t GetAvailSkins(vector<CFile>& vRet);
CString GetSkinName();
CString GetRequestCookie(const CString& sKey) const;
CString GetRequestCookie(const CString& sKey);
bool SendCookie(const CString& sKey, const CString& sValue);
static void FinishUserSessions(const CUser& User) {