drop the guess_domain function.

Our docs say about AuthDigestDomain:
This directive should always be specified and contain at least the (set of)
root URI(s) for this space. Omitting to do so will cause the client to send
the Authorization header for every request sent to this server.

guessing the parameter is somewhat bogus. guess_domain() also resulted sometimes
in relative URIs, non-URI strings or empty strings, which caused a lot of
problems.
According to the docs, the domain parameter will be omitted now,
if not specified. This is exactly, what one would expect.

PR: 16937 (related to)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@98677 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/CHANGES b/src/CHANGES
index ddca742befb67882c8d70b03f3f2dfad016f310a..0a4a345a3bb9c56d916fa2dbf83b7f19b6b8335f 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 1.3.28
 
+  *) mod_auth_digest no longer tries to guess AuthDigestDomain, if it's
+     not specified. Now it assumes "/" as already documented. PR 16937.
+     [André Malo]
+
   *) In configure always assume suexec-umask to be an octal value by
      prepending a "0". PR 16984.  [André Malo]
 

diff --git a/src/modules/experimental/mod_auth_digest.c b/src/modules/experimental/mod_auth_digest.c
index d664325b96df0a03dadee99cd01f0a021a5d1670..fbea5d2385a9a3975482005b9ef503c1e38a9dfc 100644 (file)
--- a/src/modules/experimental/mod_auth_digest.c
+++ b/src/modules/experimental/mod_auth_digest.c
@@ -1172,76 +1172,10 @@ static void clear_session(const digest_header_rec *resp)
        resp->client->ha1[0] = '\0';
 }
 
-
 /*
  * Authorization challenge generation code (for WWW-Authenticate)
  */
 
-static const char *guess_domain(pool *p, const char *uri, const char *filename,
-                               const char *dir)
-{
-    size_t u_len = strlen(uri), f_len = strlen(filename), d_len = strlen(dir);
-    const char *u, *f;
-
-
-    /* Because of things like mod_alias and mod_rewrite and the fact that
-     * protection is often on a directory basis (not a location basis) it
-     * is hard to determine the uri to put in the domain attribute.
-     *
-     * What we do is the following: first we see if the directory is
-     * a prefix for the uri - if this is the case we assume that therefore
-     * a <Location> directive was protecting this uri and we can use it
-     * for the domain.
-     */
-    if (u_len >= d_len && !memcmp(uri, dir, d_len))
-       return dir;
-
-    /* Now we check for <Files ...>, and if we find one we send back a
-     * dummy uri - this is the only way to specify that the protection
-     * space only covers a single uri.
-     */
-    if (dir[0] != '/')
-       /* This doesn't work for Amaya (ok, it's of arguable validity in
-        * the first place), so just return the file name instead
-       return "http://0.0.0.0/";
-        */
-       return dir;
-
-    /* Next we find the largest common common suffix of the request-uri
-     * and the final file name, ignoring any extensions; this gives us a
-     * hint as to where any rewriting could've occured (assuming that some
-     * prefix of the uri is rewritten, not a suffix).
-     */
-    u = uri + u_len - 1;       /* strip any extension */
-    while (u > uri && *u != '/')  u--;
-    while (*u && *u != '.')  u++;
-    if (*u == '.')  u--;
-    if (*u == '/')  u--;
-
-    f = filename + f_len - 1;  /* strip any extension */
-    while (f > filename && *f != '/')  f--;
-    while (*f && *f != '.')  f++;
-    if (*f == '.')  f--;
-    if (*f == '/')  f--;
-
-    while (*f == *u && f > filename && u > uri)  u--, f--;
-    f++; u++;
-
-    while (*f && *f != '/')  f++, u++; /* suffix must start with / */
-
-    /* Now, if the directory reaches into this common suffix then we can
-     * take the uri with the same reach.
-     */
-    if ((unsigned long) (f-filename) < d_len) {
-       char *tmp = ap_pstrdup(p, uri);
-       tmp[(u-uri)+(d_len-(f-filename))] = '\0';
-       return tmp;
-    }
-
-    return ""; /* give up */
-}
-
-
 static const char *ltox(pool *p, unsigned long num)
 {
     if (num != 0)
@@ -1323,18 +1257,15 @@ static void note_digest_auth_failure(request_rec *r,
      * unneccessarily (it's usually > 200 bytes!).
      */
 
-    if (r->proxyreq != NOT_PROXY)
-       domain = NULL;  /* don't send domain for proxy requests */
-    else if (conf->uri_list)
-       domain = conf->uri_list;
+    /* don't send domain
+     * - for proxy requests
+     * - if it's no specified
+     */
+    if (r->proxyreq || !conf->uri_list) {
+        domain = NULL;  
+    }
     else {
-       /* They didn't specify any domain, so let's guess at it */
-       domain = guess_domain(r->pool, resp->psd_request_uri->path, r->filename,
-                             conf->dir_name);
-       if (domain[0] == '/' && domain[1] == '\0')
-           domain = NULL;      /* "/" is the default, so no need to send it */
-       else
-           domain = ap_pstrcat(r->pool, ", domain=\"", domain, "\"", NULL);
+        domain = conf->uri_list;
     }
 
     ap_table_mergen(r->err_headers_out,