libtinyrad: updating URL parser to allow empty secret

3 files changed, 59 insertions, 50 deletions

diff --git a/lib/libtinyrad/lurl.c b/lib/libtinyrad/lurl.c
index e0c79b5..139762a 100644
--- a/lib/libtinyrad/lurl.c
+++ b/lib/libtinyrad/lurl.c
@@ -120,7 +120,7 @@ tinyrad_urldesc2str(
    TinyRadDebug(TRAD_DEBUG_ARGS, "   == %s(trudp)", __func__);
    TinyRadDebug(TRAD_DEBUG_ARGS, "   => trudp->trud_host:   %s", trudp->trud_host);
    TinyRadDebug(TRAD_DEBUG_ARGS, "   => trudp->trud_port:   %i", trudp->trud_port);
-   TinyRadDebug(TRAD_DEBUG_ARGS, "   => trudp->trud_secret: %s", trudp->trud_secret);
+   TinyRadDebug(TRAD_DEBUG_ARGS, "   => trudp->trud_secret: %s", (((trudp->trud_secret)) ? trudp->trud_secret : "n/a"));
    TinyRadDebug(TRAD_DEBUG_ARGS, "   => trudp->trud_opts:   0x%04x", trudp->trud_opts);
 
    memset(buff, 0, sizeof(buff));
@@ -162,7 +162,7 @@ tinyrad_urldesc2str(
 
       // add URL secret
       strncat(buff, "/", (sizeof(buff)-strlen(buff)-1));
-      if ( (trudp->trud_opts & TRAD_SCHEME) != TRAD_RADSEC)
+      if ( ((trudp->trud_opts & TRAD_SCHEME) != TRAD_RADSEC) && ((trudp->trud_secret)) )
       {
          len = strlen(buff);
          strncat(buff, trudp->trud_secret, (sizeof(buff)-strlen(buff)-1));
@@ -473,10 +473,10 @@ tinyrad_urldesc_parse_url(
       return(TRAD_EURL);
    if (!(trud_host[0]))
       return(TRAD_EURL);
-   if (!(trud_secret))
-      return(TRAD_EURL);
-   if (!(trud_secret[0]))
-      return(TRAD_EURL);
+
+   if ((trud_secret))
+      if (!(trud_secret[0]))
+         trud_secret = NULL;
 
    if (!(trudpp))
       return(TRAD_SUCCESS);
@@ -492,31 +492,34 @@ tinyrad_urldesc_parse_url(
       return(TRAD_ENOMEM);
    };
 
-   if ((trudp->trud_secret = tinyrad_strdup(trud_secret)) == NULL)
+   if ((trud_secret))
    {
-      tinyrad_urldesc_free(trudp);
-      return(TRAD_ENOMEM);
-   };
-   for(pos = 0; ((trudp->trud_secret[pos])); pos++)
-   {
-      switch(trudp->trud_secret[pos])
+      if ((trudp->trud_secret = tinyrad_strdup(trud_secret)) == NULL)
       {
-         case '+':
-         trudp->trud_secret[pos] = ' ';
-         break;
+         tinyrad_urldesc_free(trudp);
+         return(TRAD_ENOMEM);
+      };
+      for(pos = 0; ((trudp->trud_secret[pos])); pos++)
+      {
+         switch(trudp->trud_secret[pos])
+         {
+            case '+':
+            trudp->trud_secret[pos] = ' ';
+            break;
 
-         case '%':
-         hex[0] = trudp->trud_secret[pos+1];
-         hex[1] = trudp->trud_secret[pos+2];
-         hex[2] = '\0';
-         trudp->trud_secret[pos] = (char)strtol(hex, NULL, 16);
-         for(x = pos+1; ((trudp->trud_secret[x+2])); x++)
+            case '%':
+            hex[0] = trudp->trud_secret[pos+1];
+            hex[1] = trudp->trud_secret[pos+2];
+            hex[2] = '\0';
+            trudp->trud_secret[pos] = (char)strtol(hex, NULL, 16);
+            for(x = pos+1; ((trudp->trud_secret[x+2])); x++)
+               trudp->trud_secret[x] = trudp->trud_secret[x+2];
             trudp->trud_secret[x] = trudp->trud_secret[x+2];
-         trudp->trud_secret[x] = trudp->trud_secret[x+2];
-         break;
+            break;
 
-         default:
-         break;
+            default:
+            break;
+         };
       };
    };
 
@@ -552,7 +555,7 @@ tinyrad_urldesc_resolve(
    TinyRadDebug(TRAD_DEBUG_ARGS, "   == %s(trudp)", __func__);
    TinyRadDebug(TRAD_DEBUG_ARGS, "   => trudp->trud_host:   %s", trudp->trud_host);
    TinyRadDebug(TRAD_DEBUG_ARGS, "   => trudp->trud_port:   %i", trudp->trud_port);
-   TinyRadDebug(TRAD_DEBUG_ARGS, "   => trudp->trud_secret: %s", trudp->trud_secret);
+   TinyRadDebug(TRAD_DEBUG_ARGS, "   => trudp->trud_secret: %s", (((trudp->trud_secret)) ? trudp->trud_secret : "n/a"));
    TinyRadDebug(TRAD_DEBUG_ARGS, "   => trudp->trud_opts:   0x%04x", trudp->trud_opts);
 
    // clear existing sockaddrs
diff --git a/src/tinyrad-url.c b/src/tinyrad-url.c
index 91b4bf0..00d432a 100644
--- a/src/tinyrad-url.c
+++ b/src/tinyrad-url.c
@@ -259,7 +259,7 @@ int my_print_urldesc( TinyRadURLDesc * trudp)
    printf("   scheme:     %s\n", scheme);
    printf("   host:       %s\n", trudp->trud_host);
    printf("   port:       %i\n", trudp->trud_port);
-   printf("   secret:     %s\n", trudp->trud_secret);
+   printf("   secret:     %s\n", (((trudp->trud_secret)) ? trudp->trud_secret : "n/a"));
    printf("   protocol:   %s\n", ((trudp->trud_opts & TRAD_TCP)) ? "tcp" : "udp");
    if ( ((trudp->trud_sockaddrs)) && ((trudp->trud_sockaddrs[0])) )
    {
@@ -299,10 +299,10 @@ void my_usage(void)
    printf("  -r, --resolve                             resolve URLs\n");
    printf("\n");
    printf("URL Syntax:\n");
-   printf("  radius://hostport/secret[?proto]          use RFC2865 (udp/port 1812)\n");
-   printf("  radius-acct://hostport/secret[?proto]     use RFC2866 (udp/port 1813)\n");
-   printf("  radsec://hostport/[?proto]                use RFC6614/RFC7360 (tcp/port 2083)\n");
-   printf("  radius-dynauth://hostport/secret[?proto]  use RFC5176 (udp/port 3799)\n");
+   printf("  radius://hostport/[secret][?proto]         use RFC2865 (udp/port 1812)\n");
+   printf("  radius-acct://hostport/[secret][?proto]    use RFC2866 (udp/port 1813)\n");
+   printf("  radsec://hostport/[?proto]                 use RFC6614/RFC7360 (tcp/port 2083)\n");
+   printf("  radius-dynauth://hostport/[secret][?proto] use RFC5176 (udp/port 3799)\n");
    printf("\n");
    printf("  where:\n");
    printf("     'hostport' is a host name with an optional ':portnumber'\n");
diff --git a/tests/common-url.c b/tests/common-url.c
index 310775a..1f9d62f 100644
--- a/tests/common-url.c
+++ b/tests/common-url.c
@@ -71,48 +71,30 @@ const char * test_urldesc_strs_bad[] =
    "radius:///drowssap",
    "radius:/www.foo.org/drowssap",
    "radius:///www.foo.org/drowssap",
-   "radius://www.foo.org",
-   "radius://www.foo.org/",
    "radius://www.foo.org/?",
-   "radius://www.foo.org/?udp",
-   "radius://www.foo.org/?tcp",
    "radius://www.foo.org/drowssap?",
    "radius://www.foo.org/drowssap?u",
    "radius://www.foo.org:",
-   "radius://www.foo.org:1111",
-   "radius://www.foo.org:1111/",
    "radius://www.foo.org:1111/drowssap?",
    "radius://www.foo.org:1111/drowssap?u",
 
    "radius-acct:///drowssap",
    "radius-acct:/www.foo.org/drowssap",
    "radius-acct:///www.foo.org/drowssap",
-   "radius-acct://www.foo.org",
-   "radius-acct://www.foo.org/",
    "radius-acct://www.foo.org/?",
-   "radius-acct://www.foo.org/?udp",
-   "radius-acct://www.foo.org/?tcp",
    "radius-acct://www.foo.org/drowssap?",
    "radius-acct://www.foo.org/drowssap?u",
    "radius-acct://www.foo.org:",
-   "radius-acct://www.foo.org:1111",
-   "radius-acct://www.foo.org:1111/",
    "radius-acct://www.foo.org:1111/drowssap?",
    "radius-acct://www.foo.org:1111/drowssap?u",
 
    "radius-dynauth:///drowssap",
    "radius-dynauth:/www.foo.org/drowssap",
    "radius-dynauth:///www.foo.org/drowssap",
-   "radius-dynauth://www.foo.org",
-   "radius-dynauth://www.foo.org/",
    "radius-dynauth://www.foo.org/?",
-   "radius-dynauth://www.foo.org/?udp",
-   "radius-dynauth://www.foo.org/?tcp",
    "radius-dynauth://www.foo.org/drowssap?",
    "radius-dynauth://www.foo.org/drowssap?u",
    "radius-dynauth://www.foo.org:",
-   "radius-dynauth://www.foo.org:1111",
-   "radius-dynauth://www.foo.org:1111/",
    "radius-dynauth://www.foo.org:1111/drowssap?",
    "radius-dynauth://www.foo.org:1111/drowssap?u",
 
@@ -136,6 +118,8 @@ const char * test_urldesc_strs_bad[] =
 #pragma mark test_urldesc_strs_desc2str[]
 const char * test_urldesc_strs_desc2str[] =
 {
+   "radius://www.foo.org/",
+   "radius://www.foo.org/?tcp",
    "radius://www.foo.org/drowssap",
    "radius://www.foo.org/drow+ssap",
    "radius://www.foo.org/drow+ssap+",
@@ -144,6 +128,7 @@ const char * test_urldesc_strs_desc2str[] =
    "radius://www.foo.org/drow+ssap?tcp",
    "radius://www.foo.org/drow+ssap+?tcp",
    "radius://www.foo.org/drow+ss%2aap+%2a?tcp",
+   "radius://www.foo.org:1111/",
    "radius://www.foo.org:1111/drowssap",
    "radius://www.foo.org:1111/drow+ssap",
    "radius://www.foo.org:1111/drow+ssap+",
@@ -175,8 +160,11 @@ const char * test_urldesc_strs_desc2str[] =
    "radius://[::1]/drow+ss%2aap+%2a radius://www.foo.org/drow+ss%2aap+%2a",
    "radius://[::1]/drowssap?tcp radius://www.foo.org/drowssap?tcp",
 
+   "radius-acct://www.foo.org/",
+   "radius-acct://www.foo.org/?tcp",
    "radius-acct://www.foo.org/drowssap",
    "radius-acct://www.foo.org/drowssap?tcp",
+   "radius-acct://www.foo.org:1111/",
    "radius-acct://www.foo.org:1111/drowssap",
    "radius-acct://www.foo.org:1111/drowssap?tcp",
    "radius-acct://[::1]/drowssap",
@@ -184,8 +172,11 @@ const char * test_urldesc_strs_desc2str[] =
    "radius-acct://[::1]:1111/drowssap",
    "radius-acct://[::1]:1111/drowssap?tcp",
 
+   "radius-dynauth://www.foo.org/",
+   "radius-dynauth://www.foo.org/?tcp",
    "radius-dynauth://www.foo.org/drowssap",
    "radius-dynauth://www.foo.org/drowssap?tcp",
+   "radius-dynauth://www.foo.org:1111/",
    "radius-dynauth://www.foo.org:1111/drowssap",
    "radius-dynauth://www.foo.org:1111/drowssap?tcp",
    "radius-dynauth://[::1]/drowssap",
@@ -208,11 +199,17 @@ const char * test_urldesc_strs_desc2str[] =
 #pragma mark test_urldesc_strs_good[]
 const char * test_urldesc_strs_good[] =
 {
+   "radius://www.foo.org",
+   "radius://www.foo.org/?udp",
    "radius://www.foo.org/drowssap",
    "radius://www.foo.org/drowssap?tcp",
    "radius://www.foo.org/drowssap?udp",
+   "radius://www.foo.org:1111",
+   "radius://www.foo.org:1111/?udp",
    "radius://www.foo.org:1111/drowssap",
    "radius://www.foo.org:1111/drowssap?tcp",
+   "radius://[::1]",
+   "radius://[::1]/?udp",
    "radius://[::1]/drowssap",
    "radius://[::1]/drowssap?tcp",
    "radius://[::1]/drowssap?udp",
@@ -220,12 +217,18 @@ const char * test_urldesc_strs_good[] =
    "radius://[::1]:1111/drowssap?tcp",
    "radius://[::1]:1111/drowssap?udp",
 
+   "radius-acct://www.foo.org",
+   "radius-acct://www.foo.org/?udp",
    "radius-acct://www.foo.org/drowssap",
    "radius-acct://www.foo.org/drowssap?tcp",
    "radius-acct://www.foo.org/drowssap?udp",
+   "radius-acct://www.foo.org:1111",
+   "radius-acct://www.foo.org:1111/?udp",
    "radius-acct://www.foo.org:1111/drowssap",
    "radius-acct://www.foo.org:1111/drowssap?tcp",
    "radius-acct://www.foo.org:1111/drowssap?udp",
+   "radius-acct://[::1]",
+   "radius-acct://[::1]/?udp",
    "radius-acct://[::1]/drowssap",
    "radius-acct://[::1]/drowssap?tcp",
    "radius-acct://[::1]/drowssap?udp",
@@ -233,9 +236,12 @@ const char * test_urldesc_strs_good[] =
    "radius-acct://[::1]:1111/drowssap?tcp",
    "radius-acct://[::1]:1111/drowssap?udp",
 
+   "radius-dynauth://www.foo.org",
+   "radius-dynauth://www.foo.org/?udp",
    "radius-dynauth://www.foo.org/drowssap",
    "radius-dynauth://www.foo.org/drowssap?tcp",
    "radius-dynauth://www.foo.org/drowssap?udp",
+   "radius-dynauth://www.foo.org:1111",
    "radius-dynauth://www.foo.org:1111/drowssap",
    "radius-dynauth://www.foo.org:1111/drowssap?tcp",
    "radius-dynauth://www.foo.org:1111/drowssap?udp",