Implement "reqenv", "note", "-z", "-n" in ap_expr.

Make "env" ssl_expr compatible

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032408 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml
index a4d2594aa1c6bd164d4f2e3df2e6c887f629d3b1..56a7909564f2d93f5ed09b1c959069bd02b4ec75 100644 (file)
--- a/docs/manual/expr.xml
+++ b/docs/manual/expr.xml
@@ -264,9 +264,9 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
 
     <tr><th>Name</th><th>Description</th></tr>
     <tr><td><code>-n</code></td>
-        <td>String is not empty (XXX: not yet implemented)</td></tr>
+        <td>String is not empty</td></tr>
     <tr><td><code>-z</code></td>
-        <td>String is empty (XXX: not yet implemented)</td></tr>
+        <td>String is empty</td></tr>
     </table>
 
 </section>
@@ -286,10 +286,15 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
         <td>Get HTTP request header</td></tr>
     <tr><td><code>resp</code></td>
         <td>Get HTTP response header</td></tr>
+    <tr><td><code>reqenv</code></td>
+        <td>Lookup request environment variable</td></tr>
     <tr><td><code>osenv</code></td>
         <td>Lookup operating system environment variable</td></tr>
+    <tr><td><code>note</code></td>
+        <td>Lookup request environment variable</td></tr>
     <tr><td><code>env</code></td>
-        <td>Lookup request environment variable (XXX: will need to be changed for better ssl_expr compat)</td></tr>
+        <td>Reqturn first match of <code>note</code>, <code>reqenv</code>,
+            <code>osenv</code></td></tr>
     <tr><td><code>tolower</code></td>
         <td>Convert string to lower case</td></tr>
     <tr><td><code>toupper</code></td>

diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c
index 153b2467d9baee38987409dbeba470fdc3691d4b..2b80e73efb9de0a06ce074f3ae1523064319a48a 100644 (file)
--- a/server/util_expr_eval.c
+++ b/server/util_expr_eval.c
@@ -693,46 +693,55 @@ AP_DECLARE(int) ap_expr_exec(request_rec *r, const ap_expr_info_t *info, const c
         return (rc ? 1 : 0);
 }
 
-static const char *req_func(ap_expr_eval_ctx *ctx, const char *name,
-                            const char *arg)
+static const char *req_table_func(ap_expr_eval_ctx *ctx, const void *data,
+                                  const char *arg)
 {
-    if (ctx->r)
-        return apr_table_get(ctx->r->headers_in, arg);
-    else
+    const char *name = (const char *)data;
+    apr_table_t *t;
+    if (!ctx->r)
         return "";
-}
 
-static const char *resp_func(ap_expr_eval_ctx *ctx, const char *name,
-                             const char *arg)
-{
-    if (ctx->r)
-        return apr_table_get(ctx->r->headers_out, arg);
+    if (name[3] == 's')             /* resp */
+        t = ctx->r->headers_out;
+    else if (name[4] == 'e')        /* reqenv */
+        t = ctx->r->subprocess_env;
+    else if (name[0] == 'n')        /* notes */
+        t = ctx->r->notes;
     else
-        return "";
+        t = ctx->r->headers_in;
+    return apr_table_get(t, arg);
 }
 
