hyung-hwan/hio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wrote some code for http proxy support - not complete

Browse Source
This commit is contained in:
hyung-hwan 2023-03-30 15:34:32 +09:00
parent 0f910de1a6
commit 50df17b410
9 changed files with 1057 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/t06.c
View File

@ -91,6 +91,16 @@ static void on_htts_thr2_request (hio_svc_htts_t* htts, hio_dev_thr_iopair_t* io
fprintf (fp, "Status: %d\r\n", HIO_HTTP_STATUS_OK); fprintf (fp, "Status: %d\r\n", HIO_HTTP_STATUS_OK);
fprintf (fp, "Content-Type: text/html\r\n\r\n"); fprintf (fp, "Content-Type: text/html\r\n\r\n");
/* echo back the posted data */
while (1)
{
ssize_t n = read(iop->rfd, buf, sizeof(buf));
if (n <= 0) break;
fwrite (buf, 1, n, fp);
}
/* output the file contents */
while (!feof(sf) && !ferror(sf)) while (!feof(sf) && !ferror(sf))
{ {
size_t n; size_t n;
@ -196,6 +206,7 @@ if (hio_htre_getcontentlen(req) > 0)
{ {
const hio_bch_t* qpath = hio_htre_getqpath(req); const hio_bch_t* qpath = hio_htre_getqpath(req);
int x; int x;
if (hio_comp_bcstr_limited(qpath, "/thr/", 5, 1) == 0) if (hio_comp_bcstr_limited(qpath, "/thr/", 5, 1) == 0)
x = hio_svc_htts_dothr(htts, csck, req, on_htts_thr_request, HIO_NULL, 0, HIO_NULL); x = hio_svc_htts_dothr(htts, csck, req, on_htts_thr_request, HIO_NULL, 0, HIO_NULL);
else if (hio_comp_bcstr_limited(qpath, "/thr2/", 6, 1) == 0) else if (hio_comp_bcstr_limited(qpath, "/thr2/", 6, 1) == 0)
@ -332,7 +343,7 @@ static void tcp_sck_on_connect (hio_dev_sck_t* tcp)
else if (tcp->state & HIO_DEV_SCK_ACCEPTED) else if (tcp->state & HIO_DEV_SCK_ACCEPTED)
{ {
/* TODO: pass it to distributor??? */ /* TODO: pass it to distributor??? */
/* THIS PART WON"T BE CALLED FOR tcp_sck_on_raw_accept.. */ /* THIS PART WON'T BE CALLED FOR tcp_sck_on_raw_accept.. */
} }
} }

1
lib/Makefile.am
View File

@ -86,6 +86,7 @@ libhio_la_SOURCES = \
http-fcgi.c \ http-fcgi.c \
http-file.c \ http-file.c \
http-prv.h \ http-prv.h \
http-prxy.c \
http-svr.c \ http-svr.c \
http-thr.c \ http-thr.c \
http-txt.c \ http-txt.c \

59
lib/Makefile.in
View File

@ -150,12 +150,12 @@ libhio_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
am__libhio_la_SOURCES_DIST = chr.c dhcp-svr.c dns.c dns-cli.c ecs.c \ am__libhio_la_SOURCES_DIST = chr.c dhcp-svr.c dns.c dns-cli.c ecs.c \
ecs-imp.h err.c fcgi-cli.c fmt.c fmt-imp.h htb.c htrd.c htre.c \ ecs-imp.h err.c fcgi-cli.c fmt.c fmt-imp.h htb.c htrd.c htre.c \
http.c http-cgi.c http-fcgi.c http-file.c http-prv.h \ http.c http-cgi.c http-fcgi.c http-file.c http-prv.h \
http-svr.c http-thr.c http-txt.c json.c hio-prv.h hio.c md5.c \ http-prxy.c http-svr.c http-thr.c http-txt.c json.c hio-prv.h \
nwif.c opt.c opt-imp.h path.c pipe.c pro.c pty.c rad-msg.c \ hio.c md5.c nwif.c opt.c opt-imp.h path.c pipe.c pro.c pty.c \
sck.c shw.c skad.c sys.c sys-ass.c sys-err.c sys-log.c \ rad-msg.c sck.c shw.c skad.c sys.c sys-ass.c sys-err.c \
sys-mux.c sys-prv.h sys-tim.c thr.c uch-case.h uch-prop.h \ sys-log.c sys-mux.c sys-prv.h sys-tim.c thr.c uch-case.h \
tar.c tmr.c utf8.c utl.c utl-mime.c utl-siph.c utl-str.c mar.c \ uch-prop.h tar.c tmr.c utf8.c utl.c utl-mime.c utl-siph.c \
mar-cli.c utl-str.c mar.c mar-cli.c
@ENABLE_MARIADB_TRUE@am__objects_1 = libhio_la-mar.lo \ @ENABLE_MARIADB_TRUE@am__objects_1 = libhio_la-mar.lo \
@ENABLE_MARIADB_TRUE@ libhio_la-mar-cli.lo @ENABLE_MARIADB_TRUE@ libhio_la-mar-cli.lo
am_libhio_la_OBJECTS = libhio_la-chr.lo libhio_la-dhcp-svr.lo \ am_libhio_la_OBJECTS = libhio_la-chr.lo libhio_la-dhcp-svr.lo \
@ -163,17 +163,18 @@ am_libhio_la_OBJECTS = libhio_la-chr.lo libhio_la-dhcp-svr.lo \
libhio_la-err.lo libhio_la-fcgi-cli.lo libhio_la-fmt.lo \ libhio_la-err.lo libhio_la-fcgi-cli.lo libhio_la-fmt.lo \
libhio_la-htb.lo libhio_la-htrd.lo libhio_la-htre.lo \ libhio_la-htb.lo libhio_la-htrd.lo libhio_la-htre.lo \
libhio_la-http.lo libhio_la-http-cgi.lo libhio_la-http-fcgi.lo \ libhio_la-http.lo libhio_la-http-cgi.lo libhio_la-http-fcgi.lo \
libhio_la-http-file.lo libhio_la-http-svr.lo \ libhio_la-http-file.lo libhio_la-http-prxy.lo \
libhio_la-http-thr.lo libhio_la-http-txt.lo libhio_la-json.lo \ libhio_la-http-svr.lo libhio_la-http-thr.lo \
libhio_la-hio.lo libhio_la-md5.lo libhio_la-nwif.lo \ libhio_la-http-txt.lo libhio_la-json.lo libhio_la-hio.lo \
libhio_la-opt.lo libhio_la-path.lo libhio_la-pipe.lo \ libhio_la-md5.lo libhio_la-nwif.lo libhio_la-opt.lo \
libhio_la-pro.lo libhio_la-pty.lo libhio_la-rad-msg.lo \ libhio_la-path.lo libhio_la-pipe.lo libhio_la-pro.lo \
libhio_la-sck.lo libhio_la-shw.lo libhio_la-skad.lo \ libhio_la-pty.lo libhio_la-rad-msg.lo libhio_la-sck.lo \
libhio_la-sys.lo libhio_la-sys-ass.lo libhio_la-sys-err.lo \ libhio_la-shw.lo libhio_la-skad.lo libhio_la-sys.lo \
libhio_la-sys-log.lo libhio_la-sys-mux.lo libhio_la-sys-tim.lo \ libhio_la-sys-ass.lo libhio_la-sys-err.lo libhio_la-sys-log.lo \
libhio_la-thr.lo libhio_la-tar.lo libhio_la-tmr.lo \ libhio_la-sys-mux.lo libhio_la-sys-tim.lo libhio_la-thr.lo \
libhio_la-utf8.lo libhio_la-utl.lo libhio_la-utl-mime.lo \ libhio_la-tar.lo libhio_la-tmr.lo libhio_la-utf8.lo \
libhio_la-utl-siph.lo libhio_la-utl-str.lo $(am__objects_1) libhio_la-utl.lo libhio_la-utl-mime.lo libhio_la-utl-siph.lo \
libhio_la-utl-str.lo $(am__objects_1)
libhio_la_OBJECTS = $(am_libhio_la_OBJECTS) libhio_la_OBJECTS = $(am_libhio_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@) AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@ -209,6 +210,7 @@ am__depfiles_remade = ./$(DEPDIR)/libhio_la-chr.Plo \
./$(DEPDIR)/libhio_la-http-cgi.Plo \ ./$(DEPDIR)/libhio_la-http-cgi.Plo \
./$(DEPDIR)/libhio_la-http-fcgi.Plo \ ./$(DEPDIR)/libhio_la-http-fcgi.Plo \
./$(DEPDIR)/libhio_la-http-file.Plo \ ./$(DEPDIR)/libhio_la-http-file.Plo \
./$(DEPDIR)/libhio_la-http-prxy.Plo \
./$(DEPDIR)/libhio_la-http-svr.Plo \ ./$(DEPDIR)/libhio_la-http-svr.Plo \
./$(DEPDIR)/libhio_la-http-thr.Plo \ ./$(DEPDIR)/libhio_la-http-thr.Plo \
./$(DEPDIR)/libhio_la-http-txt.Plo \ ./$(DEPDIR)/libhio_la-http-txt.Plo \
@ -471,12 +473,13 @@ include_HEADERS = hio-chr.h hio-cmn.h hio-dhcp.h hio-dns.h hio-ecs.h \
lib_LTLIBRARIES = libhio.la lib_LTLIBRARIES = libhio.la
libhio_la_SOURCES = chr.c dhcp-svr.c dns.c dns-cli.c ecs.c ecs-imp.h \ libhio_la_SOURCES = chr.c dhcp-svr.c dns.c dns-cli.c ecs.c ecs-imp.h \
err.c fcgi-cli.c fmt.c fmt-imp.h htb.c htrd.c htre.c http.c \ err.c fcgi-cli.c fmt.c fmt-imp.h htb.c htrd.c htre.c http.c \
http-cgi.c http-fcgi.c http-file.c http-prv.h http-svr.c \ http-cgi.c http-fcgi.c http-file.c http-prv.h http-prxy.c \
http-thr.c http-txt.c json.c hio-prv.h hio.c md5.c nwif.c \ http-svr.c http-thr.c http-txt.c json.c hio-prv.h hio.c md5.c \
opt.c opt-imp.h path.c pipe.c pro.c pty.c rad-msg.c sck.c \ nwif.c opt.c opt-imp.h path.c pipe.c pro.c pty.c rad-msg.c \
shw.c skad.c sys.c sys-ass.c sys-err.c sys-log.c sys-mux.c \ sck.c shw.c skad.c sys.c sys-ass.c sys-err.c sys-log.c \
sys-prv.h sys-tim.c thr.c uch-case.h uch-prop.h tar.c tmr.c \ sys-mux.c sys-prv.h sys-tim.c thr.c uch-case.h uch-prop.h \
utf8.c utl.c utl-mime.c utl-siph.c utl-str.c $(am__append_2) tar.c tmr.c utf8.c utl.c utl-mime.c utl-siph.c utl-str.c \
$(am__append_2)
libhio_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON) libhio_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
libhio_la_CFLAGS = $(CFLAGS_LIB_COMMON) $(am__append_3) libhio_la_CFLAGS = $(CFLAGS_LIB_COMMON) $(am__append_3)
libhio_la_LDFLAGS = $(LDFLAGS_LIB_COMMON) $(am__append_4) libhio_la_LDFLAGS = $(LDFLAGS_LIB_COMMON) $(am__append_4)
@ -591,6 +594,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhio_la-http-cgi.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhio_la-http-cgi.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhio_la-http-fcgi.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhio_la-http-fcgi.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhio_la-http-file.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhio_la-http-file.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhio_la-http-prxy.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhio_la-http-svr.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhio_la-http-svr.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhio_la-http-thr.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhio_la-http-thr.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhio_la-http-txt.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhio_la-http-txt.Plo@am__quote@ # am--include-marker
@ -759,6 +763,13 @@ libhio_la-http-file.lo: http-file.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhio_la_CPPFLAGS) $(CPPFLAGS) $(libhio_la_CFLAGS) $(CFLAGS) -c -o libhio_la-http-file.lo `test -f 'http-file.c' || echo '$(srcdir)/'`http-file.c @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhio_la_CPPFLAGS) $(CPPFLAGS) $(libhio_la_CFLAGS) $(CFLAGS) -c -o libhio_la-http-file.lo `test -f 'http-file.c' || echo '$(srcdir)/'`http-file.c
libhio_la-http-prxy.lo: http-prxy.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhio_la_CPPFLAGS) $(CPPFLAGS) $(libhio_la_CFLAGS) $(CFLAGS) -MT libhio_la-http-prxy.lo -MD -MP -MF $(DEPDIR)/libhio_la-http-prxy.Tpo -c -o libhio_la-http-prxy.lo `test -f 'http-prxy.c' || echo '$(srcdir)/'`http-prxy.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhio_la-http-prxy.Tpo $(DEPDIR)/libhio_la-http-prxy.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='http-prxy.c' object='libhio_la-http-prxy.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhio_la_CPPFLAGS) $(CPPFLAGS) $(libhio_la_CFLAGS) $(CFLAGS) -c -o libhio_la-http-prxy.lo `test -f 'http-prxy.c' || echo '$(srcdir)/'`http-prxy.c
libhio_la-http-svr.lo: http-svr.c libhio_la-http-svr.lo: http-svr.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhio_la_CPPFLAGS) $(CPPFLAGS) $(libhio_la_CFLAGS) $(CFLAGS) -MT libhio_la-http-svr.lo -MD -MP -MF $(DEPDIR)/libhio_la-http-svr.Tpo -c -o libhio_la-http-svr.lo `test -f 'http-svr.c' || echo '$(srcdir)/'`http-svr.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhio_la_CPPFLAGS) $(CPPFLAGS) $(libhio_la_CFLAGS) $(CFLAGS) -MT libhio_la-http-svr.lo -MD -MP -MF $(DEPDIR)/libhio_la-http-svr.Tpo -c -o libhio_la-http-svr.lo `test -f 'http-svr.c' || echo '$(srcdir)/'`http-svr.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhio_la-http-svr.Tpo $(DEPDIR)/libhio_la-http-svr.Plo @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhio_la-http-svr.Tpo $(DEPDIR)/libhio_la-http-svr.Plo
@ -1156,6 +1167,7 @@ distclean: distclean-am
-rm -f ./$(DEPDIR)/libhio_la-http-cgi.Plo -rm -f ./$(DEPDIR)/libhio_la-http-cgi.Plo
-rm -f ./$(DEPDIR)/libhio_la-http-fcgi.Plo -rm -f ./$(DEPDIR)/libhio_la-http-fcgi.Plo
-rm -f ./$(DEPDIR)/libhio_la-http-file.Plo -rm -f ./$(DEPDIR)/libhio_la-http-file.Plo
-rm -f ./$(DEPDIR)/libhio_la-http-prxy.Plo
-rm -f ./$(DEPDIR)/libhio_la-http-svr.Plo -rm -f ./$(DEPDIR)/libhio_la-http-svr.Plo
-rm -f ./$(DEPDIR)/libhio_la-http-thr.Plo -rm -f ./$(DEPDIR)/libhio_la-http-thr.Plo
-rm -f ./$(DEPDIR)/libhio_la-http-txt.Plo -rm -f ./$(DEPDIR)/libhio_la-http-txt.Plo
@ -1249,6 +1261,7 @@ maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/libhio_la-http-cgi.Plo -rm -f ./$(DEPDIR)/libhio_la-http-cgi.Plo
-rm -f ./$(DEPDIR)/libhio_la-http-fcgi.Plo -rm -f ./$(DEPDIR)/libhio_la-http-fcgi.Plo
-rm -f ./$(DEPDIR)/libhio_la-http-file.Plo -rm -f ./$(DEPDIR)/libhio_la-http-file.Plo
-rm -f ./$(DEPDIR)/libhio_la-http-prxy.Plo
-rm -f ./$(DEPDIR)/libhio_la-http-svr.Plo -rm -f ./$(DEPDIR)/libhio_la-http-svr.Plo
-rm -f ./$(DEPDIR)/libhio_la-http-thr.Plo -rm -f ./$(DEPDIR)/libhio_la-http-thr.Plo
-rm -f ./$(DEPDIR)/libhio_la-http-txt.Plo -rm -f ./$(DEPDIR)/libhio_la-http-txt.Plo

