Changeset 5893

Timestamp:

03/21/10 03:15:36 (3 years ago)

Author:

jow

Message:

uhttpd: finish basic auth support, read realms from /etc/httpd.conf

Location:

luci/trunk/contrib/package/uhttpd/src

Files:

• uhttpd-utils.c (modified) (3 diffs)
• uhttpd-utils.h (modified) (1 diff)
• uhttpd.c (modified) (6 diffs)
• uhttpd.h (modified) (2 diffs)

luci/trunk/contrib/package/uhttpd/src/uhttpd-utils.c

@@ -483 +483 @@
 static int uh_realm_count = 0;
 
-struct auth_realm * uh_auth_add(
-    char *path, char *realm, char *user, char *pass
-) {
+struct auth_realm * uh_auth_add(char *path, char *user, char *pass)
+{
     struct auth_realm *new = NULL;
     struct passwd *pwd;
@@ -496 +495 @@
 
         memset(new, 0, sizeof(struct auth_realm));
-
-        memcpy(new->realm, realm,
-            min(strlen(realm), sizeof(new->realm) - 1));
 
         memcpy(new->path, path,
@@ -634 +630 @@
             "Content-Length: 23\r\n\r\n"
             "Authorization Required\n",
-                req->version, realm ? realm->realm : ""
+                req->version, cl->server->conf->realm
         );
 

luci/trunk/contrib/package/uhttpd/src/uhttpd-utils.h

@@ -80 +80 @@
 
 
-struct auth_realm * uh_auth_add(
-    char *path, char *realm, char *user, char *pass
-);
+struct auth_realm * uh_auth_add(char *path, char *user, char *pass);
 
 int uh_auth_check(

luci/trunk/contrib/package/uhttpd/src/uhttpd.c

@@ -17 +17 @@
  */
 
+#define _XOPEN_SOURCE 500   /* crypt() */
+
 #include "uhttpd.h"
 #include "uhttpd-utils.h"
@@ -39 +41 @@
 {
     run = 0;
+}
+
+static void uh_config_parse(const char *path)
+{
+    FILE *c;
+    char line[512];
+    char *user = NULL;
+    char *pass = NULL;
+    char *eol  = NULL;
+
+    if( (c = fopen(path ? path : "/etc/httpd.conf", "r")) != NULL )
+    {
+        memset(line, 0, sizeof(line));
+
+        while( fgets(line, sizeof(line) - 1, c) )
+        {
+            if( (line[0] == '/') && (strchr(line, ':') != NULL) )
+            {
+                if( !(user = strchr(line, ':')) || (*user++ = 0) ||
+                    !(pass = strchr(user, ':')) || (*pass++ = 0) ||
+                    !(eol = strchr(pass, '\n')) || (*eol++  = 0) )
+                        continue;
+
+                if( !uh_auth_add(line, user, pass) )
+                {
+                    fprintf(stderr,
+                        "Can not manage more than %i basic auth realms, "
+                        "will skip the rest\n", UH_LIMIT_AUTHREALMS
+                    );
+
+                    break;
+                } 
+            }
+        }
+
+        fclose(c);
+    }
 }
 
@@ -399 +438 @@
 #endif
 
-    while( (opt = getopt(argc, argv, "fC:K:p:s:h:c:l:L:d:")) > 0 )
+    while( (opt = getopt(argc, argv, "fC:K:p:s:h:c:l:L:d:r:m:x:")) > 0 )
     {
         switch(opt)
@@ -468 +507 @@
 #ifdef HAVE_CGI
             /* cgi prefix */
-            case 'c':
+            case 'x':
                 conf.cgi_prefix = optarg;
                 break;
@@ -502 +541 @@
                 break;
 
+            /* basic auth realm */
+            case 'r':
+                conf.realm = optarg;
+                break;
+
+            /* md5 crypt */
+            case 'm':
+                printf("%s\n", crypt(optarg, "$1$"));
+                exit(0);
+                break;
+
+            /* config file */
+            case 'c':
+                conf.file = optarg;
+                break;
+
             default:
                 fprintf(stderr,
                     "Usage: %s -p [addr:]port [-h docroot]\n"
-                    "   -p  Bind to specified address and port, multiple allowed\n"
+                    "   -f              Do not fork to background\n"
+                    "   -c file         Configuration file, default is '/etc/httpd.conf'\n"
+                    "   -p [addr:]port  Bind to specified address and port, multiple allowed\n"
 #ifdef HAVE_TLS
-                    "   -s  Like -p but provide HTTPS on this port\n"
-                    "   -C  ASN.1 server certificate file\n"
-                    "   -K  ASN.1 server private key file\n"
-#endif
-                    "   -h  Specify the document root, default is '.'\n"
-                    "   -f  Do not fork to background\n"
+                    "   -s [addr:]port  Like -p but provide HTTPS on this port\n"
+                    "   -C file         ASN.1 server certificate file\n"
+                    "   -K file         ASN.1 server private key file\n"
+#endif
+                    "   -h directory    Specify the document root, default is '.'\n"
 #ifdef HAVE_LUA
-                    "   -l  URL prefix for Lua handler, default is '/lua'\n"
-                    "   -L  Lua handler script, omit to disable Lua\n"
+                    "   -l string       URL prefix for Lua handler, default is '/lua'\n"
+                    "   -L file         Lua handler script, omit to disable Lua\n"
 #endif
 #ifdef HAVE_CGI
-                    "   -c  URL prefix for CGI handler, default is '/cgi-bin'\n"
-#endif
-                    "   -d  URL decode given string\n"
+                    "   -x string       URL prefix for CGI handler, default is '/cgi-bin'\n"
+#endif
+                    "   -d string       URL decode given string\n"
+                    "   -r string       Specify basic auth realm\n"
+                    "   -m string       MD5 crypt given string\n"
                     "\n", argv[0]
                 );
@@ -549 +607 @@
         exit(1);
     }
+
+    /* default realm */
+    if( ! conf.realm )
+        conf.realm = "Protected Area";
+
+    /* config file */
+    uh_config_parse(conf.file);
 
 #ifdef HAVE_CGI

luci/trunk/contrib/package/uhttpd/src/uhttpd.h

@@ -52 +52 @@
 struct config {
     char docroot[PATH_MAX];
+    char *realm;
+    char *file;
 #ifdef HAVE_CGI
     char *cgi_prefix;
@@ -89 +91 @@
 struct auth_realm {
     char path[PATH_MAX];
-    char realm[128];
     char user[32];
     char pass[128];