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

Honor X-Forwarded-For of HTTP clients not only in web.

Browse Source 
Fix #537
This commit is contained in:
Alexey Sokolov
2014-12-16 10:48:33 +00:00
parent a65954bb72
commit c570b551aa
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/znc/Client.h
View File

@@ -33,14 +33,14 @@ class CClient;
class CAuthBase {
public:
CAuthBase(const CString& sUsername, const CString& sPassword, Csock *pSock) {
CAuthBase(const CString& sUsername, const CString& sPassword, CZNCSock* pSock) {
SetLoginInfo(sUsername, sPassword, pSock);
}
virtual ~CAuthBase() {}
virtual void SetLoginInfo(const CString& sUsername, const CString& sPassword,
Csock *pSock) {
CZNCSock* pSock) {
m_sUsername = sUsername;
m_sPassword = sPassword;
m_pSock = pSock;
@@ -63,9 +63,9 @@ protected:
virtual void RefusedLogin(const CString& sReason) = 0;
private:
CString m_sUsername;
CString m_sPassword;
Csock* m_pSock;
CString m_sUsername;
CString m_sPassword;
CZNCSock* m_pSock;
};

2
include/znc/HTTPSock.h
View File

@@ -56,7 +56,7 @@ public:
void ParseURI();
void GetPage();
static CString GetDate(time_t tm = 0);
virtual CString GetRemoteIP() const;
CString GetRemoteIP() const override;
// Cookies
CString GetRequestCookie(const CString& sKey) const;

1
include/znc/Socket.h
View File

@@ -42,6 +42,7 @@ public:
// Don't fail to compile when ICU is not enabled
void SetEncoding(const CString&) {}
#endif
virtual CString GetRemoteIP() const { return Csock::GetRemoteIP(); }
protected:
// All existing errno codes seem to be in range 1-300

4
modules/bouncedcc.cpp
View File

@@ -57,7 +57,7 @@ public:
// Getters
unsigned short GetUserPort() const { return m_uRemotePort; }
const CString& GetRemoteIP() const { return m_sRemoteIP; }
const CString& GetRemoteAddr() const { return m_sRemoteIP; }
const CString& GetRemoteNick() const { return m_sRemoteNick; }
const CString& GetFileName() const { return m_sFileName; }
CDCCBounce* GetPeer() const { return m_pPeer; }
@@ -105,7 +105,7 @@ public:
if (!(pSock->IsRemote())) {
Table.AddRow();
Table.SetCell("Nick", pSock->GetRemoteNick());
Table.SetCell("IP", pSock->GetRemoteIP());
Table.SetCell("IP", pSock->GetRemoteAddr());
if (pSock->IsChat()) {
Table.SetCell("Type", "Chat");