1
0
mirror of https://github.com/etesync/server synced 2024-11-13 04:18:55 +00:00
Commit Graph

540 Commits

Author SHA1 Message Date
Tom Hacohen
c61dd86a8c
Merge: Replace aioredis with redis-py (#151) 2022-09-04 13:59:50 -04:00
Tom Hacohen
8c6d04e8d3 Replace aioredis with redis-py
aioredis has been merged into redis-py and will no longer be maintained
as a separate project.
2022-09-04 19:57:27 +02:00
Tom Hacohen
2f1f95fea9 Optimize how we fetch the latest (current) revision
The way were were doing it was implicitly sorting the query items and it
was causing millions of items to be sorted (even though the result should
only have one) making it slow.

By switching away from `get()` and `first()` we are telling django to
not try to sort.
2022-06-19 22:25:49 +03:00
Tom Hacohen
5f455e55b5 Bump version and update changelog. 2022-06-13 14:02:48 +03:00
Tom Hacohen
709a607d47 Update Django dependency. 2022-06-13 14:01:15 +03:00
Tom Hacohen
0563c6880a Bump version and update changelog. 2022-06-13 13:59:06 +03:00
Xiretza
cb790734e5 feat(config): add LDAP example 2022-06-13 13:54:46 +03:00
PapaTutuWawa
fac36aae11
Implement checking the username against LDAP (#64)
This commit adds code to allow users that prefer to do user management
via LDAP to do so. Since Etebase does not store the password (proof) in
a LDAP compatible fashion, we compromise and instead two checks: One while
registering an account to see if the username is the LDAP directory and
one whenever the API is accessed. To prevent too many LDAP requests, the
result of the request is cached for an configurable amount of hours.

Make sure you have python-ldap installed and can successfully import
ldap. Then, if you use the easy config, add the following to your
config:

```
; [...]
; Regular etesync configuration

[ldap]
bind_dn = <Your LDAP "user" to bind as. See Note 1>
bind_pw = <The password to authenticate as your bind user>
; Or if you have the password in a file:
; bind_pw_file = /path/to/the/file.txt
server = <The URL to your LDAP server>
search_base = <Your search base>
filter = <Your LDAP filter query. See Note 2>
; In case a cache TTL of 1 hour is too short for you, set `cache_ttl` to
the preferred
; amount of hours a cache entry should be viewed as valid:
; cache_ttl = 5
```

With this config, I am able to make the EteSync server check with my
LDAP server if a user should be able to login or register.
Note that if a user is allowed to login or register, the password of the
LDAP user will be ignored. This LDAP patch is nothing more than an
additional check before the actual authentication.

A successful LDAP check will be cached, if not configured (correctly),
for one hour, after which the LDAP query will be performed again.

Note 1: This commit only works with a bind user
Note 2: The query must be specified. If an LDAP query returns more than
one or no result, then the authentication fails. If your query needs to
include the username that currently tries to perform a login or
registration, you can use %%s, which will be subsituted for the used
username.
2022-06-13 13:29:43 +03:00
Tom Hacohen
3a4da142dc Fix import of sendfile backend due to python package changes.
Broke in c7d1de31a1.
2022-06-04 18:05:13 +03:00
Xiretza
79cef79c52
fix(testserver): store database in /data partition (#142)
This allows testing version migrations by simply mounting the volume into
a container with a different image.
2022-05-27 14:49:07 +03:00
Tom Hacohen
c7d1de31a1
Merge: Create python package #140
This is quite a big one, so it probably makes sense to review it commit-by-commit (there shouldn't be any overlap).

Summarized:
- The `etebase_fastapi` module was moved to `etebase_server.fastapi`
- The `myauth` module was moved to `etebase_server.myauth`
- The `django_etebase` module was moved to `etebase_server.django`
- The `templates/` directory was moved into `etebase_server/`
- A `setup.py` was added to allow packaging the `etebase_server` module as a python package.
2022-05-16 22:02:02 +03:00
Xiretza
aac27e6a43 feat: create python package 2022-05-09 17:41:16 +02:00
Xiretza
791de952f4 fix: move template directory into source directory
This is in preparation for creating a python package.
2022-05-09 17:41:16 +02:00
Xiretza
ada5181a7e fix: move django_etebase module from toplevel to under etebase_server
This is in preparation for creating a python package, which should only
occupy the "etebase_server" name in the global module namespace.
2022-05-09 17:41:16 +02:00
Xiretza
9d6e0ae60a fix: move myauth module from toplevel to under etebase_server
This is in preparation for creating a python package, which should only
occupy the "etebase_server" name in the global module namespace.
2022-05-09 17:41:16 +02:00
Xiretza
163f7766f1 fix: move etebase_fastapi module from toplevel to under etebase_server
This is in preparation for creating a python package, which should only
occupy the "etebase_server" name in the global module namespace.
2022-05-09 17:41:16 +02:00
Xiretza
13a137a128 fix: remove obsolete static file handler 2022-05-09 10:40:38 -05:00
Xiretza
e635e081c7 fix: use django.urls.path instead of deprecated django.conf.urls.url 2022-05-09 10:40:38 -05:00
Xiretza
04ca0ae5db
feat(config): allow specifying engine-specific database options (#135)
These are required to e.g. use PostgreSQL client certificates using
sslcert=/sslkey=.
2022-05-09 17:32:35 +03:00
Xiretza
c6b1b855df
fix: remove deprecated argument "providing_args" from Signal() (#138)
From the source:

> The providing_args argument is deprecated. As it is purely
> documentational, it has no replacement. If you rely on this
> argument as documentation, you can move the text to a code
> comment or docstring.
2022-05-09 17:19:57 +03:00
Xiretza
5dbb8a4ad8
fix(doc): remove outdated uWSGI setup documentation (#139)
uWSGI is no longer supported and ASGI must be used instead.
2022-05-09 17:19:03 +03:00
Xiretza
70b753cd31
fix: don't create secrets file as world-readable (#136) 2022-05-09 17:17:56 +03:00
Xiretza
b620d0a39c
fix(etebase_fastapi): fix crash on shutdown (#133)
self.redis isn't None, it's actually unset, so accessing it results
in an exception:

```
ERROR:    Traceback (most recent call last):
  File "./.venv/lib/python3.9/site-packages/starlette/routing.py", line 624, in lifespan
    await receive()
  File "./.venv/lib/python3.9/site-packages/starlette/routing.py", line 521, in __aexit__
    await self._router.shutdown()
  File "./.venv/lib/python3.9/site-packages/starlette/routing.py", line 608, in shutdown
    await handler()
  File "./etebase_fastapi/main.py", line 72, in on_shutdown
    await redisw.close()
  File "./etebase_fastapi/redis.py", line 18, in close
    if self.redis is not None:
AttributeError: 'RedisWrapper' object has no attribute 'redis'
```
2022-05-07 20:37:53 +03:00
Xiretza
76efbb6cb9
fix(manage.py): fix shebang to work on Debian-based systems (#134)
In debian, /usr/bin/python is python 2.7.
2022-05-07 20:37:10 +03:00
Tom Hacohen
dd0e76fc02 README: Add @DanielG to contributors
Thanks a lot for your support!
2022-04-18 15:18:30 -04:00
Tom Hacohen
006c5fc242 Update changelog. 2022-03-25 15:18:55 +03:00
Tom Hacohen
f62d4ebdfc Msgpack handling: fix compatibilty with newer fastapi.
Fixes #112.
Supersedes #127.
2022-03-25 15:17:37 +03:00
Tom Hacohen
247c5ea680 Update changelog. 2022-03-23 12:59:41 +02:00
Victor R. Santos
e0010f21f6
Update dependecies generated by pip-compile. (#126)
This one is to fix my own PR #125, the requirement files contained the following sentence:

"To update, run: pip-compile --output-file=requirements.txt requirements.in/base.txt"

But that was misleading, after reading pip-tools documentation I found that

"If pip-compile finds an existing requirements.txt file that fulfils the dependencies then no changes will be made, even if updates are available."

That was my mistake, generated the files again and made new builds using python 3.10 that worked as expected. Once again sorry for the mistake!
2022-03-23 11:36:21 +02:00
Tom Hacohen
ed2e68d4d5 Update changelog 2022-03-20 17:48:33 +02:00
Victor R. Santos
7bb1bf9d22 Fix Django 3.2 warnings models.W042 2022-03-20 14:22:05 +02:00
Victor R. Santos
d1d58f15c7 Update dependencies while keeping Django below 4.0 2022-03-20 14:22:05 +02:00
Victor R. Santos
ce70045dac
Fix Error 404 Not Found for Static Files (#124)
After changing for FastAPI the server ignores STATIC_ROOT and STATIC_URL
2022-03-20 14:21:09 +02:00
Tom Hacohen
ee8349d419 Update django version in requirements-dev.txt too 2022-03-17 20:27:30 +02:00
Tom Hacohen
f14d74510b Update changelog. 2022-03-17 20:25:37 +02:00
Tom Hacohen
056d6853a0 Deps: update django dep.
This is in response to reports in #123. There are no security issues
affecting Etebase, but people still misunderstood the reports so updating
to make sure that it's clear.

More info:
https://github.com/etesync/server/issues/123\#issuecomment-1070644715
2022-03-17 11:47:43 +02:00
Simon Vandevelde
4c4fa3d726 Update README.md with automatic user signup 2021-11-15 13:47:48 -05:00
James
453869d71d Remove port from host_from_request check
This strips the port from the client requests, comparing only the hostnames or IP addresses, and should alleviate nonstandard port and initial testing issues.  Tested on Linux, Mac, and Android clients.  Closes #105.

Code is from this comment:

https://github.com/etesync/server/issues/66#issuecomment-731215345
2021-09-20 15:13:25 +03:00
Mohammed Anas
d11504093c Make it clear in README that backing up secret.txt is ok 2021-07-29 20:23:23 +03:00
Tom Hacohen
d4de717cf7
README: Add @jzacsh to supporters
Thanks a lot for your support!
2021-07-28 12:29:32 +03:00
Dustin J. Mitchell
43d5af32d7 Fix sendfile settings
* set SENDFILE_ROOT to the filesystem path for media, not the URL
  component
* use the correct import path to the sendfile backend
2021-04-17 19:03:35 +03:00
Dustin J. Mitchell
7c58540409 Create a testing docker image 2021-04-17 19:03:35 +03:00
Zakkumaru
58163d6678 Duplicate to README.MD
When the file was changed/renamed, it retained a duplicate, possibly outdated.
2021-03-06 09:36:26 +02:00
Tom Hacohen
21e5382fc4 easyconfig: make it clear that media_root needs to be set. 2021-02-17 17:33:35 +02:00
Tom Hacohen
14b3cfca55 Handle stoken being the empty string.
For whatever reason some users were getting this which was causing this code
to fail.
2021-02-01 18:40:14 +02:00
Tom Hacohen
b33a3c882e Subscriptions: allow subscribing without setting an stoken. 2021-01-28 18:10:12 +02:00
Tom Hacohen
8485806046 Easy config: add support for setting redis URI. 2021-01-28 17:55:37 +02:00
Tom Hacohen
ef69954b6d requirements.txt: Add missing deps. 2021-01-28 17:44:17 +02:00
Tom Hacohen
e4361d2364 Patch old DB migration in order to fix mysql issues.
Really fix #69.
2021-01-27 18:48:56 +02:00
Tom Hacohen
0ac41e77e8 Fix DB errors when using MySQL/MariaDB.
Fixes #69.
2021-01-27 14:38:10 +02:00