6ca709816f
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
2020-11-12 15:25:33 +03:00
966663c3f8
Fix tests for other attachment types
2020-11-11 16:17:35 -06:00
6fd72e9e85
Ingest blurhash for attachments if they were federated
2020-11-11 12:27:51 -06:00
f97f24b067
making credo happy and test fix
2020-11-11 10:48:03 +03:00
485697d96c
config descriptions for custom MRF policies
2020-11-10 19:20:14 +03:00
24ce324973
Merge branch 'bugfix/poll_replies_count' into 'develop'
...
side_effects: Don’t increase_replies_count when it’s an Answer
Closes #2274
See merge request pleroma/pleroma!3114
2020-11-02 12:08:20 +00:00
4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer
2020-11-02 05:56:17 +01:00
ba50dc05a8
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# CHANGELOG.md
2020-10-28 19:03:40 +03:00
9542c5d0f4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
2020-10-26 16:30:48 +01:00
df61071422
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
2020-10-23 19:39:42 +00:00
60e379ce0b
User: Correctly handle whitespace names.
2020-10-23 13:53:01 +02:00
d6907e6e0c
Merge branch 'chore/elixir-1.11' into 'develop'
...
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
2020-10-22 20:33:52 +00:00
39fd4d7639
Transmogrifier: Downcase incoming Hashtags
...
Also, set sensitive to true if we have an nsfw hashtag present.
2020-10-19 15:40:50 +02:00
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
2020-10-17 17:53:47 +03:00
049ece1ef3
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
2020-10-17 13:12:39 +03:00
3985c1b450
Fix warnings
2020-10-15 16:54:59 +04:00
7a2f100061
ActivityPub: Show own replies to muted users.
...
Aligns mute with block behavior.
2020-10-15 12:28:25 +02:00
2013705690
Merge branch 'feature/gen-magic' into 'develop'
...
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
2020-10-14 17:31:45 +00:00
40f3cdc030
JPEG content_type must be image/jpeg
2020-10-13 10:37:24 -05:00
b738f70953
Merge branch 'develop' into feature/gen-magic
2020-10-13 10:08:38 -05:00
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
2020-10-13 09:54:29 -05:00
5f2071c458
changes after rebase
2020-10-13 16:44:03 +03:00
7f5dbb0201
changes after rebase
2020-10-13 16:44:03 +03:00
b081080dd9
fixes after rebase
2020-10-13 16:44:02 +03:00
f679486540
rebase
2020-10-13 16:44:02 +03:00
c4c5caedd8
changes after rebase
2020-10-13 16:44:02 +03:00
b720ad2264
files consistency after rebase
2020-10-13 16:44:01 +03:00
c5efded5fd
files consistency for new files
2020-10-13 16:44:00 +03:00
e33782455d
updates after rebase
2020-10-13 16:43:59 +03:00
7dffaef479
tests consistency
2020-10-13 16:35:09 +03:00
rinpatch