mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 00:26:30 +00:00
Code Issues Projects Releases Wiki Activity
16860 commits 262 branches 60 tags 345 MiB
Commit graph

16860 commits

This branch
This branch
All branches
Author SHA1 Message Date
Haelwenn (lanodan) Monnier
7dd3a4d86d
push: make vapid_config fallback to empty array 
2024-09-24T03:53:27.770757+00:00 NightmareMoon pleroma: path=/notice/AmJcSqyeyij4W70K36 [error] Preloading for /notice/AmJcSqyeyij4W70K36 failed.
    ** (FunctionClauseError) no function clause matching in Keyword.get/3
        (elixir 1.15.8) lib/keyword.ex:388: Keyword.get(nil, :public_key, nil)
        (pleroma 2.7.0-3067-g9b76dbd4-dev-lanodan2) lib/pleroma/web/mastodon_api/views/instance_view.ex:262: Pleroma.Web.MastodonAPI.InstanceView.pleroma_configuration/1
        (pleroma 2.7.0-3067-g9b76dbd4-dev-lanodan2) lib/pleroma/web/mastodon_api/views/instance_view.ex:45: Pleroma.Web.MastodonAPI.InstanceView.render/2
        (pleroma 2.7.0-3067-g9b76dbd4-dev-lanodan2) lib/pleroma/web/preload/providers/instance.ex:28: Pleroma.Web.Preload.Providers.Instance.build_info_tag/1
        (pleroma 2.7.0-3067-g9b76dbd4-dev-lanodan2) lib/pleroma/web/preload/providers/instance.ex:21: Pleroma.Web.Preload.Providers.Instance.generate_terms/1
        (pleroma 2.7.0-3067-g9b76dbd4-dev-lanodan2) lib/pleroma/web/preload.ex:13: anonymous fn/3 in Pleroma.Web.Preload.build_tags/2
 2024-09-24 05:57:41 +02:00
Haelwenn
d2eb4992e2 Merge branch 'elixir-1.14-docker' into 'develop' 
Dockerfile: Elixir 1.14

See merge request pleroma/pleroma!4274
 2024-09-21 13:44:17 +00:00
Haelwenn (lanodan) Monnier
a1e3fb506b
Dockerfile: Elixir 1.14 2024-09-21 15:40:04 +02:00
Haelwenn
bc1b4f0be7 Merge branch 'features/mrf-id_filter' into 'develop' 
Add id_filter to MRFs

See merge request pleroma/pleroma!3858
 2024-09-21 12:27:35 +00:00
Haelwenn (lanodan) Monnier
0fa13c5535
MRF.SimplePolicy: Add id_filter/1 2024-09-21 14:07:26 +02:00
Haelwenn (lanodan) Monnier
30063c5914
MRF.DropPolicy: Add id_filter/1 2024-09-21 14:06:26 +02:00
Haelwenn (lanodan) Monnier
3dd6f65859
Object.Fetcher: Hook to MRF.id_filter 2024-09-21 14:06:26 +02:00
Haelwenn (lanodan) Monnier
03e14e759d
MRF: Add filtering against AP id 2024-09-21 14:06:24 +02:00
feld
196f108823 Merge branch 'oban-bump' into 'develop' 
Oban: update to 2.18.3

See merge request pleroma/pleroma!4271
 2024-09-19 21:42:49 +00:00
Mark Felder
d6a364dad4 Merge remote-tracking branch 'origin/develop' into oban-bump 2024-09-19 16:23:38 -04:00
feld
7c37fc6a71 Merge branch 'elixir-1.14' into 'develop' 
Elixir 1.14

See merge request pleroma/pleroma!4272
 2024-09-19 20:23:17 +00:00
marcin mikołajczak
23e5eed4e0 Include session scopes in TokenView 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-19 10:57:50 +02:00
Mark Felder
1bd28e7d59 CI script to build and publish an image for Elixir 1.14 2024-09-18 17:28:53 +00:00
Mark Felder
7e303600fb Remove old elixir 1.12 build image generation script 2024-09-18 17:15:55 +00:00
Mark Felder
f00545d85b Elixir 1.14 and Erlang/OTP 23 is now the minimum supported release 2024-09-18 13:14:17 -04:00
feld
6358294943 Merge branch 'ldap-call' into 'develop' 
LDAP: fix compile warning

See merge request pleroma/pleroma!4270
 2024-09-18 16:20:45 +00:00
Mark Felder
ecd1b8393b Oban: update to 2.18.3 
This release includes the fix which should prevent the scenario where Postgrex crashes can cause Oban to get into a state where it will stop processing jobs.
 2024-09-18 12:09:27 -04:00
Mark Felder
73204c1bca LDAP: fix compile warning 
Sometimes the compile will emit the following warning, so we'll just avoid it by making it call a function in the LDAP module which will never have this problem.

warning: :GenServer.call/2 is undefined (module :GenServer is not available or is yet to be defined)
 2024-09-18 11:58:52 -04:00
feld
8776d31794 Merge branch 'swoosh-mua' into 'develop' 
Add dependencies for Swoosh's Mua mail adapter

See merge request pleroma/pleroma!4263
 2024-09-17 19:45:29 +00:00
