iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

WebMods/HTTPSock: Do not send Set-Cookie headers if the cookie has not changed.

Browse Source 
To achieve that, split internal cookie jar into a jar for received cookies
and one for cookies that are to be sent with the response.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1840 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
cflakes
2010-03-23 16:48:25 +00:00
parent bf5e56c04f
commit 4daa637130
4 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
WebModules.cpp
View File

@@ -483,20 +483,20 @@ bool CWebSock::ForceLogin() {
return false;
}
CString CWebSock::GetCookie(const CString& sKey) const {
CString CWebSock::GetRequestCookie(const CString& sKey) const {
if (!m_sModName.empty()) {
return CHTTPSock::GetCookie("Mod::" + m_sModName + "::" + sKey);
return CHTTPSock::GetRequestCookie("Mod::" + m_sModName + "::" + sKey);
}
return CHTTPSock::GetCookie(sKey);
return CHTTPSock::GetRequestCookie(sKey);
}
bool CWebSock::SetCookie(const CString& sKey, const CString& sValue) {
bool CWebSock::SendCookie(const CString& sKey, const CString& sValue) {
if (!m_sModName.empty()) {
return CHTTPSock::SetCookie("Mod::" + m_sModName + "::" + sKey, sValue);
return CHTTPSock::SendCookie("Mod::" + m_sModName + "::" + sKey, sValue);
}
return CHTTPSock::SetCookie(sKey, sValue);
return CHTTPSock::SendCookie(sKey, sValue);
}
void CWebSock::OnPageRequest(const CString& sURI) {
@@ -516,10 +516,8 @@ void CWebSock::OnPageRequest(const CString& sURI) {
}
CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CString& sPageRet) {
bool bNoCookie = (GetCookie("SessionId").empty());
m_spSession = GetSession();
SetCookie("SessionId", m_spSession->GetId());
SendCookie("SessionId", m_spSession->GetId());
if (m_spSession->IsLoggedIn()) {
m_sUser = m_spSession->GetUser()->GetUserName();
@@ -528,7 +526,7 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS
// Handle the static pages that don't require a login
if (sURI == "/") {
if(!m_bLoggedIn && GetParam("cookie_check").ToBool() && bNoCookie) {
if(!m_bLoggedIn && GetParam("cookie_check").ToBool() && GetRequestCookie("SessionId").empty()) {
m_spSession->AddError("Your browser does not have cookies enabled for this site!");
}
return PrintTemplate("index", sPageRet);
@@ -657,12 +655,13 @@ CSmartPtr<CWebSession> CWebSock::GetSession() {
return m_spSession;
}
CSmartPtr<CWebSession> *pSession = m_mspSessions.GetItem(GetCookie("SessionId"));
const CString sCookieSessionId = GetRequestCookie("SessionId");
CSmartPtr<CWebSession> *pSession = m_mspSessions.GetItem(sCookieSessionId);
if (pSession != NULL) {
// Refresh the timeout
m_mspSessions.AddItem((*pSession)->GetId(), *pSession);
DEBUG("Found existing session from cookie: [" + GetCookie("SessionId") + "] IsLoggedIn(" + CString((*pSession)->IsLoggedIn() ? "true" : "false") + ")");
DEBUG("Found existing session from cookie: [" + sCookieSessionId + "] IsLoggedIn(" + CString((*pSession)->IsLoggedIn() ? "true" : "false") + ")");
return *pSession;
}