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

83 Commits

Author SHA1 Message Date
Omar Polo 72bbed9136 make configless mode works again. also accept every host 2021-01-27 15:00:55 +00:00
Omar Polo 46af8c6cfe drop the daemon config in favour of the -f flag 
Now it daemonize by default when running with a config, unless the -f
flag is given.
 2021-01-27 12:04:37 +00:00
Omar Polo 3300cbe06a initial punycode support 2021-01-27 10:47:49 +00:00
Omar Polo 390a611893 sane defaults for the config-less mode 2021-01-27 10:43:55 +00:00
Omar Polo 8443bff77a rework the configless mode: change flags and generate certs 2021-01-25 14:08:31 +00:00
Omar Polo ae08ec7da5 chroot & drop privileges 2021-01-25 10:30:07 +00:00
Omar Polo 2030e31486 order 2021-01-25 09:45:09 +00:00
Omar Polo 252908e6bb added support for location blocks 2021-01-24 18:53:26 +00:00
Omar Polo 501e489c90 initialize config 2021-01-24 12:45:22 +00:00
Omar Polo 8d6ae384be move configuration init stuff in its own function 2021-01-24 10:39:48 +00:00
Omar Polo f77a8c867e add ends_with 2021-01-21 22:45:49 +00:00
Omar Polo ea28a44931 const-ify parameter to strtonum 2021-01-21 16:15:10 +00:00
Omar Polo a5a09e44b2 use strtonum 2021-01-21 16:07:12 +00:00
Omar Polo b2a6b61371 rename mimes to mime ; pass config esplicitly to mime* functions 2021-01-21 15:01:37 +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 0fbe79b33c improve mime handling 
we still have an hardcoded list, but this implements the API needed to
modify the mappings.
 2021-01-18 18:18:57 +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 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
Omar Polo 0170ba023f re-enable daemon mode 
with the split into two process, the call to daemon was lost
 2021-01-17 11:56:50 +00:00
Omar Polo 7146dd552f missing break 2021-01-17 09:34:06 +00:00
Omar Polo d939d0f09e switch to getcwd 2021-01-17 09:33:45 +00:00
Omar Polo 881a9dd9c2 split into two processes: listener and executor 
this way, we can sandbox the listener with seccomp (todo) or capsicum
(already done) and still have CGI scripts.  When we want to exec, we
tell the executor what to do, the executor executes the scripts and
send the fd backt to the listener.
 2021-01-16 19:41:34 +00:00
Omar Polo 7edc455ab4 move cgi stuff to its own file 2021-01-15 19:08:28 +00:00
Omar Polo 5bc3c98ed4 add protocols to the config 2021-01-15 18:55:05 +00:00
Omar Polo b777bf4b2b check also that the port number matches 2021-01-15 18:24:24 +00:00
Omar Polo f7b816dc39 style 2021-01-15 15:21:51 +00:00
Omar Polo dafb57b8af sandbox also on FreeBSD with capsicum 2021-01-15 14:03:45 +00:00
Omar Polo 1590277007 conf & vhosts 
* gmid.c (main): changed behaviour: daemon off by default
(main): changed -c in -C (cert option)
(main): changed -k in -K (key option, for consistency with -C)
(main): added -c to load a configuration
(main): certs, key and doc (-C -K and -d) doesn't have a default value anymore
(handle_handshake): add vhosts support
 2021-01-15 09:17:43 +00:00
Omar Polo 9862b637c2 track handshakes 
This alter the current state machine by adding S_HANDSHAKE as the
initial state.  There, we ensure we did the handshake and we check
SNI.  ATM we simply continue in S_OPEN, but later we can add virtual
host checks there, and skip to S_INITIALIZING with an error state if
the client is accessing a wrong host.
 2021-01-13 18:40:18 +00:00
Omar Polo 0d7a38c4ce avoid __dead and return at the end of main 2021-01-11 15:28:25 +00:00
Omar Polo 7b1d979032 reject non-gemini protocols with 53 2021-01-11 14:45:57 +00:00
Omar Polo 3c1cf9d07c s/uri/iri since we accept IRIs 2021-01-11 13:08:00 +00:00
Omar Polo 28778244d6 fix build 2021-01-11 12:53:46 +00:00
Omar Polo 85dff1f9c3 fix remote_user for CGI and add -6 flag to enable ipv6 2021-01-11 12:08:50 +00:00
Omar Polo 33756bd235 accept both ipv4 and ipv6 2021-01-10 22:56:33 +00:00
Omar Polo 709d6e5ead log also the port of the client 2021-01-10 22:29:22 +00:00
Omar Polo 80bbcad5f2 make FATAL and LOG inline functions 
other functions that aren't macros anymore.  LOG went under a rename
to logs because log is a builtin (the math function), or so gcc says.
 2021-01-10 15:50:27 +00:00
Omar Polo 9b374f41ee macro reordering 
and while there replace SAFE_SETENV with an inline function.  LOG is
more difficult to transform into an inline function, given the string
concatenations it does.  The other LOG* and FATAL macros are fine as
they already are.
 2021-01-10 14:40:14 +00:00
Omar Polo 16ace04d45 simplify loop 
todo was initially there for an optimization: don't loop to MAX_USERS
when you know the upper limit is todo.
 2021-01-08 16:59:50 +00:00
Omar Polo 4c4167393a
simplify unveil/pledge calls 2021-01-01 13:03:04 +01:00
Omar Polo 6c6c7a0ed7
rename cgi_setpoll_on_* to cgi_poll_on_* 2020-12-28 18:01:06 +01:00
Omar Polo b3deee7b38
initialize error string to avoid returning garbage 2020-12-28 17:50:26 +01:00
Omar Polo 4a28dd014a
ignore also SIGHUP 
SIGHUP is sent when the tty is detached and by default kills the
process.  When we run in the background we don't care anymore about
the tty, so it should be safe for us to ignore SIGHUP.  (frankly,
I expected daemon(3) to do stuff like this for us).
 2020-12-28 09:55:56 +01:00
Omar Polo 5a40216f37
fix CGI with new IRI parser 
With new IRI, parser the old assumption of path starting with ./
is no longer valid.
 2020-12-28 09:52:39 +01:00
Omar Polo 33d32d1fd6
implement a valid RFC3986 (URI) parser 
Up until now I used a "poor man" approach: the uri parser is barely a
parser, it tries to extract the path from the request, with some minor
checking, and that's all.  This obviously is not RFC3986-compliant.

The new RFC3986 (URI) parser should be fully compliant.  It may accept
some invalid URI, but shouldn't reject or mis-parse valid URI.  (in
particular, the rule for the path is way more relaxed in this parser
than it is in the RFC text).

A difference with RFC3986 is that we don't even try to parse the
(optional) userinfo part of a URI: following the Gemini spec we treat
it as an error.

A further caveats is that %2F in the path part of the URI is
indistinguishable from a literal '/': this is NOT conforming, but due
to the scope and use of gmid, I don't see how treat a %2F sequence in
the path (reject the URI?).
 2020-12-25 13:13:12 +01:00
Omar Polo 488f059ac4
moving declarations to header file 2020-12-24 16:48:39 +01:00
Omar Polo 51d876f030
always check absolutify_path return 2020-12-21 15:42:06 +01:00
Omar Polo 231bfcdc03
make -d handle correctly non-absolute paths 
before the -d option only accepted absolute paths, and this wasn't
documented.  Even more, with the default value of "docs" it won't
work.  Now it transforms all relative paths to absolute paths before
going on.
 2020-12-21 14:38:31 +01:00
Omar Polo dd3e110a70
reorder & fmt 2020-12-20 20:03:55 +01:00