lib-imap: imap-url: Forgot to check for the presence of ':' in userinfo, which is...

diff --git a/src/lib-imap/imap-url.c b/src/lib-imap/imap-url.c
index 911d1d26be8412d547ebbbfbbaae76aed121a79a..1983b661e82e515b93af70ee59bb566cb1a091a4 100644 (file)
--- a/src/lib-imap/imap-url.c
+++ b/src/lib-imap/imap-url.c
@@ -226,34 +226,49 @@ static int imap_url_parse_iserver(struct imap_url_parser *url_parser)
 
        /* iuserinfo        = enc-user [iauth] / [enc-user] iauth */
        if (auth.enc_userinfo != NULL) {
-               const char *p;
+               const char *p, *uend;
 
                /* Scan for ";AUTH=" */
-               p = strchr(auth.enc_userinfo, ';');
-               if (p != NULL) {
-                       if (strncasecmp(p, ";AUTH=",6) != 0) {
+               for (p = auth.enc_userinfo; *p != '\0'; p++) {
+                       if (*p == ';')
+                               break;
+                       /* check for unallowed userinfo characters */
+                       if (*p == ':') {
+                               parser->error = t_strdup_printf(
+                                       "Stray ':' in userinfo `%s'", auth.enc_userinfo);
+                               return -1;
+                       }
+               }
+
+               uend = p;
+
+               if (*p == ';') {
+                       if (strncasecmp(p, ";AUTH=", 6) != 0) {
                                parser->error = t_strdup_printf(
                                        "Stray ';' in userinfo `%s'",
                                        auth.enc_userinfo);
                                return -1;
                        }
 
-                       if (strchr(p+1, ';') != NULL) {
-                               parser->error = "Stray ';' after `;AUTH='";
-                               return -1;
+                       for (p += 6; *p != '\0'; p++) {
+                               if (*p == ';' || *p == ':') {
+                                       parser->error = t_strdup_printf(
+                                               "Stray '%c' in userinfo `%s'", *p, auth.enc_userinfo);
+                                       return -1;
+                               }
                        }
                }
 
                /* enc-user */
-               if (url != NULL && p != auth.enc_userinfo) {
-                       if (!uri_data_decode(parser, auth.enc_userinfo, p, &data))
+               if (url != NULL && uend > auth.enc_userinfo) {
+                       if (!uri_data_decode(parser, auth.enc_userinfo, uend, &data))
                                return -1;
                        url->userid = p_strdup(parser->pool, data);
                }
 
                /* ( "*" / enc-auth-type ) */
-               if (p != NULL) {
-                       p += 6;
+               if (*uend == ';') {
+                       p = uend + 6;
                        if (*p == '\0') {
                                parser->error = "Empty auth-type value after ';AUTH='";
                                return -1;
@@ -989,10 +1004,10 @@ const char *imap_url_create(const struct imap_url *url)
        /* user */
        if (url->userid != NULL || url->auth_type != NULL) {
                if (url->userid != NULL)
-                       uri_append_user_data(urlstr, ";", url->userid);
+                       uri_append_user_data(urlstr, ";:", url->userid);
                if (url->auth_type != NULL) {
                        str_append(urlstr, ";AUTH=");
-                       uri_append_user_data(urlstr, ";", url->auth_type);
+                       uri_append_user_data(urlstr, ";:", url->auth_type);
                }
                str_append_c(urlstr, '@');
        }

diff --git a/src/lib-imap/test-imap-url.c b/src/lib-imap/test-imap-url.c
index fda7aee03e8a5e865a318ee447be8c43f1fe072e..e6c027792adef91346ecf6cfaf6e51bab63af5d1 100644 (file)
--- a/src/lib-imap/test-imap-url.c
+++ b/src/lib-imap/test-imap-url.c
@@ -758,6 +758,10 @@ struct invalid_imap_url_test invalid_url_tests[] = {
                .url = "imap://user;AUTH=frop;friep@example.com"
        },{
                .url = "imap://user;AUTH=@example.com"
+       },{
+               .url = "imap://user:password@example.com"
+       },{
+               .url = "imap://user;AUTH=A:B@example.com"
        },{
                .url = "imap://user%@example.com"
        },{
@@ -903,6 +907,7 @@ const char *parse_create_url_tests[] = {
 #endif
        "imap://user@host.example.com/",
        "imap://user@host.example.com:993/",
+       "imap://su%3auser@host.example.com/",
        "imap://user;AUTH=PLAIN@host.example.com/",
        "imap://user;AUTH=PLAIN@host.example.com/INBOX",
        "imap://user;AUTH=PLAIN@host.example.com/INBOX/;UID=5",