Changeset 3332 for pjproject

Timestamp:

Oct 1, 2010 6:43:17 AM (14 years ago)

Author:

bennylp

Message:

Re #1136 (Basic and digest authentication in the HTTP client): fixed error in parsing URL if the path contains at ("@") character

Location:

pjproject/trunk/pjlib-util/src

Files:

• pjlib-util-test/http_client.c (modified) (2 diffs)
• pjlib-util/http_client.c (modified) (3 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util-test/http_client.c

@@ -304 +304 @@
         {"http://:@pjsip.org", PJ_SUCCESS, "", "", "pjsip.org", 80, "/"},
 
+        /* '@' character in username and path */
+        {"http://user@pjsip.org/@", PJ_SUCCESS, "user", "", "pjsip.org", 80, "/@"},
+
+        /* '@' character in path */
+        {"http://pjsip.org/@", PJ_SUCCESS, "", "", "pjsip.org", 80, "/@"},
+
+        /* '@' character in path */
+        {"http://pjsip.org/one@", PJ_SUCCESS, "", "", "pjsip.org", 80, "/one@"},
+
         /* Invalid URL */
         {"http://:", PJ_EINVAL, "", "", "", 0, ""},
@@ -324 +333 @@
         /* Invalid URL */
         {"http://@/", PJ_EINVAL, "", "", "", 0, ""},
+
+        /* Invalid URL */
+        {"http:///@", PJ_EINVAL, "", "", "", 0, ""},
 
         /* Invalid URL */

pjproject/trunk/pjlib-util/src/pjlib-util/http_client.c

@@ -767 +767 @@
 }
 
+/* Get the location of '@' character to indicate the end of
+ * user:passwd part of an URI. If user:passwd part is not
+ * present, NULL will be returned.
+ */
+static char *get_url_at_pos(const char *str, long len)
+{
+    const char *end = str + len;
+    const char *p = str;
+
+    /* skip scheme: */
+    while (p!=end && *p!='/') ++p;
+    if (p!=end && *p=='/') ++p;
+    if (p!=end && *p=='/') ++p;
+    if (p==end) return NULL;
+
+    for (; p!=end; ++p) {
+        switch (*p) {
+        case '/':
+            return NULL;
+        case '@':
+            return (char*)p;
+        }
+    }
+
+    return NULL;
+}
+
+
 PJ_DEF(pj_status_t) pj_http_req_parse_url(const pj_str_t *url, 
                                           pj_http_url *hurl)
@@ -802 +830 @@
         pj_scan_advance_n(&scanner, 3, PJ_FALSE);
 
-        if (pj_memchr(url->ptr, '@', url->slen)) {
+        if (get_url_at_pos(url->ptr, url->slen)) {
             /* Parse username and password */
             pj_scan_get_until_chr(&scanner, ":@", &hurl->username);
@@ -925 +953 @@
      * remove them from the URL.
      */
-    if ((at_pos=pj_strchr(&hreq->url, '@')) != NULL) {
+    if ((at_pos=get_url_at_pos(hreq->url.ptr, hreq->url.slen)) != NULL) {
         pj_str_t tmp;
         char *user_pos = pj_strchr(&hreq->url, '/');