Changeset 167

Timestamp:

07/04/08 14:36:58 (5 months ago)

Author:

cyrusdaboo

Message:

Parse out the user:password portion of http URLs. This will allow us to set user ids in
web calendar URLs to allow keychain based logins to work properly.

Location:

Mulberry/branches/v4.1d1/Sources_Common/Mail/URLs

Files:

• CURL.cp (modified) (5 diffs)
• CURL.h (modified) (2 diffs)

Mulberry/branches/v4.1d1/Sources_Common/Mail/URLs/CURL.cp

@@ -209 +209 @@
                 // Look for server
                 const char* p = ::strchr(temp.c_str(), '/');
+                cdstring host;
                 if (p == NULL)
-                        mServer = temp;
+                {
+                        host = temp;
+                }
                 else
                 {
@@ -216 +219 @@
                         if (punt_size != 0)
                         {
-                                mServer.assign(temp, 0, punt_size);
+                                host.assign(temp, 0, punt_size);
                                 temp.erase(0, punt_size);
                         }
@@ -224 +227 @@
                                 mPath.DecodeURL();
                 }
+                
+                // Now decode user:password@server
+                p = ::strchr(host.c_str(), '@');
+                cdstring userpswd;
+                if (p == NULL)
+                {
+                        mServer = host;
+                }
+                else
+                {
+                        punt_size = p - host.c_str();
+                        if (punt_size != 0)
+                        {
+                                userpswd.assign(host, 0, punt_size);
+                                host.erase(0, punt_size+1);
+                        }
+                        mServer = host;
+                        
+                        p = ::strchr(userpswd.c_str(), ':');
+                        if (p == NULL)
+                        {
+                                mUser = userpswd;
+                        }
+                        else
+                        {
+                                punt_size = p - userpswd.c_str();
+                                if (punt_size != 0)
+                                {
+                                        mUser.assign(userpswd, 0, punt_size);
+                                        userpswd.erase(0, punt_size+1);
+                                }
+                                
+                                mPassword = userpswd;
+                        }
+                }
                 break;
         }
@@ -251 +289 @@
         {
                 result += mScheme;
+                switch(mSchemeType)
+                {
+                case eHTTP:
+                case eHTTPS:
+                case eWebcal:
+                {
+                        if (!mUser.empty())
+                        {
+                                result += mUser;
+                                if (!mPassword.empty())
+                                {
+                                        result += ":";
+                                        result += mPassword;
+                                }
+                                result += "@";
+                        }
+                }
+                default:;
+                }
                 result += mServer;
         }
@@ -276 +333 @@
         // Compare each component
         if (mScheme.compare(comp.mScheme, true) != 0)
+                return false;
+        
+        if (mUser.compare(comp.mUser, true) != 0)
+                return false;
+        
+        if (mPassword.compare(comp.mPassword, true) != 0)
                 return false;
         

Mulberry/branches/v4.1d1/Sources_Common/Mail/URLs/CURL.h

@@ -109 +109 @@
         }
         
+        const cdstring& User() const
+        {
+                return mUser;
+        }
+        
+        const cdstring& Password() const
+        {
+                return mPassword;
+        }
+        
         const cdstring& Server() const
         {
@@ -132 +142 @@
         EScheme         mSchemeType;
         cdstring        mScheme;
+        cdstring        mUser;
+        cdstring        mPassword;
         cdstring        mServer;
         cdstring        mPath;