psyc-mirrors
/
psyced
mirror of git://git.psyced.org/git/psyced
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

http/server: added post support; http/login: set-cookie path=/

This commit is contained in:
Gabor Adam Toth 2010-02-28 23:38:35 +01:00
parent e4ce000b32
commit 5f15785e9e
3 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
world/net/http/library.i
View File

@ -215,3 +215,11 @@ varargs string make_query_string(mapping params, int sort) {
} }
return q; return q;
} }
checkToken(mapping query) {
string nick;
object user;
if (nick = query["user"]) user = find_person(nick);
if (user && user->validToken(query["token"])) return user;
return 0;
}

2
world/net/http/login.c
View File

@ -15,7 +15,7 @@ htget(prot, query, headers, qs) {
t = "_error_invalid_authentication_token"; t = "_error_invalid_authentication_token";
} else { } else {
PT(("replacing cookie %O\n", headers["cookie"])) PT(("replacing cookie %O\n", headers["cookie"]))
htok3(prot, 0, "Set-Cookie: psyced=\""+ qs +"\";\n"); htok3(prot, 0, "Set-Cookie: psyced=\""+ qs +"\"; path=/;\n");
#if 1 #if 1
// login was supposed to something more than just /surf // login was supposed to something more than just /surf
// but until this is the case, why lose time? // but until this is the case, why lose time?

36
world/net/http/server.c
View File

@ -9,8 +9,9 @@
#include "header.i" #include "header.i"
volatile string url, file, qs, version; volatile string url, file, qs, version, method, body = "";
volatile mapping headers; volatile mapping headers;
volatile int length;
// we're using #'closures to point to the functions we're giving the // we're using #'closures to point to the functions we're giving the
// next_input_to(). as i don't want to restructure the whole file, i need // next_input_to(). as i don't want to restructure the whole file, i need
@ -19,6 +20,7 @@ volatile mapping headers;
// quite stupid indeed, as they don't got any modifiers or whatever :) // quite stupid indeed, as they don't got any modifiers or whatever :)
parse_url(input); parse_url(input);
parse_header(input); parse_header(input);
parse_body(input);
devNull(); devNull();
qScheme() { return "html"; } qScheme() { return "html"; }
@ -67,14 +69,17 @@ parse_wait(null) { // waiting to send my error message here
parse_url(input) { parse_url(input) {
P3(("=== SmallHTTP got: %O\n", input)) P3(("=== SmallHTTP got: %O\n", input))
unless (sscanf(input, "GET%t%s%tHTTP/%s", url, version)) { unless (sscanf(input, "%s%t%s%tHTTP/%s", method, url, version)) quit();
if (sscanf(input, "CONNECT%t%~s")) { switch (method) {
case "CONNECT":
next_input_to(#'parse_wait); next_input_to(#'parse_wait);
return; return;
} else { case "GET":
case "POST":
break;
default:
quit(); quit();
return; return;
}
} }
version = "HTTP/" + version; version = "HTTP/" + version;
@ -95,11 +100,25 @@ parse_header(input) {
next_input_to(#'parse_header); next_input_to(#'parse_header);
} else { } else {
process(); if (method == "POST" && (length = to_int(headers["content-length"])) &&
next_input_to(#'devNull); headers["content-type"] == "application/x-www-form-urlencoded") {
input_to(#'parse_body, INPUT_IGNORE_BANG | INPUT_CHARMODE | INPUT_NO_TELNET);
} else {
process();
next_input_to(#'devNull);
}
} }
} }
parse_body(input) {
//P4(("parse_body(%O)\n", input))
body += input;
if (strlen(body) == length)
process();
else
input_to(#'parse_body, INPUT_IGNORE_BANG | INPUT_CHARMODE | INPUT_NO_TELNET);
}
process() { process() {
string t, ext; string t, ext;
mapping query = ([]); mapping query = ([]);
@ -139,6 +158,9 @@ process() {
} else { } else {
file = url; file = url;
} }
if (method == "POST" && headers["content-type"] == "application/x-www-form-urlencoded") {
query = url_parse_query(query, body);
}
P4(("parsed query: %O\n", query)) P4(("parsed query: %O\n", query))
switch (file) { switch (file) {
case "/favicon.ico": case "/favicon.ico":