-static const char *env_func(ap_expr_eval_ctx *ctx, const char *name,
+static const char *env_func(ap_expr_eval_ctx *ctx, const void *data,
                             const char *arg)
 {
-    if (ctx->r)
-        return apr_table_get(ctx->r->subprocess_env, arg);
-    else
-        return "";
+    const char *res;
+    /* this order is for ssl_expr compatibility */
+    if (ctx->r) {
+        if ((res = apr_table_get(ctx->r->notes, arg)) != NULL)
+            return res;
+        else if ((res = apr_table_get(ctx->r->subprocess_env, arg)) != NULL)
+            return res;
+    }
+    return getenv(arg);
 }
 
-static const char *osenv_func(ap_expr_eval_ctx *ctx, const char *name, const char *arg)
+static const char *osenv_func(ap_expr_eval_ctx *ctx, const void *data,
+                              const char *arg)
 {
     return getenv(arg);
 }
 
-static const char *tolower_func(ap_expr_eval_ctx *ctx, const char *name, const char *arg)
+static const char *tolower_func(ap_expr_eval_ctx *ctx, const void *data,
+                                const char *arg)
 {
     char *result = apr_pstrdup(ctx->p, arg);
     ap_str_tolower(result);
     return result;
 }
 
-static const char *toupper_func(ap_expr_eval_ctx *ctx, const char *name, const char *arg)
+static const char *toupper_func(ap_expr_eval_ctx *ctx, const void *data,
+                                const char *arg)
 {
     char *p;
     char *result = apr_pstrdup(ctx->p, arg);
@@ -744,13 +753,14 @@ static const char *toupper_func(ap_expr_eval_ctx *ctx, const char *name, const c
     return result;
 }
 
-static const char *escape_func(ap_expr_eval_ctx *ctx, const char *name, const char *arg)
+static const char *escape_func(ap_expr_eval_ctx *ctx, const void *data,
+                               const char *arg)
 {
     return ap_escape_uri(ctx->p, arg);
 }
 
 #define MAX_FILE_SIZE 10*1024*1024
-static const char *file_func(ap_expr_eval_ctx *ctx, const char *name, char *arg)
+static const char *file_func(ap_expr_eval_ctx *ctx, const void *data, char *arg)
 {
     apr_file_t *fp;
     char *buf;
@@ -794,7 +804,8 @@ static const char *file_func(ap_expr_eval_ctx *ctx, const char *name, char *arg)
 }
 
 
-static const char *unescape_func(ap_expr_eval_ctx *ctx, const char *name, const char *arg)
+static const char *unescape_func(ap_expr_eval_ctx *ctx, const void *data,
+                                 const char *arg)
 {
     char *result = apr_pstrdup(ctx->p, arg);
     if (ap_unescape_url(result))
@@ -804,6 +815,15 @@ static const char *unescape_func(ap_expr_eval_ctx *ctx, const char *name, const
 
 }
 
+static int op_nz(ap_expr_eval_ctx *ctx, const void *data, const char *arg)
+{
+    const char *name = (const char *)data;
+    if (name[0] == 'z')
+        return (arg[0] == '\0');
+    else
+        return (arg[0] != '\0');
+}
+
 APR_DECLARE_OPTIONAL_FN(int, ssl_is_https, (conn_rec *));
 static APR_OPTIONAL_FN_TYPE(ssl_is_https) *is_https = NULL;
 
@@ -1025,10 +1045,11 @@ static const struct expr_provider_multi var_providers[] = {
 static const struct expr_provider_single string_func_providers[] = {
     { osenv_func, "osenv" },
     { env_func, "env" },
-    { resp_func, "resp" },
-    { req_func, "req" },
+    { req_table_func, "resp" },
+    { req_table_func, "req" },
     /* 'http' as alias for 'req' for compatibility with ssl_expr */
-    { req_func, "http" },
+    { req_table_func, "http" },
+    { req_table_func, "note" },
     { tolower_func, "tolower" },
     { toupper_func, "toupper" },
     { escape_func, "escape" },
@@ -1038,6 +1059,11 @@ static const struct expr_provider_single string_func_providers[] = {
 };
 /* XXX: base64 encode/decode ? */
 
+static const struct expr_provider_single unary_op_providers[] = {
+    { op_nz, "n" },
+    { op_nz, "z" },
+    { NULL, NULL}
+};
 static int core_expr_lookup(ap_expr_lookup_parms *parms)
 {
     switch (parms->type) {
@@ -1069,6 +1095,18 @@ static int core_expr_lookup(ap_expr_lookup_parms *parms)
         }
         break;
     }
+    case AP_EXPR_FUNC_OP_UNARY: {
+        const struct expr_provider_single *prov = unary_op_providers;
+        while (prov->func) {
+            if (strcasecmp(prov->name, parms->name) == 0) {
+                *parms->func = prov->func;
+                *parms->data = prov->name;
+                return OK;
+            }
+            prov++;
+        }
+        break;
+    }
     default:
         break;
     }