Commit graph

446 commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier 26a6d80227
README.md: Requires Python 3.6 2020-12-28 11:36:44 +01:00
Haelwenn 83d56cb570 Merge branch 'block_relays' into 'master'
Block relays

See merge request pleroma/relay!26
2020-12-07 15:38:17 +00:00
Izalia Mae 6cef5d8f38 Apply 1 suggestion(s) to 1 file(s) 2020-12-05 05:35:10 +00:00
Izalia Mae 63be7f2034 Apply 1 suggestion(s) to 1 file(s) 2020-12-05 05:34:58 +00:00
Izalia Mae bc0914b5c1 make software blocklist configurable 2020-12-04 02:34:40 -05:00
Izalia Mae f0e08f26b3 fetch well-known url for nodeinfo 2020-12-04 01:43:49 -05:00
Izalia Mae 1727425bec add relay blocking option 2020-12-02 23:13:33 -05:00
Izalia Mae c59cec0c31 cleanup load_config 2020-12-02 22:41:45 -05:00
Haelwenn 4d4bebd0be Merge branch 'db-inbox-fix' into 'master'
properly create 'relay-list' in db

See merge request pleroma/relay!25
2020-11-23 07:06:50 +00:00
Haelwenn 8b4ef87eba Merge branch 'master' into 'master'
set content-type to application/activity+json for /actor

See merge request pleroma/relay!24
2020-11-23 06:51:56 +00:00
Izalia Mae 89990331d5 properly create 'relay-list' in db 2020-11-22 00:50:57 -05:00
Joel Beckmeyer c2d53df85b set content-type to application/activity+json for /actor 2020-11-19 21:13:24 -05:00
Haelwenn a15d734218 Merge branch 'follows' into 'master'
remove unnecessary actor checking for (un)follows

See merge request pleroma/relay!22
2020-11-12 13:43:09 +00:00
Haelwenn 6e10db1aa0 Merge branch 'headers-fix' into 'master'
Include the headers required by mastodon

See merge request pleroma/relay!23
2020-11-12 13:40:20 +00:00
Izalia Mae 193ea00996 Include the headers required by mastodon 2020-11-12 13:40:19 +00:00
Izalia Mae 436a57971c remove unnecessary actor checking for (un)follows 2020-03-18 00:53:21 -04:00
kaniini 1e8acd3c0b Merge branch 'update_crypto' into 'master'
Update crypto module

See merge request pleroma/relay!21
2019-11-20 11:24:27 +00:00
Izalia Mae 544d790ef2 use pycryptodome instead of pycrypto 2019-11-19 22:08:14 -05:00
kaniini 132cd1ea42 Merge branch 'fix' into 'master'
Fix db wipe on json error and default config checking

See merge request pleroma/relay!19
2019-09-30 10:45:46 +00:00
Izalia Mae b4f0835106 Fix db wipe on json error and default config checking 2019-09-30 10:45:46 +00:00
kaniini f3b4fc44b8 Merge branch 'dockerize' into 'master'
Add a Dockerfile and instructions to run with Docker

See merge request pleroma/relay!20
2019-09-30 10:45:09 +00:00
Louise de Beaufort a8c81f1d40 Add the whole directory in the workdir
(Prevents a fatal error about not being a git repository)
2019-08-20 13:52:27 +02:00
Louise de Beaufort 1fb8ca9ffc Add config file to gitignore 2019-08-20 12:39:18 +02:00
Louise de Beaufort 76743ac1c6 Add a Dockerfile and instructions to run with Docker 2019-08-20 12:38:53 +02:00
kaniini 47e2eb6556 Merge branch 'feature/add_force_remove_relay' into 'master'
implement force-remove in manage.py, should only be used when relay is not running

See merge request pleroma/relay!15
2019-07-31 19:21:12 +00:00
kaniini b3b33c9796 Merge branch 'feature/semaphore_in_push_to_actor' into 'master'
use global semaphore in push_to_actor to prevent overloading system with outbound connections

