diff options
Diffstat (limited to 'server/helpers/custom-validators/activitypub/actor.ts')
-rw-r--r-- | server/helpers/custom-validators/activitypub/actor.ts | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/server/helpers/custom-validators/activitypub/actor.ts b/server/helpers/custom-validators/activitypub/actor.ts index 070632a20..c05f60f14 100644 --- a/server/helpers/custom-validators/activitypub/actor.ts +++ b/server/helpers/custom-validators/activitypub/actor.ts | |||
@@ -73,24 +73,10 @@ function isActorDeleteActivityValid (activity: any) { | |||
73 | return isBaseActivityValid(activity, 'Delete') | 73 | return isBaseActivityValid(activity, 'Delete') |
74 | } | 74 | } |
75 | 75 | ||
76 | function isActorFollowActivityValid (activity: any) { | 76 | function sanitizeAndCheckActorObject (object: any) { |
77 | return isBaseActivityValid(activity, 'Follow') && | 77 | normalizeActor(object) |
78 | isActivityPubUrlValid(activity.object) | ||
79 | } | ||
80 | |||
81 | function isActorAcceptActivityValid (activity: any) { | ||
82 | return isBaseActivityValid(activity, 'Accept') | ||
83 | } | ||
84 | |||
85 | function isActorRejectActivityValid (activity: any) { | ||
86 | return isBaseActivityValid(activity, 'Reject') | ||
87 | } | ||
88 | |||
89 | function isActorUpdateActivityValid (activity: any) { | ||
90 | normalizeActor(activity.object) | ||
91 | 78 | ||
92 | return isBaseActivityValid(activity, 'Update') && | 79 | return isActorObjectValid(object) |
93 | isActorObjectValid(activity.object) | ||
94 | } | 80 | } |
95 | 81 | ||
96 | function normalizeActor (actor: any) { | 82 | function normalizeActor (actor: any) { |
@@ -139,10 +125,7 @@ export { | |||
139 | isActorObjectValid, | 125 | isActorObjectValid, |
140 | isActorFollowingCountValid, | 126 | isActorFollowingCountValid, |
141 | isActorFollowersCountValid, | 127 | isActorFollowersCountValid, |
142 | isActorFollowActivityValid, | ||
143 | isActorAcceptActivityValid, | ||
144 | isActorRejectActivityValid, | ||
145 | isActorDeleteActivityValid, | 128 | isActorDeleteActivityValid, |
146 | isActorUpdateActivityValid, | 129 | sanitizeAndCheckActorObject, |
147 | isValidActorHandle | 130 | isValidActorHandle |
148 | } | 131 | } |