1
0
Fork 0
Commit Graph

98 Commits

Author SHA1 Message Date
Xavier Del Campo Romero 3388eb719a
Move dynstr to new URL 2023-07-28 01:32:51 +02:00
Xavier Del Campo Romero 7517312290
README.md: Provide more details about features 2023-07-28 01:27:19 +02:00
Xavier Del Campo Romero 8c3ba33ced
Move header files to subdirectory
Since slweb is meant as a library, it is advisable to keep public header
files under their own directory in order to avoid name clashing i.e.,

 #include "something.h"

Now becomes:

 #include "slweb/something.h"
2023-07-21 01:28:38 +02:00
Xavier Del Campo Romero 4dd531b9ed
Makefile: Adapt to slweb
This project was forked off slcl, a "suckless" cloud solution, so that
its HTTP/1.1 server implementation could be reused by other
applications.
2023-07-21 01:28:38 +02:00
Xavier Del Campo Romero ffd29ca6e5
Add top-level CMakeLists.txt 2023-07-21 01:28:37 +02:00
Xavier Del Campo Romero ec0e6abddd
Add README.md 2023-07-21 01:28:37 +02:00
Xavier Del Campo Romero abedf4f296
Import dynstr 2023-07-20 23:52:56 +02:00
Xavier Del Campo Romero dbeeb2b526
Add .gitignore 2023-07-20 23:52:56 +02:00
Xavier Del Campo Romero 6c6e4c4fec
Makefile: Allow users to define LDFLAGS
This should allow for easier packaging if extra linker flags are
required.
2023-07-20 23:52:56 +02:00
Xavier Del Campo Romero 9cab9431bb
Allow admins to define their own stylesheet
slcl used to provide a hardcoded stylesheet. However, it would be
desirable for some admins to provide a custom stylesheet without having
to rebuild the application.

Now, slcl creates a default stylesheet, namely style.css, into the
target directory, that can be later modified by admins.

While this might contradict the suckless philosophy a bit, hopefully
some admins might find this new feature useful.
2023-07-20 23:52:56 +02:00
Xavier Del Campo Romero 090eccf092
wildcard_cmp.c: Fix out-of-bounds cmp
When the distance between '*' on a wildcard expression was larger than
the string to compare with, this would cause an out-of-bounds read
because `n` was not being limited to the strlen(3) from the input
string.

Example:

- s="c", p="*cc*", casecmp=false

Here, the distance between the first and second '*' is 2 bytes, which is
longer than the input string itself (1 byte, not counting the
terminating null byte '\0').
2023-07-20 23:52:56 +02:00
Xavier Del Campo Romero e0f43ac410
http.c: Disallow forbidden filenames during upload
- '.' or '..' must not be used for filenames.
- Filenames must not contain forward slashes ('/').
- Filenames must not contain asterisks ('*') to avoid confusion with
wildcard expressions.
2023-07-20 23:52:56 +02:00
Xavier Del Campo Romero f136fdd463
http.c: Use case-insensitive compare for Content-Disposition
HTTP headers are case-insensitive, so the implementation must accept
Content-Diposition, content-disposition or any other variation.
2023-07-20 23:52:56 +02:00
Xavier Del Campo Romero 01cebe5917
server.c: Fix typo 2023-07-20 23:52:55 +02:00
Xavier Del Campo Romero 0c0dee59ce
http.c: Accept resources with '&' or '?'
Otherwise, client requests to resources such as '/me & you', '/?' or
'/??preview=1' would fail.
2023-07-20 23:52:55 +02:00
Xavier Del Campo Romero a527164cb5
server.c: Fix undefined behaviour on >1 clients
server.c kept an array of all of its active clients, calling realloc(3)
everytime its size had to be modified. However, reallocating this array
had the undesired consequence of moving other active clients to other
memory locations.

Potentially, this would result in dangling pointers from other
components that also kept pointers to struct server_client instances
e.g.: handler.c.

For this reason, the array-based approach has been completely dropped,
in favour of a doubly-linked list.
2023-07-20 23:52:55 +02:00
Xavier Del Campo Romero ea16427345
wildcard_cmp.c: Fix a couple of bugs
wildcard_cmp would otherwise fail with the following use cases:

s = "mymi", p = "*mi*"
s = "mymi", p = "*mi"
2023-07-20 23:52:55 +02:00
Xavier Del Campo Romero d639e5d269
wildcard_cmp.c: Remove leftovers
These statements had no effect since it was always executed when
n == 0.
2023-07-20 23:52:55 +02:00
Xavier Del Campo Romero 35ced95c36
wildcard_cmp: Allow case-insensitive searches
The new search feature will require them.
2023-07-20 23:52:55 +02:00
Xavier Del Campo Romero 0759122e4c
Split wildcard_cmp into its own component
Future commits will make use of this function outside handler.c.
2023-07-20 23:52:55 +02:00
Xavier Del Campo Romero 3f64235123
Makefile: Use dynstr's own Makefile
dynstr has been recently modified so as to allow building also from
make(1).
2023-07-20 23:52:54 +02:00
Xavier Del Campo Romero f75ff13b31
Avoid crashing on SIGPIPE
Under some circumstances, clients could cause SIGPIPE to slcl. Since
this signal was not handled by server.c (i.e., via sigaction(3)), slcl
would crash without any error messages printed to stderr.

In such situation, SIGPIPE should not be usually considered a fatal
error, so it is preferrable to close the connection and keep working.
2023-07-20 23:52:54 +02:00
Xavier Del Campo Romero 0b6f28d96a
http.c: Decode URL resource and parameters separately
Given the following contrived example request:

/example%FB%DC&arg%DE1=examplevalue%AA

slcl must decode each token separately, so that percent-encoded
characters '&', '=' or '?' do not get accidently intepreted.
2023-07-20 23:52:54 +02:00
Xavier Del Campo Romero 7b729f89e6
Fix missing error checks for strtoul(3) 2023-07-20 23:52:54 +02:00
Xavier Del Campo Romero ad2ab22d00
Return error if write_ctx_free fails
Otherwise, write_body_mem and write_body_mem would silently fail,
causing undefined behaviour.

Notes:

The return value for write_ctx_free is currently assigned to that of
fclose(3), which can be either 0 on success or EOF on failure.
However, it makes sense for write_body_mem and write_body_mem to simply
check against non-zero.

Also, it would not be sensible to return EOF to caller functions, which
expect either 0 (success), -1 (fatal error) or 1 (input error).
2023-07-20 23:52:54 +02:00
Xavier Del Campo Romero 0336d249d6
Makefile: remove .SUFFIXES
According to POSIX.1-2008, .c and .o are already included by the default
.SUFFIX rule, among other suffixes.
2023-07-20 23:52:54 +02:00
Xavier Del Campo Romero 30c76e6d18
Remove HTTP/1.0 support
Considering http.h defined HTTP/1.1-only responses such as "303 See
Other", as well as incoming HTTP/1.1-only features (e.g.: byte serving),
it did not make much sense to keep a somewhat broken compatibility
against HTTP/1.0.

Unfortunately, this breaks support with some existing clients such
as lynx(1), even if HTTP/1.0 was already deprecated many years ago.
However, even lynx(1) can be configured to support HTTP/1.1.
2023-07-20 23:52:53 +02:00
Xavier Del Campo Romero 2e8485d687
Replace select(2) with poll(2)
select(2) has a number of well-known issues (e.g.: FD_SETSIZE limiting
the maximum amount of file descriptors to watch) that are mostly solved
by poll(2) and thus can be used as a drop-in replacement.
2023-07-20 23:52:53 +02:00
Xavier Del Campo Romero 82fffd1ace
Support URL parameters
Now, http_payload includes a list of human-readable parameters that can
be read (but not modified) by users. Given the following example link:

/test?key1=value1&key2=value2

This will generate two parameters, with the following values:

{
	.args =
	{
		[0] = {.key = "key1", .value = "value1"},
		[1] = {.key = "key2", .value = "value2"}
	},

	.n_args = 2
}

As expected, if any URL parameters are given, struct http_payload member
"resource" is accordingly trimmed so as not to include any parameters.
Therefore, considering the example above:

{.args = {...}, .resource = "/test"}

Limitations:

- Since the definition of struct http_arg is both shared by http.h
(as a read-only pointer within struct http_payload) and http.c
(as a read/write pointer within struct ctx), its members (namely key
and value) must remain as read/write pointers, even if they must not
be modified by users of http.h.
2023-07-20 23:52:53 +02:00
Xavier Del Campo Romero 8e40262306
Makefile: make -MF write to .d file instead of stdout
This way, the default rule for .c.o can be used, simplifying the
Makefile a bit more.
2023-07-20 23:52:53 +02:00
Xavier Del Campo Romero af16aa6702
Define _POSIX_C_SOURCE
This allows using the default compiler defined by make(1) (i.e.,
c99(1)), thus improving POSIX compatibility.
2023-07-20 23:52:53 +02:00
Xavier Del Campo Romero 327690ad9f
http.c: Add missing #include
As required by strncasecmp(3).
2023-07-20 23:52:53 +02:00
Xavier Del Campo Romero 483169d192
Send response on quota exceeded
So far, slcl would just close the connection with a client when the
Content-Length of an incoming request exceeded the user quota, without
any meaningful information given back to the user.

