Commit Graph

180 Commits

Author SHA1 Message Date
Xavier Del Campo Romero 18bd0d83be
usergen: Remove dependency against xxd(1)
xxd(1) is closely related to vim(1), might not be available under
some POSIX systems.
2023-09-16 01:00:05 +02:00
Xavier Del Campo Romero d8f683d9ca
usergen: Reject non-numeric, invalid quota 2023-09-16 00:59:46 +02:00
Xavier Del Campo Romero b5327b2f7a
Reduce minimum required major version for OpenSSL
slcl has been successfully tested with OpenSSL 2.0 on an OpenBSD 7.3
host.
2023-09-16 00:29:07 +02:00
Xavier Del Campo Romero 5af036c37c
auth.c: Add missing include
As opposed to other integer constants such as ULLONG_MAX, SIZE_MAX is
defined by stdint.h, not limits.h.
2023-09-15 22:34:07 +02:00
Xavier Del Campo Romero e81d1f6312
main.c: Remove string duplication in get_forms
slweb now assumes application/x-www-form-urlencoded-data as text, so it
now returns a null-terminated string on struct http_post member "data".
This removes the need for slcl to call strdup(3) in order to obtain a
null-terminated string.
2023-09-09 02:34:26 +02:00
Xavier Del Campo Romero fcef3b99b8
Check directory on uploads
For historical reasons, slweb used to check for a name called "dir" on
multipart/form-data POST requests. However, stricly speaking this is
application logic, so it has been now moved from slweb to slcl.

This has resulted in a couple of breaking changes in slweb that had to
be updated on slcl.
2023-09-09 00:50:22 +02:00
Xavier Del Campo Romero 7471da3886
page.c: Update project URL 2023-09-09 00:19:07 +02:00
Xavier Del Campo Romero df873a988c
main.c: Return 1 on null buffer
Malformed POST requests might include no payload data. However, this is
not considered a fatal error, but wrong user input.
2023-09-09 00:15:39 +02:00
Xavier Del Campo Romero 93b146a8a8
Bump slweb
Last commits introduced several minor bugfixes and improvements.
2023-09-07 16:12:55 +02:00
Xavier Del Campo Romero 474de49bad
Add screenshots 2023-08-08 13:05:33 +02:00
Xavier Del Campo Romero a53781a297
Bump slweb
d55b84f68b90fe5c2521724d0c22ebf22e62b0b4 introduces a bugfix:

Author: Xavier Del Campo Romero <xavi.dcr@tutanota.com>
Date:   Tue Aug 8 00:32:21 2023 +0200

    html.c: Fix wrong encoding for '>' and '<'
2023-08-08 00:38:52 +02:00
Xavier Del Campo Romero 77ceb994cf
Bump slweb 2023-08-02 13:07:20 +02:00
Xavier Del Campo Romero 0e324e6d77
CMakeLists.txt: Set project language to C
Otherwise, CMake by default tests the system C++ compiler, but this is
not a requirement for slcl.
2023-08-02 13:05:23 +02:00
Xavier Del Campo Romero a88589db6f
Makefile: run the clean target recursively 2023-08-01 02:25:30 +02:00
Xavier Del Campo Romero 08b2cfd2de
Bump slweb 2023-08-01 02:25:30 +02:00
Xavier Del Campo Romero 710852ec71
Makefile: Add FORCE target
When added to targets $(DYNSTR) and $(SLWEB), this would force running
the recursive Makefiles, which might then (or might not) rebuild
targets.
2023-08-01 02:25:30 +02:00
Xavier Del Campo Romero 75f1f223d4
Do some minor rebranding
Despite designed around portability and minimalism, I feel slcl no
longer aligns with the philosophical views from the suckless project.
Therefore, I think it was appropriate to unlink its branding from it.
2023-08-01 02:25:30 +02:00
Xavier Del Campo Romero 7cc5ab1e79
README.md: Inform about -t command line option 2023-07-30 23:41:18 +02:00
Xavier Del Campo Romero 9bcad04de6
Move slweb to new URL 2023-07-28 01:40:44 +02:00
Xavier Del Campo Romero f84cfcfa14
README.md: Add references to slweb
slweb is the HTTP/1.1 server implementation and utilities that slcl
originally implemented, which have now been split into a separate
repository.
2023-07-21 01:40:55 +02:00
Xavier Del Campo Romero f4aa3367f8
Remove dynstr as a submodule
It is now provided by slweb instead.
2023-07-21 01:40:55 +02:00
Xavier Del Campo Romero e49f1da7ae
Adapt to slweb's include paths
slweb puts its header files into its own directory in order to avoid
potential name clashing.
2023-07-21 01:40:55 +02:00
Xavier Del Campo Romero 6e5c091d8f
Adapt build system to slweb
Now, slweb is a library slcl depends on, which includes the HTTP/1.1
server implementation, as well as other utilities.
2023-07-21 01:40:55 +02:00
Xavier Del Campo Romero 7fe639b3ba
Remove files now provided by slweb 2023-07-21 01:40:55 +02:00
Xavier Del Campo Romero 1d4480c0f3
Import slweb
slweb contains the HTTP/1.1 server implementation and surrounding
utilities that are used by slcl. The motivation behind this was to allow
these components to be used by other projects, as well as effectively
making slcl smaller and more modular.
2023-07-21 01:40:51 +02:00
Xavier Del Campo Romero 4eb044e625
Makefile: Allow users to define LDFLAGS
This should allow for easier packaging if extra linker flags are
required.
2023-07-16 03:33:40 +02:00
Xavier Del Campo Romero 38f3f82a77
Limit amount of search results
When a user enters a search term that is too generic, slcl would
generate a long list of search results, where this generation could have
a big impact on the server performance and its available resources.

