changeset 1050:93315ac00394

More fun with cookies
author Adam Chlipala <adamc@hcoop.net>
date Thu, 26 Nov 2009 14:20:00 -0500 (2009-11-26)
parents c2317cfb99ec
children 731e6aa6655a
files CHANGELOG demo/cookie.ur doc/manual.tex include/urweb.h lib/ur/basis.urs src/c/urweb.c src/demo.sml src/monoize.sml src/settings.sml
diffstat 9 files changed, 100 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Thu Nov 26 10:35:57 2009 -0500
+++ b/CHANGELOG	Thu Nov 26 14:20:00 2009 -0500
@@ -1,3 +1,10 @@
+========
+Next
+========
+
+- Extended cookie interface (breaks backward compatibility for 'setCookie')
+- Bug fixes
+
 ========
 20091124
 ========
--- a/demo/cookie.ur	Thu Nov 26 10:35:57 2009 -0500
+++ b/demo/cookie.ur	Thu Nov 26 14:20:00 2009 -0500
@@ -1,15 +1,30 @@
 cookie c : {A : string, B : float, C : int}
 
 fun set r =
-    setCookie c {A = r.A, B = readError r.B, C = readError r.C};
+    setCookie c {Value = {A = r.A, B = readError r.B, C = readError r.C},
+                 Expires = None,
+                 Secure = False};
     return <xml>Cookie set.</xml>
 
+fun setExp r =
+    setCookie c {Value = {A = r.A, B = readError r.B, C = readError r.C},
+                 Expires = Some (readError "2012-11-6 00:00:00"),
+                 Secure = False};
+    return <xml>Cookie set robustly.</xml>
+
+fun delete () =
+    clearCookie c;
+    return <xml>Cookie cleared.</xml>
+
 fun main () =
     ro <- getCookie c;
     return <xml><body>
       {case ro of
            None => <xml>No cookie set.</xml>
-         | Some v => <xml>Cookie: A = {[v.A]}, B = {[v.B]}, C = {[v.C]}</xml>}
+         | Some v => <xml>
+           Cookie: A = {[v.A]}, B = {[v.B]}, C = {[v.C]}<br/>
+           <form><submit value="Delete" action={delete}/></form>
+         </xml>}
       <br/><br/>
 
       <form>
