hyung-hwan/hio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8613cbffc4
hio/bin/webs.c

308 lines
6.4 KiB
C
Raw Normal View History

added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
#include <hio-http.h>
attempting to implement 'untar'
2022-10-25 22:47:40 +00:00
#include <hio-tar.h>
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
#include <hio-opt.h>
fixed many bugs http server code
2022-12-26 17:03:53 +00:00
#include <hio-prv.h>
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
#include <signal.h>
#include <string.h>
#include <stdio.h>
attempting to implement 'untar'
2022-10-25 22:47:40 +00:00
#include <unistd.h>
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
struct arg_info_t
{
const char* laddrs;
const char* docroot;
int file_list_dir;
};
typedef struct arg_info_t arg_info_t;
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
struct htts_ext_t
{
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
arg_info_t* ai;
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
};
typedef struct htts_ext_t htts_ext_t;
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
attempting to implement 'untar'
2022-10-25 22:47:40 +00:00
void untar (hio_t* hio, hio_dev_thr_iopair_t* iop, hio_svc_htts_thr_func_info_t* tfi, void* ctx)
{
implemented a simple untar method in hio-webs
2022-12-13 16:17:39 +00:00
FILE* wfp = HIO_NULL;
attempting to implement 'untar'
2022-10-25 22:47:40 +00:00
htts_ext_t* ext;
implemented a simple untar method in hio-webs
2022-12-13 16:17:39 +00:00
hio_tar_t* tar = HIO_NULL;
hio_uint8_t buf[4096];
ssize_t n;
attempting to implement 'untar'
2022-10-25 22:47:40 +00:00
ext = hio_svc_htts_getxtn(tfi->htts);
fixed many bugs http server code
2022-12-26 17:03:53 +00:00
/* TODO: error handling on write() failure */
attempting to implement 'untar'
2022-10-25 22:47:40 +00:00
wfp = fdopen(iop->wfd, "w");
if (!wfp)
{
write (iop->wfd, "Status: 500\r\n\r\n", 15); /* internal server error */
goto done;
}
implemented a simple untar method in hio-webs
2022-12-13 16:17:39 +00:00
tar = hio_tar_open(hio, 0);
if (!tar)
attempting to implement 'untar'
2022-10-25 22:47:40 +00:00
{
implemented a simple untar method in hio-webs
2022-12-13 16:17:39 +00:00
write (iop->wfd, "Status: 500\r\n\r\n", 15);
attempting to implement 'untar'
2022-10-25 22:47:40 +00:00
goto done;
}
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
hio_tar_setxrootwithbcstr (tar, ext->ai->docroot);
implemented a simple untar method in hio-webs
2022-12-13 16:17:39 +00:00
while (1)
{
n = read(iop->rfd, buf, HIO_COUNTOF(buf));
if (n <= 0) break; /* eof or error */
if (hio_tar_xfeed(tar, buf, n) <= -1)
{
write (iop->wfd, "Status: 500\r\n\r\n", 20);
goto done;
}
}
hio_tar_endxfeed (tar);
attempting to implement 'untar'
2022-10-25 22:47:40 +00:00
write (iop->wfd, "Status: 200\r\n\r\n", 15);
done:
implemented a simple untar method in hio-webs
2022-12-13 16:17:39 +00:00
if (tar)
{
hio_tar_close (tar);
}
attempting to implement 'untar'
2022-10-25 22:47:40 +00:00
if (wfp)
{
implemented a simple untar method in hio-webs
2022-12-13 16:17:39 +00:00
iop->wfd = HIO_SYSHND_INVALID; /* prevent double close by the main library since this function closes it with fclose() */
attempting to implement 'untar'
2022-10-25 22:47:40 +00:00
fclose (wfp);
}
}
enhancing the directory handling in http-file.c
2022-12-30 17:18:28 +00:00
static void bfmt_dir (hio_svc_htts_t* htts, int fd, const hio_bch_t* qpath, hio_svc_htts_file_bfmt_dir_type_t type, const hio_bch_t* name, void* ctx)
directory formatting code in http server file handler
2022-12-23 14:44:55 +00:00
{
/* TODO: do bufferring */
/* "<a href="urlencoded-name">name</a> */
fixed many bugs http server code
2022-12-26 17:03:53 +00:00
if (type == HIO_SVC_HTTS_FILE_BFMT_DIR_HEADER)
{
write (fd, "<html><body>", 12);
}
else if (type == HIO_SVC_HTTS_FILE_BFMT_DIR_FOOTER)
{
write (fd, "</body></html>", 14);
}
else
directory formatting code in http server file handler
2022-12-23 14:44:55 +00:00
{
fixed many bugs http server code
2022-12-26 17:03:53 +00:00
HIO_ASSERT (hio_svc_htts_gethio(htts), name != HIO_NULL);
enhancing the directory handling in http-file.c
2022-12-30 17:18:28 +00:00
if (name[0] == '.' && name[1] == '\0') return;
if (qpath[0] == '\0' || (qpath[0] == '/' && qpath[1] == '\0'))
{
/* at the root */
if (name[0] == '.' && name[1] == '.' && name[2] == '\0') return;
}
directory formatting code in http server file handler
2022-12-23 14:44:55 +00:00
/* TODO: get the directory name
enhancing the directory handling in http-file.c
2022-12-30 17:18:28 +00:00
check if the entry is a directory or something else
do escaping...
show file size?
append / if the file is a directory
*/
directory formatting code in http server file handler
2022-12-23 14:44:55 +00:00
write (fd, "<li><a href=\"", 13);
write (fd, name, strlen(name));
write (fd, "\">", 2);
write (fd, name, strlen(name));
write (fd, "</a>", 4);
}
}
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
static int process_http_request (hio_svc_htts_t* htts, hio_dev_sck_t* csck, hio_htre_t* req)
{
htts_ext_t* ext = hio_svc_htts_getxtn(htts);
added --enable-all-static and --with-all-static-libs to ease full static binary builds for selected commands fixed a bug where the client socket is kept when keep-alive is set. it should have been closed if client EOF is detected regardless of keep-alive touched up debug messages in http-file.c
2022-10-08 07:47:55 +00:00
hio_t* hio = hio_svc_htts_gethio(htts);
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
hio_http_method_t mth;
const hio_bch_t* qpath;
directory formatting code in http server file handler
2022-12-23 14:44:55 +00:00
static hio_svc_htts_file_cbs_t fcbs = { bfmt_dir, HIO_NULL };
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
hio_htre_perdecqpath (req);
mth = hio_htre_getqmethodtype(req);
qpath = hio_htre_getqpath(req);
attempting to implement 'untar'
2022-10-25 22:47:40 +00:00
if (mth == HIO_HTTP_OTHER && hio_comp_bcstr(hio_htre_getqmethodname(req), "UNTAR", 1) == 0)
{
changed hio_svc_htts_dofile() to attempt index.html if a directory is given
2022-12-15 15:24:31 +00:00
/* don't care about the path for now. TODO: make this secure and reasonable */
attempting to implement 'untar'
2022-10-25 22:47:40 +00:00
hio_svc_htts_dothr(htts, csck, req, untar, HIO_NULL, 0);
}
changed hio_svc_htts_dofile() to attempt index.html if a directory is given
2022-12-15 15:24:31 +00:00
else // if (mth == HIO_HTTP_GET || mth == HIO_HTTP_POST)
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
{
added --enable-all-static and --with-all-static-libs to ease full static binary builds for selected commands fixed a bug where the client socket is kept when keep-alive is set. it should have been closed if client EOF is detected regardless of keep-alive touched up debug messages in http-file.c
2022-10-08 07:47:55 +00:00
/* TODO: proper mime-type */
set HIO_SVC_HTTS_FILE_LIST_DIR to hio_svc-htts_dofile() in webs.c
2022-12-22 05:21:15 +00:00
/* TODO: make HIO_SVC_HTTS_FILE_DIR a cli option */
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
int fopts = 0;
if (ext->ai->file_list_dir) fopts |= HIO_SVC_HTTS_FILE_LIST_DIR;
directory formatting code in http server file handler
2022-12-23 14:44:55 +00:00
if (hio_svc_htts_dofile(htts, csck, req, ext->ai->docroot, qpath, HIO_NULL, fopts, &fcbs) <= -1) goto oops;
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
}
enabled the http file handler to accept POST, PUT, DELETE
2022-10-09 16:41:07 +00:00
#if 0
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
else
{
enabled the http file handler to accept POST, PUT, DELETE
2022-10-09 16:41:07 +00:00
if (hio_svc_htts_dotxt(htts, csck, req, HIO_HTTP_STATUS_FORBIDDEN, "text/plain", hio_http_status_to_bcstr(403), 0) <= -1) goto oops;
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
}
enabled the http file handler to accept POST, PUT, DELETE
2022-10-09 16:41:07 +00:00
#endif
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
return 0;
attempting to implement 'untar'
2022-10-25 22:47:40 +00:00
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
oops:
hio_dev_sck_halt (csck);
return 0;
}
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
int webs_start (hio_t* hio, const arg_info_t* ai)
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
{
const hio_bch_t* ptr, * end;
hio_bcs_t tok;
hio_dev_sck_bind_t bi[100];
hio_oow_t bic;
hio_svc_htts_t* webs;
htts_ext_t* ext;
bic = 0;
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
ptr = ai->laddrs;
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
end = ptr + hio_count_bcstr(ptr);
while (ptr)
{
ptr = hio_tokenize_bchars(ptr, end - ptr, ", ", 2, &tok, 0);
if (tok.len > 0)
{
if (hio_bcharstoskad(hio, tok.ptr, tok.len, &bi[bic].localaddr) <= -1)
{
/* TODO: logging */
continue;
}
bi[bic].options = HIO_DEV_SCK_BIND_REUSEADDR | HIO_DEV_SCK_BIND_REUSEPORT | HIO_DEV_SCK_BIND_IGNERR;
bic++;
if (bic >= HIO_COUNTOF(bi)) break; /* TODO: make 'bi' dynamic */
}
}
webs = hio_svc_htts_start(hio, HIO_SIZEOF(htts_ext_t), bi, bic, process_http_request);
if (!webs) return -1; /* TODO: logging */
ext = hio_svc_htts_getxtn(webs);
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
ext->ai = ai;
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
return 0;
}
static hio_t* g_hio = HIO_NULL;
static void handle_sigint (int sig)
{
if (g_hio) hio_stop (g_hio, HIO_STOPREQ_TERMINATION);
}
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
static int process_args (int argc, char* argv[], arg_info_t* ai)
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
{
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
static hio_bopt_lng_t lopt[] =
{
{ "file-list-dir", '\0' }
};
static hio_bopt_t opt =
{
"",
fixed many bugs http server code
2022-12-26 17:03:53 +00:00
lopt
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
};
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
hio_bci_t c;
changed code to use hio_get_mime_type_by_ext()
2022-12-16 16:24:10 +00:00
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
if (argc < 3)
{
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
print_usage:
fprintf (stderr, "Usage: %s [options] listen-address:port docroot-dir\n", argv[0]);
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
return -1;
}
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
memset (ai, 0, HIO_SIZEOF(*ai));
while ((c = hio_getbopt(argc, argv, &opt)) != HIO_BCI_EOF)
{
switch (c)
{
case '\0':
if (strcasecmp(opt.lngopt, "file-list-dir") == 0)
{
ai->file_list_dir = 1;
break;
}
goto print_usage;
case ':':
if (opt.lngopt)
fprintf (stderr, "bad argument for '%s'\n", opt.lngopt);
else
fprintf (stderr, "bad argument for '%c'\n", opt.opt);
return -1;
default:
goto print_usage;
}
}
if (argc - opt.ind != 2) goto print_usage;
ai->laddrs = argv[opt.ind++];
ai->docroot = argv[opt.ind++];
return 0;
}
int main (int argc, char* argv[])
{
hio_t* hio = HIO_NULL;
struct sigaction sigact;
arg_info_t ai;
int xret = -1;
if (process_args(argc, argv, &ai) <= -1) return -1;
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
memset (&sigact, 0, HIO_SIZEOF(sigact));
sigact.sa_handler = SIG_IGN;
sigaction (SIGPIPE, &sigact, HIO_NULL);
memset (&sigact, 0, HIO_SIZEOF(sigact));
sigact.sa_handler = handle_sigint;
sigaction (SIGINT, &sigact, HIO_NULL);
hio = hio_open(HIO_NULL, 0, HIO_NULL, HIO_FEATURE_ALL, 512, HIO_NULL);
if (!hio)
{
printf ("Cannot open hio\n");
goto oops;
}
hio_setoption (hio, HIO_LOG_TARGET_BCSTR, "/dev/stderr");
implemented a simple untar method in hio-webs
2022-12-13 16:17:39 +00:00
{
hio_bitmask_t logmask;
hio_getoption (hio, HIO_LOG_MASK, &logmask);
logmask |= HIO_LOG_GUARDED;
hio_setoption (hio, HIO_LOG_MASK, &logmask);
}
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
g_hio = hio;
enhanced cmdline arguments in hio-webs.c
2022-12-22 16:25:20 +00:00
if (webs_start(hio, &ai) <= -1) goto oops;
added the hio-webs command added the extension size parameter to hio_svc_htts_start() added the docker build step
2022-10-07 05:08:40 +00:00
hio_loop (hio);
g_hio = HIO_NULL;
xret = 0;
oops:
memset (&sigact, 0, HIO_SIZEOF(sigact));
sigact.sa_handler = SIG_IGN;
sigaction (SIGINT, &sigact, HIO_NULL);
if (hio) hio_close (hio);
return xret;
}
Reference in New Issue Copy Permalink