aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-07-01InstanceStatic should have reasonable cachingfrontend-cachingMark Felder
While here fix the naming convention of the old module attribute restricting caching and add a new one for the default cache value All frontends should be shipped with versioned assets. There be dragons if you don't.
2022-06-06Merge branch 'hackney_reenable_TLSv1.3' into 'develop'lain
hackney adapter helper: enable TLSv1.3 See merge request pleroma/pleroma!3661
2022-05-31Add tlsv1.3 to suggestionsPierre-Louis Bonicoli
2022-05-31hackney adapter helper & reverse proxy client: enable TLSv1.3Pierre-Louis Bonicoli
The list of TLS versions was added by 8bd2b6eb138ace3408a03c78ecc339fc35b19f10 when hackney version was pinned to 1.15.2. Later hackney version was upgraded (166455c88441b22455d996ed528ed4804514a3c0) but the list of TLS versions wasn't removed. From the hackney point of view, this list has been replaced by the OTP defaults since 0.16.0 (734694ea4e24f267864c459a2f050e943adc6694). It looks like the same issue already occurred before: 0cb7b0ea8477bdd7af2e5e9071843be5b8623dff. A way to test this issue (where example.com is an ActivityPub site which uses TLSv1.3 only): $ PLEROMA_CONFIG_PATH=/path/to/config.exs pleroma start_iex Erlang/OTP 22 [erts-10.7.2.16] [source] [64-bit] [smp:2:2] [ds:2:2:10] [async-threads:1] [hipe] Erlang/OTP 22 [erts-10.7.2.16] [source] [64-bit] [smp:2:2] [ds:2:2:10] [async-threads:1] [hipe] Interactive Elixir (1.10.4) - press Ctrl+C to exit (type h() ENTER for help) iex(pleroma@127.0.0.1)2> Pleroma.Object.Fetcher.fetch_and_contain_remote_object_from_id("https://example.com/@/Nick/") {:error, {:tls_alert, {:protocol_version, 'TLS client: In state hello received SERVER ALERT: Fatal - Protocol Version\n'}}} With this patch, the output is the expected one: iex(pleroma@127.0.0.1)3> Pleroma.Object.Fetcher.fetch_and_contain_remote_object_from_id("https://example.com/@/Nick/") {:error, {:ok, %{ "@context" => [ "https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1", %{ "Emoji" => "toot:Emoji", "Hashtag" => "as:Hashtag", "atomUri" => "ostatus:atomUri", "conversation" => "ostatus:conversation", "featured" => "toot:featured", "focalPoint" => %{"@container" => "@list", "@id" => "toot:focalPoint"}, "inReplyToAtomUri" => "ostatus:inReplyToAtomUri", "manuallyApprovesFollowers" => "as:manuallyApprovesFollowers", "movedTo" => "as:movedTo", "ostatus" => "http://ostatus.org#", "sensitive" => "as:sensitive", "toot" => "http://joinmastodon.org/ns#" } ], "endpoints" => %{"sharedInbox" => "https://example.com/inbox"}, "followers" => "https://example.com/@/Nick/followers", "following" => nil, "icon" => %{ "type" => "Image", "url" => "https://example.com/static/media/[...].png" }, "id" => "https://example.com/@/Nick/", "inbox" => "https://example.com/@/Nick/inbox", "liked" => nil, "name" => "Nick", "outbox" => "https://example.com/@/Nick/outbox", "preferredUsername" => "Nick", "publicKey" => %{ "id" => "https://example.com/@/Nick/#main-key", "owner" => "https://example.com/@/Nick/", "publicKeyPem" => "[...] }, "summary" => "", "type" => "Person", "url" => "https://example.com/@/Nick/" }} A way to test the reverse proxy bits of this issue (where example.com allows TLSv1.3 only): iex(pleroma@127.0.0.1)1> Pleroma.ReverseProxy.Client.Hackney.request("GET", "https://example.com", [], []) {:error, {:tls_alert, {:protocol_version, 'TLS client: In state hello received SERVER ALERT: Fatal - Protocol Version\n'}}}
2022-05-22Merge branch 'lewdthewides-develop-patch-48691' into 'develop'Haelwenn
Instruct users to run 'git pull' as the pleroma user See merge request pleroma/pleroma!3667
2022-05-19Merge branch 'fix/mrf-steal-emoji-regex' into 'develop'lain
StealEmojiPolicy: fix String rejected_shortcodes See merge request pleroma/pleroma!3673
2022-05-18StealEmojiPolicy: fix String rejected_shortcodesHélène
* rejected_shortcodes is defined as a list of strings in the configuration description. As such, database-based configuration was led to handle those settings as strings, and not as the actually expected type, Regex. * This caused each message passing through this MRF, if a rejected shortcode was set and the emoji did not exist already on the instance, to fail federating, as an exception was raised, swiftly caught and mostly silenced. * This commit fixes the issue by introducing new behavior: strings are now handled as perfect matches for an emoji shortcode (meaning that if the emoji-to-be-pulled's shortcode is in the blacklist, it will be rejected), while still supporting Regex types as before.
2022-05-12Instruct users to run 'git pull' as the pleroma userlewdthewides
2022-05-08Merge branch 'improve_anti_followbot_policy' into 'develop'Haelwenn
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy Closes #2561 See merge request pleroma/pleroma!3498
2022-05-08Also use actor_type to determine if an account is a bot in antiFollowbotPolicyIlja
2022-05-06Merge branch 'security/2.4.3-develop' into 'develop'Haelwenn
Merge back 2.4.3 See merge request pleroma/pleroma!3663
2022-05-06mix: Bump to 2.4.52 for 2.4.3 mergebackHaelwenn (lanodan) Monnier
2022-05-06Skip cache when /objects or /activities is authenticatedTusooa Zhu
Ref: fix-local-public
2022-05-06Allow to skip cache in Cache plugTusooa Zhu
Ref: fix-local-public
2022-05-06update sweet_xml [Security]Ilja
2022-04-18Merge branch 'from/upstream-develop/tusooa/fix-en-fallback' into 'develop'Haelwenn
Fix incorrect fallback when English is set to first language See merge request pleroma/pleroma!3656
2022-04-17Fix incorrect fallback when English is set to first languageTusooa Zhu
2022-04-05Merge branch 'fix_eratic_test_for_report_notes' into 'develop'Haelwenn
Fix eratic test for POST /api/pleroma/admin/reports/:id/notes See merge request pleroma/pleroma!3653
2022-04-05Fix eratic test for POST /api/pleroma/admin/reports/:id/notesIlja
It retrieved two ReportNotes and then checked one of them. But the order isn't guaranteed, while the test tested on the content of the first ReportNote. I made the test on the content more generic
2022-03-20Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop'Haelwenn
Translate backend-rendered pages See merge request pleroma/pleroma!3634
2022-03-20Merge branch 'caddyfile-v2' into 'develop'Haelwenn
Update Caddyfile to Caddy v2 Closes #2764 See merge request pleroma/pleroma!3641
2022-03-20Merge branch 'delete_report_notifs_when_demoting_from_superuser' into 'develop'Haelwenn
Delete report notifs when demoting from superuser Closes #2840 See merge request pleroma/pleroma!3642
2022-03-17Merge branch 'bugfix/mix-dotgit' into 'develop'Haelwenn
mix: Check `.git` presence See merge request pleroma/pleroma!3638
2022-03-07After code reviewIlja
Use patern matching to see if someone was superuser before
2022-03-06Merge branch 'fix_test_get_user_apps' into 'develop'Haelwenn
Fix test get_user_apps/1 See merge request pleroma/pleroma!3636
2022-03-06Merge branch 'copyright-bump-2022' into 'develop'Haelwenn
Copyright bump for 2022 See merge request pleroma/pleroma!3593
2022-03-06Support fallbacking to other languagesTusooa Zhu
2022-03-06Delete report notifs when demoting from superuserIlja
When someone isn't a superuser any more, they shouldn't see the reporsts any more either. Here we delete the report notifications from a user when that user gets updated from being a superuser to a non-superuser.
2022-03-06Update Caddyfile to Caddy v2sleepycrow
2022-03-03LintTusooa Zhu
2022-03-03Support multiple locales from userLanguage cookieTusooa Zhu
2022-03-03Support multiple locales formallyTusooa Zhu
elixir gettext current does not fully support fallback to another language [0]. But it might in the future. We adapt it so that all languages in Accept-Language headers are received by Pleroma.Web.Gettext. User.languages is now a comma-separated list. [0]: https://github.com/elixir-gettext/gettext/issues/303
2022-03-02Make lint happyTusooa Zhu
2022-03-02Add test for fallbacking to a general languageTusooa Zhu
2022-03-02Fallback to a variant if the language in general is not supportedTusooa Zhu
For an example, here, zh is not supported, but zh_Hans and zh_Hant are. If the user asks for zh, we should choose a variant for them instead of fallbacking to default. Some browsers (e.g. Firefox) does not allow users to customize their language codes. For example, there is no zh-Hans, but only zh, zh-CN, zh-TW, zh-HK, etc. This provides a workaround for those users suffering from bad design decisions.
2022-03-02Add changelogTusooa Zhu
2022-03-02Document API additionTusooa Zhu
2022-03-02Allow user to register with custom languageTusooa Zhu
2022-03-02Allow update_credentials to update User.languageTusooa Zhu
2022-03-01Send emails i18n'd using backend-stored user languageTusooa Zhu
2022-03-01Make all emails translatableTusooa Zhu
2022-03-01Fix digest testTusooa Zhu
2022-03-01Make mail and mailer translatableTusooa Zhu
2022-03-01Make static fe translatableTusooa Zhu
2022-03-01Merge branch 'revert-ee05abe0' into 'develop'feld
Revert "Merge branch 'revert/notice-routes' into 'develop'" See merge request pleroma/pleroma!3639
2022-03-01Revert "Merge branch 'revert/notice-routes' into 'develop'"feld
This reverts merge request !3576
2022-02-28Fix testsTusooa Zhu
2022-02-28Make mfa pages translatableTusooa Zhu
2022-02-28Make oauth pages translatableTusooa Zhu
2022-02-28Use proper lang attributes in htmlsTusooa Zhu
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-21 09:25:49 +0000