From 549ee1cc09be5bbdc613649eb9be3ebc122c0331 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Wed, 15 Jan 2003 17:13:21 +0000 Subject: [w3m-dev 03644] Re: Other user can see local cookie. * cookie.c (save_cookies): return if no_rc_dir * etc.c (tmpf_base): add cookie (tmpfname): use tmp_dir instead of rc_dir * file.c (loadGeneralFile): cookie is not passed via URL * fm.h (TMPF_COOKIE): incl (MAX_TMPF_TYPE): incl (no_rc_dir): added (tmp_dir): added (config_file): added * local.c (Local_cookie_file): added (writeLocalCookie): added (setLocalCookie): dont set environment LOCAL_COOKIE (localcgi_post): writeLocalCookie (localcgi_get): writeLocalCookie * main.c (config_filename): deleted (cmd_loadURL): arg FormList (main): rewrite config_file, rc (ldhelp): no cookie in URL (cmd_loadURL): arg FormList (goURL0): cmd_loadURL change (cmd_loadBuffer): cmd_loadURL change (adBmark): cookie is posted (follow_map): cmd_loadURL change (linkMn): cmd_loadURL change (reinit): init_rc change * proto.h (create_option_search_table): deleted (init_rc): no args * rc.c (create_option_search_table): static (init_rc): no args rewrite (optionpanel_src1): rewrite (load_option_panel): html_quote (panel_set_option): no_rc_dir * w3mbookmark.c: rewrite * w3mhelperpanel.c: rewrite * scripts/dirlist.cgi.in: rewrite * scripts/w3mhelp.cgi.in: rewrite * scripts/w3mmail.cgi.in: rewrite * scripts/multipart/multipart.cgi.in: rewrite From: Hironori SAKAMOTO --- w3mbookmark.c | 121 +++++++++++++++++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 53 deletions(-) (limited to 'w3mbookmark.c') diff --git a/w3mbookmark.c b/w3mbookmark.c index 57d9bcf..5e0da84 100644 --- a/w3mbookmark.c +++ b/w3mbookmark.c @@ -1,7 +1,5 @@ -/* $Id: w3mbookmark.c,v 1.7 2002/11/26 18:03:29 ukai Exp $ */ -#ifdef __EMX__ +/* $Id: w3mbookmark.c,v 1.8 2003/01/15 17:13:22 ukai Exp $ */ #include -#endif #include #include "config.h" #include "Str.h" @@ -10,46 +8,47 @@ #include "parsetag.h" #if LANG == JA -static char *bkmark_src1 = "Bookmark Registration\n\ -

ブックマークの登録

\n\n" "\ -\n"; -static char *default_section = "未分類"; -#else /* LANG != JA */ -static char *bkmark_src1 = "Bookmark Registration\n\ -

Register to my bookmark

\n\n" "\ -\n"; -static char *default_section = "Miscellaneous"; -#endif /* LANG != JA */ +\n\ +\n\ +\n"; +#undef FALSE #define FALSE 0 -#define T 1 +#undef TRUE +#define TRUE 1 static char end_section[] = "\n"; -char *Local_cookie; +static char *Local_cookie = NULL; void print_bookmark_panel(char *bmark, char *url, char *title) @@ -59,7 +58,7 @@ print_bookmark_panel(char *bmark, char *url, char *title) char *p; printf("Content-Type: text/html\n\n"); - printf(bkmark_src1, w3m_lib_dir(), bmark); + printf(bkmark_src1, html_quote(bmark), html_quote(Local_cookie)); if ((f = fopen(bmark, "r")) != NULL) { printf("Section:\n"); } - printf(bkmark_src2, html_quote(url), html_quote(title), Local_cookie); + printf(bkmark_src2, html_quote(url), html_quote(title)); } /* create new bookmark */ @@ -117,7 +116,7 @@ insert_bookmark(char *bmark, struct parsed_tagarg *data) if (section == NULL || *section == '\0') section = tag_get_value(data, "section"); if (section == NULL || *section == '\0') - section = default_section; + section = DEFAULT_SECTION; if (url == NULL || *url == '\0' || title == NULL || *title == '\0') { /* Bookmark not added */ @@ -175,7 +174,9 @@ int main(int argc, char *argv[], char **envp) { extern char *getenv(); - char *qs; + char *p; + int length; + Str qs = NULL; struct parsed_tagarg *cgiarg; char *mode; char *bmark; @@ -183,21 +184,33 @@ main(int argc, char *argv[], char **envp) char *title; char *sent_cookie; - if ((qs = getenv("QUERY_STRING")) == NULL) { - printf("Content-Type: text/plain\n\n"); - printf("Incomplete Request: no QUERY_STRING\n"); - exit(1); + p = getenv("REQUEST_METHOD"); + if (p == NULL || strcasecmp(p, "post")) + goto request_err; + p = getenv("CONTENT_LENGTH"); + if (p == NULL || (length = atoi(p)) <= 0) + goto request_err; + + qs = Strfgets(stdin); + Strchop(qs); + if (qs->length != length) + goto request_err; + cgiarg = cgistr2tagarg(qs->ptr); + + p = getenv("LOCAL_COOKIE_FILE"); + if (p) { + FILE *f = fopen(p, "r"); + if (f) { + Local_cookie = Strfgets(f)->ptr; + fclose(f); + } } - - cgiarg = cgistr2tagarg(qs); - - Local_cookie = getenv("LOCAL_COOKIE"); sent_cookie = tag_get_value(cgiarg, "cookie"); if (sent_cookie == NULL || Local_cookie == NULL || strcmp(sent_cookie, Local_cookie) != 0) { /* local cookie doesn't match: It may be an illegal invocation */ - printf("Content-Type: text/plain\n"); - printf("\nLocal cookie doesn't match: It may be an illegal invocation\n"); + printf("Content-Type: text/plain\n\n"); + printf("Local cookie doesn't match: It may be an illegal invocation\n"); exit(1); } @@ -205,12 +218,8 @@ main(int argc, char *argv[], char **envp) bmark = expandPath(tag_get_value(cgiarg, "bmark")); url = tag_get_value(cgiarg, "url"); title = tag_get_value(cgiarg, "title"); - if (bmark == NULL || url == NULL) { - /* incomplete request */ - printf("Content-Type: text/plain\n\n"); - printf("Incomplete Request: QUERY_STRING=%s\n", qs); - exit(1); - } + if (bmark == NULL || url == NULL) + goto request_err; if (mode && !strcmp(mode, "panel")) { if (title == NULL) title = ""; @@ -220,8 +229,14 @@ main(int argc, char *argv[], char **envp) printf("Content-Type: text/plain\n"); if (insert_bookmark(bmark, cgiarg)) { printf("w3m-control: BACK\n"); - printf("w3m-control: BACK\n\n"); + printf("w3m-control: BACK\n"); } + printf("\n"); } return 0; + + request_err: + printf("Content-Type: text/plain\n\n"); + printf("Incomplete Request: %s\n", qs ? qs->ptr : "(null)"); + exit(1); } -- cgit v1.2.3

New Section:
URL:
Title:

New Section:	\n\ +
URL:	\n\ +
Title:	\n\ +
\n\

ブックマークの登録

Register to my bookmark

" BKMARK_TITLE "