Skip to content

Remove DD-based docroot, UFS-only static file serving #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgrossmann merged 1 commit into from
Apr 8, 2026
Merged

Remove DD-based docroot, UFS-only static file serving #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 10 additions & 74 deletions src/httpfile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,47 +462,7 @@ ssi_system_env(HTTPC *httpc)

}

/* ddname() convert "/index.html" -> "/DD:html(index)" */
static UCHAR *
ddname(const UCHAR *in, UCHAR *out, int size)
{
UCHAR *ext = strchr(in,'.');
UCHAR *mem = strchr(in,'/');
int extlen = ext ? strlen(ext+1) : 0;
int memlen = (mem && ext) ? (int)(ext-mem) - 1 : 0;
int pos = 0;
int len;

/* we need space for "/DD:_ddname_(_member_)" */
if (size < sizeof("/DD:_ddname_(_member_)")) goto quit;

if (extlen < 0 OR memlen < 0 OR strchr(in, ':')) {
/* doesn't look like a normal "file.ext" name */
out = NULL;
goto quit;
}

if (extlen > 8) extlen = 8; /* limit ddname to 8 characters */
if (memlen > 8) memlen = 8; /* limit member name to 8 characters */

strcpy(out, "/DD:");
pos += 4;

for(ext++;(*ext) && (extlen > 0); extlen--) {
out[pos++]=*ext++;
}
out[pos++] = '(';
for(mem++;(*mem) && (*mem!='.') && (memlen > 0); memlen--) {
out[pos++]=*mem++;
}
out[pos++] = ')';
out[pos] = 0;

quit:
return out;
}

