diff options
author | Chocobozzz <me@florianbigard.com> | 2018-01-11 17:37:49 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-01-11 17:45:57 +0100 |
commit | 4bbc373f134ecbf53f0198277663a25b26a19cc8 (patch) | |
tree | 77bb92e0f7003fcdf0746695d314bfaf19625daa /server/helpers/custom-validators/activitypub/activity.ts | |
parent | cfe1efd200f80239e19f94335364ac9ef3813c19 (diff) | |
download | PeerTube-4bbc373f134ecbf53f0198277663a25b26a19cc8.tar.gz PeerTube-4bbc373f134ecbf53f0198277663a25b26a19cc8.tar.zst PeerTube-4bbc373f134ecbf53f0198277663a25b26a19cc8.zip |
Add reject processing for activitypub
Diffstat (limited to 'server/helpers/custom-validators/activitypub/activity.ts')
-rw-r--r-- | server/helpers/custom-validators/activitypub/activity.ts | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/server/helpers/custom-validators/activitypub/activity.ts b/server/helpers/custom-validators/activitypub/activity.ts index 577cf4b52..632f14223 100644 --- a/server/helpers/custom-validators/activitypub/activity.ts +++ b/server/helpers/custom-validators/activitypub/activity.ts | |||
@@ -1,6 +1,9 @@ | |||
1 | import * as validator from 'validator' | 1 | import * as validator from 'validator' |
2 | import { Activity, ActivityType } from '../../../../shared/models/activitypub' | 2 | import { Activity, ActivityType } from '../../../../shared/models/activitypub' |
3 | import { isActorAcceptActivityValid, isActorDeleteActivityValid, isActorFollowActivityValid, isActorUpdateActivityValid } from './actor' | 3 | import { |
4 | isActorAcceptActivityValid, isActorDeleteActivityValid, isActorFollowActivityValid, isActorRejectActivityValid, | ||
5 | isActorUpdateActivityValid | ||
6 | } from './actor' | ||
4 | import { isAnnounceActivityValid } from './announce' | 7 | import { isAnnounceActivityValid } from './announce' |
5 | import { isActivityPubUrlValid } from './misc' | 8 | import { isActivityPubUrlValid } from './misc' |
6 | import { isDislikeActivityValid, isLikeActivityValid } from './rate' | 9 | import { isDislikeActivityValid, isLikeActivityValid } from './rate' |
@@ -33,6 +36,7 @@ const activityCheckers: { [ P in ActivityType ]: (activity: Activity) => boolean | |||
33 | Delete: checkDeleteActivity, | 36 | Delete: checkDeleteActivity, |
34 | Follow: checkFollowActivity, | 37 | Follow: checkFollowActivity, |
35 | Accept: checkAcceptActivity, | 38 | Accept: checkAcceptActivity, |
39 | Reject: checkRejectActivity, | ||
36 | Announce: checkAnnounceActivity, | 40 | Announce: checkAnnounceActivity, |
37 | Undo: checkUndoActivity, | 41 | Undo: checkUndoActivity, |
38 | Like: checkLikeActivity | 42 | Like: checkLikeActivity |
@@ -82,6 +86,10 @@ function checkAcceptActivity (activity: any) { | |||
82 | return isActorAcceptActivityValid(activity) | 86 | return isActorAcceptActivityValid(activity) |
83 | } | 87 | } |
84 | 88 | ||
89 | function checkRejectActivity (activity: any) { | ||
90 | return isActorRejectActivityValid(activity) | ||
91 | } | ||
92 | |||
85 | function checkAnnounceActivity (activity: any) { | 93 | function checkAnnounceActivity (activity: any) { |
86 | return isAnnounceActivityValid(activity) | 94 | return isAnnounceActivityValid(activity) |
87 | } | 95 | } |