@@ -17,5 +32,13 @@
         B: <textbox{#B}/><br/>
         C: <textbox{#C}/><br/>
         <submit action={set}/>
+      </form><br/>
+
+      <form>
+        <b>Version that expires on November 6, 2012:</b><br/>
+        A: <textbox{#A}/><br/>
+        B: <textbox{#B}/><br/>
+        C: <textbox{#C}/><br/>
+        <submit action={setExp}/>
       </form>
     </body></xml>
--- a/doc/manual.tex	Thu Nov 26 10:35:57 2009 -0500
+++ b/doc/manual.tex	Thu Nov 26 14:20:00 2009 -0500
@@ -1288,7 +1288,8 @@
   \\
   \mt{con} \; \mt{http\_cookie} :: \mt{Type} \to \mt{Type} \\
   \mt{val} \; \mt{getCookie} : \mt{t} ::: \mt{Type} \to \mt{http\_cookie} \; \mt{t} \to \mt{transaction} \; (\mt{option} \; \mt{t}) \\
-  \mt{val} \; \mt{setCookie} : \mt{t} ::: \mt{Type} \to \mt{http\_cookie} \; \mt{t} \to \mt{t} \to \mt{transaction} \; \mt{unit}
+  \mt{val} \; \mt{setCookie} : \mt{t} ::: \mt{Type} \to \mt{http\_cookie} \; \mt{t} \to \{\mt{Value} : \mt{t}, \mt{Expires} : \mt{option} \; \mt{time}, \mt{Secure} : \mt{bool}\} \to \mt{transaction} \; \mt{unit} \\
+  \mt{val} \; \mt{clearCookie} : \mt{t} ::: \mt{Type} \to \mt{http\_cookie} \; \mt{t} \to \mt{transaction} \; \mt{unit}
 \end{array}$$
 
 There are also an abstract $\mt{url}$ type and functions for converting to it, based on the policy defined by \texttt{[allow|deny] url} directives in the project file.
--- a/include/urweb.h	Thu Nov 26 10:35:57 2009 -0500
+++ b/include/urweb.h	Thu Nov 26 14:20:00 2009 -0500
@@ -185,7 +185,8 @@
 void uw_write_header(uw_context, uw_Basis_string);
 
 uw_Basis_string uw_Basis_get_cookie(uw_context, uw_Basis_string c);
-uw_unit uw_Basis_set_cookie(uw_context, uw_Basis_string prefix, uw_Basis_string c, uw_Basis_string v);
+uw_unit uw_Basis_set_cookie(uw_context, uw_Basis_string prefix, uw_Basis_string c, uw_Basis_string v, uw_Basis_time *expires, uw_Basis_bool secure);
+uw_unit uw_Basis_clear_cookie(uw_context, uw_Basis_string prefix, uw_Basis_string c);
 
 uw_Basis_channel uw_Basis_new_channel(uw_context, uw_unit);
 uw_unit uw_Basis_send(uw_context, uw_Basis_channel, uw_Basis_string);
@@ -210,6 +211,7 @@
 __attribute__((noreturn)) void uw_return_blob(uw_context, uw_Basis_blob, uw_Basis_string mimeType);
 
 uw_Basis_time uw_Basis_now(uw_context);
+extern const uw_Basis_time uw_Basis_minTime;
 
 void uw_register_transactional(uw_context, void *data, uw_callback commit, uw_callback rollback, uw_callback free);
 
--- a/lib/ur/basis.urs	Thu Nov 26 10:35:57 2009 -0500
+++ b/lib/ur/basis.urs	Thu Nov 26 14:20:00 2009 -0500
@@ -115,6 +115,7 @@
 (** * Time *)
 
 val now : transaction time
+val minTime : time
 
 
 (** HTTP operations *)
@@ -123,7 +124,10 @@
 
 con http_cookie :: Type -> Type
 val getCookie : t ::: Type -> http_cookie t -> transaction (option t)
-val setCookie : t ::: Type -> http_cookie t -> t -> transaction unit
+val setCookie : t ::: Type -> http_cookie t -> {Value : t,
+                                                Expires : option time,
+                                                Secure : bool} -> transaction unit
+val clearCookie : t ::: Type -> http_cookie t -> transaction unit
 
 
 (** JavaScript-y gadgets *)
--- a/src/c/urweb.c	Thu Nov 26 10:35:57 2009 -0500
+++ b/src/c/urweb.c	Thu Nov 26 14:20:00 2009 -0500
@@ -672,7 +672,7 @@
 }
 
 int uw_set_input(uw_context ctx, const char *name, char *value) {
-  printf("Input name %s\n", name);
+  //printf("Input name %s\n", name);
 
   if (!strcasecmp(name, ".b")) {
     int n = uw_input_num(value);
@@ -2680,18 +2680,41 @@
   return NULL;
 }
 
-uw_unit uw_Basis_set_cookie(uw_context ctx, uw_Basis_string prefix, uw_Basis_string c, uw_Basis_string v) {
+uw_unit uw_Basis_set_cookie(uw_context ctx, uw_Basis_string prefix, uw_Basis_string c, uw_Basis_string v, uw_Basis_time *expires, uw_Basis_bool secure) {
   uw_write_header(ctx, "Set-Cookie: ");
   uw_write_header(ctx, c);
   uw_write_header(ctx, "=");
   uw_write_header(ctx, v);
   uw_write_header(ctx, "; path=");
   uw_write_header(ctx, prefix);
+  if (expires) {
+    char formatted[30];
+    struct tm tm;
+
+    gmtime_r(expires, &tm);
+
+    strftime(formatted, sizeof formatted, "%a, %d-%b-%Y %T GMT", &tm);
+
+    uw_write_header(ctx, "; expires=");
+    uw_write_header(ctx, formatted);
+  }
+  if (secure)
+    uw_write_header(ctx, "; secure");
   uw_write_header(ctx, "\r\n");
 
   return uw_unit_v;
 }
 
+uw_unit uw_Basis_clear_cookie(uw_context ctx, uw_Basis_string prefix, uw_Basis_string c) {
+  uw_write_header(ctx, "Set-Cookie: ");
+  uw_write_header(ctx, c);
+  uw_write_header(ctx, "=; path=");
+  uw_write_header(ctx, prefix);
+  uw_write_header(ctx, "; expires=Mon, 01-01-1970 00:00:00 GMT\r\n");
+
+  return uw_unit_v;
+}
+
 static delta *allocate_delta(uw_context ctx, unsigned client) {
   unsigned i;
   delta *d;
@@ -3077,6 +3100,8 @@
   return r;
 }
 
+const uw_Basis_time minTime = 0;
+
 uw_Basis_time uw_Basis_now(uw_context ctx) {
   return time(NULL);
 }
--- a/src/demo.sml	Thu Nov 26 10:35:57 2009 -0500
+++ b/src/demo.sml	Thu Nov 26 14:20:00 2009 -0500
@@ -430,7 +430,7 @@
 
                 TextIO.closeOut outf;
 
-                Compiler.compile (OS.Path.base fname)
+                Compiler.compiler (OS.Path.base fname)
             end;
 
         TextIO.output (demosOut, "\n</body></html>\n");
--- a/src/monoize.sml	Thu Nov 26 10:35:57 2009 -0500
+++ b/src/monoize.sml	Thu Nov 26 14:20:00 2009 -0500
@@ -1338,19 +1338,43 @@
                 val s = (L'.TFfi ("Basis", "string"), loc)
                 val un = (L'.TRecord [], loc)
                 val t = monoType env t
-                val (e, fm) = urlifyExp env fm ((L'.ERel 1, loc), t)
+                val rt = (L'.TRecord [("Value", t),
+                                      ("Expires", (L'.TOption (L'.TFfi ("Basis", "time"),
+                                                               loc), loc)),
+                                      ("Secure", (L'.TFfi ("Basis", "bool"), loc))], loc)
+
+                fun fd x = (L'.EField ((L'.ERel 1, loc), x), loc)
+                val (e, fm) = urlifyExp env fm (fd "Value", t)
             in
-                ((L'.EAbs ("c", s, (L'.TFun (t, (L'.TFun (un, un), loc)), loc),
-                           (L'.EAbs ("v", t, (L'.TFun (un, un), loc),
+                ((L'.EAbs ("c", s, (L'.TFun (rt, (L'.TFun (un, un), loc)), loc),
+                           (L'.EAbs ("r", rt, (L'.TFun (un, un), loc),
                                      (L'.EAbs ("_", un, un,
                                                (L'.EFfiApp ("Basis", "set_cookie", [(L'.EPrim (Prim.String
                                                                                                    (Settings.getUrlPrefix ())),
                                                                                      loc),
                                                                                     (L'.ERel 2, loc),
-                                                                                    e]), loc)),
+                                                                                    e,
+                                                                                    fd "Expires",
+                                                                                    fd "Secure"])
+                                              , loc)), loc)), loc)), loc),
+                 fm)
+            end
+
+          | L.ECApp ((L.EFfi ("Basis", "clearCookie"), _), t) =>
+            let
+                val s = (L'.TFfi ("Basis", "string"), loc)
+                val un = (L'.TRecord [], loc)
+            in
+                ((L'.EAbs ("c", s, (L'.TFun (un, un), loc),
+                           (L'.EAbs ("_", un, un,
+                                     (L'.EFfiApp ("Basis", "clear_cookie",
+                                                  [(L'.EPrim (Prim.String
+                                                                  (Settings.getUrlPrefix ())),
+                                                    loc),
+                                                   (L'.ERel 1, loc)]),
                                       loc)), loc)), loc),
                  fm)
-            end            
+            end
 
           | L.ECApp ((L.EFfi ("Basis", "channel"), _), t) =>
                 ((L'.EAbs ("_", (L'.TRecord [], loc), (L'.TFfi ("Basis", "channel"), loc),
--- a/src/settings.sml	Thu Nov 26 10:35:57 2009 -0500
+++ b/src/settings.sml	Thu Nov 26 14:20:00 2009 -0500
@@ -80,6 +80,7 @@
 val effectfulBase = basis ["dml",
                            "nextval",
                            "set_cookie",
+                           "clear_cookie",
                            "new_client_source",
                            "get_client_source",
                            "set_client_source",