# HG changeset patch # User Adam Chlipala # Date 1314566214 14400 # Node ID c3b5cf5c2f987d34a87cba2f46d48bdf6b06ba97 # Parent 5175bed443f9979964d8fdb6da67ded1cf5163c4 Gentle handling of back-button returns to pages with stale message-passing credentials diff -r 5175bed443f9 -r c3b5cf5c2f98 lib/js/urweb.js --- a/lib/js/urweb.js Sun Aug 28 14:43:30 2011 -0400 +++ b/lib/js/urweb.js Sun Aug 28 17:16:54 2011 -0400 @@ -736,6 +736,7 @@ var client_pass = 0; var url_prefix = "/"; var timeout = 60; +var isPost = false; function getXHR(uri) { @@ -909,6 +910,15 @@ return; var lines = text.split("\n"); + if (lines.length == 1 && lines[0] == "R") { + if (isPost) + history.back(); + else + location.reload(); + + return; + } + if (lines.length < 2) { discon(); return; diff -r 5175bed443f9 -r c3b5cf5c2f98 src/c/urweb.c --- a/src/c/urweb.c Sun Aug 28 14:43:30 2011 -0400 +++ b/src/c/urweb.c Sun Aug 28 17:16:54 2011 -0400 @@ -247,6 +247,13 @@ on_success = s; } +static void chastise(int (*send)(int sockfd, const void *buf, ssize_t len), int sock) { + send(sock, on_success, strlen(on_success)); + send(sock, begin_msgs, sizeof(begin_msgs) - 1); + send(sock, "R", 1); + close(sock); +} + void uw_client_connect(unsigned id, int pass, int sock, int (*send)(int sockfd, const void *buf, ssize_t len), int (*close)(int fd), @@ -254,7 +261,7 @@ client *c = find_client(id); if (c == NULL) { - close(sock); + chastise(send, sock); log_error(logger_data, "Out-of-bounds client request (%u)\n", id); return; } @@ -263,14 +270,14 @@ if (c->mode != USED) { pthread_mutex_unlock(&c->lock); - close(sock); + chastise(send, sock); log_error(logger_data, "Client request for unused slot (%u)\n", id); return; } if (pass != c->pass) { pthread_mutex_unlock(&c->lock); - close(sock); + chastise(send, sock); log_error(logger_data, "Wrong client password (%u, %d)\n", id, pass); return; } @@ -1342,7 +1349,8 @@ char *sig = ctx->needs_sig ? ctx->app->cookie_sig(ctx) : ""; char *r = uw_malloc(ctx, 59 + 3 * INTS_MAX + strlen(ctx->app->url_prefix) + (ctx->needs_sig ? strlen(sig) + 7 : 0)); - sprintf(r, "client_id=%u;client_pass=%d;url_prefix=\"%s\";timeout=%d;%s%s%slistener();", + sprintf(r, "isPost=%s;client_id=%u;client_pass=%d;url_prefix=\"%s\";timeout=%d;%s%s%slistener();", + (ctx->isPost ? "true" : "false"), ctx->client->id, ctx->client->pass, ctx->app->url_prefix, diff -r 5175bed443f9 -r c3b5cf5c2f98 tests/goback.ur --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/goback.ur Sun Aug 28 17:16:54 2011 -0400 @@ -0,0 +1,20 @@ +table channels : { Channel : channel {} } + +fun get () = + ch <- channel; + dml (INSERT INTO channels (Channel) VALUES ({[ch]})); + return + Hi. + + +fun post () = + ch <- channel; + dml (INSERT INTO channels (Channel) VALUES ({[ch]})); + return + Hi! + + +fun main () = return +
  • Get
    • +
    • +     diff -r 5175bed443f9 -r c3b5cf5c2f98 tests/goback.urp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/goback.urp Sun Aug 28 17:16:54 2011 -0400 @@ -0,0 +1,6 @@ +database dbname=goback +sql goback.sql +rewrite all Goback/* +safeGet get + +goback diff -r 5175bed443f9 -r c3b5cf5c2f98 tests/goback.urs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/goback.urs Sun Aug 28 17:16:54 2011 -0400 @@ -0,0 +1,1 @@ +val main : {} -> transaction page