static int
static int
ssi_include(HTTPC *httpc, char *next)
{
int isfile = 0;
Expand All @@ -516,7 +476,6 @@ ssi_include(HTTPC *httpc, char *next)
UCHAR subtype = httpc->subtype;
UCHAR substate = httpc->substate;
UCHAR ssi = httpc->ssi;
char buf[40];
char uri[UFS_PATH_MAX];

// wtof("%s: enter next=\"%s\"", __func__, next);
Expand Down Expand Up @@ -555,40 +514,17 @@ ssi_include(HTTPC *httpc, char *next)
strncpy(uri, path, sizeof(uri));
uri[sizeof(uri)-1] = 0;

if (httpc->ufs) {
/* try to open path asis */
mime = http_mime(path);
if (!mime->binary) {
httpc->fp = http_open(httpc, path, mime);
if (httpc->fp || httpc->ufp) goto okay; /* file was opened */
}
mime = http_mime(path);
if (mime->binary) {
ssi_printf(httpc, "<!-- Oops: we can't include a binary file \"%s\" -->\n", uri);
goto quit;
}

/* now we'll try to convert the path to a "/DD:EXT(MEMBER)" */
if (http_cmpn(path,"/DD:",4)!=0 &&
strchr(path,'.') && strlen(path) < 19) {

/* convert the path to a "/DD:ddname(member)" */
if (ddname(path, buf, sizeof(buf))) {
path = buf;

mime = http_mime(path);
if (!mime->binary) {
/* open the file */
httpc->fp = http_open(httpc, path, mime);
}
}
}

if (!httpc->fp && !httpc->ufp) {
if (mime->binary) {
ssi_printf(httpc, "<!-- Oops: we can't include a binary file \"%s\" -->\n", uri);
goto quit;
}
/* open failed for path name */
ssi_printf(httpc, "<!-- Oops: we didn't find \"%s\" -->\n", uri);
goto quit;
}
httpc->fp = http_open(httpc, path, mime);
if (!httpc->fp && !httpc->ufp) {
ssi_printf(httpc, "<!-- Oops: we didn't find \"%s\" -->\n", uri);
goto quit;
}

okay:
// ssi_printf(httpc, "\n");
Expand Down
126 changes: 22 additions & 104 deletions src/httpget.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,46 +11,6 @@ enum ctype {
CTYPE_TEXT
};

/* ddname() convert "/index.html" -> "/DD:html(index)" */
static UCHAR *
ddname(const UCHAR *in, UCHAR *out, int size)
{
UCHAR *ext = strchr(in,'.');
UCHAR *mem = strchr(in,'/');
int extlen = ext ? strlen(ext+1) : 0;
int memlen = (mem && ext) ? (int)(ext-mem) - 1 : 0;
int pos = 0;
int len;

/* we need space for "/DD:_ddname_(_member_)" */
if (size < sizeof("/DD:_ddname_(_member_)")) goto quit;

if (extlen < 0 OR memlen < 0 OR strchr(in, ':')) {
/* doesn't look like a normal "file.ext" name */
out = NULL;
goto quit;
}

if (extlen > 8) extlen = 8; /* limit ddname to 8 characters */
if (memlen > 8) memlen = 8; /* limit member name to 8 characters */

strcpy(out, "/DD:");
pos += 4;

for(ext++;(*ext) && (extlen > 0); extlen--) {
out[pos++]=*ext++;
}
out[pos++] = '(';
for(mem++;(*mem) && (*mem!='.') && (memlen > 0); memlen--) {
out[pos++]=*mem++;
}
out[pos++] = ')';
out[pos] = 0;

quit:
return out;
}

extern int
httpget(HTTPC *httpc)
{
Expand All @@ -76,71 +36,30 @@ httpget(HTTPC *httpc)
__asm__("DC\tH'0'");
}

if (http_get_ufs(httpc)) {
/* try to open path asis */
mime = http_mime(path);
fp = http_open(httpc, path, mime);
// wtof("%s: 1 http_open(%p, \"%s\", %p) fp=%p, httpc->ufp=%p",
// __func__, httpc, path, mime, fp, httpc->ufp);
if (fp || httpc->ufp) goto okay; /* file was opened */

/* If the path is for a directory then we need to see if a
* "index.html" exist in this directory and open it.
*/
len = strlen(path);
if (path[len-1]=='/') {
memcpy(buf, path, len);
strcpy(&buf[len], "index.html");

mime = http_mime(buf);
fp = http_open(httpc, buf, mime);

if (fp || httpc->ufp) goto okay; /* file was opened */
}
}

if (http_cmpn(path,"/DD:",4)!=0 &&
strchr(path,'.') && strlen(path) < 19) {

/* convert the path to a "/DD:ddname(member)" */
if (ddname(path, buf, sizeof(buf))) {
path = buf;
http_dbgf("ddname:\"%s\"\n", path);
}
}
/* try to open path from UFS */
mime = http_mime(path);

/* try to open the requested document */
fp = http_open(httpc, path, mime);
// wtof("%s: 2 http_open(%p, \"%s\", %p) fp=%p, httpc->ufp=%p",
// __func__, httpc, path, mime, fp, httpc->ufp);
if (!fp && !httpc->ufp && http_cmp(path,"/")==0) {
/* try to open default documents */
path = "/index.html";
mime = http_mime(path);
fp = http_open(httpc, path, mime);
if (!fp && !httpc->ufp) {
path = "/default.html";
mime = http_mime(path);
fp = http_open(httpc, path, mime);
}
if (!fp && !httpc->ufp) {
path = "/DD:HTML(INDEX)";
mime = http_mime(path);
fp = http_open(httpc, path, mime);
}
if (!fp && !httpc->ufp) {
/* try another one */
path = "/DD:HTML(DEFAULT)";
fp = http_open(httpc, path, mime);
}
if (fp || httpc->ufp) goto okay;

/* If the path is for a directory, try index.html / default.html */
len = strlen(path);
if (path[len-1]=='/') {
memcpy(buf, path, len);
strcpy(&buf[len], "index.html");
mime = http_mime(buf);
fp = http_open(httpc, buf, mime);
if (fp || httpc->ufp) goto okay;

strcpy(&buf[len], "default.html");
mime = http_mime(buf);
fp = http_open(httpc, buf, mime);
if (fp || httpc->ufp) goto okay;
}

if (!fp && !httpc->ufp) {
rc = http_resp_not_found(httpc, path);
httpc->state = CSTATE_DONE;
goto quit;
}
/* file not found */
rc = http_resp_not_found(httpc, path);
httpc->state = CSTATE_DONE;
goto quit;

okay:
httpc->fp = fp;
Expand All @@ -153,9 +72,8 @@ httpget(HTTPC *httpc)
if (rc) goto die;
#if 1
/* don't allow the browser to cache our html documents */
if (strstr(mime->type, "html") ||
__patmat(path, "*.html") ||
__patmat(path, "/DD:HTML(*)")) {
if (strstr(mime->type, "html") ||
__patmat(path, "*.html")) {
rc = http_printf(httpc, "Cache-Control: no-store\r\n");
if (rc) goto die;
}
Expand Down
69 changes: 3 additions & 66 deletions src/httpopen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,10 @@
FILE *
http_open(HTTPC *httpc, const UCHAR *path, const HTTPM *mime)
{
FILE *fp = NULL;
UCHAR *mode;
UCHAR *p;
int len;
int lock;
UCHAR ddname[12] = "";
UCHAR member[12] = "";
UCHAR buf[256];

// wtof("%s: enter path=\"%s\"", __func__, path);

if (!path) goto quit;

/* reject path traversal attempts */
Expand All @@ -29,50 +22,6 @@ http_open(HTTPC *httpc, const UCHAR *path, const HTTPM *mime)
memcpy(buf, path, len);
buf[len]=0;

/* wtof("%s buf=\"%s\"", __func__, buf); */

if (http_cmpn(buf, "/DD:", 4)==0) {
/* open by DD name */
strcpy(buf, buf+1); /* strip leading '/' */

/* Ideally we would expect the path to be "/DD:EXT(MEMBER)"
** but we'd also like to handle "/DD:MEMBER.EXT" and convert
** that internally to "/DD:EXT(MEMBER)".
**
** The EXT part of the name will be used to lookup the MIME
** info and would also be used as the DDNAME to open.
*/

p = strchr(buf, '(');
if (!p) {
/* We likely have "DD:MEMBER.EXT" */
p = strrchr(buf, '.'); /* find the extension */
if (p) {
/* We have "DD:MEMBER.EXT"
** Use the EXT as the DDNAME
*/
p++;
len = strlen(p);
if (len>=sizeof(ddname)) len = sizeof(ddname)-1;
memcpy(ddname, p, len);
ddname[len] = 0;
}
else {
/* We don't want to allow "DD:MEMBER"
** They should use "DD:MEMBER.EXT"
*/
goto quit;
}

len = strlen(&buf[3]);
if (len>=sizeof(member)) len = sizeof(member)-1;
memcpy(member, &buf[3], len);
member[len] = 0;
/* convert to "DD:DDNAME(MEMBER)" */
sprintf(buf, "DD:%s(%s)", ddname, member);
}
}

if (!mime) mime = (const HTTPM *) http_mime(buf);

if (mime) {
Expand All @@ -82,42 +31,30 @@ http_open(HTTPC *httpc, const UCHAR *path, const HTTPM *mime)
else {
mode = "r";
}

if (http_cmp(mime->type, "text/html")==0 ||
http_cmp(mime->type, "text/x-server-parsed-html")==0) {
/* enable Server Side Include processing of this file */
httpc->ssi = 1;
// wtof("%s: enabling SSI processing for \"%s\" as \"%s\"", __func__, buf, mime->type);
}
else {
/* disable Server Side Processing of this file */
httpc->ssi = 0;
// wtof("%s: disabling SSI processing for \"%s\" as \"%s\"", __func__, buf, mime->type);
}
}


{
UFS *ufs = http_get_ufs(httpc);
if (ufs) {
UCHAR ufspath[256];
const char *dr = httpc->httpd->docroot;
if (dr[0] && http_cmpn(buf, "/DD:", 4) != 0) {
/* prepend document root to UFS path */
if (dr[0]) {
snprintf((char *)ufspath, sizeof(ufspath), "%s%s", dr, buf);
httpc->ufp = ufs_fopen(ufs, ufspath, mode);
} else {
httpc->ufp = ufs_fopen(ufs, buf, mode);
}
if (httpc->ufp) {
goto quit; /* success, return NULL to caller */
}
}
}

fp = fopen(buf, mode);

quit:
// wtof("%s: exit fp=%p", __func__, fp);
return fp;
return NULL;
}
Loading