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

Merge branch '1.6.x'

Browse Source
This commit is contained in:
Alexey Sokolov
2015-04-16 20:32:58 +01:00
parent 0b205db494 7c64eba693
commit 7719213ea6
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/WebModules.cpp
View File

@@ -161,7 +161,9 @@ void CWebAuth::AcceptedLogin(CUser& User) {
m_pWebSock->SetLoggedIn(true);
m_pWebSock->UnPauseRead();
if (!m_bBasic) {
if (m_bBasic) {
m_pWebSock->ReadLine("");
} else {
m_pWebSock->Redirect("/?cookie_check=true");
}
@@ -178,7 +180,13 @@ void CWebAuth::RefusedLogin(const CString& sReason) {
m_pWebSock->SetLoggedIn(false);
m_pWebSock->UnPauseRead();
m_pWebSock->Redirect("/?cookie_check=true");
if (m_bBasic) {
m_pWebSock->AddHeader("WWW-Authenticate", "Basic realm=\"ZNC\"");
m_pWebSock->CHTTPSock::PrintErrorPage(401, "Unauthorized", "HTTP Basic authentication attemped with invalid credentials");
// Why CWebSock makes this function protected?..
} else {
m_pWebSock->Redirect("/?cookie_check=true");
}
DEBUG("UNSUCCESSFUL login attempt ==> REASON [" + sReason + "] ==> SESSION [" + spSession->GetId() + "]");
}