Commit graph

17981 commits

Author SHA1 Message Date
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
f3f01f4093 Change color for avatar border
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-17 13:48:45 +02: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
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
7694ca4b25 Support Mozhi as translation provider
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-16 11:56:02 +02:00
0366bb284c Fix migration
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-16 11:42:09 +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
f01663fe6c Merge branch 'admin-report-notification-type' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-15 12:10:30 +02:00
00e253d3db Merge branch 'profile-image-descriptions' into fork
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-15 12:09:18 +02:00
8c35794961 Merge remote-tracking branch 'origin/develop' into fork 2024-09-15 12:08:20 +02: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
1a120d0130 Federate avatar/header descriptions
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-14 21:32:32 +02:00
455e3dea2e Use admin.report for report notification type
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-14 21:30:51 +02:00
8e8ec6bda9 Merge branch 'profile-image-descriptions' into fork 2024-09-14 20:17:17 +02:00
26fc74835f federate avatar/header descriptions
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-14 20:17:08 +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
marcin mikołajczak
abf38b405d Merge branch 'manifest-icon-size' into 'develop'
Manifest: declare /static/logo.svg as 512x512 to match one bundled with pleroma

See merge request pleroma/pleroma!4260
2024-09-14 17:27:49 +00:00
Mint
e10db52e0a Add dependencies for Swoosh's Mua mail adapter 2024-09-13 02:58:59 +03:00
f813da39ce fix typo
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 15:45:56 +02:00
17b69c43d5 Add group_key to notifications
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 14:37:37 +02:00
a6ec71873a Manifest: prefer theme color provided by pl fe configuration
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 11:30:37 +02:00
e4539f014c Merge branch 'manifest-icon-size' into fork 2024-09-12 11:30:07 +02:00
affdcdb68d Manifest: declare /static/logo.svg as 512x512 to match one provided by pleroma-fe
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 11:27:29 +02:00
106abc34b1 declare support for window controls overlay
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 11:26:26 +02:00
7a2200faa8 Include Pleroma logo in .svg
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 11:19:54 +02:00
291061032c update test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-12 00:11:15 +02:00
d74b5800e7 Merge remote-tracking branch 'mkljczk-pleroma/akkoma-migration' into fork 2024-09-11 22:09:24 +02:00
4cee86756c Merge remote-tracking branch 'origin/develop' into fork 2024-09-11 22:09:18 +02:00
feld
360dd34f19 Merge branch 'ldap-tls' into 'develop'
LDAP Auth: fix TLS certificate verification

See merge request pleroma/pleroma!4259
2024-09-11 18:00:22 +00:00
Mark Felder
7def11d7c3 LDAP Auth: fix TLS certificate verification
Currently we only support STARTTLS and it was not verifying certificate and hostname correctly. We must pass a custom fqdn_fun/1 function so it knows what value to compare against.
2024-09-11 12:47:46 -04:00
23f548dc61 Akkoma migration: Move mastofe settings to settings store
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-10 22:30:47 +02:00
91f0861449 yes, i'm not a big fan of this api_versions thing, how did you know?
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-10 13:05:49 +02:00
509d5ef74a we're not soapbox actually
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-09-09 16:15:45 +02:00