From dbccd1c2611589a74006a9993a64e8adcda58a27 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 19 Jan 2006 10:28:22 +0000
Subject: [PATCH] Applied patch [ 1381420 ] wxHTTP Basic authentication support

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/protocol/http.h |  9 ++++++++-
 src/common/http.cpp        | 39 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index f87227bc38..2f6437e24a 100644
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -2,7 +2,7 @@
 // Name:        http.h
 // Purpose:     HTTP protocol
 // Author:      Guilhem Lavaux
-// Modified by:
+// Modified by: Simo Virokannas (authentication, Dec 2005)
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
@@ -43,6 +43,9 @@ public:
 
   int GetResponse() { return m_http_response; }
 
+  virtual void SetUser(const wxString& user) { m_username = user; }
+  virtual void SetPassword(const wxString& passwd ) { m_password = passwd; }
+
 protected:
   enum wxHTTP_Req
   {
@@ -58,6 +61,8 @@ protected:
   void SendHeaders();
   bool ParseHeaders();
 
+  wxString GenerateAuthString(const wxString& user, const wxString& pass) const;
+
   // find the header in m_headers
   wxHeaderIterator FindHeader(const wxString& header);
   wxHeaderConstIterator FindHeader(const wxString& header) const;
@@ -72,6 +77,8 @@ protected:
   wxSockAddress *m_addr;
   wxString m_post_buf;
   int m_http_response;
+  wxString m_username;
+  wxString m_password;
 
   DECLARE_DYNAMIC_CLASS(wxHTTP)
   DECLARE_PROTOCOL(wxHTTP)
diff --git a/src/common/http.cpp b/src/common/http.cpp
index 600cef4d47..24b6904e2e 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -2,7 +2,7 @@
 // Name:        http.cpp
 // Purpose:     HTTP protocol
 // Author:      Guilhem Lavaux
-// Modified by:
+// Modified by: Simo Virokannas (authentication, Dec 2005)
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
@@ -115,6 +115,38 @@ wxString wxHTTP::GetHeader(const wxString& header) const
     return it == m_headers.end() ? wxGetEmptyString() : it->second;
 }
 
+wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass) const
+{
+    static const char *base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+    wxString buf;
+    wxString toencode;
+
+    buf.Printf(wxT("Basic "));
+
+    toencode.Printf(wxT("%s:%s"),user.c_str(),pass.c_str());
+
+    size_t len = toencode.Length();
+    const wxChar *from = toencode.c_str();
+    while (len >= 3) { // encode full blocks first
+        buf << wxString::Format(wxT("%c%c"), base64[(from[0] >> 2) & 0x3f], base64[((from[0] << 4) & 0x30) | ((from[1] >> 4) & 0xf)]);
+        buf << wxString::Format(wxT("%c%c"), base64[((from[1] << 2) & 0x3c) | ((from[2] >> 6) & 0x3)], base64[from[2] & 0x3f]);
+        from += 3;
+        len -= 3;
+    }
+    if (len > 0) { // pad the remaining characters
+        buf << wxString::Format(wxT("%c"), base64[(from[0] >> 2) & 0x3f]);
+        if (len == 1) {
+            buf << wxString::Format(wxT("%c="), base64[(from[0] << 4) & 0x30]);
+        } else {
+            buf << wxString::Format(wxT("%c%c"), base64[(from[0] << 4) & 0x30] + ((from[1] >> 4) & 0xf), base64[(from[1] << 2) & 0x3c]);
+        }
+        buf << wxString::Format(wxT("="));
+    }
+
+    return buf;
+}
+
 void wxHTTP::SetPostBuffer(const wxString& post_buf)
 {
     m_post_buf = post_buf;
@@ -228,6 +260,11 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     if (GetHeader(wxT("User-Agent")).IsNull())
         SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x"));
 
+    // Send authentication information
+    if (m_username.Length()>0 || m_password.Length()>0) {
+        SetHeader(wxT("Authorization"), GenerateAuthString(m_username, m_password));
+    }
+
     SaveState();
 
     // we may use non blocking sockets only if we can dispatch events from them
-- 
2.45.2