Commit graph

682 commits

Author SHA1 Message Date
Ivan Tashkinov 5304c8cd21 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks 2020-01-15 18:12:08 +03:00
Alexander Strizhakov 41c7f34905
short labels and fixes for typos 2020-01-14 15:00:38 +03:00
Alexander Strizhakov 70c7a26de8
Merge branch 'develop' into admin-be 2020-01-14 14:52:00 +03:00
Maksim Pechnikov b7908844f2 Merge branch 'develop' into issue/1383 2020-01-13 12:41:07 +03:00
feld 6cc5341d26 Merge branch 'config/benchmark' into 'develop'
Benchmark env uses test database so we should be able to use test.secret.exs

See merge request pleroma/pleroma!2057
2020-01-12 18:31:10 +00:00
Hakaba Hitoyo 0c9c62509d Remove MDII uploader 2020-01-11 17:19:54 +00:00
Alexander Strizhakov 7d128ca208
dynamic_configuration renaming
and moving it from instance settings
2020-01-10 19:34:19 +03:00
Alexander Strizhakov 00aff5f78c
syncing new setting to descriptions.exs 2020-01-10 17:54:54 +03:00
Ivan Tashkinov 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
# Conflicts:
#	lib/pleroma/user.ex
2020-01-10 16:18:32 +03:00
Alexander 0b02040327
little fixes and typos fix 2020-01-10 15:52:02 +03:00
Alexander cda2c1fc63
fix for subgroup tuple
added settings for swoosh adapters local
2020-01-10 15:52:01 +03:00
Alexander f9d01068cf
suggestions fix 2020-01-10 15:52:01 +03:00
Alexander 4306769671
adapter children 2020-01-10 15:52:00 +03:00
Alex S 2753285b77
config editing through database 2020-01-10 15:51:59 +03:00
Ivan Tashkinov 6c94b7498b [#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests. 2020-01-10 10:52:21 +03:00
Mark Felder 89243fee8e Fix captcha time, which was meant to be 5 minutes 2020-01-09 15:45:46 -06:00
Egor Kislitsyn b012e66e4e
Increase CAPTCHA expiration time to 5 minutes 2019-12-23 15:14:46 +07:00
Maksim Pechnikov 54c9db38c8 Merge branch 'develop' into issue/1383 2019-12-21 20:38:59 +03:00
Mark Felder b7811dfb7b Instead allow a dedicated benchmark config 2019-12-19 12:16:53 -06:00
Mark Felder 50638525db Merge branch 'develop' into config/benchmark 2019-12-19 12:16:33 -06:00
Egor Kislitsyn b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules 2019-12-16 22:34:21 +07:00
Egor Kislitsyn a12b6454bb
Add an option to require fetches to be signed 2019-12-16 22:24:03 +07:00
Egor Kislitsyn fc484e5ce6
Add Kocaptcha endpoint to config.exs 2019-12-16 19:35:10 +07:00
Egor Kislitsyn 8d242f52d4
Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha"
This reverts commit 82c62c5028.
2019-12-16 19:33:51 +07:00
Egor Kislitsyn 82c62c5028
Add default endpoint to Pleroma.Captcha.Kocaptcha 2019-12-16 15:32:33 +07:00
Maksim Pechnikov 67cb46e15d Merge branch 'develop' into issue/1383 2019-12-14 21:44:10 +03:00
Egor Kislitsyn 7528322f83 Merge branch 'develop' into feature/custom-runtime-modules 2019-12-13 01:51:52 +07:00
Egor Kislitsyn 470a3a678d Add Kocaptcha endpoint to the test config 2019-12-12 18:04:52 +07:00
Egor Kislitsyn e536796984 Add native captcha and enable it by default. 2019-12-12 17:39:39 +07:00
stwf 63ffa0e3ed try local sheduling 2019-12-11 14:57:33 -05:00
Mark Felder df469b4468 Benchmark env uses test database so we should be able to use test.secret.exs 2019-12-11 12:52:57 -06:00
Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
#	CHANGELOG.md
2019-12-10 08:55:14 +03:00
Egor Kislitsyn c098dec473 Merge branch 'develop' into feature/custom-runtime-modules 2019-12-10 00:16:43 +07:00
Egor Kislitsyn ed92784e7c Set Logger level to :info in prod 2019-12-09 19:11:54 +07:00
Maksim Pechnikov 5876a9cb79 Merge branch 'develop' into issue/1383 2019-12-08 19:52:46 +03:00
Egor Kislitsyn a75d4a41e0 Add a test for custom runtime modules 2019-12-06 17:05:09 +07:00
Egor Kislitsyn 157bceeda9 Move runtime configuration from :instance to :modules 2019-12-06 15:04:46 +07:00
Ivan Tashkinov 13926537b6 Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes 2019-12-06 00:26:31 +03:00
Ivan Tashkinov af42c00cff [#1427] Reworked admin scopes support.
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
2019-12-06 00:25:44 +03:00
Egor Kislitsyn 48ae3c4347 Add support for custom modules 2019-12-05 20:18:25 +07:00
lain aa97fe8f17 ChatChannel: Ignore messages that are too long. 2019-12-04 12:48:34 +01:00
Maksim Pechnikov 652cc6ba4b updated ScheduledActivity 2019-12-04 09:12:17 +03:00
Maksim Pechnikov b7c449118b Merge branch 'develop' into issue/1383 2019-11-28 21:27:01 +03:00
Maksim Pechnikov d55859f5a4 remove quantum package 2019-11-27 16:35:12 +03:00
Maksim Pechnikov a4f834a687 moved DigestEmail to Oban Periodic jobs 2019-11-27 15:59:13 +03:00
Maksim Pechnikov c5766a8100 moved ActivityExpiration to Oban Periodic jobs 2019-11-27 13:36:03 +03:00
Maksim Pechnikov 6f202a401b moved ScheduledActivity to Oban Periodic jobs 2019-11-27 09:26:37 +03:00
Mark Felder f673e3deef Default log level for syslog in prod should also be :warn 2019-11-26 05:46:48 -06:00
Maksim Pechnikov ac3abb5414 moved Pleroma.Stats to Oban Periodic jobs 2019-11-26 10:54:30 +03:00
Maksim Pechnikov 0e9be6bafa moved OAuth.Token.CleanWorker to Oban Periodic jobs 2019-11-25 14:32:20 +03:00
Sadposter d3656c2725 add ability to set a custom user-agent string 2019-11-25 09:53:11 +00:00
rinpatch dedb1ad5d6 Merge branch 'revert-5c6c3026' into 'develop'
Revert "Merge branch 'patch-1' into 'develop'"

See merge request pleroma/pleroma!2002
2019-11-21 15:20:05 +00:00
rinpatch dc9303eac5 Revert "Merge branch 'patch-1' into 'develop'"
This reverts merge request !1829
2019-11-21 15:03:27 +00:00
Mark Felder edaae845af Some tasks try to set log level in test environment, but we were stripping logs belog :warn.
Ensure console backend logs in test environment are :warn, but mix tasks run in test env
do not run with :debug because it's far too verbose.
2019-11-20 11:55:30 -06:00
Mark Felder c65190c799 Console backend's log format should be prefixed and suffixed with newlines.
This is how upstream does it by default.
2019-11-20 11:18:42 -06:00
Mark Felder 1c17f18329 Be specific about format for logs in test as we have tests that check it 2019-11-20 09:14:27 -06:00
Mark Felder cb513a599c Allow test builds to have info and debug logs stripped 2019-11-19 16:21:30 -06:00
Mark Felder ff9133b978 Allow mix tasks to always run with debug logging 2019-11-19 16:01:17 -06:00
Ariadne Conill 1d33eeca72 config: add configuration for MRF ObjectAgePolicy 2019-11-14 18:26:06 -06:00
kaniini 2cc043591c Merge branch 'feature/static-fe' into 'develop'
Static frontend

See merge request pleroma/pleroma!1917
2019-11-11 19:10:44 +00:00
lain 72cc92259e Default config: Use extended nickname format 2019-11-11 12:49:18 +00:00
rinpatch 4499a7a075 Disable attachment links by default
Closes #1394
2019-11-10 15:02:47 +03:00
lain e08bd99bab Apply suggestion to config/config.exs 2019-11-10 11:02:34 +00:00
lain 4885d403fe Apply suggestion to config/config.exs 2019-11-10 10:44:23 +00:00
Maksim Pechnikov 9d0b989521 add subject to atom feed 2019-11-10 11:10:20 +03:00
Phil Hagelberg 886a07ba57 Move static_fe config to its own section instead of in :instance. 2019-11-09 18:08:45 -08:00
rinpatch 2f4e9a068f Bump fast_sanitize to 0.1.1
The parser C-Node has been completely rewritten to not use the deprecated
`erl_interface` api.

Closes #1378 since Nodex was ripped out and the replacement randomizes
master node name.
2019-11-08 00:51:04 +03:00
rinpatch 9434e151a9 Blacklist myhtmlex nodes from swarm 2019-10-29 01:16:22 +03:00
rinpatch 05d111b622 Use the default scrubber before mediaproxy transformation 2019-10-29 01:15:28 +03:00
KokaKiwi 638457ba94 MastoFE: Add PWA manifest. 2019-10-19 12:15:14 +02:00
rinpatch 5c6c3026ea Merge branch 'patch-1' into 'develop'
Fix a typo in default static directory configuration for OTP releases

Closes #1289

See merge request pleroma/pleroma!1829
2019-10-18 22:29:04 +00:00
Ariadne Conill c6de0cbb4a config: disable Websub and Salmon publisher modules 2019-10-18 14:50:09 +00:00
yalh76 fb5dce481c Fix https://git.pleroma.social/pleroma/pleroma/issues/1289 2019-10-10 20:05:54 +00:00
lain ecd7ac855b Benchmark config: Don't use the sql sandbox. 2019-10-10 15:42:54 +02:00
lain 2629493804 Benchmark config: Database adjustments. 2019-10-10 15:01:06 +02:00
lain c54ae662dc Merge remote-tracking branch 'origin/develop' into benchmark-finishing 2019-10-10 14:40:59 +02:00
lain 02f8e2a8ab Gitlab: Run benchmark in CI. 2019-10-10 14:24:54 +02:00
Sergey Suprunenko 4b3f77a99f Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +00:00
Ivan Tashkinov f459aabdfa Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
#	CHANGELOG.md
2019-10-06 09:30:49 +03:00
Mark Felder b8b98ac40f Add missing extended_nickname_format setting to the default config 2019-10-03 10:40:49 -05:00
Ivan Tashkinov 6ffa2b5f66 [#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
#	CHANGELOG.md
2019-09-30 17:41:20 +03:00
minibikini f9380289eb Add remote_ip plug 2019-09-27 21:59:23 +00:00
kaniini 19263f30c3 Merge branch 'support-rel-ugc' into 'develop'
Add support for `rel="ugc"`

Closes #1255

See merge request pleroma/pleroma!1679
2019-09-23 22:41:31 +00:00
Rachel Fae Fox 63af6951fa add tunable for stream uploads, as needed for jortage to work. 2019-09-23 20:38:53 +00:00
Egor Kislitsyn d639cdcecb Update "config/description.exs" 2019-09-19 14:56:10 +07:00
Egor Kislitsyn cf3041220a Add support for rel="ugc" 2019-09-19 14:56:10 +07:00
Ekaterina Vaartis 3e972c0456 Add :shared_pack_cache_seconds_per_file to description.exs 2019-09-19 00:23:18 +03:00
Ekaterina Vaartis ee620ecbf1 Add caching for emoji pack sharing 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis 7e4c8b56ea Add tests for emoji pack sharing 2019-09-19 00:16:33 +03:00
Haelwenn (lanodan) Monnier 32d64102cb
description.exs: uncomment type for email logo 2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier c0c5628200
description.exs: remove empty strings on descriptions 2019-09-17 23:05:26 +02:00
Haelwenn (lanodan) Monnier 50ec445b2c
description.exs: remove empty strings and arrays 2019-09-17 23:05:13 +02:00
Haelwenn (lanodan) Monnier 35dcea3e13
Remove [true,false] for booleans, it is implicit 2019-09-17 21:47:32 +02:00
Ivan Tashkinov e7afb67c5c [#1260] Rate-limiting for create authentication and related requests. 2019-09-17 16:16:11 +03:00
Egor Kislitsyn d6ab78e610 Set account_field_value_length limit to 2048 by default 2019-09-16 21:48:01 +07:00
Egor Kislitsyn 96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
2019-09-16 17:55:04 +07:00
kaniini c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
Steven Fuchs aab264db82 Streamer refactoring 2019-09-16 07:44:03 +00:00
Ivan Tashkinov e127b9ab6d [#1149] Rewritten readme as config/description.exs. 2019-09-14 16:28:59 +03:00
Ivan Tashkinov 6bcedb693c [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
#	docs/config.md
#	mix.lock
2019-09-14 16:11:44 +03:00
rinpatch f884987ace Merge branch 'admin-config-description' into 'develop'
Admin config description

Closes #1178 and #1209

See merge request pleroma/pleroma!1611
2019-09-13 12:36:24 +00:00
rinpatch 56828abf6d Use Jason for rendering responses
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59))
2019-09-11 23:06:31 +03:00
Alex S e47089cf55 web_cache_ttl description 2019-09-11 09:32:58 +03:00
Alex S 10827eecad formatting 2019-09-11 09:25:33 +03:00
Alexander Strizhakov 5db2920644 Apply suggestion to config/description.exs 2019-09-11 09:25:33 +03:00
Alexander Strizhakov 65bc9e66ad Apply suggestion to config/description.exs 2019-09-11 09:25:33 +03:00
Alex S 6721301086 some changes 2019-09-11 09:25:33 +03:00
Alex S 171cefd889 description.exs 2019-09-11 09:25:33 +03:00
minibikini 11e12b5761 Add Pleroma.Plugs.Cache 2019-09-09 18:53:08 +00:00
Alex S db690bede9 temp commit 2019-09-05 16:02:20 +03:00
Ivan Tashkinov 79cf629e1a Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-09-05 11:30:41 +03:00
Ashlynn Anderson bd8b92ea5e Remove dynamic config as default, add healthcheck 2019-09-03 09:31:52 -04:00
Ivan Tashkinov b49085c156 [#1149] Refactoring: GenServer workers renamed to daemons, use Oban.Worker moved to helper. 2019-09-02 14:57:40 +03:00
Ivan Tashkinov a90ea8ba15 [#1149] Addressed code review comments (code style, jobs pruning etc.). 2019-08-31 19:08:56 +03:00
Ivan Tashkinov e890ea7e82 [#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
#	config/config.exs
2019-08-31 14:25:43 +03:00
Egor Kislitsyn 66c1966688 Disable rate limiter by default 2019-08-26 20:36:44 +07:00
lain cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration 2019-08-24 15:48:33 +02:00
Ivan Tashkinov c34126f89c Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-24 09:29:54 +03:00
aries e5f76a54e6 Fix default config of account fields length 2019-08-23 21:28:52 +00:00
Ivan Tashkinov 581123f8bb [#1149] Introduced quantum job scheduler. Documentation & config changes. 2019-08-23 18:28:23 +03:00
Ivan Tashkinov c29686309e [#1149] Upgraded oban from 0.6.0 to 0.7.1. 2019-08-23 09:23:10 +03:00
Ivan Tashkinov 7101ba1a21 Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-22 21:01:28 +03:00
Ivan Tashkinov 256ff09aa8 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs
2019-08-22 20:59:58 +03:00
lain f740d786a3 Merge branch 'rate-limit-ap-routes' into 'develop'
[#1174] Rate limit AP routes

See merge request pleroma/pleroma!1586
2019-08-21 16:45:20 +00:00
Egor Kislitsyn 8d899d6197 Add :ap_routes rate limit 2019-08-20 22:10:36 +07:00
lain 8340fe8fcc Merge branch 'digest-template' into 'develop'
Improve digest email template

See merge request pleroma/pleroma!1565
2019-08-20 12:55:51 +00:00
Egor Kislitsyn 158231cd20 Add configurable colors and logo for the digest template 2019-08-16 18:32:25 +07:00
Ivan Tashkinov 8778c16dac Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-14 21:44:50 +03:00
Egor Kislitsyn a2e1db5632 Increase max account fields limits 2019-08-14 14:58:38 +07:00
Egor Kislitsyn e457fcc479 Add :max_remote_account_fields config option 2019-08-14 14:58:06 +07:00
Egor Kislitsyn 2c35d4b0b0 Add configurable account field name length limit 2019-08-14 14:52:54 +07:00
Egor Kislitsyn db3c05f6b4 Add configurable account field value length limit 2019-08-14 14:52:54 +07:00
Egor Kislitsyn e0ac5c7a66 Add custom profile fields 2019-08-14 14:52:54 +07:00
rinpatch 9ef31767f2 Merge branch 'feature/mrf-vocabulary' into 'develop'
MRF Vocabulary

See merge request pleroma/pleroma!1559
2019-08-13 22:51:15 +00:00
rinpatch 83a3de8cc4 Merge branch 'length-limit-bio' into 'develop'
Add configurable length limits for `User.bio` and `User.name`

See merge request pleroma/pleroma!1515
2019-08-13 22:40:13 +00:00
Ariadne Conill 3fdbeb7087 MRF: add vocabulary policy module 2019-08-13 20:55:38 +00:00
Ariadne Conill f46cd7e9c7 config: remove legacy activitypub accept_blocks setting
Anyone who is interested in dropping blocks can write their own MRF
policy at this point.  This setting predated the MRF framework.

Disabling the side effect (unsubscription) is still a config option
per policy.
2019-08-13 02:15:21 +00:00
Ivan Tashkinov 267262491e Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-09 20:09:56 +03:00
Ivan Tashkinov b7fad8d395 [#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues. 2019-08-09 20:08:01 +03:00
lain 29807ef6a5 Merge branch 'feature/digest-email' into 'develop'
Feature/digest email

See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
Hakaba Hitoyo 39c7bbe18f Remove longfox emoji set 2019-08-04 04:32:45 +00:00
Ashlynn Anderson 4007717534 Run mix format 2019-08-03 13:42:57 -04:00
Ashlynn Anderson 4a418698db Create docker.exs and docker-entrypoint + round out Dockerfile
At this point, the implementation is completely working and has been
tested running live and federating with other instances.
2019-08-03 00:21:54 -04:00
Roman Chvanikov 9d4f34fbcb Merge branch 'develop' into feature/digest-email 2019-08-02 18:16:04 +03:00
Ivan Tashkinov 23d279e03e [#1149] Replaced RetryQueue with oban-based retries. 2019-08-01 17:28:00 +03:00
Egor Kislitsyn 9ca4506355 Add configurable length limits for User.bio and User.name 2019-08-01 15:53:37 +07:00
rinpatch c88a5d3251 Merge branch 'develop' into feature/hide-follows-remote 2019-07-31 14:12:29 +03:00
Sachin Joshi 242f5c585e add account confirmation email resend in mastodon api 2019-07-28 20:30:10 +00:00
Mike Verdone 378f5f0fbe Add activity expiration worker
This is a worker that runs every minute and deletes expired activities.
It's based heavily on the scheduled activities worker.
2019-07-24 13:14:52 +02:00
Mike Verdone b729402774 Make test.exs read config in the same way as dev.exs
This way, if your test.secret.exs has an error, you'll actually see it.
2019-07-24 13:14:52 +02:00