rinpatch [Tue, 17 Nov 2020 14:28:30 +0000 (17:28 +0300)]
Remove FedSockets
Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
ets table until the value changes, or double JSON encoding).
Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
are just too overkill for what they were trying to accomplish, which is
reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further
discussion on alternatives to fedsockets.
From discussions I had with other Pleroma developers it seems like they
would approve the descision to remove them as well,
therefore I am submitting this patch.
rinpatch [Tue, 17 Nov 2020 13:24:01 +0000 (13:24 +0000)]
Merge branch 'fix/debian-install-libmagic-typo' into 'develop'
Debian installation guide: fix libmagic header package name
See merge request pleroma/pleroma!3154
rinpatch [Tue, 17 Nov 2020 13:11:37 +0000 (16:11 +0300)]
Debian installation guide: fix libmagic header package name
It's libmagic-dev in both Ubuntu and Debian.
Reported in private by NaiJi.
rinpatch [Tue, 17 Nov 2020 12:55:09 +0000 (12:55 +0000)]
Merge branch 'feat/add-bundles-to-gitattributes' into 'develop'
.gitattributes: Treat js/css/source maps as binary files
See merge request pleroma/pleroma!3153
rinpatch [Tue, 17 Nov 2020 12:42:51 +0000 (12:42 +0000)]
Merge branch 'chores/tesla_1.4.0' into 'develop'
mix.exs: Update tesla to 1.4.0
See merge request pleroma/pleroma!3152
rinpatch [Tue, 17 Nov 2020 12:40:42 +0000 (12:40 +0000)]
Merge branch 'sync-stable/2.2.0' into 'develop'
Import stable commits into develop after releasing 2.2.0
Closes #2275, #1516, #2257, #2242, #1668, and #2236
See merge request pleroma/pleroma!3151
rinpatch [Tue, 17 Nov 2020 12:38:28 +0000 (15:38 +0300)]
.gitattributes: Treat js/css/source maps as binary files
This prevents `git grep` from showing the matching line and diffs from
being shown by default.
rinpatch [Tue, 17 Nov 2020 12:21:46 +0000 (15:21 +0300)]
CHANGELOG.md: Use a period after every bullet point for unreleased sections
It has been the de-facto style for a while now, however it is not
enforced, so there were some entries that didn't use it.
rinpatch [Tue, 17 Nov 2020 12:20:57 +0000 (15:20 +0300)]
CHANGELOG.md: Add back an entry for S3 fix
Haelwenn [Tue, 17 Nov 2020 12:16:54 +0000 (12:16 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3127
rinpatch [Tue, 17 Nov 2020 12:14:35 +0000 (15:14 +0300)]
mix.exs: bump development version to 2.2.50 after 2.2.0 release
rinpatch [Tue, 17 Nov 2020 12:10:58 +0000 (15:10 +0300)]
Import stable commits into develop after releasing 2.2.0
Updates the frontend bundle and syncs the changelog.
Haelwenn (lanodan) Monnier [Tue, 17 Nov 2020 12:09:56 +0000 (13:09 +0100)]
mix.exs: Update tesla to 1.4.0
Guy Sheffer [Tue, 10 Nov 2020 13:39:17 +0000 (13:39 +0000)]
Added translation using Weblate (Hebrew)
lain [Tue, 17 Nov 2020 11:14:50 +0000 (11:14 +0000)]
Merge branch 'fix/s3-uploads-elixir-1.11' into 'develop'
Fix S3 uploads with Elixir 1.11
See merge request pleroma/pleroma!3148
lain [Tue, 17 Nov 2020 11:12:20 +0000 (11:12 +0000)]
Merge branch 'fix/api-v1-instance-absolute-urls' into 'develop'
Use absolute URLs to thumbnail and background in /api/v1/instance
See merge request pleroma/pleroma!3149
Mark Felder [Mon, 16 Nov 2020 21:29:15 +0000 (21:29 +0000)]
Use absolute URLs to thumbnail and background in /api/v1/instance
Mark Felder [Mon, 16 Nov 2020 19:54:02 +0000 (19:54 +0000)]
Document S3 and Elixir 1.11 compat fix
Mark Felder [Mon, 16 Nov 2020 19:51:44 +0000 (19:51 +0000)]
Fix S3 uploads with Elixir 1.11
Haelwenn [Sat, 14 Nov 2020 21:43:07 +0000 (21:43 +0000)]
Merge branch 'bugfix/instance-gen_exiftool' into 'develop'
pleroma.instance: Fix Exiftool module name
See merge request pleroma/pleroma!3143
Haelwenn (lanodan) Monnier [Sat, 14 Nov 2020 21:27:13 +0000 (22:27 +0100)]
pleroma.instance: Fix Exiftool module name
lain [Fri, 13 Nov 2020 13:35:47 +0000 (13:35 +0000)]
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
Ilja [Fri, 13 Nov 2020 13:35:46 +0000 (13:35 +0000)]
Make notifs view work for reports
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
lain [Fri, 13 Nov 2020 13:31:46 +0000 (13:31 +0000)]
Merge branch 'docs/otp-tuning' into 'develop'
First draft of tips for optimizing BEAM
See merge request pleroma/pleroma!3123
rinpatch [Fri, 13 Nov 2020 10:32:16 +0000 (10:32 +0000)]
Merge branch 'fix/oban-in-database-config' into 'develop'
remove PurgeExpiredActivity from Oban db config
See merge request pleroma/pleroma!3137
Alexander Strizhakov [Fri, 13 Nov 2020 06:07:08 +0000 (09:07 +0300)]
remove PurgeExpiredActivity from Oban db config
feld [Thu, 12 Nov 2020 22:41:00 +0000 (22:41 +0000)]
Merge branch 'majic-dep' into 'develop'
Install file-dev in Dockerfile build stage
See merge request pleroma/pleroma!3135
Michael Walker [Thu, 12 Nov 2020 22:20:17 +0000 (22:20 +0000)]
Install file-dev in Dockerfile build stage
This is required by the majic, added in #2534.
rinpatch [Thu, 12 Nov 2020 12:34:48 +0000 (12:34 +0000)]
Merge branch 'release/2.2.0' into 'stable'
Release/2.2.0
See merge request pleroma/secteam/pleroma!19
rinpatch [Wed, 28 Oct 2020 15:08:23 +0000 (18:08 +0300)]
Fix object spoofing vulnerability in attachments
Validate the content-type of the response when fetching an object,
according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects.
content-type headers had to be added to many mocks in order to support
this, some of this was done with a regex. While I did go over the
resulting files to check I didn't modify anything unrelated, there is a
possibility I missed something.
Closes pleroma#1948
Haelwenn [Thu, 12 Nov 2020 08:50:26 +0000 (08:50 +0000)]
Merge branch 'title-injection-change' into 'develop'
Title injection change
See merge request pleroma/pleroma!3132
feld [Wed, 11 Nov 2020 22:37:16 +0000 (22:37 +0000)]
Merge branch 'feature/ingest-blurhash' into 'develop'
Ingest blurhash for attachments if they were federated
Closes #2294
See merge request pleroma/pleroma!3133
Mark Felder [Wed, 11 Nov 2020 22:17:35 +0000 (16:17 -0600)]
Fix tests for other attachment types
rinpatch [Wed, 11 Nov 2020 20:28:15 +0000 (23:28 +0300)]
rinpatch [Wed, 11 Nov 2020 20:12:52 +0000 (23:12 +0300)]
Polish the changelog a bit and specify release date
Mark Felder [Wed, 11 Nov 2020 19:39:02 +0000 (13:39 -0600)]
Ingest blurhash field during transmogrification
Mark Felder [Wed, 11 Nov 2020 18:51:13 +0000 (12:51 -0600)]
Render blurhashes in Mastodon API
Mark Felder [Wed, 11 Nov 2020 18:27:51 +0000 (12:27 -0600)]
Ingest blurhash for attachments if they were federated
lain [Wed, 11 Nov 2020 16:19:09 +0000 (17:19 +0100)]
Changelog: Add info about title injection
lain [Wed, 11 Nov 2020 16:17:41 +0000 (17:17 +0100)]
Bundled FE: Remove title tag
feld [Wed, 11 Nov 2020 16:15:57 +0000 (16:15 +0000)]
Merge branch 'mrf-config-descriptions' into 'develop'
little changes for MRF config descriptions
See merge request pleroma/pleroma!3131
lain [Wed, 11 Nov 2020 16:10:59 +0000 (17:10 +0100)]
RedirectController: Don't replace title, but inject into the meta
Alexander Strizhakov [Wed, 11 Nov 2020 15:49:15 +0000 (18:49 +0300)]
little changes for MRF config descriptions
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
feld [Wed, 11 Nov 2020 13:48:03 +0000 (13:48 +0000)]
Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'
Config descriptions for custom MRF policies
Closes #2222
See merge request pleroma/pleroma!3128
Alexander Strizhakov [Sat, 19 Sep 2020 18:25:01 +0000 (21:25 +0300)]
changes after rebase
Alexander Strizhakov [Wed, 11 Nov 2020 07:48:03 +0000 (10:48 +0300)]
making credo happy and test fix
Alexander Strizhakov [Wed, 11 Nov 2020 07:10:57 +0000 (10:10 +0300)]
fix for adminFE
- revert UserAllowPolicy description
- MRF descriptions order
feld [Tue, 10 Nov 2020 16:44:23 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)
feld [Tue, 10 Nov 2020 16:44:17 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)
feld [Tue, 10 Nov 2020 16:44:08 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)
feld [Tue, 10 Nov 2020 16:44:00 +0000 (16:44 +0000)]
Apply 1 suggestion(s) to 1 file(s)
Alexander Strizhakov [Tue, 10 Nov 2020 16:18:53 +0000 (19:18 +0300)]
config descriptions for custom MRF policies
lain [Tue, 10 Nov 2020 11:04:19 +0000 (11:04 +0000)]
Merge branch '2260-wrong-report-link' into 'develop'
Resolve "Wrong user link in Report email"
Closes #2260
See merge request pleroma/pleroma!3121
lain [Tue, 10 Nov 2020 10:05:15 +0000 (10:05 +0000)]
Merge branch 'fix/html-title-load' into 'develop'
Fix title on load of Pleroma HTML, fixes #2281
Closes #2281
See merge request pleroma/pleroma!3125
lain [Tue, 10 Nov 2020 09:34:13 +0000 (09:34 +0000)]
Merge branch 'fix/2291-atom-feed-escape' into 'develop'
Escaping in xml templates
Closes #2291
See merge request pleroma/pleroma!3126
Alexander Strizhakov [Tue, 10 Nov 2020 07:44:22 +0000 (10:44 +0300)]
escaping summary and other fields in xml templates
Haelwenn [Mon, 9 Nov 2020 09:14:41 +0000 (09:14 +0000)]
Merge branch 'remove/release-env' into 'develop'
Remove release_env
See merge request pleroma/pleroma!3124
Sean King [Sun, 8 Nov 2020 23:16:20 +0000 (16:16 -0700)]
Fix title on load of Pleroma HTML
lain [Sun, 8 Nov 2020 09:45:35 +0000 (09:45 +0000)]
Update optimizing_beam.md
rinpatch [Sat, 7 Nov 2020 19:09:28 +0000 (22:09 +0300)]
Remove release_env
While taking a final look at instance.gen before releasing I noticed
that the release_env task outputs messages in broken english. Upon
further inspection it seems to have even more severe issues which, in
my opinion, warrant it's at least temporary removal:
- We do not explain what it actually does, anywhere. Neither the task
docs nor instance.gen, nor installation instructions.
- It does not respect FHS on OTP releases (uses /opt/pleroma/config even
though we store the config in /etc/pleroma/config.exs).
- It doesn't work on OTP releases, which is the main reason it exists.
Neither systemd nor openrc service files for OTP include it.
- It is not mentioned in install guides other than the ones for Debian
and OTP releases.
Mark Felder [Fri, 6 Nov 2020 19:16:22 +0000 (13:16 -0600)]
Markdown, you're drunk
Mark Felder [Fri, 6 Nov 2020 19:15:21 +0000 (13:15 -0600)]
Make it clearer the settings go into the vm.args file
Mark Felder [Fri, 6 Nov 2020 19:12:13 +0000 (13:12 -0600)]
More grammar fixes
Mark Felder [Fri, 6 Nov 2020 19:04:13 +0000 (13:04 -0600)]
Less confusing I hope
Mark Felder [Fri, 6 Nov 2020 19:02:07 +0000 (13:02 -0600)]
Grammar
Mark Felder [Fri, 6 Nov 2020 19:00:31 +0000 (13:00 -0600)]
First draft of tips for optimizing BEAM
rinpatch [Thu, 5 Nov 2020 13:33:51 +0000 (16:33 +0300)]
CHANGELOG.md: Add an entry for the spoofing fix
rinpatch [Tue, 3 Nov 2020 13:59:18 +0000 (13:59 +0000)]
Merge branch 'fix/object-attachment-spoof' into 'develop'
Fix object spoofing vulnerability in attachments
See merge request pleroma/secteam/pleroma!18
Haelwenn [Tue, 27 Oct 2020 22:44:31 +0000 (22:44 +0000)]
Merge branch '2236-no-name' into 'develop'
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
Mark Felder [Tue, 27 Oct 2020 19:37:48 +0000 (14:37 -0500)]
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
feld [Wed, 28 Oct 2020 18:08:51 +0000 (18:08 +0000)]
Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'
OStatus / Static FE access control fixes
See merge request pleroma/pleroma!3053
feld [Tue, 27 Oct 2020 17:47:56 +0000 (17:47 +0000)]
Merge branch '1668-prometheus-access-restrictions' into 'develop'
[#1668] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
rinpatch [Fri, 23 Oct 2020 19:39:42 +0000 (19:39 +0000)]
Merge branch '2242-nsfw-case' into 'develop'
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"
Closes #2242
See merge request pleroma/pleroma!3094
feld [Wed, 28 Oct 2020 15:06:47 +0000 (15:06 +0000)]
Merge branch 'issue/2261' into 'develop'
[#2261] FrontStatic plug: excluded invalid url
See merge request pleroma/pleroma!3106
lain [Thu, 5 Nov 2020 12:44:16 +0000 (12:44 +0000)]
Merge branch 'feature/expire-mutes' into 'develop'
Expiring mutes for users and activities
Closes #1817
See merge request pleroma/pleroma!2971
lain [Thu, 5 Nov 2020 12:23:58 +0000 (13:23 +0100)]
Docs: Add info about expiring mutes.
lain [Wed, 4 Nov 2020 16:15:04 +0000 (16:15 +0000)]
Merge branch 'stats-genserver-fix' into 'develop'
don't run Stats GenServer updates in tests
See merge request pleroma/pleroma!2976
lain [Wed, 4 Nov 2020 16:13:34 +0000 (17:13 +0100)]
Changelog: Add info about admin email user link changes.
lain [Wed, 4 Nov 2020 16:12:47 +0000 (17:12 +0100)]
AdminEmail: Use AP id as user url.
lain [Wed, 4 Nov 2020 15:54:12 +0000 (15:54 +0000)]
Merge branch 'default-mrf' into 'develop'
Add TagPolicy as default MRF
See merge request pleroma/pleroma!2834
lain [Wed, 4 Nov 2020 15:52:30 +0000 (16:52 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix
lain [Wed, 4 Nov 2020 15:51:42 +0000 (16:51 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
lain [Wed, 4 Nov 2020 15:42:48 +0000 (15:42 +0000)]
Merge branch 'ejabberd-pleroma-auth' into 'develop'
Add ejabberd auth document
See merge request pleroma/pleroma!3074
lain [Wed, 4 Nov 2020 15:00:52 +0000 (15:00 +0000)]
Merge branch 'features/federation-status' into 'develop'
Add a federation_status endpoint showing unreachable instances
See merge request pleroma/pleroma!3086
lain [Wed, 4 Nov 2020 14:54:53 +0000 (14:54 +0000)]
Merge branch 'restrict-domain' into 'develop'
View a remote server's timeline
See merge request pleroma/pleroma!2713
Haelwenn [Wed, 4 Nov 2020 14:44:45 +0000 (14:44 +0000)]
Merge branch '2284-voters-count' into 'develop'
Always return voters_count in polls
See merge request pleroma/pleroma!3120
lain [Wed, 4 Nov 2020 14:39:32 +0000 (15:39 +0100)]
Changelog: Add info about federation status endpoint
lain [Wed, 4 Nov 2020 14:38:10 +0000 (15:38 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
lain [Wed, 4 Nov 2020 14:24:10 +0000 (15:24 +0100)]
TopicsTest: Small addition.
rinpatch [Thu, 22 Oct 2020 10:56:17 +0000 (10:56 +0000)]
Merge branch '2257-self-chat' into 'develop'
Resolve "Can't message yourself in a chat (but can start it)"
Closes #2257
See merge request pleroma/pleroma!3099
feld [Thu, 22 Oct 2020 20:33:52 +0000 (20:33 +0000)]
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
lain [Wed, 4 Nov 2020 14:05:01 +0000 (15:05 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
feld [Thu, 17 Sep 2020 16:54:53 +0000 (16:54 +0000)]
Merge branch 'instance-docs' into 'develop'
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
Closes #1516
See merge request pleroma/pleroma!2931
feld [Sun, 1 Nov 2020 19:31:17 +0000 (19:31 +0000)]
Merge branch 'tesla-get-to-pleroma' into 'develop'
Use Pleroma.HTTP instead of Tesla
Closes #2275
See merge request pleroma/pleroma!3113
lain [Wed, 4 Nov 2020 13:48:15 +0000 (13:48 +0000)]
Merge branch 'hide-muted-chats' into 'develop'
Hide chats from muted users
Closes #2230
See merge request pleroma/pleroma!3116
Egor Kislitsyn [Wed, 4 Nov 2020 12:40:12 +0000 (16:40 +0400)]
Add `with_muted` param to ChatController.index/2
lain [Wed, 4 Nov 2020 09:20:09 +0000 (10:20 +0100)]
Poll Schema: Update and fix.
lain [Wed, 4 Nov 2020 09:14:48 +0000 (10:14 +0100)]
Changelog: Add info about poll view changes
lain [Wed, 4 Nov 2020 09:14:00 +0000 (10:14 +0100)]
Poll View: Always return `voters_count`.
lain [Tue, 3 Nov 2020 13:12:39 +0000 (13:12 +0000)]
Merge branch 'chores/pleroma-favicon-logo' into 'develop'
favicon: Use images/pleroma_logo_vector_bg_32.png from pleroma.social
Closes #2270
See merge request pleroma/pleroma!3115
projects / akkoma / log