Status are sent to mastodon

[github/Chocobozzz/PeerTube.git] / server / helpers / custom-validators / activitypub / actor.ts

diff --git a/server/helpers/custom-validators/activitypub/actor.ts b/server/helpers/custom-validators/activitypub/actor.ts
index 28551c96c5bff818a057b1125f9bc2a6e8fd7b47..ec8da33509c27a4dbac6d4f247450e626bae21f1 100644 (file)
--- a/server/helpers/custom-validators/activitypub/actor.ts
+++ b/server/helpers/custom-validators/activitypub/actor.ts
@@ -1,8 +1,9 @@
 import * as validator from 'validator'
 import { CONSTRAINTS_FIELDS } from '../../../initializers'
 import { isAccountNameValid } from '../accounts'
-import { exists, isUUIDValid } from '../misc'
-import { isActivityPubUrlValid, isBaseActivityValid } from './misc'
+import { exists } from '../misc'
+import { isVideoChannelNameValid } from '../video-channels'
+import { isActivityPubUrlValid, isBaseActivityValid, setValidAttributedTo } from './misc'
 
 function isActorEndpointsObjectValid (endpointObject: any) {
   return isActivityPubUrlValid(endpointObject.sharedInbox)
@@ -22,25 +23,30 @@ function isActorPublicKeyValid (publicKey: string) {
   return exists(publicKey) &&
     typeof publicKey === 'string' &&
     publicKey.startsWith('-----BEGIN PUBLIC KEY-----') &&
-    publicKey.endsWith('-----END PUBLIC KEY-----') &&
+    publicKey.indexOf('-----END PUBLIC KEY-----') !== -1 &&
     validator.isLength(publicKey, CONSTRAINTS_FIELDS.ACTOR.PUBLIC_KEY)
 }
 
+const actorNameRegExp = new RegExp('[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_]+')
 function isActorPreferredUsernameValid (preferredUsername: string) {
-  return isAccountNameValid(preferredUsername)
+  return exists(preferredUsername) && validator.matches(preferredUsername, actorNameRegExp)
+}
+
+function isActorNameValid (name: string) {
+  return isAccountNameValid(name) || isVideoChannelNameValid(name)
 }
 
 function isActorPrivateKeyValid (privateKey: string) {
   return exists(privateKey) &&
     typeof privateKey === 'string' &&
     privateKey.startsWith('-----BEGIN RSA PRIVATE KEY-----') &&
-    privateKey.endsWith('-----END RSA PRIVATE KEY-----') &&
+    // Sometimes there is a \n at the end, so just assert the string contains the end mark
+    privateKey.indexOf('-----END RSA PRIVATE KEY-----') !== -1 &&
     validator.isLength(privateKey, CONSTRAINTS_FIELDS.ACTOR.PRIVATE_KEY)
 }
 
 function isRemoteActorValid (remoteActor: any) {
   return isActivityPubUrlValid(remoteActor.id) &&
-    isUUIDValid(remoteActor.uuid) &&
     isActorTypeValid(remoteActor.type) &&
     isActivityPubUrlValid(remoteActor.following) &&
     isActivityPubUrlValid(remoteActor.followers) &&
@@ -49,7 +55,11 @@ function isRemoteActorValid (remoteActor: any) {
     isActorPreferredUsernameValid(remoteActor.preferredUsername) &&
     isActivityPubUrlValid(remoteActor.url) &&
     isActorPublicKeyObjectValid(remoteActor.publicKey) &&
-    isActorEndpointsObjectValid(remoteActor.endpoints)
+    isActorEndpointsObjectValid(remoteActor.endpoints) &&
+    setValidAttributedTo(remoteActor) &&
+    // If this is not an account, it should be attributed to an account
+    // In PeerTube we use this to attach a video channel to a specific account
+    (remoteActor.type === 'Person' || remoteActor.attributedTo.length !== 0)
 }
 
 function isActorFollowingCountValid (value: string) {
@@ -87,5 +97,6 @@ export {
   isActorFollowersCountValid,
   isActorFollowActivityValid,
   isActorAcceptActivityValid,
-  isActorDeleteActivityValid
+  isActorDeleteActivityValid,
+  isActorNameValid
 }