William Pitcock
595d855f0e
html scrubbing policies: restrict img tags to http/https only for mediaproxy compatibility
6 years ago
Haelwenn (lanodan) Monnier
2154c5dcd8
lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes
6 years ago
William Pitcock
582dbe5c8d
formatter: fix matching osada users
6 years ago
scarlett
7562912f6a
Use maybe_direct_follow for follow imports
6 years ago
Haelwenn (lanodan) Monnier
d7654c77de
lib/pleroma/html.ex: Use a function as a variable (broken for some reason)
6 years ago
Haelwenn (lanodan) Monnier
50e0a9ae56
lib/pleroma/html.ex: Fix scheme lists
...
Gosh please don’t break ourselves…
Also this is copy-paste of the list in lib/pleroma/formatter.ex,
I think this should be put in a common variable, but where?
6 years ago
William Pitcock
30efa86c05
common api: enable tag linking in markdown mode
6 years ago
Haelwenn (lanodan) Monnier
eacab0fb05
Delete Tokens and Authorizations on password change
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/320
6 years ago
William Pitcock
51eaece3ea
user: break out local cases for maybe_direct_follow
6 years ago
William Pitcock
2c29329d39
user: local users are always AP-enabled ( closes #316 )
6 years ago
William Pitcock
111841ad34
common api: take the combination of the subject and content for length limit enforcement
...
closes #315
6 years ago
William Pitcock
08d5ad71b6
nodeinfo: allow opting out of MRF transparency
6 years ago
William Pitcock
7b3fff9af8
{mastodon api, twitter api}: make the follow handshake timeout configurable
6 years ago
William Pitcock
7f530f6f80
mastodon api: relationship view: better handle no pre-existing follow activity
6 years ago
William Pitcock
e69faf550c
user: add wait_and_refresh() for async three-way handshake case
6 years ago
William Pitcock
3e751496e3
mastodon api: account view: fetch follow state and use it to populate `requested` field
6 years ago
William Pitcock
a71b822013
activitypub: always track following state for async reasons
6 years ago
William Pitcock
8ce217776d
activitypub transmogrifier: better manage follow state
6 years ago
William Pitcock
4f7a468659
user: only pre-create follow relationships on OStatus
...
closes #306
6 years ago
William Pitcock
bd76d9cee6
nodeinfo: add accepted post formats to metadata
6 years ago
William Pitcock
285ac80c36
config: allow for accepted post formats to be configured
6 years ago
William Pitcock
52b05137c5
formatter: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
William Pitcock
16307da311
twitterapi: frontend config: add formattingOptionsEnabled
6 years ago
William Pitcock
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe
, reversing
changes made to 340ab3cb90
.
6 years ago
Haelwenn (lanodan) Monnier
f2efc8dcfb
nodeinfo_controller: Fix JSON rendering
...
This is the last noedinfo difference from my own branch
6 years ago
Haelwenn (lanodan) Monnier
28651df478
MRF Transparency
6 years ago
Haelwenn (lanodan) Monnier
56d31db130
Pleroma.Web.Nodeinfo.NodeinfoController: Further transparency, breaks API of previous one
6 years ago
Haelwenn (lanodan) Monnier
8226953f1d
[Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF Simple
6 years ago
kaniini
4f03bb2299
Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'
...
activitypub: fix error condition match
See merge request pleroma/pleroma!365
6 years ago
William Pitcock
4db1bc2c0e
activitypub: fix error condition match
6 years ago
Haelwenn (lanodan) Monnier
a3cffd3566
formatter: Stop using phoenix HTML and format it ourselves
...
* Pheonix has an extra scheme whitelist conflicting with ours
* Pheonix doesn’t seems to do URL encoding, just HTML encoding
Closes: https://git.pleroma.social/pleroma/pleroma/issues/307
6 years ago
Haelwenn
34b6d444d6
Merge branch 'feature/twitter_api/fields' into 'develop'
...
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
See merge request pleroma/pleroma!360
6 years ago
Haelwenn (lanodan) Monnier
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
6 years ago
William Pitcock
707077edde
activitypub: don't fall back to OStatus fetching when MRF rejects an object
6 years ago
William Pitcock
5c312ad677
activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else
...
although the previous handling assumed any unsigned/invalid signature message was a Create,
lets make it more explicit
6 years ago
Haelwenn (lanodan) Monnier
c739737998
transmogrifier: get_actor called without casting attributedTo in actor and actor is nil
6 years ago
Haelwenn (lanodan) Monnier
9446b02bdf
transmogrifier: Just make attachement maps into a list and reroll
6 years ago
Haelwenn (lanodan) Monnier
e53da692fb
transmogrifier: Use the correct variable and prefer inspect in case of a bad type being passed on
6 years ago
William Pitcock
d830a243a3
transmogrifier: more robustly handle dereferencing pointer URIs
6 years ago
Haelwenn (lanodan) Monnier
4c3a80de96
transmogrifier: Use oneliners when applicable
6 years ago
William Pitcock
ed8dfa3029
transmogrifier: reformat `cond` block by hand
6 years ago
Haelwenn (lanodan) Monnier
eebe33e86a
transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor
6 years ago
Haelwenn (lanodan) Monnier
f3291acc91
transmogrifier: pro-actively add support for Hashtag without array in tag
6 years ago
Haelwenn (lanodan) Monnier
22927f3a34
transmogrifier: Use a cond, add proactive support for arrays
6 years ago
Haelwenn (lanodan) Monnier
0aac72f1d3
[Pleroma.Web.ActivityPub.Transmogrifier]: quick fix when tag is a Map
6 years ago
Haelwenn (lanodan) Monnier
28e8a8ab36
[Pleroma.Web.ActivityPub.Transmogrifier]: fix emoji in tag when it’s not in a array [kroeg]
...
Also simplified the code for name trimming.
And not copying the Map.merge part as it looks buggy.
See: https://queer.hacktivis.me/objects/a9f21ebc-9a12-4a6c-89d5-3d46955c6ee8
6 years ago
Haelwenn (lanodan) Monnier
f8a0cb9c0b
[Pleroma.Web.ActivityPub.Transmogrifier]: fix when attachment contain is just a Map [kroeg]
6 years ago
Haelwenn (lanodan) Monnier
a4abb124ea
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix when inReplyTo is a inlined post [kroeg]
6 years ago
Haelwenn (lanodan) Monnier
523757be52
[Pleroma.Web.ActivityPub.ActivityPub]: Harden getting endpoints [kroeg]
6 years ago
Martin Kühl
f77ec96707
Uploaders.S3: Replace unsafe characters in object key
...
According to [the S3 docs][s3], the characters safe for use in object keys are:
* 0-9
* a-z
* A-Z
* !
* -
* _
* .
* *
* '
* (
* )
(The / character is not listed but mentioned being safe outside of the list.)
Several characters that are valid in filenames can cause problems, for example
spaces are not valid in URLs and need to be escaped,
sequences of spaces can become squeezed by S3,
some characters like \ are documented to require “significant special handling”.
To avoid these problems, this change encodes the filename
before using it as part of the S3 object name
by replacing all characters except those documented as “safe” with dashes.
[s3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html
6 years ago
William Pitcock
7f0e291483
html: twittertext: add missing catchall scrub function
6 years ago
William Pitcock
56577d8b48
twitter api: add no_rich_text option to userview for account prefs
6 years ago
William Pitcock
df00a364fb
mastodon api: formatting
6 years ago
William Pitcock
c2b69798dd
twitter api: add support for disabling rich text
6 years ago
William Pitcock
958e085acb
mastodon api: add support for user-supplied html policy
6 years ago
William Pitcock
2f5b026548
twitter api: add support for user-specified html policy
6 years ago
William Pitcock
735cdfb848
user: add User.html_filter_policy()
6 years ago
William Pitcock
8ae9424edb
html: default to using normal scrub policy if provided scrub policy is nil
6 years ago
kaniini
4cb6331843
Merge branch 'feature/dynamic-user-refresh' into 'develop'
...
user: implement dynamic refresh of profiles
See merge request pleroma/pleroma!350
6 years ago
kaniini
0fe165165f
Merge branch 'task-204-on-options-request' into 'develop'
...
Return 204 response on options request
See merge request pleroma/pleroma!347
6 years ago
William Pitcock
8e28e8a18f
mix: remove fix_ap_users task, now obsolete
6 years ago
William Pitcock
c9f6eb9a41
user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)
6 years ago
Haelwenn (lanodan) Monnier
40c51f118f
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0
6 years ago
Haelwenn (lanodan) Monnier
f74725df41
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables
6 years ago
Haelwenn (lanodan) Monnier
33a1e92584
[Pleroma.Web.Router]: Fake /api/v1/endorsements
6 years ago
Haelwenn (lanodan) Monnier
a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
6 years ago
Haelwenn (lanodan) Monnier
43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
6 years ago
William Pitcock
c9585ec007
twitter api: fix mimetype fallback when attachments use a URI instead of a URL object
6 years ago
William Pitcock
0cac493fdc
mastodon api: default attachment type to image if one is not present
6 years ago
Martin Kühl
f4fcea5258
Revert "Mastodon API: Fake support for loading filters"
...
This reverts commit c1d07da4e1
.
The fake support was superseded by 6e030129fb
which actually implements the faked filters API.
This change removes the fake support and ensures that the actual implementation is used.
6 years ago
Dominique Feyer
9b0f2d572b
Return 204 response on options request
6 years ago
William Pitcock
a7d0ecdc7c
html: add policy which transforms inline images to pass through the media proxy
6 years ago
William Pitcock
cd13fa17fd
html: allow scrubbing policies to be stackable
6 years ago
William Pitcock
342ed84446
MRF: add policy for normalizing HTML markup (local and remote) to a specific policy
6 years ago
William Pitcock
95376ac1fe
html: add the ability to override the default scrub policy
6 years ago
kaniini
c2650f0ffb
Merge branch 'feature/html-scrub-policy' into 'develop'
...
html scrub policy
See merge request pleroma/pleroma!339
6 years ago
shadowfacts
39aed5348a
Add visible_in_picker to status emojis
6 years ago
William Pitcock
d3248e13e3
activitypub: transmogrifier: allow profile updates from bots
6 years ago
William Pitcock
e0b8c0ccba
MRF: reject non-public: use pattern match to remove unnecessary if block
6 years ago
William Pitcock
88094c266d
MRF: simple policy: refactor module to use guards and pattern matching
6 years ago
William Pitcock
97253df3ee
MRF: simple policy: contain media removal/nsfw ops to create activities only
6 years ago
William Pitcock
e82ce2a4b3
formatting
6 years ago
William Pitcock
358f88e10a
html: allow inline images by default (because of custom emoji)
6 years ago
William Pitcock
40e2f6e500
html: add default scrubbing profile and configuration knobs
6 years ago
William Pitcock
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
William Pitcock
255f46d7ab
html: new module providing a configurable markup scrubbing policy
6 years ago
Dominique Feyer
801d645c6b
TASK: Fix formatting
6 years ago
Dominique Feyer
b79c126ee0
Add missing URL encoding in create authorization redirect
6 years ago
Hakaba Hitoyo
4e1bb7bccb
make limit for /api/v1/suggestions
6 years ago
lambda
045953225e
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
...
auth overhaul and legacy GS auth
See merge request pleroma/pleroma!331
6 years ago
kaniini
530561a091
Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'
...
Add Secure and SameSite cookie flags
See merge request pleroma/pleroma!302
6 years ago
kaniini
3e4f39116b
Merge branch 'feature/custom_media_url' into 'develop'
...
[Pleroma.Uploaders.Local]: Add configuration for custom url path
See merge request pleroma/pleroma!318
6 years ago
Martin Kühl
c1d07da4e1
Mastodon API: Fake support for loading filters
6 years ago
Martin Kühl
619f67768a
Mastodon API: Add unsupported attributes to relationship responses
...
These attributes are documented as required by the Mastodon API.
Since we don’t support them (I think?), respond with default values.
6 years ago
lain
70163aec9b
Add LegacyAuthenticationPlug to router.
6 years ago
lain
44b094908c
Update legacy passwords automatically.
6 years ago
lain
3aba585e7a
Add Plugs to router.
6 years ago
lain
e601165426
Add UserEnabledPlug.
6 years ago
lain
5ce1ebb179
Add SetUserSessionIdPlug.
6 years ago
Haelwenn
4a3dbd9d4e
Merge branch 'fix/sign-in-with-toot' into 'develop'
...
Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306
6 years ago
lain
636ad3e155
Add new plugs to router.
6 years ago
lain
12bc73dd28
Add EnsureUserKeyPlug, smaller fixes
6 years ago
lain
32465b9939
Simplify AuthenticationPlug
6 years ago
lain
9a96c93be7
Add SessionAuthenticationPlug.
6 years ago
lain
a3f54fca4d
Add LegacyAuthenticationPlug
6 years ago
lain
3cf17dc402
Add EnsureAuthenticatedPlug
6 years ago
lain
faf5347748
Add UserFetcherPlug.
6 years ago
lain
42bd985e66
Add BasicAuthDecoderPlug
6 years ago
Moon Man
8b020e03a6
change cond to if else
6 years ago
Moon Man
1a8bc26e52
auth against sha512-crypt password hashes, upgrade to pbkdf2
6 years ago
kaniini
76c67a41c1
Merge branch 'develop' into 'feature/staff-discovery-api'
...
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
6 years ago
William Pitcock
9a21ff5f61
nodeinfo: add staffAccounts field to metadata
6 years ago
kaniini
1c9e539b47
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
...
Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266
6 years ago
Hakaba Hitoyo
b1124f1605
report chat and gopher support at /nodeinfo/2.0.json
6 years ago
William Pitcock
b61430163b
user: add moderator_user_query()
6 years ago
kaniini
7ca2a2ddea
Merge branch 'nil-bio-emojis' into 'develop'
...
add nil clause for Formatter.get_emoji/1 to return an empty result
Closes #274
See merge request pleroma/pleroma!315
6 years ago
shadowfacts
35515cfa66
Update mastodon_api_controller.ex
6 years ago
shadowfacts
26f8697400
Update mastodon_api_controller.ex
6 years ago
shadowfacts
2b2bd0e047
Render notification IDs as strings, not numbers
6 years ago
Thurloat
4257f784bc
sloop around get_emoji/1 to check is_binary and have a fallthrough
...
default that returns empty
6 years ago
Haelwenn (lanodan) Monnier
754deb26dd
[Pleroma.Uploaders.Local]: Add configuration for custom url path
...
One use-case being an external caching proxy
6 years ago
kaniini
b7923aa304
Merge branch 'hotfix_broken_likes' into 'develop'
...
hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284
6 years ago
William Pitcock
834515fb51
formatter: don't add XSS emoji
6 years ago
kaniini
3c7280934e
Merge branch 'security/activitypub-spoofing' into 'develop'
...
security: activitypub spoofing
See merge request pleroma/pleroma!321
6 years ago
William Pitcock
03e92977cb
transmogrifier: fix peertube/plume actor handling
6 years ago
William Pitcock
0b2c051a04
activitypub: fix possibility of spoofing by containing remote objects to the same domain as their actor
6 years ago
William Pitcock
e2ce0e9e05
run `mix format`.
6 years ago
Martin Kühl
84d84e4ca4
OAuth: Support /revoke endpoint for revoking tokens
...
(for compatibility with Mastodon)
6 years ago
Martin Kühl
ad2a7972e7
OAuth: Set `created_at` in token exchange response
...
(for compatibility with Mastodon)
6 years ago
Martin Kühl
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
6 years ago
William Pitcock
c921d99898
config: add ability to disable Pleroma FE config management ( closes #276 )
6 years ago
kaniini
2e2f458705
Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'
...
Clean code duplication in MastoAPI search(v1/v2)
See merge request pleroma/pleroma!316
6 years ago
Will Pearson
0c2a0e3551
Specify default scope in verify_credentials
...
Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value.
6 years ago
Haelwenn (lanodan) Monnier
8885d16e1b
[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code duplication
6 years ago
Thurloat
a9c0f395cb
add nil clause for Formatter.get_emoji/1 to return an empty result
6 years ago
lambda
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
6 years ago
William Pitcock
856b5e1ca4
config: chase pleroma-fe updates from MR pleroma-fe!324.
6 years ago
kaniini
a26d5e6b2a
Merge branch 'feature/rich-text' into 'develop'
...
rich text support
See merge request pleroma/pleroma!309
6 years ago
William Pitcock
6aa65b68b8
common api: add support for formatting messages outside of twitter-style plain text
6 years ago
kaniini
e838969495
Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'
...
use media proxy for the suggestions api
See merge request pleroma/pleroma!305
6 years ago
kaniini
65e8d47cfb
Merge branch 'backendhack' into 'develop'
...
Flexible Storage Backends
See merge request pleroma/pleroma!304
6 years ago
Thurloat
adffad5502
increase uploader behaviour documentation accuracy.
6 years ago
Thurloat
af01f0196a
Add backend failure handling with :ok | :error so the uploader can handle it.
...
defaulting to :ok, since that's the currently level of error handling.
6 years ago
William Pitcock
29b5e30c46
activity: drop recipients_to/recipients_cc fields
6 years ago
William Pitcock
de9acebbf3
activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.
6 years ago
href
ddc6f32b75
Fix Mastodon API when actor's nickname is null
6 years ago
William Pitcock
cce9d008f9
streamer: contain list updates in the same way as we do with the database query
6 years ago
William Pitcock
ded9091206
mastodon api: use bounded AP object graph query to enforce containment of private statuses
6 years ago
William Pitcock
643fae6e36
activitypub: allow querying the activity/object graph bounded to a specific to/cc set
6 years ago
William Pitcock
81673b8136
activity: add recipients_to and recipients_cc fields
6 years ago