rdelaage
/
gmid
mirror of https://github.com/omar-polo/gmid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
293 Commits 2 Branches 28 Tags 5.5 MiB
Commit Graph

35 Commits

Author SHA1 Message Date
Omar Polo 35744950aa simplify handle_cgi 
Now that I got rid of the enum+switch, adding more state is easier.
Before, we used an hack to remember if we had read the CGI reply or
not (c->code = -1).

This introduces a new state, handle_cgi_reply that reads the CGI
script reply, logs it, and only then switches to handle_cgi.
handle_cgi itself is cleaner, now it only reads into c->sbuf and send
what it had red.

We even get, almost for free, the 42 error.  If read exists with -1 or
0 from in handle_cgi_reply, we return a proper error to the client.
We can extend this further in the future and also try to validate the
CGI reply (for now we're only looking for a \n).
 2021-02-01 22:04:51 +00:00
Omar Polo b06f80cdf4 switch to handle_open_conn right after handshake 
So we don't re-enter the handle_handsahke and re-do the loop on
fnmatch etc.  This way, once we're successfully past the handshake,
we'll re-enter no handle_open_conn.
 2021-02-01 20:27:08 +00:00
Omar Polo 112802ea31 client state machine: function pointers instead of enum+switch 2021-02-01 20:00:33 +00:00
Omar Polo 2fafa2d23e bring the CGI implementation in par with GLV-1.12556 2021-02-01 11:11:43 +00:00
Omar Polo b59f3cdd27 typo 2021-01-30 12:12:37 +00:00
Omar Polo 6016a593a3 invert the location precedence: first match wins 
It's how httpd(8) does it, and it allows us to call fnmatch less time
 2021-01-30 12:04:20 +00:00
Omar Polo a8d4a89770 don't ignore punycode errors when decoding SNI-provided servname 2021-01-29 17:29:14 +00:00
Omar Polo a2fd801327 puny_decode: set an error string 2021-01-29 17:11:03 +00:00
Omar Polo 90cb9eea8a don't log the SNI & matching 
I'll re-enable this when i'll improve the logging
 2021-01-28 16:28:44 +00:00
Omar Polo 22c6d6334d log info about SNI, punycode and matched vhost 2021-01-27 15:06:15 +00:00
Omar Polo caad03081b some null checks 2021-01-27 15:05:50 +00:00
Omar Polo c4f682f855 trim_req_iri: set error string 2021-01-27 15:05:16 +00:00
Omar Polo 3300cbe06a initial punycode support 2021-01-27 10:47:49 +00:00
Omar Polo 8443bff77a rework the configless mode: change flags and generate certs 2021-01-25 14:08:31 +00:00
Omar Polo 252908e6bb added support for location blocks 2021-01-24 18:53:26 +00:00
Omar Polo c8b7433918 added support for location blocks 2021-01-24 14:11:40 +00:00
Omar Polo 07b0a14218 void-ify some functions 
their return value is no longer used, it's only confusing at this point.
 2021-01-24 09:54:44 +00:00
Omar Polo a87f662565 refactoring state management 
instead of having a flag to discern between two different behaviours
in S_SENDING, split that state into S_SENDING_FILE and S_SENDING_CGI
(this will also make it easier in the future to add other sending
states).  While there, also get rid of `goodbye' and make start_reply
advance the state machine by itself.
 2021-01-24 09:49:09 +00:00
Omar Polo e7a2a99b5a added index option 2021-01-24 09:14:01 +00:00
Omar Polo 3309ef975c accumulate the whole response line for CGI scripts 2021-01-23 15:32:38 +00:00
Omar Polo f890c8c54d use a helper to handle no-body replies 2021-01-22 13:58:54 +00:00
Omar Polo 36162ed86d rename goodbye -> close_conn 2021-01-22 13:45:27 +00:00
Omar Polo d1ca3911d2 fix redirects 
make sure redirect starts with /.  This also requires a tweak in
check_path, in the case we go open_file -> send_dir -> open_file ->
check-path and the path starts with a slash.
 2021-01-21 22:44:41 +00:00
Omar Polo 06f233ad8a ensure we're in the correct state 2021-01-21 19:46:36 +00:00
Omar Polo b4d409cf29 use fnmatch on the domain name 2021-01-21 09:07:26 +00:00
Omar Polo ce79c944bc simplify flow when SNI is missing 
this also gives a chance for users to use the default host even if SNI
is missing.
 2021-01-21 08:46:07 +00:00
Omar Polo 0ab65593e2 don't crash on wrong vhost or missing SNI 
the new logging code was crashing if the client didn't support SNI or
if required an unknown vhost: this because we short-circuit in
handle_handshake to an error, so c->iri isn't populated yet (we don't
even read the request).

fixes #1
 2021-01-21 08:26:21 +00:00
Omar Polo 0be51733ef improve logs 
now we log the full IRI requested (before was only the path) and the
response line (even for CGI).
 2021-01-20 18:54:44 +00:00
Omar Polo 2debfe2b1f drop useless field 
was probably added to distinguish between AF_INET and AF_INET6, to use
different functions for logging.  But it wasn't really used, and now
we use getnameinfo anyway.
 2021-01-19 18:49:36 +00:00
Omar Polo 6119e13e8a moving "default type" from global options to server options 2021-01-19 11:28:41 +00:00
Omar Polo df79b4c1d5 rename reason to meta 2021-01-19 11:00:06 +00:00
Omar Polo 05c23a54ea add "lang" server option 2021-01-19 10:58:29 +00:00
Omar Polo 132cae8c6f removing err/warn functions with our fatal 
err/warn is not available on some systems (unfortunately!) and in any
case don't play well with our daemon mode (that closes std{in,out,err}).
Use our fatal that is daemon-aware.
 2021-01-18 18:15:58 +00:00
Omar Polo f87bf597ea removing O_CLOEXEC 
we don't fork anymore in that process, so the flag is extra.
 2021-01-17 23:25:59 +00:00
Omar Polo d3a08f4d17 reorganize: move bunch of functions to server.c 
cgi.c wasn't really needed; it better to group all the server related
functions together, cgi or not.  Now gmid.c contains only startup and
utility code.
 2021-01-17 23:23:58 +00:00