mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-11-13 12:31:13 +00:00
Code Issues Projects Releases Wiki Activity
16716 commits 259 branches 58 tags 358 MiB
Commit graph

16716 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
marcin mikołajczak
17b69c43d5 Add group_key to notifications 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-12 14:37:37 +02:00
marcin mikołajczak
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
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
Haelwenn
20e82c7456 Merge branch 'argon2' into 'develop' 
Support and convert argon2 passwords

See merge request pleroma/pleroma!4257
 2024-09-08 20:48:21 +00:00
Mint
7e91c3a306 Changelog 2024-09-08 05:41:48 +03:00
Mint
9de522ce50 Authentication: convert argon2 passwords, add tests 2024-09-08 05:32:40 +03:00
marcin mikołajczak
c9b28eaf9a Argon2 password support 2024-09-08 05:23:46 +03:00
feld
bb0cb06d8a Merge branch 'well-known' into 'develop' 
NodeInfo: Accept application/activity+json requests

See merge request pleroma/pleroma!4242
 2024-09-06 16:30:07 +00:00
feld
80f3e507d4 Merge branch 'dialyzer' into 'develop' 
Dialyzer fixes

See merge request pleroma/pleroma!4254
 2024-09-06 16:12:28 +00:00
feld
b871551d97 Merge branch 'oban-uniques' into 'develop' 
Oban: more unique job constraints

See merge request pleroma/pleroma!4253
 2024-09-06 16:02:06 +00:00
feld
7f3600fddd Merge branch 'scrubber-mention-hashtag' into 'develop' 
Add tests for Mastodon mention hashtag class

See merge request pleroma/pleroma!4255
 2024-09-06 15:52:06 +00:00
Mark Felder
1afcfd4845 Add tests for Mastodon mention hashtag class 2024-09-06 11:51:16 -04:00
Mark Felder
5b26c56624 Changelog 2024-09-06 11:34:06 -04:00
Mark Felder
06ce5e3b43 Dialyzer: pattern_match The pattern can never match the type {:diff, false}. 2024-09-06 11:27:07 -04:00
Mark Felder
1d0e3b1355 Dialyzer: The pattern variable _ can never match the type, because it is covered by previous clauses. 2024-09-06 11:24:37 -04:00
Mark Felder
06d6febff9 Dialyzer: The pattern variable _e@1 can never match the type, because it is covered by previous clauses. 2024-09-06 11:19:24 -04:00
Mark Felder
7eb579c191 Dialyzer: invalid contract 2024-09-06 11:18:12 -04:00
Mark Felder
bc16f09d7b Dialyzer: the pattern can never match the type 
The original error was for the chat controller:

lib/pleroma/web/pleroma_api/controllers/chat_controller.ex:104:pattern_match The pattern can never match the type {:error, :content_too_long | :forbidden | :no_content | :not_found} | {:user, nil}.

Improve typespecs for the Pipeline and apply them where it could be encountered
 2024-09-06 11:12:15 -04:00
Mark Felder
fc3ea94a1c Dialyzer: the pattern can never match the type 2024-09-06 09:58:03 -04:00
Mark Felder
a887188890 Oban: more unique job constraints 2024-09-06 09:42:53 -04:00
feld
2c916ccd89 Merge branch 'following-state-bug' into 'develop' 
Fix Following status bug

See merge request pleroma/pleroma!4251
 2024-09-06 13:27:06 +00:00
feld
25db1a5d67 Merge branch 'oauth-app-spam2' into 'develop' 
OAuth App Spam, revisited

See merge request pleroma/pleroma!4250
 2024-09-05 21:19:09 +00:00
Mark Felder
5f573b4095 Credo: comment line length 2024-09-05 17:11:02 -04:00
Mark Felder
e51cd31a57 Bump credo to prevent it from crashing 2024-09-05 17:06:53 -04:00
Mark Felder
1797f5958a App orphans should only be removed if they are older than 15 mins 2024-09-05 20:55:28 +00:00
Mark Felder
4d76692db3 Fix Following status bug 2024-09-05 16:14:13 -04:00
Mark Felder
fb376ce005 Test Account View does not indicate following if a FollowingRelationship is missing 2024-09-05 16:14:06 -04:00
Mark Felder
53744bf146 Limit the number of orphaned to delete at 100 every 10 mins due to the cascading queries that have to check oauth_authorizations and oauth_tokens tables. 
This should keep ahead of most app registration spam and not overwhelm lower powered servers.
 2024-09-04 11:45:05 -04:00
Mark Felder
a1951f3af7 Add Cron worker to clean up orphaned apps hourly 2024-09-04 10:59:58 -04:00
Mark Felder
7bd0750787 Ensure apps are assigned to users 2024-09-04 10:40:37 -04:00
Mark Felder
427da7a99a Rate Limit the OAuth App spam 2024-09-04 09:22:58 -04:00
feld
fbcfbde833 Merge branch 'revert-9077d092' into 'develop' 
Revert "Merge branch 'oauth-app-spam' into 'develop'"

See merge request pleroma/pleroma!4249
 2024-09-04 02:41:31 +00:00
feld
92d5f0ac14 Revert "Merge branch 'oauth-app-spam' into 'develop'" 
This reverts merge request !4244
 2024-09-04 02:22:25 +00:00
marcin mikołajczak
6d5ae4d2e9 Include list id in StatusView 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-03 15:17:45 +02:00
marcin mikołajczak
fecfe8bf89 Merge branch 'scrubbers-allow-mention-hashtag' into 'develop' 
scrubbers/default: Allow "mention hashtag" classes used by Mastodon

See merge request pleroma/pleroma!4245
 2024-09-02 11:08:33 +00:00
marcin mikołajczak
37397a43be scrubbers/default: Allow "mention hashtag" classes used by Mastodon 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-09-02 12:39:29 +02:00
feld
9077d0925b Merge branch 'oauth-app-spam' into 'develop' 
Fix OAuth app spam

See merge request pleroma/pleroma!4244
 2024-09-01 18:24:06 +00:00
feld
61e4be396f Merge branch 'drop-unknown-deletes' into 'develop' 
Drop unwanted activities from unknown actors

See merge request pleroma/pleroma!4236
 2024-09-01 18:08:07 +00:00
Mark Felder
751d63d4bb Support OAuth App updating the website URL 2024-09-01 13:55:45 -04:00