import * as express from 'express'
-
-import {
- processCreateActivity,
- processUpdateActivity,
- processFlagActivity
-} from '../../lib'
-import {
- Activity,
- ActivityType,
- RootActivity,
- ActivityPubCollection,
- ActivityPubOrderedCollection
-} from '../../../shared'
-import {
- signatureValidator,
- checkSignature,
- asyncMiddleware
-} from '../../middlewares'
+import { Activity, ActivityPubCollection, ActivityPubOrderedCollection, ActivityType, RootActivity } from '../../../shared'
import { logger } from '../../helpers'
+import { isActivityValid } from '../../helpers/custom-validators/activitypub/activity'
+import { processCreateActivity, processUpdateActivity, processUndoActivity } from '../../lib'
+import { processAcceptActivity } from '../../lib/activitypub/process/process-accept'
+import { processAddActivity } from '../../lib/activitypub/process/process-add'
+import { processAnnounceActivity } from '../../lib/activitypub/process/process-announce'
+import { processDeleteActivity } from '../../lib/activitypub/process/process-delete'
+import { processFollowActivity } from '../../lib/activitypub/process/process-follow'
+import { asyncMiddleware, checkSignature, localAccountValidator, signatureValidator } from '../../middlewares'
+import { activityPubValidator } from '../../middlewares/validators/activitypub/activity'
+import { AccountInstance } from '../../models/account/account-interface'
-const processActivity: { [ P in ActivityType ]: (activity: Activity) => Promise<any> } = {
+const processActivity: { [ P in ActivityType ]: (activity: Activity, inboxAccount?: AccountInstance) => Promise<any> } = {
Create: processCreateActivity,
+ Add: processAddActivity,
Update: processUpdateActivity,
- Flag: processFlagActivity
+ Delete: processDeleteActivity,
+ Follow: processFollowActivity,
+ Accept: processAcceptActivity,
+ Announce: processAnnounceActivity,
+ Undo: processUndoActivity
}
const inboxRouter = express.Router()
-inboxRouter.post('/',
+inboxRouter.post('/inbox',
+ signatureValidator,
+ asyncMiddleware(checkSignature),
+ activityPubValidator,
+ asyncMiddleware(inboxController)
+)
+
+inboxRouter.post('/account/:name/inbox',
signatureValidator,
asyncMiddleware(checkSignature),
- // inboxValidator,
+ localAccountValidator,
+ activityPubValidator,
asyncMiddleware(inboxController)
)
activities = [ rootActivity as Activity ]
}
- await processActivities(activities)
+ // Only keep activities we are able to process
+ logger.debug('Filtering activities...', { activities })
+ activities = activities.filter(a => isActivityValid(a))
+ logger.debug('We keep %d activities.', activities.length, { activities })
+
+ await processActivities(activities, res.locals.account)
res.status(204).end()
}
-async function processActivities (activities: Activity[]) {
+async function processActivities (activities: Activity[], inboxAccount?: AccountInstance) {
for (const activity of activities) {
const activityProcessor = processActivity[activity.type]
if (activityProcessor === undefined) {
continue
}
- await activityProcessor(activity)
+ await activityProcessor(activity, inboxAccount)
}
}