See merge request pleroma/relay!16
2019-07-31 19:20:46 +00:00
kaniini 723f286f21 Merge branch 'patch-2' into 'master'
Fix relay crashing on signed GET requests

See merge request pleroma/relay!18
2019-07-31 19:20:18 +00:00
Thibaut Girka e56d909fe2 Fix relay crashing on signed GET requests 2019-07-31 05:36:23 +00:00
kaniini 2eb17041b1 Merge branch 'feature-update' into 'master'
Handle "Update" event

See merge request pleroma/relay!14
2019-07-20 21:18:05 +00:00
kaniini f7a7d595d6 Merge branch 'whitelist' into 'master'
add whitelist feature

See merge request pleroma/relay!13
2019-07-20 21:17:32 +00:00
gled 94e669cf7d use global semaphore in push_to_actor to prevent overloading system with outbound connections 2019-06-11 10:54:05 -07:00
gled 06d9d4c19e implement force-remove in manage.py, should only be used when relay is not running 2019-06-11 10:48:49 -07:00
kjwon15 9e5772855d Handle "Update" event to forward update profile 2019-06-03 18:50:45 +09:00
Izalia Mae 1a922ecb29 add whitelist feature 2019-05-21 12:29:55 -04:00
kaniini f34b42ae78 Merge branch 'feature-delete' into 'master'
Implement handle_delete to forward delete

Closes #2

See merge request pleroma/relay!12
2019-05-13 18:41:06 +00:00
kaniini d890bdd6ed Merge branch 'block_unauth' into 'master'
reject activities from instance not on relay-list

See merge request pleroma/relay!11
2019-05-13 18:39:05 +00:00
kjwon15 08fe53bdbd Implement handle_delete to forward delete 2019-05-08 17:27:01 +09:00
Izalia Mae 1065c5ff36 reject activities from instance not on relay-list 2019-05-08 02:54:57 -04:00
kaniini 9d1c6a3fa2 Merge branch 'patch-1' into 'master'
Fix wrong URI for the relay's followers collection

See merge request pleroma/relay!10
2019-03-29 11:29:13 +00:00
Thibaut Girka eefef994e1 Fix wrong URI for the relay's followers collection 2019-03-28 17:21:53 +00:00
kaniini 79d127595b Merge branch 'revert-10744d91' into 'master'
Revert "Merge branch 'fix-html' into 'master'"

See merge request pleroma/relay!9
2019-01-17 23:04:20 +00:00
kaniini 44faf30162 Revert "Merge branch 'fix-html' into 'master'"
This reverts merge request !8
2019-01-17 23:04:07 +00:00
kaniini 10744d9191 Merge branch 'fix-html' into 'master'
Fix html

See merge request pleroma/relay!8
2019-01-17 23:02:53 +00:00
kjwon15 6b8c2354fd Add doctype to html 2019-01-09 22:17:01 +09:00
kaniini 190ccf27d1 http signatures: cache things we've already signed
this helps with the scatter/gather
2019-01-08 05:30:29 +00:00
kaniini 18b17f91e3 http signatures: hold actor keys in an LRU cache 2019-01-08 05:15:16 +00:00
kjwon15 65c80bca55 Merge branch 'upstream' 2018-12-29 13:41:14 +09:00
kaniini 950cd1e720 Merge branch 'feature/always-update-displayed-instance-list' into 'master'
Rebuild the list of instances that use this relay every time it is requested

See merge request pleroma/relay!6
2018-12-27 18:49:12 +00:00
kaniini 6debb5f086 Merge branch 'patch-1' into 'master'
Fix encoding problem on actor

See merge request pleroma/relay!7
2018-12-27 18:48:49 +00:00
kjwon15 c1f1cfe066 Add white list policy 2018-12-27 19:08:38 +09:00