Four tools and a document writer, plus the storage half of the phone: until now the picker's answer (a content:// URI) reached the engine as a path, and it said "cannot read" -- the app had no way to hand a phone's file over. - md_to_html (new, src/tools/web.c + cst_web_md_document()): markdown in, one self-contained HTML document out -- doctype, utf-8, viewport, escaped title, a small stylesheet; no script, no external request. It is written into the workspace and delivered as a file card (for_user, so it never enters a request), the way deliver_file does. The default name comes from the source file's stem or, for pasted markdown, from the title with what a path cannot carry turned into '-'. It has a preview, so an approval prompt says "render x -> y.html" before anything is written. - download (src/tools/web.c): an http(s) URL into a file in the workspace, streamed with a 128 MB ceiling; a redirect chain, the same CA handling and the same refusals as web_fetch, but the bytes stay on disk (a half file is removed on any failure, including HTTP >= 400). The name comes from the URL when the caller names only a directory. - read_pdf (src/tools/fs_tools.c): the text layer and page count of a PDF, which read_file refuses because the bytes are binary -- and a PDF is exactly what arrives from a phone. Same extractor an attachment uses, its own 4 MiB input ceiling, 256 KiB of text by default with a note when cut. - session_search (new, src/tools/session_tools.c): every stored session -- this one and all the ones before it -- searched for a substring, reporting the session's id, message count and title, then the matching lines with their number and role. Case-insensitive by default, capped at 20 matches. - device_info (same file, perm_name "device"): version, system/arch/CPU count, workspace, sandbox, model and permissions, config/temp/program directories, pid -- so the model stops guessing where it runs. - Tools 3 and 4 come with tests/test_tools_ext.c (also in both build files): the document is a whole page, a script tag and a javascript: link do not survive, a hostile title stays text and cannot write outside the workspace, the preview names the file, read_pdf/download refuse what they must (no network in a test), session_search finds a fixture session and says so when nothing matches, device_info names the workspace. README's tool table grew five rows. - Android storage: the picker (SAF) answers with a content:// URI, and the engine opens files by path, so the app now copies what it points at into its own directory first -- app/android/src/xyz/whcself/cstagent/ AttachFile.java, called through a new app::materializeAttachment() (ToolProvider.h: one API for every platform; a desktop strips file:// and refuses content:// with a reason). The copy needs no permission at all: the grant travels with the URI. - "All files access" (MANAGE_EXTERNAL_STORAGE) is the other half: it is what lets the engine read a path in shared storage that a task names rather than picks. Android has no runtime dialog for it, so main.cpp opens the one Settings screen once (AttachFile.java's requestAllFilesAccess, with the all-apps screen as a fallback) and never insists: without it everything works, one picked file at a time. On the NX789J the screen came up, the app-op reads back "allow", and a relaunch no longer asks. - Composer.qml hands a content:// URI through untouched (it is not a path, and decoding it would corrupt it); AgentCore::attachFile() turns whatever the picker gave into a path first. Desktop: build clean, make check 36/36 (the new test included, also under ASan), --uitest all green, --selftest and cst-app-selftest OK. The APK builds and installs (86 MB, release-signed) with the new Java class in its dex. Version 0.9.6.
402 lines
12 KiB
C
402 lines
12 KiB
C
#ifndef _DEFAULT_SOURCE
|
|
#define _DEFAULT_SOURCE
|
|
#endif
|
|
|
|
#include "cst_web_md.h"
|
|
|
|
#include "cst_util.h"
|
|
#include "sashidown.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
struct cst_web_md {
|
|
sashidown_stream_t *st;
|
|
cst_web_md_emit_fn emit;
|
|
void *ud;
|
|
cst_buf_t in; /* HTML from sashidown, waiting for a complete tag */
|
|
int failed;
|
|
};
|
|
|
|
/* --- sanitizer ------------------------------------------------------------ */
|
|
|
|
static const char *ALLOWED_TAGS[] = {
|
|
"p", "br", "hr", "h1", "h2", "h3", "h4",
|
|
"h5", "h6", "strong", "em", "b", "i", "u",
|
|
"s", "del", "code", "pre", "blockquote", "ul", "ol",
|
|
"li", "table", "thead", "tbody", "tr", "th", "td",
|
|
"a", "img", "span", "div", NULL};
|
|
|
|
static int tag_allowed(const char *name, size_t n) {
|
|
for (int i = 0; ALLOWED_TAGS[i]; i++) {
|
|
if (strlen(ALLOWED_TAGS[i]) == n && strncmp(name, ALLOWED_TAGS[i], n) == 0)
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* A URL we are willing to put in href: http(s), mailto, or a same-site
|
|
* path. Anything else (javascript:, data:, file:, //evil) is dropped. */
|
|
static int href_ok(const char *v, size_t n) {
|
|
if (n == 0)
|
|
return 0;
|
|
if (!strncmp(v, "http://", 7) || !strncmp(v, "https://", 8) ||
|
|
!strncmp(v, "mailto:", 7))
|
|
return 1;
|
|
if (v[0] == '/' && !(n > 1 && (v[1] == '/' || v[1] == '\\')))
|
|
return 1;
|
|
if (v[0] == '#')
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
static int src_ok(const char *v, size_t n) {
|
|
if (n > 11 && !strncmp(v, "data:image/", 11))
|
|
return 1;
|
|
if (n > 12 && !strncmp(v, "/api/attach/", 12))
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
static void attr_append(cst_buf_t *b, const char *name, size_t nlen,
|
|
const char *val, size_t vlen) {
|
|
cst_buf_puts(b, " ");
|
|
cst_buf_append(b, name, nlen);
|
|
cst_buf_puts(b, "=\"");
|
|
/* a single-quoted or bare value may hold '"': it must not end ours */
|
|
for (size_t i = 0; i < vlen; i++) {
|
|
if (val[i] == '"')
|
|
cst_buf_puts(b, """);
|
|
else if (val[i] == '<')
|
|
cst_buf_puts(b, "<");
|
|
else if (val[i] == '>')
|
|
cst_buf_puts(b, ">");
|
|
else
|
|
cst_buf_append(b, val + i, 1);
|
|
}
|
|
cst_buf_puts(b, "\"");
|
|
}
|
|
|
|
/* Rewrite one tag (open, close or self-closing) into out; may emit nothing
|
|
* when the tag is not allowed. Returns 0, or -1 on OOM. */
|
|
static int sanitize_tag(const char *tag, size_t len, cst_buf_t *out) {
|
|
/* <name ...> or </name> or <!-- ... --> */
|
|
size_t i = 0;
|
|
int closing = 0;
|
|
if (len < 3 || tag[0] != '<')
|
|
return 0;
|
|
i = 1;
|
|
if (i < len && tag[i] == '/') {
|
|
closing = 1;
|
|
i++;
|
|
}
|
|
size_t name_start = i;
|
|
while (i < len && ((tag[i] >= 'a' && tag[i] <= 'z') ||
|
|
(tag[i] >= 'A' && tag[i] <= 'Z') ||
|
|
(tag[i] >= '0' && tag[i] <= '9')))
|
|
i++;
|
|
size_t name_len = i - name_start;
|
|
if (name_len == 0 || !tag_allowed(tag + name_start, name_len))
|
|
return 0; /* comments, <script>, <iframe>: dropped entirely */
|
|
int is_img = name_len == 3 && strncmp(tag + name_start, "img", 3) == 0;
|
|
int is_a = name_len == 1 && tag[name_start] == 'a';
|
|
int self_closing = len > 2 && tag[len - 2] == '/';
|
|
size_t start = out->len;
|
|
cst_buf_puts(out, "<");
|
|
if (closing)
|
|
cst_buf_puts(out, "/");
|
|
cst_buf_append(out, tag + name_start, name_len);
|
|
if (!closing) {
|
|
/* copy the allowed attributes */
|
|
int keep_target = 0; /* a link is only useful with a usable href */
|
|
size_t p = name_start + name_len;
|
|
while (p < len && tag[p] != '>' && !(tag[p] == '/' && p + 1 < len &&
|
|
tag[p + 1] == '>')) {
|
|
while (p < len && (tag[p] == ' ' || tag[p] == '\t' || tag[p] == '\n'))
|
|
p++;
|
|
size_t an = p;
|
|
while (p < len && tag[p] != '=' && tag[p] != ' ' && tag[p] != '\t' &&
|
|
tag[p] != '\n' && tag[p] != '>' && tag[p] != '/')
|
|
p++;
|
|
size_t an_len = p - an;
|
|
if (an_len == 0) {
|
|
p++;
|
|
continue;
|
|
}
|
|
const char *aval = "";
|
|
size_t av_len = 0;
|
|
if (p < len && tag[p] == '=') {
|
|
p++;
|
|
char quote = 0;
|
|
if (p < len && (tag[p] == '"' || tag[p] == '\''))
|
|
quote = tag[p++];
|
|
size_t as = p;
|
|
while (p < len &&
|
|
(quote ? tag[p] != quote : (tag[p] != ' ' && tag[p] != '>')))
|
|
p++;
|
|
aval = tag + as;
|
|
av_len = p - as;
|
|
if (quote && p < len)
|
|
p++; /* closing quote */
|
|
}
|
|
int keep = 0;
|
|
if (is_a && an_len == 4 && strncmp(tag + an, "href", 4) == 0) {
|
|
keep = href_ok(aval, av_len);
|
|
keep_target = keep;
|
|
} else if (is_img && an_len == 3 && strncmp(tag + an, "src", 3) == 0) {
|
|
keep = src_ok(aval, av_len);
|
|
keep_target = keep;
|
|
} else if (is_img && an_len == 3 && strncmp(tag + an, "alt", 3) == 0)
|
|
keep = 1;
|
|
else if (an_len == 5 && strncmp(tag + an, "class", 5) == 0 &&
|
|
av_len > 9 && !strncmp(aval, "language-", 9))
|
|
keep = 1;
|
|
if (keep)
|
|
attr_append(out, tag + an, an_len, aval, av_len);
|
|
}
|
|
if (is_a && keep_target) {
|
|
cst_buf_puts(out, " target=\"_blank\" rel=\"noopener noreferrer\"");
|
|
}
|
|
if ((is_a && !keep_target) || (is_img && !keep_target)) {
|
|
/* a link with an unusable href, or an image from nowhere: drop the
|
|
* whole tag and keep only its text */
|
|
out->len = start;
|
|
if (out->buf)
|
|
out->buf[start] = 0;
|
|
return 0;
|
|
}
|
|
cst_buf_puts(out, self_closing ? " /" : "");
|
|
}
|
|
cst_buf_puts(out, ">");
|
|
return 0;
|
|
}
|
|
|
|
/* Emit the text before every '<' and every tag through the sanitizer. */
|
|
static void scan_chunk(cst_web_md_t *s, int final) {
|
|
if (!s->emit || s->failed)
|
|
return;
|
|
size_t i = 0, emitted = 0;
|
|
while (i < s->in.len) {
|
|
if (s->in.buf[i] != '<') {
|
|
i++;
|
|
continue;
|
|
}
|
|
size_t close = i;
|
|
while (close < s->in.len && s->in.buf[close] != '>')
|
|
close++;
|
|
if (close >= s->in.len && !final)
|
|
break; /* the tag may still be growing: keep it buffered */
|
|
if (i > emitted && s->emit(s->in.buf + emitted, i - emitted, s->ud) != 0)
|
|
s->failed = 1;
|
|
size_t tag_len = close >= s->in.len ? s->in.len - i : close - i + 1;
|
|
cst_buf_t tag = {0};
|
|
if (sanitize_tag(s->in.buf + i, tag_len, &tag) != 0) {
|
|
cst_buf_free(&tag);
|
|
s->failed = 1;
|
|
return;
|
|
}
|
|
if (tag.len && s->emit(tag.buf, tag.len, s->ud) != 0)
|
|
s->failed = 1;
|
|
cst_buf_free(&tag);
|
|
i = i + tag_len;
|
|
emitted = i;
|
|
if (s->failed)
|
|
break;
|
|
}
|
|
if (emitted > 0) {
|
|
memmove(s->in.buf, s->in.buf + emitted, s->in.len - emitted);
|
|
s->in.len -= emitted;
|
|
s->in.buf[s->in.len] = 0;
|
|
}
|
|
}
|
|
|
|
/* Collector used by the one-shot sanitizer. */
|
|
typedef struct {
|
|
cst_buf_t *b;
|
|
int failed;
|
|
} md_collect_t;
|
|
|
|
static int collect_emit(const char *html, size_t len, void *ud) {
|
|
md_collect_t *c = ud;
|
|
if (cst_buf_append(c->b, html, len) != 0) {
|
|
c->failed = 1;
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
char *cst_web_md_sanitize(const char *html, size_t len) {
|
|
cst_web_md_t tmp;
|
|
memset(&tmp, 0, sizeof(tmp));
|
|
cst_buf_t out = {0};
|
|
md_collect_t col = {&out, 0};
|
|
if (cst_buf_append(&tmp.in, html ? html : "", len) != 0)
|
|
return NULL;
|
|
tmp.emit = collect_emit;
|
|
tmp.ud = &col;
|
|
scan_chunk(&tmp, 1);
|
|
cst_buf_free(&tmp.in);
|
|
if (col.failed) {
|
|
cst_buf_free(&out);
|
|
return NULL;
|
|
}
|
|
return cst_buf_steal(&out);
|
|
}
|
|
|
|
/* --- sashidown glue ------------------------------------------------------- */
|
|
|
|
static int on_sashidown_html(const char *html, size_t len, void *user) {
|
|
cst_web_md_t *s = user;
|
|
if (cst_buf_append(&s->in, html, len) != 0) {
|
|
s->failed = 1;
|
|
return 1;
|
|
}
|
|
scan_chunk(s, 0);
|
|
return s->failed ? 1 : 0;
|
|
}
|
|
|
|
cst_web_md_t *cst_web_md_new(cst_web_md_emit_fn emit, void *ud) {
|
|
cst_web_md_t *s = calloc(1, sizeof(*s));
|
|
if (!s)
|
|
return NULL;
|
|
sashidown_stream_opts_t opts;
|
|
memset(&opts, 0, sizeof(opts));
|
|
opts.on_html = on_sashidown_html;
|
|
opts.user = s;
|
|
s->st = sashidown_stream_create(&opts);
|
|
if (!s->st) {
|
|
free(s);
|
|
return NULL;
|
|
}
|
|
s->emit = emit;
|
|
s->ud = ud;
|
|
return s;
|
|
}
|
|
|
|
int cst_web_md_feed(cst_web_md_t *s, const char *data, size_t len) {
|
|
if (!s || !s->st)
|
|
return -1;
|
|
if (len && sashidown_stream_feed(s->st, data, len) != 0) {
|
|
s->failed = 1;
|
|
return -1;
|
|
}
|
|
return s->failed ? -1 : 0;
|
|
}
|
|
|
|
int cst_web_md_finish(cst_web_md_t *s) {
|
|
if (!s || !s->st)
|
|
return -1;
|
|
if (sashidown_stream_finish(s->st) != 0) {
|
|
s->failed = 1;
|
|
return -1;
|
|
}
|
|
scan_chunk(s, 1);
|
|
return s->failed ? -1 : 0;
|
|
}
|
|
|
|
void cst_web_md_free(cst_web_md_t *s) {
|
|
if (!s)
|
|
return;
|
|
if (s->st)
|
|
sashidown_stream_destroy(s->st);
|
|
cst_buf_free(&s->in);
|
|
free(s);
|
|
}
|
|
|
|
/* Escape the few characters a <title> cannot carry as they are. */
|
|
static void doc_escape(const char *s, size_t n, cst_buf_t *out) {
|
|
for (size_t i = 0; i < n && s[i]; i++) {
|
|
switch (s[i]) {
|
|
case '&':
|
|
cst_buf_puts(out, "&");
|
|
break;
|
|
case '<':
|
|
cst_buf_puts(out, "<");
|
|
break;
|
|
case '>':
|
|
cst_buf_puts(out, ">");
|
|
break;
|
|
case '"':
|
|
cst_buf_puts(out, """);
|
|
break;
|
|
default:
|
|
cst_buf_append(out, s + i, 1);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* The document a generated file holds: the same sanitized HTML, inside a page
|
|
* that stands on its own -- charset first (a phone that guesses is a phone
|
|
* that shows mojibake), a title, and a stylesheet small enough to read: no
|
|
* script, no font, no request to anywhere. */
|
|
char *cst_web_md_document(const char *md, size_t len, const char *title) {
|
|
char *body = cst_web_md_html(md, len);
|
|
if (!body)
|
|
return NULL;
|
|
static const char head[] =
|
|
"<!doctype html>\n<html lang=\"en\">\n<head>\n<meta charset=\"utf-8\">\n"
|
|
"<meta name=\"viewport\" content=\"width=device-width, "
|
|
"initial-scale=1\">\n<title>";
|
|
static const char mid[] =
|
|
"</title>\n<style>\n"
|
|
" :root { color-scheme: light dark; }\n"
|
|
" body { margin: 0 auto; max-width: 46rem; padding: 2rem 1rem 4rem;\n"
|
|
" font: 16px/1.65 system-ui, -apple-system, \"Segoe UI\", Roboto,\n"
|
|
" \"Noto Sans CJK SC\", \"Microsoft YaHei\", sans-serif; }\n"
|
|
" h1, h2, h3 { line-height: 1.25; margin: 1.6em 0 .5em; }\n"
|
|
" h1 { font-size: 1.9rem; } h2 { font-size: 1.4rem; } "
|
|
"h3 { font-size: 1.15rem; }\n"
|
|
" pre { overflow-x: auto; padding: .75rem 1rem; border-radius: 8px;\n"
|
|
" background: rgba(127, 127, 127, .12); }\n"
|
|
" code { font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, "
|
|
"monospace;\n"
|
|
" font-size: .92em; }\n"
|
|
" pre code { font-size: .88em; }\n"
|
|
" table { border-collapse: collapse; width: 100%; margin: 1em 0; }\n"
|
|
" th, td { border: 1px solid rgba(127, 127, 127, .35); padding: "
|
|
".35rem .6rem;\n"
|
|
" text-align: left; vertical-align: top; }\n"
|
|
" blockquote { margin: 1em 0; padding: .1em 1em; border-left: 3px "
|
|
"solid rgba(127, 127, 127, .4); }\n"
|
|
" img { max-width: 100%; height: auto; }\n"
|
|
" hr { border: 0; border-top: 1px solid rgba(127, 127, 127, .35); }\n"
|
|
"</style>\n</head>\n<body>\n";
|
|
static const char tail[] = "\n</body>\n</html>\n";
|
|
cst_buf_t b = {0};
|
|
cst_buf_puts(&b, head);
|
|
if (title && title[0])
|
|
doc_escape(title, 200, &b);
|
|
else
|
|
cst_buf_puts(&b, "Document");
|
|
cst_buf_puts(&b, mid);
|
|
cst_buf_puts(&b, body);
|
|
cst_buf_puts(&b, tail);
|
|
free(body);
|
|
return cst_buf_steal(&b);
|
|
}
|
|
|
|
char *cst_web_md_html(const char *md, size_t len) {
|
|
if (!md)
|
|
return NULL;
|
|
size_t cap = 65536;
|
|
char *out = NULL;
|
|
for (int attempt = 0; attempt < 8; attempt++) {
|
|
char *buf = malloc(cap);
|
|
if (!buf)
|
|
return NULL;
|
|
size_t out_len = 0;
|
|
if (sashidown_convert(md, len, buf, cap, &out_len, SASHIDOWN_FMT_HTML) ==
|
|
0) {
|
|
out = cst_web_md_sanitize(buf, out_len);
|
|
free(buf);
|
|
return out;
|
|
}
|
|
free(buf);
|
|
if (cap >= (size_t)8 * 1024 * 1024)
|
|
break;
|
|
cap *= 2;
|
|
}
|
|
return NULL;
|
|
}
|