fix dlen

[citadel.git] / libcitadel / lib / urlhandling.c

diff --git a/libcitadel/lib/urlhandling.c b/libcitadel/lib/urlhandling.c
index 131cafa6ec4efed449a330320a661b8ea4baf7d6..db879dcaf971f3185b574d7cb6580d0039704e3d 100644 (file)
--- a/libcitadel/lib/urlhandling.c
+++ b/libcitadel/lib/urlhandling.c
@@ -1,3 +1,5 @@
+// This program is open source software.  Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
 #include "sysdep.h"
 #include <ctype.h>
 #include <errno.h>
@@ -11,21 +13,15 @@
 #include "libcitadel.h"
 #include <sys/socket.h>
 
-/**
- * @defgroup URLHandling ParsedURL object to handle connection data
- */
-
-/**
- * @ingroup URLHandling
- * @brief frees a linked list of ParsedURL 
- * @param Url (list) of ParsedURL to be freet; Pointer is NULL'ed for the caller.
- */
-void FreeURL(ParsedURL** Url)
-{
+// frees a linked list of ParsedURL 
+// Url (list) of ParsedURL to be freet; Pointer is NULL'ed for the caller.
+void FreeURL(ParsedURL** Url) {
        if (*Url != NULL) {
                FreeStrBuf(&(*Url)->URL);
                FreeStrBuf(&(*Url)->UrlWithoutCred);
                FreeStrBuf(&(*Url)->CurlCreds);
+               FreeStrBuf(&(*Url)->UsrName);
+               FreeStrBuf(&(*Url)->Password);
                if ((*Url)->Next != NULL)
                        FreeURL(&(*Url)->Next);
                free(*Url);
@@ -33,30 +29,23 @@ void FreeURL(ParsedURL** Url)
        }
 }
 
-/**
- * @ingroup URLHandling
- * @brief parses the string provided with UrlStr into *Url
- * @param Url on success this contains the parsed object; needs to be free'd by caller.
- * @param UrlStr String we should parse into parts
- * @param DefaultPort Which is the default port here?
- */
-int ParseURL(ParsedURL **Url, StrBuf *UrlStr, unsigned short DefaultPort)
-{
-       const char *pch, *pEndHost, *pPort, *pCredEnd, *pUserEnd;
+// parses the string provided with UrlStr into *Url
+// Url on success this contains the parsed object; needs to be free'd by caller.
+// UrlStr String we should parse into parts
+// DefaultPort Which is the default port here?
+int ParseURL(ParsedURL **Url, StrBuf *UrlStr, unsigned short DefaultPort) {
+       const char *pch, *pPort, *pCredEnd, *pUserEnd;
        ParsedURL *url = (ParsedURL *)malloc(sizeof(ParsedURL));
        memset(url, 0, sizeof(ParsedURL));
 
        url->af = AF_INET;
        url->Port =  DefaultPort;
-       /*
-        * http://username:passvoid@[ipv6]:port/url 
-        */
-       url->URL = NewStrBufDup(UrlStr);
+       url->URL = NewStrBufDup(UrlStr); // http://username:password@[ipv6]:port/url 
        url->Host = pch = ChrPtr(url->URL);
        url->LocalPart = strchr(pch, '/');
        if (url->LocalPart != NULL) {
                if ((*(url->LocalPart + 1) == '/') && 
-                   (*(url->LocalPart - 1) == ':')) { /* TODO: find default port for this protocol... */
+                   (*(url->LocalPart - 1) == ':')) {
                        url->Host = url->LocalPart + 2;
                        url->LocalPart = strchr(url->Host, '/');
                        if (url->LocalPart != NULL)
@@ -67,14 +56,13 @@ int ParseURL(ParsedURL **Url, StrBuf *UrlStr, unsigned short DefaultPort)
                }
        }
        if (url->LocalPart == NULL) {
-               url->LocalPart = pch + StrLength(url->URL);
+               url->LocalPart = ChrPtr(url->URL) + StrLength(url->URL);
        }
 
-       pCredEnd = strchr(pch, '@');
+       pCredEnd = strrchr(ChrPtr(url->URL), '@');
        if (pCredEnd >= url->LocalPart)
                pCredEnd = NULL;
-       if (pCredEnd != NULL)
-       {
+       if (pCredEnd != NULL) {
                url->User = url->Host;
                url->Host = pCredEnd + 1;
                pUserEnd = strchr(url->User, ':');
@@ -87,9 +75,12 @@ int ParseURL(ParsedURL **Url, StrBuf *UrlStr, unsigned short DefaultPort)
                StrBufPeek(url->URL, pUserEnd, 0, '\0');
                StrBufPeek(url->URL, pCredEnd, 0, '\0');                
        }
+       else
+               pUserEnd = NULL;
        
        pPort = NULL;
        if (*url->Host == '[') {
+               const char *pEndHost;
                url->Host ++;
                pEndHost = strchr(url->Host, ']');
                if (pEndHost == NULL) {
@@ -113,30 +104,40 @@ int ParseURL(ParsedURL **Url, StrBuf *UrlStr, unsigned short DefaultPort)
        }
        if (pPort != NULL)
                url->Port = atol(pPort);
-       if (url->IPv6)
-       {
+       if (url->IPv6) {
            url->IsIP = inet_pton(AF_INET6, url->Host, &url->Addr.sin6_addr);
-           if (url->IsIP)
-           {
+           if (url->IsIP) {
                url->Addr.sin6_port = htons(url->Port);
                url->Addr.sin6_port = AF_INET6;
            }
        }
-       else
-       {
+       else {
            url->IsIP = inet_pton(AF_INET, url->Host, &((struct sockaddr_in *)&(url->Addr))->sin_addr);
-           if (url->IsIP)
-           {
+           if (url->IsIP) {
                ((struct sockaddr_in *)&(url->Addr))->sin_port = htons(url->Port);
                ((struct sockaddr_in *)&(url->Addr))->sin_family = AF_INET;
            }   
-       }       
+       }
+
+       if (url->User != NULL) {
+               url->UsrName = NewStrBufPlain(url->User, pUserEnd - url->User);
+               StrBufUnescape(url->UsrName, 0);
+               url->User = ChrPtr(url->UsrName);
+       }
+
+       if (url->Pass != NULL) {
+               url->Password = NewStrBufPlain(url->Pass, pCredEnd - url->Pass);
+               StrBufUnescape(url->Password, 0);
+               url->Pass = ChrPtr(url->Password);
+       }
+
+       if (*Url != NULL)
+               url->Next = *Url;
        *Url = url;
        return 1;
 }
 
-void CurlPrepareURL(ParsedURL *Url)
-{
+void CurlPrepareURL(ParsedURL *Url) {
        if (!strcmp(ChrPtr(Url->URL), "http"))
                Url->UrlWithoutCred = NewStrBufPlain(ChrPtr(Url->URL), -1);
        else 
@@ -148,12 +149,10 @@ void CurlPrepareURL(ParsedURL *Url)
        StrBufAppendPrintf(Url->UrlWithoutCred, "%u", Url->Port);
 
        StrBufAppendBufPlain(Url->UrlWithoutCred, HKEY("/"), 0);
-       if (Url->LocalPart)
-       {
+       if (Url->LocalPart) {
            StrBufAppendBufPlain(Url->UrlWithoutCred, Url->LocalPart, -1, 0);
        }
-       if (Url->User != NULL)
-       {
+       if (Url->User != NULL) {
                Url->CurlCreds = NewStrBufPlain(Url->User, -1);
                StrBufAppendBufPlain(Url->CurlCreds, HKEY(":"), 0);
                if (Url->Pass != NULL)