18
lib/fcgi-cli.c
View File

@ -299,27 +299,11 @@ static int make_connection_socket (hio_svc_fcgic_t* fcgic, hio_svc_fcgic_conn_t*
fcgic_sck_xtn_t* sck_xtn; fcgic_sck_xtn_t* sck_xtn;
HIO_MEMSET (&mi, 0, HIO_SIZEOF(mi)); HIO_MEMSET (&mi, 0, HIO_SIZEOF(mi));
switch (hio_skad_get_family(&conn->addr)) if (hio_get_stream_sck_type_from_skad(&conn->addr, &mi.type) <= -1)
{ {
case HIO_AF_INET:
mi.type = HIO_DEV_SCK_TCP4;
break;
case HIO_AF_INET6:
mi.type = HIO_DEV_SCK_TCP6;
break;
#if defined(HIO_AF_UNIX)
case HIO_AF_UNIX:
mi.type = HIO_DEV_SCK_UNIX;
break;
#endif
default:
hio_seterrnum (hio, HIO_EINVAL); hio_seterrnum (hio, HIO_EINVAL);
return -1; return -1;
} }
mi.options = HIO_DEV_SCK_MAKE_LENIENT; mi.options = HIO_DEV_SCK_MAKE_LENIENT;
mi.on_write = sck_on_write; mi.on_write = sck_on_write;
mi.on_read = sck_on_read; mi.on_read = sck_on_read;

23
lib/hio-http.h
View File

@ -467,6 +467,26 @@ HIO_EXPORT int hio_svc_htts_dofile (
hio_svc_htts_file_cbs_t* cbs hio_svc_htts_file_cbs_t* cbs
); );
HIO_EXPORT int hio_svc_htts_dofcgi (
hio_svc_htts_t* htts,
hio_dev_sck_t* csck,
hio_htre_t* req,
const hio_skad_t* fcgis_addr,
const hio_bch_t* docroot,
const hio_bch_t* script,
int options, /**< 0 or bitwise-Ored of #hio_svc_htts_file_option_t enumerators */
hio_svc_htts_task_on_kill_t on_kill
);
HIO_EXPORT int hio_svc_htts_doprxy (
hio_svc_htts_t* htts,
hio_dev_sck_t* csck,
hio_htre_t* req,
const hio_skad_t* tgt_addr,
int options,
hio_svc_htts_task_on_kill_t on_kill
);
HIO_EXPORT int hio_svc_htts_dothr ( HIO_EXPORT int hio_svc_htts_dothr (
hio_svc_htts_t* htts, hio_svc_htts_t* htts,
hio_dev_sck_t* csck, hio_dev_sck_t* csck,
@ -488,6 +508,9 @@ HIO_EXPORT int hio_svc_htts_dotxt (
hio_svc_htts_task_on_kill_t on_kill hio_svc_htts_task_on_kill_t on_kill
); );
HIO_EXPORT hio_svc_htts_task_t* hio_svc_htts_task_make ( HIO_EXPORT hio_svc_htts_task_t* hio_svc_htts_task_make (
hio_svc_htts_t* htts, hio_svc_htts_t* htts,
hio_oow_t task_size, hio_oow_t task_size,

5
lib/hio-sck.h
View File

@ -623,6 +623,11 @@ HIO_EXPORT hio_uint16_t hio_checksum_ip (
hio_oow_t len hio_oow_t len
); );
HIO_EXPORT int hio_get_stream_sck_type_from_skad (
const hio_skad_t* skad,
hio_dev_sck_type_t* type
);
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif

950
lib/http-prxy.c Normal file
View File

@ -0,0 +1,950 @@
/*
Copyright (c) 2016-2020 Chung, Hyung-Hwan. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "http-prv.h"
#include <hio-pro.h>
#include <hio-fmt.h>
#include <hio-chr.h>
#include <hio-dns.h>
#include <unistd.h> /* TODO: move file operations to sys-file.XXX */
#include <fcntl.h>
#include <sys/stat.h>
#include <stdlib.h> /* setenv, clearenv */
#if defined(HAVE_CRT_EXTERNS_H)
# include <crt_externs.h> /* _NSGetEnviron */
#endif
#define PRXY_ALLOW_UNLIMITED_REQ_CONTENT_LENGTH
#define PRXY_PENDING_IO_THRESHOLD 5
#define PRXY_OVER_READ_FROM_CLIENT (1 << 0)
#define PRXY_OVER_READ_FROM_PEER (1 << 1)
#define PRXY_OVER_WRITE_TO_CLIENT (1 << 2)
#define PRXY_OVER_WRITE_TO_PEER (1 << 3)
#define PRXY_OVER_ALL (PRXY_OVER_READ_FROM_CLIENT | PRXY_OVER_READ_FROM_PEER | PRXY_OVER_WRITE_TO_CLIENT | PRXY_OVER_WRITE_TO_PEER)
struct prxy_t
{
HIO_SVC_HTTS_TASK_HEADER;
hio_svc_htts_task_on_kill_t on_kill; /* user-provided on_kill callback */
int options;
hio_oow_t peer_pending_writes;
hio_dev_pro_t* peer;
hio_htrd_t* peer_htrd;
unsigned int over: 4; /* must be large enough to accomodate PRXY_OVER_ALL */
unsigned int client_htrd_recbs_changed: 1;
hio_dev_sck_on_read_t client_org_on_read;
hio_dev_sck_on_write_t client_org_on_write;
hio_dev_sck_on_disconnect_t client_org_on_disconnect;
hio_htrd_recbs_t client_htrd_org_recbs;
};
typedef struct prxy_t prxy_t;
struct prxy_peer_xtn_t
{
prxy_t* prxy; /* back pointer to the prxy object */
};
typedef struct prxy_peer_xtn_t prxy_peer_xtn_t;
static void unbind_task_from_client (prxy_t* prxy, int rcdown);
static void unbind_task_from_peer (prxy_t* prxy, int rcdown);
static void prxy_halt_participating_devices (prxy_t* prxy)
{
HIO_DEBUG5 (prxy->htts->hio, "HTTS(%p) - prxy(t=%p,c=%p(%d),p=%p) Halting participating devices\n", prxy->htts, prxy, prxy->task_csck, (prxy->task_csck? prxy->task_csck->hnd: -1), prxy->peer);
if (prxy->task_csck) hio_dev_sck_halt (prxy->task_csck);
/* check for peer as it may not have been started */
if (prxy->peer) hio_dev_pro_halt (prxy->peer);
}
static int prxy_write_to_peer (prxy_t* prxy, const void* data, hio_iolen_t dlen)
{
if (prxy->peer)
{
prxy->peer_pending_writes++;
if (hio_dev_pro_write(prxy->peer, data, dlen, HIO_NULL) <= -1)
{
prxy->peer_pending_writes--;
return -1;
}
if (prxy->peer_pending_writes > PRXY_PENDING_IO_THRESHOLD)
{
/* suspend input watching */
if (prxy->task_csck && hio_dev_sck_read(prxy->task_csck, 0) <= -1) return -1;
}
}
return 0;
}
static HIO_INLINE void prxy_mark_over (prxy_t* prxy, int over_bits)
{
hio_svc_htts_t* htts = prxy->htts;
hio_t* hio = htts->hio;
unsigned int old_over;
old_over = prxy->over;
prxy->over |= over_bits;
HIO_DEBUG8 (hio, "HTTS(%p) - prxy(t=%p,c=%p[%d],p=%p) - old_over=%x | new-bits=%x => over=%x\n", prxy->htts, prxy, prxy->task_client, (prxy->task_csck? prxy->task_csck->hnd: -1), prxy->peer, (int)old_over, (int)over_bits, (int)prxy->over);
if (!(old_over & PRXY_OVER_READ_FROM_CLIENT) && (prxy->over & PRXY_OVER_READ_FROM_CLIENT))
{
if (prxy->task_csck && hio_dev_sck_read(prxy->task_csck, 0) <= -1)
{
HIO_DEBUG5 (hio, "HTTS(%p) - prxy(t=%p,c=%p[%d],p=%p) - halting client for failure to disable input watching\n", prxy->htts, prxy, prxy->task_client, (prxy->task_csck? prxy->task_csck->hnd: -1), prxy->peer);
hio_dev_sck_halt (prxy->task_csck);
}
}
if (!(old_over & PRXY_OVER_READ_FROM_PEER) && (prxy->over & PRXY_OVER_READ_FROM_PEER))
{
if (prxy->peer && hio_dev_pro_read(prxy->peer, HIO_DEV_PRO_OUT, 0) <= -1)
{
HIO_DEBUG5 (hio, "HTTS(%p) - prxy(t=%p,c=%p[%d],p=%p) - halting peer for failure to disable input watching\n", prxy->htts, prxy, prxy->task_client, (prxy->task_csck? prxy->task_csck->hnd: -1), prxy->peer);
hio_dev_pro_halt (prxy->peer);
}
}
if (old_over != PRXY_OVER_ALL && prxy->over == PRXY_OVER_ALL)
{
/* ready to stop */
if (prxy->peer)
{
HIO_DEBUG5 (hio, "HTTS(%p) - prxy(t=%p,c=%p[%d],p=%p) - halting unneeded peer\n", prxy->htts, prxy, prxy->task_client, (prxy->task_csck? prxy->task_csck->hnd: -1), prxy->peer);
hio_dev_pro_halt (prxy->peer);
}
if (prxy->task_csck)
{
HIO_ASSERT (hio, prxy->task_client != HIO_NULL);
if (prxy->task_keep_client_alive)
{
HIO_DEBUG5 (hio, "HTTS(%p) - prxy(t=%p,c=%p[%d],p=%p) - keeping client alive\n", prxy->htts, prxy, prxy->task_client, (prxy->task_csck? prxy->task_csck->hnd: -1), prxy->peer);
HIO_ASSERT (prxy->htts->hio, prxy->task_client->task == (hio_svc_htts_task_t*)prxy);
unbind_task_from_client (prxy, 1);
/* prxy must not be accessed from here down as it could have been destroyed */
}
else
{
HIO_DEBUG5 (hio, "HTTS(%p) - prxy(t=%p,c=%p[%d],p=%p) - halting client\n", prxy->htts, prxy, prxy->task_client, (prxy->task_csck? prxy->task_csck->hnd: -1), prxy->peer);
hio_dev_sck_shutdown (prxy->task_csck, HIO_DEV_SCK_SHUTDOWN_WRITE);
hio_dev_sck_halt (prxy->task_csck);
}
}
}
}
static void prxy_on_kill (hio_svc_htts_task_t* task)
{
prxy_t* prxy = (prxy_t*)task;
hio_t* hio = prxy->htts->hio;
HIO_DEBUG5 (hio, "HTTS(%p) - prxy(t=%p,c=%p[%d],p=%p) - killing the task\n", prxy->htts, prxy, prxy->task_client, (prxy->task_csck? prxy->task_csck->hnd: -1), prxy->peer);
if (prxy->on_kill) prxy->on_kill (task);
/* [NOTE]
* 1. if hio_svc_htts_task_kill() is called, prxy->peer, prxy->peer_htrd, prxy->task_csck,
* prxy->task_client may not not null.
* 2. this callback function doesn't decrement the reference count on prxy because
* it is the task destruction callback. (passing 0 to unbind_task_from_peer/client)
*/
unbind_task_from_peer (prxy, 0);
if (prxy->task_csck)
{
HIO_ASSERT (hio, prxy->task_client != HIO_NULL);
unbind_task_from_client (prxy, 0);
}
if (prxy->task_next) HIO_SVC_HTTS_TASKL_UNLINK_TASK (prxy); /* detach from the htts service only if it's attached */
HIO_DEBUG5 (hio, "HTTS(%p) - prxy(t=%p,c=%p[%d],p=%p) - killed the task\n", prxy->htts, prxy, prxy->task_client, (prxy->task_csck? prxy->task_csck->hnd: -1), prxy->peer);
}
static void prxy_peer_on_connect (hio_dev_sck_t* sck)
{
}
static void prxy_peer_on_disconnect (hio_dev_sck_t* sck)
{
hio_t* hio = sck->hio;
prxy_peer_xtn_t* pxtn = hio_dev_sck_getxtn(sck);
prxy_t* prxy = pxtn->prxy;
if (!prxy) return; /* prxy task already gone */
HIO_DEBUG3 (hio, "HTTS(%p) - peer %p(hnd=%d) disconnectd\n", prxy->htts, sck, (int)sck->hnd);
/* reset prxy->peer before calling unbind_task_from_peer() because this is the peer close callback */
prxy->peer = HIO_NULL;
unbind_task_from_peer (prxy, 1);
/*
if (!(prxy->over & PRXY_OVER_READ_FROM_PEER))
{
if (hio_svc_htts_task_endbody(prxy) <= -1)
prxy_halt_participating_devices (prxy);
else
prxy_mark_over (prxy, PRXY_OVER_READ_FROM_PEER);
}
*/
}
static int prxy_peer_on_read (hio_dev_sck_t* sck, const void* data, hio_iolen_t dlen, const hio_skad_t* srcaddr)
{
hio_t* hio = sck->hio;
prxy_peer_xtn_t* peer = hio_dev_sck_getxtn(sck);
prxy_t* prxy = peer->prxy;
HIO_ASSERT (hio, prxy != HIO_NULL);
if (dlen <= -1)
{
HIO_DEBUG3 (hio, "HTTS(%p) - read error from peer %p(hnd=%d)\n", prxy->htts, sck, (unsigned int)sck->hnd);
goto oops;
}
if (dlen == 0)
{
HIO_DEBUG3 (hio, "HTTS(%p) - EOF from peer %p(hnd=%d)\n", prxy->htts, sck, (int)sck->hnd);
if (!(prxy->over & PRXY_OVER_READ_FROM_PEER))
{
int n;
/* the prxy script could be misbehaving.
* it still has to read more but EOF is read.
* otherwise peer_htrd_poke() should have been called */
n = hio_svc_htts_task_endbody(prxy);
prxy_mark_over (prxy, PRXY_OVER_READ_FROM_PEER);
if (n <= -1) goto oops;
}
}
else
{
hio_oow_t rem;
HIO_ASSERT (hio, !(prxy->over & PRXY_OVER_READ_FROM_PEER));
if (hio_htrd_feed(prxy->peer_htrd, data, dlen, &rem) <= -1)
{
HIO_DEBUG3 (hio, "HTTS(%p) - unable to feed peer htrd - peer %p(hnd=%d)\n", prxy->htts, sck, (int)sck->hnd);
if (!prxy->task_res_started && !(prxy->over & PRXY_OVER_WRITE_TO_CLIENT))
{
hio_svc_htts_task_sendfinalres (prxy, HIO_HTTP_STATUS_BAD_GATEWAY, HIO_NULL, HIO_NULL, 1); /* don't care about error because it jumps to oops below anyway */
}
goto oops;
}
if (rem > 0)
{
/* If the script specifies Content-Length and produces longer data, it will come here */
}
}
return 0;
oops:
prxy_halt_participating_devices (prxy);
return 0;
}
static int prxy_peer_on_write (hio_dev_sck_t* sck, hio_iolen_t wrlen, void* wrctx, const hio_skad_t* dstaddr)
{
hio_t* hio = sck->hio;
prxy_peer_xtn_t* peer = hio_dev_pro_getxtn(sck);
prxy_t* prxy = peer->prxy;
if (!prxy) return 0; /* there is nothing i can do. the prxy is being cleared or has been cleared already. */
HIO_ASSERT (hio, prxy->peer == sck);
if (wrlen <= -1)
{
HIO_DEBUG3 (hio, "HTTS(%p) - unable to write to peer %p(hnd=%d)\n", prxy->htts, sck, (int)sck->hnd);
goto oops;
}
else if (wrlen == 0)
{
/* indicated EOF */
/* do nothing here as i didn't increment peer_pending_writes when making the write request */
prxy->peer_pending_writes--;
HIO_ASSERT (hio, prxy->peer_pending_writes == 0);
HIO_DEBUG3 (hio, "HTTS(%p) - indicated EOF to peer %p(hnd=%d)\n", prxy->htts, sck, (int)sck->hnd);
/* indicated EOF to the peer side. i need no more data from the client side.
* i don't need to enable input watching in the client side either */
prxy_mark_over (prxy, PRXY_OVER_WRITE_TO_PEER);
}
else
{
HIO_ASSERT (hio, prxy->peer_pending_writes > 0);
prxy->peer_pending_writes--;
if (prxy->peer_pending_writes == PRXY_PENDING_IO_THRESHOLD)
{
if (!(prxy->over & PRXY_OVER_READ_FROM_CLIENT) &&
hio_dev_sck_read(prxy->task_csck, 1) <= -1) goto oops;
}
if ((prxy->over & PRXY_OVER_READ_FROM_CLIENT) && prxy->peer_pending_writes <= 0)
{
prxy_mark_over (prxy, PRXY_OVER_WRITE_TO_PEER);
}
}
return 0;
oops:
prxy_halt_participating_devices (prxy);
return 0;
}
static int peer_capture_response_header (hio_htre_t* req, const hio_bch_t* key, const hio_htre_hdrval_t* val, void* ctx)
{
return hio_svc_htts_task_addreshdrs((prxy_t*)ctx, key, val);
}
static int peer_htrd_peek (hio_htrd_t* htrd, hio_htre_t* req)
{
prxy_peer_xtn_t* peer = hio_htrd_getxtn(htrd);
prxy_t* prxy = peer->prxy;
hio_svc_htts_cli_t* cli = prxy->task_client;
if (HIO_LIKELY(cli))
{
int status_code = HIO_HTTP_STATUS_OK;
const hio_bch_t* status_desc = HIO_NULL;
int chunked;
if (req->attr.status) hio_parse_http_status_header_value(req->attr.status, &status_code, &status_desc);
chunked = prxy->task_keep_client_alive && !req->attr.content_length;
if (hio_svc_htts_task_startreshdr(prxy, status_code, status_desc, chunked) <= -1 ||
hio_htre_walkheaders(req, peer_capture_response_header, prxy) <= -1 ||
hio_svc_htts_task_endreshdr(prxy) <= -1) return -1;
}
return 0;
}
static int peer_htrd_poke (hio_htrd_t* htrd, hio_htre_t* req)
{
/* peer response got completed */
prxy_peer_xtn_t* peer = hio_htrd_getxtn(htrd);
prxy_t* prxy = peer->prxy;
int n;
n = hio_svc_htts_task_endbody(prxy);
prxy_mark_over (prxy, PRXY_OVER_READ_FROM_PEER);
return n;
}
static int peer_htrd_push_content (hio_htrd_t* htrd, hio_htre_t* req, const hio_bch_t* data, hio_oow_t dlen)
{
prxy_peer_xtn_t* peer = hio_htrd_getxtn(htrd);
prxy_t* prxy = peer->prxy;
int n;
HIO_ASSERT (prxy->htts->hio, htrd == prxy->peer_htrd);
n = hio_svc_htts_task_addresbody(prxy, data, dlen);
if (prxy->task_res_pending_writes > PRXY_PENDING_IO_THRESHOLD)
{
if (hio_dev_pro_read(prxy->peer, HIO_DEV_PRO_OUT, 0) <= -1) n = -1;
}
return n;
}
static hio_htrd_recbs_t peer_htrd_recbs =
{
peer_htrd_peek,
peer_htrd_poke,
peer_htrd_push_content
};
static int prxy_client_htrd_poke (hio_htrd_t* htrd, hio_htre_t* req)
{
/* client request got completed */
hio_svc_htts_cli_htrd_xtn_t* htrdxtn = (hio_svc_htts_cli_htrd_xtn_t*)hio_htrd_getxtn(htrd);
hio_dev_sck_t* sck = htrdxtn->sck;
hio_svc_htts_cli_t* cli = hio_dev_sck_getxtn(sck);
prxy_t* prxy = (prxy_t*)cli->task;
/* indicate EOF to the client peer */
if (prxy_write_to_peer(prxy, HIO_NULL, 0) <= -1) return -1;
prxy_mark_over (prxy, PRXY_OVER_READ_FROM_CLIENT);
return 0;
}
static int prxy_client_htrd_push_content (hio_htrd_t* htrd, hio_htre_t* req, const hio_bch_t* data, hio_oow_t dlen)
{
hio_svc_htts_cli_htrd_xtn_t* htrdxtn = (hio_svc_htts_cli_htrd_xtn_t*)hio_htrd_getxtn(htrd);
hio_dev_sck_t* sck = htrdxtn->sck;
hio_svc_htts_cli_t* cli = hio_dev_sck_getxtn(sck);
prxy_t* prxy = (prxy_t*)cli->task;
HIO_ASSERT (sck->hio, cli->sck == sck);
return prxy_write_to_peer(prxy, data, dlen);
}
static hio_htrd_recbs_t prxy_client_htrd_recbs =
{
HIO_NULL, /* this shall be set to an actual peer handler before hio_htrd_setrecbs() */
prxy_client_htrd_poke,
prxy_client_htrd_push_content
};
static void prxy_client_on_disconnect (hio_dev_sck_t* sck)
{
hio_svc_htts_cli_t* cli = hio_dev_sck_getxtn(sck);
hio_svc_htts_t* htts = cli->htts;
prxy_t* prxy = (prxy_t*)cli->task;
hio_t* hio = sck->hio;
HIO_ASSERT (hio, sck == prxy->task_csck);
HIO_DEBUG4 (hio, "HTTS(%p) - prxy(t=%p,c=%p,csck=%p) - client socket disconnect notified\n", htts, prxy, cli, sck);
if (prxy)
{
HIO_SVC_HTTS_TASK_RCUP (prxy);
/* detach the task from the client and the client socket */
unbind_task_from_client (prxy, 1);
/* call the parent handler*/
/*if (fprxy->client_org_on_disconnect) fprxy->client_org_on_disconnect (sck);*/
if (sck->on_disconnect) sck->on_disconnect (sck); /* restored to the orginal parent handler in unbind_task_from_client() */
HIO_SVC_HTTS_TASK_RCDOWN (prxy);
}
HIO_DEBUG4 (hio, "HTTS(%p) - prxy(t=%p,c=%p,csck=%p) - client socket disconnect handled\n", htts, prxy, cli, sck);
/* Note: after this callback, the actual device pointed to by 'sck' will be freed in the main loop. */
}
static int prxy_client_on_read (hio_dev_sck_t* sck, const void* buf, hio_iolen_t len, const hio_skad_t* srcaddr)
{
hio_t* hio = sck->hio;
hio_svc_htts_cli_t* cli = hio_dev_sck_getxtn(sck);
prxy_t* prxy = (prxy_t*)cli->task;
int n;
HIO_ASSERT (hio, sck == cli->sck);
n = prxy->client_org_on_read? prxy->client_org_on_read(sck, buf, len, srcaddr): 0;
if (len <= -1)
{
/* read error */
HIO_DEBUG3 (cli->htts->hio, "HTTS(%p) - read error on client %p(%d)\n", prxy->htts, sck, (int)sck->hnd);
goto oops;
}
if (len == 0)
{
/* EOF on the client side. arrange to close */
HIO_DEBUG3 (hio, "HTTS(%p) - EOF from client %p(hnd=%d)\n", prxy->htts, sck, (int)sck->hnd);
if (!(prxy->over & PRXY_OVER_READ_FROM_CLIENT)) /* if this is true, EOF is received without prxy_client_htrd_poke() */
{
int x;
x = prxy_write_to_peer(prxy, HIO_NULL, 0);
prxy_mark_over (prxy, PRXY_OVER_READ_FROM_CLIENT);
if (x <= -1) goto oops;
}
}
if (n <= -1) goto oops;
return 0;
oops:
prxy_halt_participating_devices (prxy);
return 0;
}
static int prxy_client_on_write (hio_dev_sck_t* sck, hio_iolen_t wrlen, void* wrctx, const hio_skad_t* dstaddr)
{
hio_t* hio = sck->hio;
hio_svc_htts_cli_t* cli = hio_dev_sck_getxtn(sck);
prxy_t* prxy = (prxy_t*)cli->task;
int n;
n = prxy->client_org_on_write? prxy->client_org_on_write(sck, wrlen, wrctx, dstaddr): 0;
if (wrlen == 0)
{
/* if the connect is keep-alive, this part may not be called */
HIO_DEBUG3 (hio, "HTTS(%p) - indicated EOF to client %p(%d)\n", prxy->htts, sck, (int)sck->hnd);
/* since EOF has been indicated to the client, it must not write to the client any further.
* this also means that i don't need any data from the peer side either.
* i don't need to enable input watching on the peer side */
prxy_mark_over (prxy, PRXY_OVER_WRITE_TO_CLIENT);
}
else if (wrlen > 0)
{
if (prxy->peer && prxy->task_res_pending_writes == PRXY_PENDING_IO_THRESHOLD)
{
/* enable input watching */
if (!(prxy->over & PRXY_OVER_READ_FROM_PEER) &&
hio_dev_pro_read(prxy->peer, HIO_DEV_PRO_OUT, 1) <= -1) n = -1;
}
if ((prxy->over & PRXY_OVER_READ_FROM_PEER) && prxy->task_res_pending_writes <= 0)
{
prxy_mark_over (prxy, PRXY_OVER_WRITE_TO_CLIENT);
}
}
if (n <= -1 || wrlen <= -1) prxy_halt_participating_devices (prxy);
return 0;
}
/* ----------------------------------------------------------------------- */
struct peer_fork_ctx_t
{
hio_svc_htts_cli_t* cli;
hio_htre_t* req;
const hio_bch_t* docroot;
const hio_bch_t* script;
hio_bch_t* actual_script;
};
typedef struct peer_fork_ctx_t peer_fork_ctx_t;
static int peer_capture_request_header (hio_htre_t* req, const hio_bch_t* key, const hio_htre_hdrval_t* val, void* ctx)
{
hio_becs_t* dbuf = (hio_becs_t*)ctx;
if (hio_comp_bcstr(key, "Connection", 1) != 0 &&
hio_comp_bcstr(key, "Transfer-Encoding", 1) != 0 &&
hio_comp_bcstr(key, "Content-Length", 1) != 0 &&
hio_comp_bcstr(key, "Expect", 1) != 0)
{
hio_oow_t val_offset;
hio_bch_t* ptr;
hio_becs_clear (dbuf);
if (hio_becs_cpy(dbuf, "HTTP_") == (hio_oow_t)-1 ||
hio_becs_cat(dbuf, key) == (hio_oow_t)-1 ||
hio_becs_ccat(dbuf, '\0') == (hio_oow_t)-1) return -1;
for (ptr = HIO_BECS_PTR(dbuf); *ptr; ptr++)
{
*ptr = hio_to_bch_upper(*ptr);
if (*ptr =='-') *ptr = '_';
}
val_offset = HIO_BECS_LEN(dbuf);
if (hio_becs_cat(dbuf, val->ptr) == (hio_oow_t)-1) return -1;
val = val->next;
while (val)
{
if (hio_becs_cat(dbuf, ",") == (hio_oow_t)-1 ||
hio_becs_cat(dbuf, val->ptr) == (hio_oow_t)-1) return -1;
val = val->next;
}
setenv (HIO_BECS_PTR(dbuf), HIO_BECS_CPTR(dbuf, val_offset), 1);
}
return 0;
}
static int prxy_peer_on_fork (hio_dev_pro_t* pro, void* fork_ctx)
{
hio_t* hio = pro->hio; /* in this callback, the pro device is not fully up. however, the hio field is guaranteed to be available */
peer_fork_ctx_t* fc = (peer_fork_ctx_t*)fork_ctx;
hio_oow_t content_length;
const hio_bch_t* qparam;
const hio_bch_t* tmpstr;
hio_bch_t* path, * lang;
hio_bch_t tmp[256];
hio_becs_t dbuf;
qparam = hio_htre_getqparam(fc->req);
/* the anchor/fragment is never part of the server-side URL.
* the client must discard that part before sending to the server.
* hio_htre_getqanchor() is just disregarded here. */
tmpstr = getenv("PATH");
if (!tmpstr) tmpstr = "";
path = hio_dupbcstr(hio, tmpstr, HIO_NULL);
tmpstr = getenv("LANG");
if (!tmpstr) tmpstr = "";
lang = hio_dupbcstr(hio, tmpstr, HIO_NULL);
#if defined(HAVE_CLEARENV)
clearenv ();
#elif defined(HAVE_CRT_EXTERNS_H)
{
char** environ = *_NSGetEnviron();
if (environ) environ[0] = '\0';
}
#else
{
extern char** environ;
/* environ = NULL; this crashed this program on NetBSD */
if (environ) environ[0] = '\0';
}
#endif
if (path)
{
setenv ("PATH", path, 1);
hio_freemem (hio, path);
}
if (lang)
{
setenv ("LANG", lang, 1);
hio_freemem (hio, lang);
}
setenv ("GATEWAY_INTERFACE", "PRXY/1.1", 1);
hio_fmttobcstr (hio, tmp, HIO_COUNTOF(tmp), "HTTP/%d.%d", (int)hio_htre_getmajorversion(fc->req), (int)hio_htre_getminorversion(fc->req));
setenv ("SERVER_PROTOCOL", tmp, 1);
setenv ("DOCUMENT_ROOT", fc->docroot, 1);
setenv ("SCRIPT_NAME", fc->script, 1);
setenv ("SCRIPT_FILENAME", fc->actual_script, 1);
/* TODO: PATH_INFO */
setenv ("REQUEST_METHOD", hio_htre_getqmethodname(fc->req), 1);
setenv ("REQUEST_URI", hio_htre_getqpath(fc->req), 1);
if (qparam) setenv ("QUERY_STRING", qparam, 1);
if (hio_htre_getreqcontentlen(fc->req, &content_length) == 0)
{
hio_fmt_uintmax_to_bcstr(tmp, HIO_COUNTOF(tmp), content_length, 10, 0, '\0', HIO_NULL);
setenv ("CONTENT_LENGTH", tmp, 1);
}
else
{
/* content length unknown, neither is it 0 - this is not standard */
setenv ("CONTENT_LENGTH", "-1", 1);
}
setenv ("SERVER_SOFTWARE", fc->cli->htts->server_name, 1);
hio_skadtobcstr (hio, &fc->cli->sck->localaddr, tmp, HIO_COUNTOF(tmp), HIO_SKAD_TO_BCSTR_ADDR);
setenv ("SERVER_ADDR", tmp, 1);
gethostname (tmp, HIO_COUNTOF(tmp)); /* if this fails, i assume tmp contains the ip address set by hio_skadtobcstr() above */
setenv ("SERVER_NAME", tmp, 1);
hio_skadtobcstr (hio, &fc->cli->sck->localaddr, tmp, HIO_COUNTOF(tmp), HIO_SKAD_TO_BCSTR_PORT);
setenv ("SERVER_PORT", tmp, 1);
hio_skadtobcstr (hio, &fc->cli->sck->remoteaddr, tmp, HIO_COUNTOF(tmp), HIO_SKAD_TO_BCSTR_ADDR);
setenv ("REMOTE_ADDR", tmp, 1);
hio_skadtobcstr (hio, &fc->cli->sck->remoteaddr, tmp, HIO_COUNTOF(tmp), HIO_SKAD_TO_BCSTR_PORT);
setenv ("REMOTE_PORT", tmp, 1);
if (hio_becs_init(&dbuf, hio, 256) >= 0)
{
hio_htre_walkheaders (fc->req, peer_capture_request_header, &dbuf);
/* [NOTE] trailers are not available when this prxy resource is started. let's not call hio_htre_walktrailers() */
hio_becs_fini (&dbuf);
}
return 0;
}
/* ----------------------------------------------------------------------- */
static void bind_task_to_client (prxy_t* prxy, hio_dev_sck_t* csck)
{
hio_svc_htts_cli_t* cli = hio_dev_sck_getxtn(csck);
HIO_ASSERT (prxy->htts->hio, cli->sck == csck);
HIO_ASSERT (prxy->htts->hio, cli->task == HIO_NULL);
/* prxy->task_client and prxy->task_csck are set in hio_svc_htts_task_make() */
/* remember the client socket's io event handlers */
prxy->client_org_on_read = csck->on_read;
prxy->client_org_on_write = csck->on_write;
prxy->client_org_on_disconnect = csck->on_disconnect;
/* set new io events handlers on the client socket */
csck->on_read = prxy_client_on_read;
csck->on_write = prxy_client_on_write;
csck->on_disconnect = prxy_client_on_disconnect;
cli->task = (hio_svc_htts_task_t*)prxy;
HIO_SVC_HTTS_TASK_RCUP (prxy);
}
static void unbind_task_from_client (prxy_t* prxy, int rcdown)
{
hio_dev_sck_t* csck = prxy->task_csck;
HIO_ASSERT (prxy->htts->hio, prxy->task_client != HIO_NULL);
HIO_ASSERT (prxy->htts->hio, prxy->task_csck != HIO_NULL);
HIO_ASSERT (prxy->htts->hio, prxy->task_client->task == (hio_svc_htts_task_t*)prxy);
HIO_ASSERT (prxy->htts->hio, prxy->task_client->htrd != HIO_NULL);
if (prxy->client_htrd_recbs_changed)
{
hio_htrd_setrecbs (prxy->task_client->htrd, &prxy->client_htrd_org_recbs);
prxy->client_htrd_recbs_changed = 0;
}
if (prxy->client_org_on_read)
{
csck->on_read = prxy->client_org_on_read;
prxy->client_org_on_read = HIO_NULL;
}
if (prxy->client_org_on_write)
{
csck->on_write = prxy->client_org_on_write;
prxy->client_org_on_write = HIO_NULL;
}
if (prxy->client_org_on_disconnect)
{
csck->on_disconnect = prxy->client_org_on_disconnect;
prxy->client_org_on_disconnect = HIO_NULL;
}
/* there is some ordering issue in using HIO_SVC_HTTS_TASK_UNREF()
* because it can destroy the prxy itself. so reset prxy->task_client->task
* to null and call RCDOWN() later */
prxy->task_client->task = HIO_NULL;
/* these two lines are also done in csck_on_disconnect() in http-svr.c because the socket is destroyed.
* the same lines here are because the task is unbound while the socket is still alive */
prxy->task_client = HIO_NULL;
prxy->task_csck = HIO_NULL;
/* enable input watching on the socket being unbound */
if (prxy->task_keep_client_alive && hio_dev_sck_read(csck, 1) <= -1)
{
HIO_DEBUG2 (prxy->htts->hio, "HTTS(%p) - halting client(%p) for failure to enable input watching\n", prxy->htts, csck);
hio_dev_sck_halt (csck);
}
if (rcdown) HIO_SVC_HTTS_TASK_RCDOWN ((hio_svc_htts_task_t*)prxy);
}
/* ----------------------------------------------------------------------- */
static void on_peer_ipaddr_resolved (hio_svc_dnc_t* dnc, hio_dns_msg_t* reqmsg, hio_errnum_t status, const void* data, hio_oow_t len)
{
// initiate connect.
// enable read if necessary...
}
/* ----------------------------------------------------------------------- */
static int bind_task_to_peer (prxy_t* prxy, hio_dev_sck_t* csck, hio_htre_t* req, const hio_skad_t* skad)
{
hio_svc_htts_cli_t* cli = hio_dev_sck_getxtn(csck);
hio_svc_htts_t* htts = prxy->htts;
hio_t* hio = htts->hio;
hio_dev_sck_make_t m;
hio_dev_sck_t* sck = HIO_NULL;
hio_htrd_t* htrd = HIO_NULL;
prxy_peer_xtn_t* pxtn;
hio_skad_t resolved_skad;
if (!skad)
{
const hio_bch_t* qpath = hio_htre_getqpath(req);
/* TODO: https not supported yet */
if (hio_comp_bcstr_limited(qpath, "http://", 7, 0) == 0)
{
const hio_bch_t* host = qpath + 7;
if (hio_bcstrtoskad(hio, host, &resolved_skad) <= -1)
{
/*
if (hio_svc_dnc_resolve(htts->dnc, qpath + , qtype, 0, on_peer_ipaddr_resolved, 0) <= -1)
{
}*/
}
}
}
HIO_MEMSET (&m, 0, HIO_SIZEOF(m));
if (hio_get_stream_sck_type_from_skad(skad, &m.type) <= -1)
{
hio_seterrnum (hio, HIO_EINVAL);
goto oops;
}
m.on_write = prxy_peer_on_write;
m.on_read = prxy_peer_on_read;
m.on_connect = prxy_peer_on_connect;
m.on_disconnect = prxy_peer_on_disconnect;
sck = hio_dev_sck_make(hio, HIO_SIZEOF(*pxtn), &m);
htrd = hio_htrd_open(hio, HIO_SIZEOF(*pxtn));
if (HIO_UNLIKELY(!sck || !htrd)) goto oops;
hio_htrd_setoption (htrd, HIO_HTRD_RESPONSE);
hio_htrd_setrecbs (htrd, &peer_htrd_recbs);
prxy->peer = sck;
prxy->peer_htrd = htrd;
pxtn = hio_dev_pro_getxtn(prxy->peer);
pxtn->prxy = prxy;
HIO_SVC_HTTS_TASK_RCUP (prxy);
pxtn = hio_htrd_getxtn(prxy->peer_htrd);
pxtn->prxy = prxy;
HIO_SVC_HTTS_TASK_RCUP (prxy);
return 0;
oops:
if (htrd) hio_htrd_close (htrd);
if (sck) hio_dev_sck_kill (sck);
return -1;
}
static void unbind_task_from_peer (prxy_t* prxy, int rcdown)
{
int n = 0;
if (prxy->peer_htrd)
{
hio_htrd_close (prxy->peer_htrd);
prxy->peer_htrd = HIO_NULL;
n++;
}
if (prxy->peer)
{
hio_dev_pro_kill (prxy->peer);
prxy->peer = HIO_NULL;
n++;
}
if (rcdown)
{
while (n > 0)
{
n--;
HIO_SVC_HTTS_TASK_RCDOWN((hio_svc_htts_task_t*)prxy);
}
}
}
/* ----------------------------------------------------------------------- */
static int setup_for_content_length(prxy_t* prxy, hio_htre_t* req)
{
int have_content;
#if defined(PRXY_ALLOW_UNLIMITED_REQ_CONTENT_LENGTH)
have_content = prxy->task_req_conlen > 0 || prxy->task_req_conlen_unlimited;
#else
have_content = prxy->task_req_conlen > 0;
#endif
if (prxy->task_req_conlen_unlimited)
{
/* change the callbacks to subscribe to contents to be uploaded */
prxy->client_htrd_org_recbs = *hio_htrd_getrecbs(prxy->task_client->htrd);
prxy_client_htrd_recbs.peek = prxy->client_htrd_org_recbs.peek;
hio_htrd_setrecbs (prxy->task_client->htrd, &prxy_client_htrd_recbs);
prxy->client_htrd_recbs_changed = 1;
}
else
{
/* no content to be uploaded from the client */
/* indicate EOF to the peer and disable input wathching from the client */
if (prxy_write_to_peer(prxy, HIO_NULL, 0) <= -1) return -1;
prxy_mark_over (prxy, PRXY_OVER_READ_FROM_CLIENT | PRXY_OVER_WRITE_TO_PEER);
}
return 0;
}
/* ----------------------------------------------------------------------- */
int hio_svc_htts_doprxy (hio_svc_htts_t* htts, hio_dev_sck_t* csck, hio_htre_t* req, const hio_skad_t* tgt_addr, int options, hio_svc_htts_task_on_kill_t on_kill)
{
hio_t* hio = htts->hio;
hio_svc_htts_cli_t* cli = hio_dev_sck_getxtn(csck);
prxy_t* prxy = HIO_NULL;
int n;
/* ensure that you call this function before any contents is received */
HIO_ASSERT (hio, hio_htre_getcontentlen(req) == 0);
HIO_ASSERT (hio, cli->sck == csck);
prxy = (prxy_t*)hio_svc_htts_task_make(htts, HIO_SIZEOF(*prxy), prxy_on_kill, req, csck);
if (HIO_UNLIKELY(!prxy)) goto oops;
prxy->on_kill = on_kill;
prxy->options = options;
bind_task_to_client (prxy, csck);
if ((n = bind_task_to_peer(prxy, csck, req, tgt_addr)) <= -1)
{
hio_svc_htts_task_sendfinalres(prxy, (n == 2? HIO_HTTP_STATUS_FORBIDDEN: HIO_HTTP_STATUS_INTERNAL_SERVER_ERROR), HIO_NULL, HIO_NULL, 1);
goto oops; /* TODO: must not go to oops. just destroy the prxy and finalize the request .. */
}
if (hio_svc_htts_task_handleexpect100(prxy) <= -1) goto oops;
if (setup_for_content_length(prxy, req) <= -1) goto oops;
/* TODO: store current input watching state and use it when destroying the prxy data */
if (hio_dev_sck_read(csck, !(prxy->over & PRXY_OVER_READ_FROM_CLIENT)) <= -1) goto oops;
HIO_SVC_HTTS_TASKL_APPEND_TASK (&htts->task, (hio_svc_htts_task_t*)prxy);
return 0;
oops:
HIO_DEBUG2 (hio, "HTTS(%p) - FAILURE in doprxy - socket(%p)\n", htts, csck);
if (prxy) prxy_halt_participating_devices (prxy);
return -1;
}

2
lib/http-txt.c
View File

@ -118,8 +118,6 @@ static int txt_client_htrd_poke (hio_htrd_t* htrd, hio_htre_t* req)
hio_svc_htts_cli_t* cli = hio_dev_sck_getxtn(sck); hio_svc_htts_cli_t* cli = hio_dev_sck_getxtn(sck);
txt_t* txt = (txt_t*)cli->task; txt_t* txt = (txt_t*)cli->task;
/*printf (">> CLIENT REQUEST COMPLETED\n");*/
txt_mark_over (txt, TXT_OVER_READ_FROM_CLIENT); txt_mark_over (txt, TXT_OVER_READ_FROM_CLIENT);
return 0; return 0;
} }

27
lib/sck.c
View File

@ -2645,3 +2645,30 @@ hio_uint16_t hio_checksum_ip (const void* hdr, hio_oow_t len)
return (hio_uint16_t)~sum; return (hio_uint16_t)~sum;
} }
/* ========================================================================= */
int hio_get_stream_sck_type_from_skad (const hio_skad_t* skad, hio_dev_sck_type_t* type)
{
/* if you like SCTP or something, use your own mapping.
* this utility defaults to TCP for INET and INET6 */
switch (hio_skad_get_family(skad))
{
case HIO_AF_INET:
*type = HIO_DEV_SCK_TCP4;
return 0;
case HIO_AF_INET6:
*type = HIO_DEV_SCK_TCP6;
return 0;
#if defined(HIO_AF_UNIX)
case HIO_AF_UNIX:
*type = HIO_DEV_SCK_UNIX;
return 0;
#endif
}
return -1;
}