Now, slcl responds with a HTML file with meaningful information about
the error.

Limitations:

- While this commits has been successfully tested on ungoogled-chromium,
LibreWolf (and I assume Firefox and any other derivates too) does not
seem to receive the response from the server.
    - However, this issue only occurred during local testing, but not
on remote instances.
2023-07-20 23:52:53 +02:00
Xavier Del Campo Romero fdf6dc2464
Move decode_hex into its own file
- Error detection against strotul(3) has been improved, as done in other
places.
- New function encode_hex has been implemented, which will be used
by future commits.
2023-07-20 23:52:52 +02:00
Xavier Del Campo Romero d4c74686b0
http.c: Minor formatting change 2023-07-20 23:52:52 +02:00
Xavier Del Campo Romero 4bcf440bf2
Remove(3) f->tmpname from ctx_free
Until now, f->tmpname was removed by move_file when the move
operation succeeded. However, since a HTTP operation can fail before
move_file is called, the temporary file must also be removed.
2023-07-20 23:52:52 +02:00
Xavier Del Campo Romero fbaa7b9bcf
server.c: Fix wrong size for memcpy(3) 2023-07-20 23:52:52 +02:00
Xavier Del Campo Romero cc714d9006
html.c: Allow empty strings on html_encode 2023-07-20 23:52:52 +02:00
Xavier Del Campo Romero 5b0faff8e6
server.c: Minor const-correctness improvement 2023-07-20 23:52:52 +02:00
Xavier Del Campo Romero 7b810b55ab
Implement user quota
This feature allows admins to set a specific quota for each user, in
MiB. This feature is particularly useful for shared instances, where
unlimited user storage might be unfeasible or even dangerous for the
server.

Also, a nice HTML5 <progress> element has been added to the site that
shows how much of the quota has been consumed.

If no quota is set, slcl falls back to the default behaviour i.e.,
assume unlimited storage.

Limitations:

- While HTTP does specify a Content-Length, which determines the length
of the whole request, it does not specify how many files are involved
or their individual sizes.
- Because of this, if multiple files are uploaded simultaneously, the
whole request would be dropped if user quota is exceeded, even if not
all files exceeded it.
- Also, Content-Length adds the length of some HTTP boilerplate
(e.g.: boundaries), but slcl must rely on this before accepting the
whole request. In other words, this means some requests might be
rejected by slcl because of the extra bytes caused by such boilerplate.
- When the quota is exceeded, slcl must close the connection so that
the rest of the transfer is cancelled. Unfortunately, this means no
HTML can be sent back to the customer to inform about the situation.
2023-07-20 23:52:52 +02:00
Xavier Del Campo Romero f5dfbf6e8b
Add cftw
POSIX functions ftw(3) and nftw(3) do not allow passing an opaque
pointer to the callback they call, so it forces the use of statically
allocated data.

ctfw (from "custom ftw") is a custom implementation that solves this,
while also removing unneeded stuff.

This function will be used by future commits.
2023-07-20 23:52:52 +02:00
Xavier Del Campo Romero fa4745b4ba
Perform some minor optimizations 2023-07-20 23:52:51 +02:00
Xavier Del Campo Romero 4ef6d1b86f
http.c: Compare headers as case-insensitive
Web browsers such as lynx send "Content-length" instead of
"Content-Length" (as done by LibreWolf and Chromium).
2023-07-20 23:52:51 +02:00
Xavier Del Campo Romero 5a831267aa
http.c: Use persistent cookies
Cookies without "Expires" are considered non-persistent and thus can be
removed by the web browser. Instead, slcl now sets persistent cookies
that last for 1 year.
2023-07-20 23:52:51 +02:00
Xavier Del Campo Romero 0e8e6c3742
http.c: Improve error detection for strotull(3)
set_length relies on user input to determine Content-Length, so it
should be considered unreliable.
2023-07-20 23:52:51 +02:00
Xavier Del Campo Romero 67ffb772b7
Fix memory leak on failed realloc(3)
According to C99 §7.20.3.4:

If memory for the new object cannot be allocated, the old object is not
deallocated and its value is unchanged.

Therefore, a temporary pointer must be used to ensure the original
object can still be deallocated should realloc(3) return a null pointer.
2023-07-20 23:52:51 +02:00
Xavier Del Campo Romero 37fd5c92ae
Add Makefile 2023-07-20 23:52:51 +02:00
Xavier Del Campo Romero 2968c5f67d
Initial commit 2023-07-20 23:52:47 +02:00