rimmon1971/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
6301 commits 10 branches 75 tags 308 MiB
Commit graph

2127 commits

Author SHA1 Message Date
Sergey Suprunenko
05b5af8075 Add tests for users tasks and PleromaAuthenticator 2019-07-22 02:43:15 +00:00
Sadposter
a5d6287ba8 Hide blocked users from interactions 2019-07-22 02:42:29 +00:00
Ariadne Conill
56019d53a8 activitypub: publisher: align sharedinbox usage with AP specification rules 
While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification.  Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification.
 2019-07-22 02:38:31 +00:00
rinpatch
196cad46f3 Resolve merge conflicts 2019-07-20 22:04:47 +03:00
Roman Chvanikov
8292331b35 Merge branch 'develop' into feature/digest-email 2019-07-20 16:41:58 +03:00
Sergey Suprunenko
43a7cd27fe [tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest 2019-07-20 13:07:51 +00:00
Roman Chvanikov
36049f08ef Merge develop 2019-07-20 01:03:25 +03:00
kaniini
33729bbb28 Merge branch 'feature/richmedia-ttl' into 'develop' 
add the rich media ttl based on image exp time

See merge request pleroma/pleroma!1438
 2019-07-19 21:36:36 +00:00
kaniini
716afc83ce Merge branch 'refactor/http-signature-plug' into 'develop' 
http signature plug: separation of concerns

See merge request pleroma/pleroma!1449
 2019-07-19 16:57:24 +00:00
Maksim
c2e2aadc42 #1110 fixed /api/pleroma/healthcheck 2019-07-19 16:20:23 +00:00
Sachin Joshi
de9906ad56 change the structure of image ttl parsar 2019-07-19 11:43:42 +05:45
Maxim Filippov
9570a5be40 Merge branch 'develop' into feature/admin-api-user-statuses 2019-07-18 23:38:38 +03:00
Ariadne Conill
c947cfec5a mapped signature plug: use user assign like authentication plug 2019-07-18 20:31:25 +00:00
Maksim
f435217e50 tests for Plugs.AuthenticationPlug 2019-07-18 20:29:51 +00:00
Ariadne Conill
621cacf667 tests: add tests for mapped signature plug 2019-07-18 16:28:36 +00:00
Ariadne Conill
88d064d80e http signature plug: remove redundant checks handled by HTTPSignatures library 
the redundant checks assumed a POST request, which will not work for signed GETs.
this check was originally needed because the HTTPSignatures adapter assumed that
the requests were also POST requests.  but now, the adapter has been corrected.
 2019-07-18 15:11:21 +00:00
kaniini
f9a0014681 Merge branch 'feature/signed-object-fetches' into 'develop' 
signed object fetches

See merge request pleroma/pleroma!1446
 2019-07-18 13:27:50 +00:00
Maksim
b6b748d3e7 tests for Uploader with webhook 2019-07-18 12:30:18 +00:00
Ariadne Conill
1345e0c2bf tests: add tests for signed object fetches 2019-07-17 23:06:16 +00:00
kaniini
1e48af9acf Merge branch 'feature/instance-fetch-actor' into 'develop' 
instance fetch service actor

See merge request pleroma/pleroma!1440
 2019-07-17 19:45:40 +00:00
kaniini
60b54ee64a Merge branch 'feature/http-signatures-keyid' into 'develop' 
http signatures: derive actor from key IDs

See merge request pleroma/pleroma!1442
 2019-07-17 19:44:14 +00:00
Ariadne Conill
f84fb340b7 http signatures: derive actor ID from key ID. 
Almost all AP servers return their key ID as the actor URI with #main-key
added.  Hubzilla, which doesn't, uses a URL which refers to the actor
anyway, so worst case, Hubzilla users get refetched.
 2019-07-17 19:18:19 +00:00
Eugenij
4bf2bb9cff Fix password reset for non-test env 
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.

Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.
 2019-07-17 18:09:31 +00:00
Ariadne Conill
3d23a12d75 tests: add test for fetching the internal fetch actor 2019-07-17 17:48:08 +00:00
Ariadne Conill
62e5ff624e user: add is_internal_user? helper function 2019-07-17 17:12:42 +00:00
kaniini
ce73d5f6a5 Merge branch 'feature/mention-mrf' into 'develop' 
Add MRF MentionPolicy for dropping posts which mention specific actors

See merge request pleroma/pleroma!1439
 2019-07-17 15:28:41 +00:00
RX14
96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors 2019-07-17 15:16:55 +01:00
Alexander Strizhakov
10f82c88b8 mastoapi password reset 
added rate limit to password reset

configure rate limit in runtime
 2019-07-16 21:44:50 +00:00
Maksim
21e3f9ac69 added tests for Pleroma.Upload.Filter 2019-07-16 21:35:43 +00:00
Sachin Joshi
18234cc44e add the rich media ttl based on image exp time 2019-07-17 00:20:34 +05:45
Roman Chvanikov
9bca70b10a Merge develop 2019-07-16 16:19:19 +03:00
Eugenij
520ee6c591 Add pleroma.deactivated to the Account entity (Mastodon API) 2019-07-16 11:14:46 +00:00
Eugenij
c4ca142e14 Add the blocked_by attribute to the relationship API (GET /api/v1/accounts/relationships) 2019-07-16 11:04:11 +00:00
rinpatch
996fd58ac4 Merge branch 'bugfix/poll-id-as-string' into 'develop' 
Status View: Poll ids are strings.

See merge request pleroma/pleroma!1430
 2019-07-16 06:06:22 +00:00
lain
7a24def473 Mastodon Controller: Fix tests. 2019-07-16 14:01:18 +09:00
lain
1ed24bcc76 Status View: Poll ids are strings. 
All ids in mastodon are strings, in general.
 2019-07-16 12:47:40 +09:00
feld
9f987dd017 Merge branch 'match-file-name' into 'develop' 
try to always match the filename for proxy url

See merge request pleroma/pleroma!1405
 2019-07-15 22:04:58 +00:00
Sergey Suprunenko
b74300bc7a Add more tests for MastodonAPIController and CommonAPI 2019-07-15 19:47:23 +00:00
Sachin Joshi
1d906ffa82 Merge branch 'develop' into match-file-name 
# Conflicts:
#	lib/pleroma/web/media_proxy/media_proxy_controller.ex
 2019-07-15 21:30:56 +05:45
kaniini
03c4ea44ad Merge branch 'admin-configure-atom-keys' into 'develop' 
admin configure - atom keys with leading :

See merge request pleroma/pleroma!1424
 2019-07-15 13:01:58 +00:00
Maksim
c32384c1ea tests for Pleroma.Signature 2019-07-15 13:01:22 +00:00
Alex S
b8607c151c migrating task refactor 2019-07-15 15:45:27 +03:00
Alex S
c66044b923 atom keys with leading : 2019-07-15 11:00:55 +03:00
Egor Kislitsyn
de13c9bb8f List messages must be visible for mentioned users 2019-07-15 14:54:40 +07:00
Egor Kislitsyn
64a946643e Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-07-15 14:11:54 +07:00
Egor Kislitsyn
a87c313309 Support list visibility in StatusView 2019-07-15 14:00:29 +07:00
Maksim
fa17879c20 added tests for Web.MediaProxy 2019-07-14 21:01:32 +00:00
Sergey Suprunenko
dce8ebc9ea Unfollow should also unsubscribe 2019-07-14 19:25:03 +00:00
Ariadne Conill
841314c2d5 tests: fix object containment violations in the transmogrifier tests 
Some objects were not completely rewritten in the tests, which caused object
containment violations.  Fix them by rewriting the object IDs to be in an
appropriate namespace.
 2019-07-14 19:24:22 +00:00
Roman Chvanikov
c729883936 Merge branch 'develop' into feature/digest-email 2019-07-14 21:43:30 +03:00
Ariadne Conill
739bbe0d3b security: detect object containment violations at the IR level 
It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers.  OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.

Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph.
 2019-07-14 17:47:08 +00:00
kaniini
cef4337f95 Merge branch 'bugfix/llal-object-containment' into 'develop' 
Object.Fetcher: Handle error on Containment.contain_origin/2

See merge request pleroma/pleroma!1414
 2019-07-14 16:39:17 +00:00
Haelwenn (lanodan) Monnier
a2c601acb5
FetcherTest: Containment refute called(OStatus.fetch_activity_from_url) 2019-07-14 17:05:32 +02:00
Alexander Strizhakov
e7c39b7ac8 Feature/1072 muting notifications 2019-07-14 13:29:31 +00:00
Haelwenn (lanodan) Monnier
f00562ed6b
HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site 2019-07-14 13:55:41 +02:00
Haelwenn (lanodan) Monnier
efa9a13d4e
HttpRequestMock: Add missing mocks for object containment tests 2019-07-14 13:55:41 +02:00
rinpatch
0c2dcb4c69 Add follow information refetching after following/unfollowing 2019-07-14 01:58:39 +03:00
rinpatch
183da33e00 Add tests for fetch_follow_information_for_user and check object type 
when fetching the page
 2019-07-14 00:56:02 +03:00
Maxim Filippov
418ae6638d Merge branch 'develop' into feature/admin-api-user-statuses 2019-07-14 00:39:06 +03:00
Maxim Filippov
a9459ff98f Admin API: Endpoint for fetching latest user's statuses 2019-07-14 00:37:26 +03:00
Ariadne Conill
80c46d6d8b nodeinfo: implement MRF transparency exclusions 2019-07-13 18:53:14 +00:00
rinpatch
e8fa477793 Refactor Follows/Followers counter syncronization 
- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page
 2019-07-13 19:27:49 +03:00
Ivan Tashkinov
369e9bb42f [#1041] Rate-limited status actions (per user and per user+status). 2019-07-13 14:49:39 +03:00
rinpatch
095117a58c Merge branch 'develop' into fix/ap-hide-follows 2019-07-12 21:43:06 +03:00
rinpatch
97b79efbcd ActivityPub Controller: Actually pass for_user to following/followers 
views and give 403 errors when trying to request hidden follower pages
when unauthenticated
 2019-07-12 20:54:20 +03:00
Sachin Joshi
f8e3ae6154 try to always match the filename for proxy url 2019-07-12 22:56:14 +05:45
Maksim
92055941bd Pleroma.Web.Metadata - tests 2019-07-12 16:42:54 +00:00
rinpatch
1f6ac7680d ActivityPub User view: Following/Followers refactoring 
- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it
 2019-07-12 19:41:55 +03:00
Mark Felder
360e4cdaa2 Move these to pleroma namespace in Mastodon API 2019-07-12 11:25:58 -05:00
rinpatch
27ed260eed AP user view: Add a test for hiding totalItems in following/followers 2019-07-12 18:36:14 +03:00
Sachin Joshi
6a6c4d134b preserve the original path/filename (no encoding/decoding) for proxy 2019-07-12 21:05:01 +05:45
Roman Chvanikov
eae991b06a merge develop 2019-07-12 18:08:27 +03:00
Eugenij
4198c3ac39 Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel 2019-07-11 13:55:31 +00:00
Alexander Strizhakov
846ad9a463 admin api configure changes 2019-07-11 13:02:13 +00:00
kaniini
e4e3fd7e55 Merge branch 'fix/1019-refactor' into 'develop' 
Fix/1019 refactor

See merge request pleroma/pleroma!1397
 2019-07-11 13:01:11 +00:00
Egor Kislitsyn
9e06873d58 Add list to Visibility 2019-07-11 19:29:24 +07:00
Egor Kislitsyn
958fb9aa80 Add "listMessage" 2019-07-11 16:36:08 +07:00
Egor Kislitsyn
182f7bbb11 Merge branch 'develop' into feature/addressable-lists 2019-07-11 13:26:59 +07:00
Alexander Strizhakov
a237c6a2d4 support for idna domains 2019-07-10 15:23:25 +00:00
Haelwenn (lanodan) Monnier
252e129b1e
MastoAPI: Add categories to custom emojis 
Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch.
 2019-07-10 17:02:37 +02:00
Alex S
beba7bbc85 removing synchronization worker 2019-07-10 17:42:18 +03:00
Alex S
ade213cb35 robots txt test fix 2019-07-10 17:42:18 +03:00
Alex S
f8786fa6f2 adding following_address field to user 2019-07-10 17:42:18 +03:00
Sergey Suprunenko
ff55e3c16f Create mentions only for explicitly mentioned users 2019-07-10 13:29:50 +00:00
Egor Kislitsyn
c2a589d9a3 Fix credo warning 2019-07-10 18:10:09 +07:00
Egor Kislitsyn
0d54a571ca Add SetLocalePlug 2019-07-10 18:08:03 +07:00
Maksim
008c55e4e9 add test for search_controller/ 100% coverage 2019-07-10 08:28:03 +00:00
Maksim
12b1454245 [#1062] added option to disable send email 2019-07-10 05:34:21 +00:00
Sergey Suprunenko
2d2b50ccca Send and handle "Delete" activity for deleted users 2019-07-10 05:16:08 +00:00
kaniini
75be90a6d1 Merge branch 'release/listener' into 'develop' 
add listener port and ip option for 'pleroma.instance gen' and enable its test

See merge request pleroma/pleroma!1393
 2019-07-10 05:14:08 +00:00
feld
93a0eeab16 Add license/copyright to all project files 2019-07-10 05:13:23 +00:00
Maksim
bb8065a1fd tests MRF filters 2019-07-10 05:12:21 +00:00
Sachin Joshi
6d0ae264fc add listener port and ip option for 'pleroma.instance gen' and enable its test 2019-07-10 01:46:49 +05:45
Ivan Tashkinov
8a41d34673 [#878] Tests improvements per code review. 2019-07-09 22:37:59 +03:00
Ivan Tashkinov
6fc0c27be3 [#878] Uncommented test statement. 2019-07-09 22:28:04 +03:00
Ivan Tashkinov
829e997223 [#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests 
# Conflicts:
#	lib/pleroma/object.ex
#	test/web/activity_pub/transmogrifier_test.exs
#	test/web/ostatus/ostatus_test.exs
 2019-07-09 21:46:16 +03:00
Roman Chvanikov
371d39e160 Merge develop 2019-07-09 21:21:09 +03:00
kaniini
1417627d07 Merge branch 'remove-avatar-header' into 'develop' 
Ability to reset avatar, profile banner and backgroud

See merge request pleroma/pleroma!1187
 2019-07-09 17:51:41 +00:00
Alexander Strizhakov
d6b0fce6e9 Fix/1019 correct count remote users 2019-07-09 17:36:35 +00:00
kaniini
4948117fcf Merge branch 'remove-swift' into 'develop' 
Remove Uploaders.Swift and `httpoison` dependency

Closes #1051

See merge request pleroma/pleroma!1374
 2019-07-09 16:54:32 +00:00
Alexander Strizhakov
4e6e5d8042 reverse proxy tests 2019-07-09 16:54:13 +00:00
kaniini
1179a13533 Merge branch 'features/sec-websocket-protocol-header' into 'develop' 
Features: MastoAPI streaming Sec-WebSocket-Protocol header

See merge request pleroma/pleroma!1381
 2019-07-09 16:52:22 +00:00
feld
167f810ff1 Merge branch 'proxy-error' into 'develop' 
make sure the url used by proxy is same as original url

See merge request pleroma/pleroma!1383
 2019-07-09 16:00:44 +00:00
Mark Felder
e143747445 Add test for URLs with Unicode characters too 2019-07-09 10:55:36 -05:00
Haelwenn
95c085174d Merge branch 'test-speedup' into 'develop' 
Testing: Don't federate in testing.

See merge request pleroma/pleroma!1391
 2019-07-09 15:35:28 +00:00
Mark Felder
ce3ffad13a Remove duplicated test. New one is more comprehensive. 2019-07-09 10:23:22 -05:00
Mark Felder
31a59d6f23 Merge branch 'develop' into proxy-error 2019-07-09 10:18:30 -05:00
Mark Felder
98f13eac9e Capitalize 2019-07-09 10:11:42 -05:00
Mark Felder
4213a4e2aa Test that all ASCII encoded characters are preserved 2019-07-09 09:43:33 -05:00
rinpatch
376a55c97f Merge branch '161-incoming-replies-depth-limit' into 'develop' 
[#161] Limited replies depth on incoming federation (memory leaks fix)

Closes #161

See merge request pleroma/pleroma!1361
 2019-07-09 14:15:10 +00:00
Alexander Strizhakov
23d4781e73 change for local user search 2019-07-09 08:52:49 +00:00
lain
abe2e8881f Testing: Don't federate in testing. 2019-07-09 15:30:51 +09:00
Ivan Tashkinov
46cf81a544 [#878] Formatting fix. 2019-07-08 20:05:02 +03:00
Ivan Tashkinov
daff85a985 [#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity. 2019-07-08 19:53:02 +03:00
rinpatch
72b88c82bc Mastodon API: Fix embedded relationships not being rendered inside of statuses 2019-07-08 12:07:08 +03:00
Sachin Joshi
f5ad430974 make sure the url used by proxy is same as origin url 
encoding or decoding it breaks some of the signed url
 2019-07-07 14:13:40 +05:45
Haelwenn (lanodan) Monnier
b5ba41a725
mastodon_websocket_test.exs: Test for Sec-WebSocket-Protocol header 2019-07-07 08:58:24 +02:00
Ivan Tashkinov
ad8d86e7c6 Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit 2019-07-06 10:17:06 +03:00
Maksim
6dadf5d6f4 [#1043] fix search accounts. 2019-07-05 04:22:08 +00:00
Egor Kislitsyn
11143c542a Remove httpoison from dependencies 2019-07-03 14:42:24 +07:00
Eugenij
ab50c6b3ca Add fallback value to the admin report view. 
This is to avoid 500 error when the reported user no longer exists
in the database.
 2019-07-02 01:27:00 +00:00
Roman Chvanikov
d2cb18b2a3 Merge branch 'develop' into feature/digest-email 2019-06-30 21:23:35 +03:00
Ivan Tashkinov
a799418573 [#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit 
# Conflicts:
#	CHANGELOG.md
 2019-06-30 16:05:00 +03:00
Ivan Tashkinov
2b9d914089 [#161] Refactoring, documentation. 2019-06-30 15:58:50 +03:00
Eugenij
1f76740e10 Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses) 2019-06-30 09:08:46 +00:00
Maksim
acd20f166b [#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text 2019-06-30 07:28:35 +00:00
rinpatch
4c60a562a7 Fix not being able to pin unlisted posts 
Closes #1038
 2019-06-29 22:27:42 +03:00
Ivan Tashkinov
5b7b1040b3 [#161] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching. 2019-06-29 20:04:50 +03:00
kaniini
d1549a6375 Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop' 
Merge admin and mastodon user views for reports

See merge request pleroma/pleroma!1346
 2019-06-29 00:12:09 +00:00
William Pitcock
c22f0bfb80 test: add tests for mediaproxy warming policy 2019-06-28 23:41:42 +00:00
Roman Chvanikov
657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +03:00
Maxim Filippov
90927e6a9a Kowalski, analysis! 2019-06-28 15:27:18 +03:00
Maxim Filippov
452ca5250d Merge admin and mastodon user views for reports 2019-06-28 15:15:32 +03:00
kaniini
0369a5db16 Merge branch 'idempotency-plug' into 'develop' 
Add IdempotencyPlug and use it in all of the api

Closes #1003

See merge request pleroma/pleroma!1339
 2019-06-27 04:20:17 +00:00
Alexander Strizhakov
c6705144a2 don't delete config settings on admin update 2019-06-27 04:19:44 +00:00
Egor Kislitsyn
889a9c3a3f Polish IdempotencyPlug 2019-06-27 01:53:58 +07:00
Egor Kislitsyn
825077a5b0 Add Idempotency plug 2019-06-26 18:36:58 +07:00
Sergey Suprunenko
d53fb55bb7 Return correct response when reply to a direct message is not direct itself 2019-06-26 10:59:27 +00:00
Maksim Pechnikov
4ad15ad2a9 add ignore hosts and TLDs for rich_media 2019-06-25 22:25:37 +03:00
Maksim Pechnikov
0cb8e710fb add test 2019-06-25 18:06:08 +03:00
Maksim
a0c4ebb4d7 [#184] small refactoring reset password 2019-06-24 19:01:56 +00:00
Sergey Suprunenko
2c63c67512 Rework user deletion 2019-06-24 18:59:12 +00:00
Eugenij
f2c03425b0 Broadcast conversation update when DM is deleted 2019-06-24 07:14:04 +00:00
kaniini
27b9605de0 Merge branch 'rich_media_titles_two' into 'develop' 
Rich media titles two

See merge request pleroma/pleroma!1325
 2019-06-23 05:43:11 +00:00
Alex S
b37ede5df3 log capturing 2019-06-23 08:16:28 +03:00
Alex S
982cad0268 support for config groups 2019-06-23 08:16:16 +03:00
Sachin Joshi
a0c65bbd6c Merge branch 'develop' into 'remove-avatar-header' 
# Conflicts:
#   CHANGELOG.md
 2019-06-23 03:25:50 +00:00
Alex S
410add1c30 support for tuples with more than 2 values 2019-06-22 17:30:53 +03:00
lain
0e415921cd Rich Media Parser: Do not return just a title if nothing else is there. 2019-06-22 16:22:59 +02:00
lain
58c4d5312b Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'"" 
This reverts commit b6af80f769.
 2019-06-22 15:12:57 +02:00