diff options
Diffstat (limited to 'server/helpers/custom-validators/activitypub')
-rw-r--r-- | server/helpers/custom-validators/activitypub/actor.ts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/server/helpers/custom-validators/activitypub/actor.ts b/server/helpers/custom-validators/activitypub/actor.ts index df0edc30e..9908be4d3 100644 --- a/server/helpers/custom-validators/activitypub/actor.ts +++ b/server/helpers/custom-validators/activitypub/actor.ts | |||
@@ -1,5 +1,6 @@ | |||
1 | import * as validator from 'validator' | 1 | import * as validator from 'validator' |
2 | import { CONSTRAINTS_FIELDS } from '../../../initializers' | 2 | import { CONSTRAINTS_FIELDS } from '../../../initializers' |
3 | import { normalizeActor } from '../../../lib/activitypub' | ||
3 | import { exists } from '../misc' | 4 | import { exists } from '../misc' |
4 | import { isActivityPubUrlValid, isBaseActivityValid, setValidAttributedTo } from './misc' | 5 | import { isActivityPubUrlValid, isBaseActivityValid, setValidAttributedTo } from './misc' |
5 | 6 | ||
@@ -52,6 +53,7 @@ function isActorObjectValid (actor: any) { | |||
52 | isActorPublicKeyObjectValid(actor.publicKey) && | 53 | isActorPublicKeyObjectValid(actor.publicKey) && |
53 | isActorEndpointsObjectValid(actor.endpoints) && | 54 | isActorEndpointsObjectValid(actor.endpoints) && |
54 | setValidAttributedTo(actor) && | 55 | setValidAttributedTo(actor) && |
56 | |||
55 | // If this is not an account, it should be attributed to an account | 57 | // If this is not an account, it should be attributed to an account |
56 | // In PeerTube we use this to attach a video channel to a specific account | 58 | // In PeerTube we use this to attach a video channel to a specific account |
57 | (actor.type === 'Person' || actor.attributedTo.length !== 0) | 59 | (actor.type === 'Person' || actor.attributedTo.length !== 0) |
@@ -83,6 +85,8 @@ function isActorRejectActivityValid (activity: any) { | |||
83 | } | 85 | } |
84 | 86 | ||
85 | function isActorUpdateActivityValid (activity: any) { | 87 | function isActorUpdateActivityValid (activity: any) { |
88 | normalizeActor(activity.object) | ||
89 | |||
86 | return isBaseActivityValid(activity, 'Update') && | 90 | return isBaseActivityValid(activity, 'Update') && |
87 | isActorObjectValid(activity.object) | 91 | isActorObjectValid(activity.object) |
88 | } | 92 | } |