Port "file" function from ssl_expr

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

diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml
index aa81488169c57787e5a995f1cb78cc9964dfa460..a4d2594aa1c6bd164d4f2e3df2e6c887f629d3b1 100644 (file)
--- a/docs/manual/expr.xml
+++ b/docs/manual/expr.xml
@@ -290,7 +290,7 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
         <td>Lookup operating system 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>
-    <tr><td><code>lolower</code></td>
+    <tr><td><code>tolower</code></td>
         <td>Convert string to lower case</td></tr>
     <tr><td><code>toupper</code></td>
         <td>Convert string to uppser case</td></tr>
@@ -298,6 +298,8 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
         <td>Escape special characters in %hex encoding</td></tr>
     <tr><td><code>unescape</code></td>
         <td>Unescape %hex encoded string, leaving URL-special characters encoded (XXX: describe better)</td></tr>
+    <tr><td><code>file</code></td>
+        <td>Read contents from a file</td></tr>
     </table>
 
     <p>In addition to string-valued functions, there are also list-valued functions which

diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c
index 968e1a07e83469763739d95dc1ab0067b44ff88c..153b2467d9baee38987409dbeba470fdc3691d4b 100644 (file)
--- a/server/util_expr_eval.c
+++ b/server/util_expr_eval.c
@@ -749,6 +749,51 @@ static const char *escape_func(ap_expr_eval_ctx *ctx, const char *name, const ch
     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)
+{
+    apr_file_t *fp;
+    char *buf;
+    apr_off_t offset;
+    apr_size_t len;
+    apr_finfo_t finfo;
+
+    if (apr_file_open(&fp, arg, APR_READ|APR_BUFFERED,
+                      APR_OS_DEFAULT, ctx->p) != APR_SUCCESS) {
+        *ctx->err = apr_psprintf(ctx->p, "Cannot open file %s", arg);
+        return "";
+    }
+    apr_file_info_get(&finfo, APR_FINFO_SIZE, fp);
+    if (finfo.size > MAX_FILE_SIZE) {
+        *ctx->err = apr_psprintf(ctx->p, "File %s too large", arg);
+        apr_file_close(fp);
+        return "";
+    }
+    len = (apr_size_t)finfo.size;
+    if (len == 0) {
+        apr_file_close(fp);
+        return "";
+    }
+    else {
+        if ((buf = (char *)apr_palloc(ctx->p, sizeof(char)*(len+1))) == NULL) {
+            *ctx->err = "Cannot allocate memory";
+            apr_file_close(fp);
+            return "";
+        }
+        offset = 0;
+        apr_file_seek(fp, APR_SET, &offset);
+        if (apr_file_read(fp, buf, &len) != APR_SUCCESS) {
+            *ctx->err = apr_psprintf(ctx->p, "Cannot read from file %s", arg);
+            apr_file_close(fp);
+            return "";
+        }
+        buf[len] = '\0';
+    }
+    apr_file_close(fp);
+    return buf;
+}
+
+
 static const char *unescape_func(ap_expr_eval_ctx *ctx, const char *name, const char *arg)
 {
     char *result = apr_pstrdup(ctx->p, arg);
@@ -988,6 +1033,7 @@ static const struct expr_provider_single string_func_providers[] = {
     { toupper_func, "toupper" },
     { escape_func, "escape" },
     { unescape_func, "unescape" },
+    { file_func, "file" },
     { NULL, NULL}
 };
 /* XXX: base64 encode/decode ? */