aboutsummaryrefslogtreecommitdiffstats
path: root/w3mbookmark.c
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2003-01-15 17:13:21 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2003-01-15 17:13:21 +0000
commit549ee1cc09be5bbdc613649eb9be3ebc122c0331 (patch)
treec8f2ea7433d0eddc429d36dc12267d482374ac87 /w3mbookmark.c
parent* file.c (loadGopherDir): convertLine RAW_MODE (diff)
downloadw3m-549ee1cc09be5bbdc613649eb9be3ebc122c0331.tar.gz
w3m-549ee1cc09be5bbdc613649eb9be3ebc122c0331.zip
[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 <hsaka@mth.biglobe.ne.jp>
Diffstat (limited to '')
-rw-r--r--w3mbookmark.c121
1 files changed, 68 insertions, 53 deletions
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 <stdlib.h>
-#endif
#include <stdio.h>
#include "config.h"
#include "Str.h"
@@ -10,46 +8,47 @@
#include "parsetag.h"
#if LANG == JA
-static char *bkmark_src1 = "<html><head><title>Bookmark Registration</title>\n\
-<body><h1>ブックマークの登録</h1>\n\n" "<form method=get action=\"file://%s/" W3MBOOKMARK_CMDNAME "\">\n\n" "<input type=hidden name=mode value=register>\n\
-<input type=hidden name=bmark value=\"%s\">\n\
-<table cellpadding=0>\n";
+#define BKMARK_TITLE "ブックマークの登録"
+#define BKMARK_ADD "登録"
+#define DEFAULT_SECTION "未分類"
+#else
+#define BKMARK_TITLE "Register to my bookmark"
+#define BKMARK_ADD "ADD"
+#define DEFAULT_SECTION "Miscellaneous"
+#endif
-static char *bkmark_src2 =
- "<tr><td>New Section:</td><td><input type=text name=newsection width=60></td></tr>\n\
-<tr><td>URL:</td><td><input type=text name=url value=\"%s\" width=60></td></tr>\n\
-<tr><td>Title:</td><td><input type=text name=title value=\"%s\" width=60></td></tr>\n\
-<tr><td><input type=submit name=submit value=\"登録\"></td>\n\
-</table>\n\
-<input type=hidden name=cookie value=\"%s\">\
-</form>\
-</body></html>\n";
-static char *default_section = "未分類";
-#else /* LANG != JA */
-static char *bkmark_src1 = "<html><head><title>Bookmark Registration</title>\n\
-<body><h1>Register to my bookmark</h1>\n\n" "<form method=get action=\"file://%s/" W3MBOOKMARK_CMDNAME "\">\n\n" "<input type=hidden name=mode value=register>\n\
+static char *bkmark_src1 =
+ "<html>\n\
+<head>\n\
+<title>" BKMARK_TITLE "</title>\n\
+</head>\n\
+<body>\n\
+<h1>" BKMARK_TITLE "</h1>\n\
+<form method=post action=\"file:///$LIB/" W3MBOOKMARK_CMDNAME "\">\n\
+<input type=hidden name=mode value=register>\n\
<input type=hidden name=bmark value=\"%s\">\n\
+<input type=hidden name=cookie value=\"%s\">\n\
<table cellpadding=0>\n";
static char *bkmark_src2 =
- "<tr><td>New Section:</td><td><input type=text name=newsection width=60></td></tr>\n\
-<tr><td>URL:</td><td><input type=text name=url value=\"%s\" width=60></td></tr>\n\
-<tr><td>Title:</td><td><input type=text name=title value=\"%s\" width=60></td></tr>\n\
-<tr><td><input type=submit name=submit value=\"ADD\"></td>\n\
+ "<tr><td>New&nbsp;Section:<td><input type=text name=newsection size=60>\n\
+<tr><td>URL:<td><input type=text name=url value=\"%s\" size=60>\n\
+<tr><td>Title:<td><input type=text name=title value=\"%s\" size=60>\n\
+<tr><td><input type=submit value=\"" BKMARK_ADD "\">\n\
</table>\n\
-<input type=hidden name=cookie value=\"%s\">\
-</form>\
-</body></html>\n";
-static char *default_section = "Miscellaneous";
-#endif /* LANG != JA */
+</form>\n\
+</body>\n\
+</html>\n";
+#undef FALSE
#define FALSE 0
-#define T 1
+#undef TRUE
+#define TRUE 1
static char end_section[] =
"<!--End of section (do not delete this comment)-->\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("<tr><td>Section:<td><select name=\"section\">\n");
while (tmp = Strfgets(f), tmp->length > 0) {
@@ -69,13 +68,13 @@ print_bookmark_panel(char *bmark, char *url, char *title)
tmp2 = Strnew();
while (*p && *p != '<')
Strcat_char(tmp2, *p++);
- printf("<option value=\"%s\">%s</option>", tmp2->ptr,
+ printf("<option value=\"%s\">%s\n", tmp2->ptr,
tmp2->ptr);
}
}
printf("</select>\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);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 16:44:14 +0000