Therefore, it is reasonable to limit the number of search results to an
arbitrary limit, so that users are forced to enter a more specific
search term in order to achieve more relevant results.
2023-07-11 13:27:49 +02:00
Xavier Del Campo Romero 59e17afe29
cftw: Allow user callback to stop recursive search
So far, cftw would search through all directories and files recursively,
until all objects are processed. However, it is interesting for the user
callback to be able to stop this process under specific circumstances.

Now, cftw will pass a pointer to a bool, initialised to false by
default, that can be optionally assigned to true by the user
callback.

Future commits will make use of this feature. For example, this will be
used to limit the number of search results when a user enters a search
term that is too generic and would otherwise generate a large amount of
search results.
2023-07-11 13:27:49 +02:00
Xavier Del Campo Romero 48b171335c
main.c: Use path_isrel for search terms
Search terms cannot use the same strict rules used for filenames or
directory names, as otherwise examples such as "*folder*/*IMG*" would
not work.
2023-07-11 13:27:49 +02:00
Xavier Del Campo Romero e79e955d93
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-11 01:49:12 +02:00
Xavier Del Campo Romero 4236c7fc3a
page.c: Allow add_element to hide checkboxes
Since removing files or directories is currently not an option in
searches, it is better to leave checkboxes out to avoid confusion.
2023-07-09 05:54:56 +02:00
Xavier Del Campo Romero 55f0efb8ab
page.c: Remove back button from searches
- The back button would not return to the previous directory, but to the
user root directory.
- While this could have been solved easily (e.g.: by inserting the
referrer directory into the form), it would have implied extra and
unneeded complexity.
2023-07-09 05:54:56 +02:00
Xavier Del Campo Romero 82c68c4a02
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-09 05:54:56 +02:00
Xavier Del Campo Romero b5282b2365
main.c: Disallow invalid filenames or directory names
- Relative paths must not be used for filenames or directory names,
such as "..", "." or "dir/..".
- Paths with asterisks ('*') must not be allowed, to avoid confusion
with wildcard expressions.
2023-07-09 05:54:53 +02:00
Xavier Del Campo Romero fbd730754b
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-09 05:41:43 +02:00
Xavier Del Campo Romero fa8217c511
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-09 04:14:14 +02:00
Xavier Del Campo Romero 0822a982ef
Implement file/directory removal
The following workflow has been implemented:

- A new checkbox for each object inside a directory is shown.
- When one or more objects are selected, the user submits a request
through a HTML5 form.
- Then, slcl will ask the user for confirmation, listing the selected
objects, while reminding the user about the effects.
- The user confirms the selection.
- slcl removes the selected objects. All objects from non-empty
directories are removed, too.
- Finally, slcl redirects the user to the directory the request was
made from.
2023-07-08 03:08:07 +02:00
Xavier Del Campo Romero 74ca76a58f
cftw: Allow directories to call the user callback
This provides a few benefits:

- This will allow searching for directories by name.
- Future commits will allow to remove files and directories, so this
  change was also required for cftw.
2023-07-08 02:30:31 +02:00
Xavier Del Campo Romero 8bff49d9c8
page.c: Return HTTP_STATUS_OK on successful page_search
This was probably a copy-paste issue when implementing page_search based
on page_quota_exceeded.
2023-07-08 00:52:53 +02:00
Xavier Del Campo Romero 960a35a02f
main.c: Fix use-after-free on failed search_fn
When search_fn fails, it must free `r` before `results`, as the former
is assigned based on the latter - otherwise, it would lead to undefined
behaviour.

So far, only memory allocation errors would make search_fn to fail.
2023-07-07 22:04:01 +02:00
Xavier Del Campo Romero 74b7f7a902
cftw.c: Check errors from readdir(3)
According to POSIX.1-2017, applications are advised to assign errno(3)
to 0 before a call to readdir(3), and compare errno(3) after the call to
check for errors.
2023-07-06 01:56:43 +02:00
Xavier Del Campo Romero 36ff7d8143
main.c: Use ISO C99-compatible declaration for main
C99 §5.1.2.2.1 only defines the following declarations for main:

- int main(void)
- int main(int argc, char *argv[])

While the use of equivalent types (e.g.: char **argv) is allowed, const
char ** would not be considered equivalent, and thus an invalid
declaration depending on the implementation.
2023-07-06 00:56:27 +02:00
Xavier Del Campo Romero 640210a7f6
server.c: Fix typo 2023-07-06 00:42:12 +02:00
Xavier Del Campo Romero 7bd56e69dc
http.c: Accept resources with '&' or '?'
Otherwise, client requests to resources such as '/me & you', '/?' or
'/??preview=1' would fail.
2023-07-06 00:19:05 +02:00
Xavier Del Campo Romero 15c905f150
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-03 13:40:12 +02:00
Xavier Del Campo Romero 5a6c92d69b
Implement search
This new feature adds a HTML form on each directory listing that allows
to search files recursively, starting from the current user directory.
Wildcard patterns are also allowed.
2023-06-06 03:52:16 +02:00
Xavier Del Campo Romero 6e9ce3a25b
ctfw.c: Avoid trailing forward slash
Otherwise, this would generate strings such as "directory//resource" if
dirpath contained a trailing slash, which could be problematic for users
relying on ctfw.
2023-06-06 03:48:51 +02:00
Xavier Del Campo Romero 6adf1c44ad
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-06-06 03:48:51 +02:00
Xavier Del Campo Romero 0d7ead4638
wildcard_cmp.c: Remove leftovers
These statements had no effect since it was always executed when
n == 0.
2023-06-06 03:48:51 +02:00
Xavier Del Campo Romero 6e5c001c28
wildcard_cmp: Allow case-insensitive searches
The new search feature will require them.
2023-06-06 03:48:50 +02:00