diff options
author | kaniini <ariadne@dereferenced.org> | 2019-09-16 07:39:58 +0000 |
---|---|---|
committer | kaniini <ariadne@dereferenced.org> | 2019-09-16 07:39:58 +0000 |
commit | 17142a3720c55e8bb0595f1a1c2f128dfcf47d10 (patch) | |
tree | 3e4ed9af085e410ebab1adbb6ecc1d9cd84f3e42 /lib/pleroma/web/router.ex | |
parent | d1a84ceec88ddd1bc2538cae8a4b6e72cde4fe6f (diff) | |
parent | ba70a8cae6c0d00963dc1d9e80f915186397ad06 (diff) | |
download | pleroma-17142a3720c55e8bb0595f1a1c2f128dfcf47d10.tar.gz |
Merge branch 'feature/delivery-tracking' into 'develop'
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
Diffstat (limited to 'lib/pleroma/web/router.ex')
-rw-r--r-- | lib/pleroma/web/router.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index b0464037e..401133bf3 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -135,6 +135,7 @@ defmodule Pleroma.Web.Router do pipeline :http_signature do plug(Pleroma.Web.Plugs.HTTPSignaturePlug) + plug(Pleroma.Web.Plugs.MappedSignatureToIdentityPlug) end scope "/api/pleroma", Pleroma.Web.TwitterAPI do @@ -514,6 +515,7 @@ defmodule Pleroma.Web.Router do scope "/", Pleroma.Web do pipe_through(:ostatus) + pipe_through(:http_signature) get("/objects/:uuid", OStatus.OStatusController, :object) get("/activities/:uuid", OStatus.OStatusController, :activity) |