Mint
1de5208a9e Cheatsheet: add Mua mail adapter config 2024-09-17 22:03:43 +03:00
feld
f423534ef0 Merge branch 'ldap-tls' into 'develop' 
LDAP: refactor to a GenServer

See merge request pleroma/pleroma!4268
 2024-09-17 18:15:35 +00:00
Mark Felder
35ddb1d2c8 LDAP genserver changelog 2024-09-17 13:57:10 -04:00
Mark Felder
2b482e34eb Improve matching on bind errors 2024-09-17 13:54:57 -04:00
Mark Felder
ea63533cf2 Change :connection to :handle to match upstream nomenclature 2024-09-17 13:46:56 -04:00
Mark Felder
1d123832da Formatting 2024-09-17 13:46:49 -04:00
Mark Felder
21bf229731 Reduce LDAP timeouts 
10 seconds is way too long for any login attempt or search result. LDAP should always be fast.
 2024-09-17 13:43:22 -04:00
Mark Felder
363b462c54 Make the email attribute configurable 
While here, fix the System.get_env usage to use the normal fallback value method and improve the UID label description
 2024-09-17 13:40:15 -04:00
Mark Felder
14a9663f1a Remove cacertfile as child of SSL and TLS options 
We need to pass the cacerts (list of charlist encoded certs) not cacertfile, so our new cacertfile setting handles this for us.
 2024-09-17 13:40:15 -04:00
Mark Felder
a1972d57e3 Link the eldap connection process 
Ensure if LDAP GenServer crashes it gets cleaned up, and we should crash and restart if somehow the eldap connection process crashes unexpectedly as we can't seem to receive any DOWN messages from it, etc.
 2024-09-17 13:40:15 -04:00
Mark Felder
164ffbcab8 Fix return value when not doing STARTTLS 2024-09-17 13:40:15 -04:00
Mark Felder
d0ee899ab9 Only close connection if it is not nil 2024-09-17 13:40:15 -04:00
Mark Felder
123093a186 Ensure :ssl is started before we attempt to make the LDAP connection 2024-09-17 13:40:15 -04:00
Mark Felder
65a7b387c3 Require a reboot if LDAP configuration changes 2024-09-17 13:40:15 -04:00
Mark Felder
d82abf925d Ensure :cacertfile is configurable in ConfigDB 2024-09-17 13:40:15 -04:00
Mark Felder
44b836c94c Fix tests 
We do not need to mock and verify connections are closed as the new Pleroma.LDAP GenServer will handle managing the connection lifetime
 2024-09-17 13:40:15 -04:00
Mark Felder
7c04098dde Catchall for when LDAP is not enabled 2024-09-17 13:40:15 -04:00
Mark Felder
ead287d623 Credo 2024-09-17 13:40:08 -04:00
Mark Felder
9264b21907 Pleroma.LDAP 
This adds a GenServer which will keep an LDAP connection open and auto reconnect on failure with a 5 second wait between retries. Another benefit is this prevents parsing the Root CAs for every login attempt as we only need to do it once per connection.
 2024-09-17 13:40:08 -04:00
feld
e7176bb998 Merge branch 'retry-tests' into 'develop' 
Reapply "Custom mix task to retry failed tests once in CI pipeline"

See merge request pleroma/pleroma!4267
 2024-09-16 20:13:10 +00:00
Mark Felder
e24e107f3d Merge remote-tracking branch 'origin/develop' into retry-tests 2024-09-16 11:51:22 -04:00
feld
3a0d4e9837 Merge branch 'ldap-tls' into 'develop' 
LDAP: permit overriding the CA root, improve SSL/TLS

See merge request pleroma/pleroma!4265
 2024-09-16 15:50:58 +00:00
Mark Felder
e59706c201 Reapply "Custom mix task to retry failed tests once in CI pipeline" 
This reverts commit b281ad06de.
 2024-09-16 11:42:55 -04:00
marcin mikołajczak
e74e0089bf Repesct :restrict_unauthenticated for hashtag rss/atom feeds 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-16 17:19:21 +02:00
Mark Felder
91d1d7260b Retain the try do so an LDAP failure can fall back to local database. 
This fixes tests but the automatic fallback may not be well documented behavior.
 2024-09-15 23:18:18 -04:00
Mark Felder
af3bf8a462 Support implicit TLS connections 
Update docs to clarify that the :ssl option is also for modern TLS, but the :tls option is only for STARTTLS

These options may benefit from being renamed but they match upstream terminology.
 2024-09-15 14:00:19 -04:00
marcin mikołajczak
8250a9764e Merge branch 'notifications-group-key' into 'develop' 
Add `group_key` to notifications

See merge request pleroma/pleroma!4262
 2024-09-15 10:07:52 +00:00
Mark Felder
5539fea3bb LDAP: permit overriding the CA root 2024-09-14 20:36:24 -04:00
marcin mikołajczak
1a120d0130 Federate avatar/header descriptions 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-14 21:32:32 +02:00
marcin mikołajczak
c1a1150888 Merge branch 'profile-image-descriptions' into 'develop' 
Allow providing avatar/header descriptions

See merge request pleroma/pleroma!4227
 2024-09-14 17:46:33 +00:00
marcin mikołajczak
0111659a1f Merge branch 'list-id-visibility' into 'develop' 
Include list id in StatusView

See merge request pleroma/pleroma!4246
 2024-09-14 17:46:09 +00:00