yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 19:42:24 +02:00
Code Issues Releases Wiki Activity

Follow works

Browse source
This commit is contained in:
Chocobozzz 2017-11-14 17:31:26 +01:00
parent e34c85e527
commit 350e31d6b6
No known key found for this signature in database
GPG key ID: 583A612D890159BE
39 changed files with 431 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

32
server/middlewares/activitypub.ts
View file

@ -1,12 +1,9 @@
import { Request, Response, NextFunction } from 'express'
import { database as db } from '../initializers'
import {
logger,
getAccountFromWebfinger,
isSignatureVerified
} from '../helpers'
import { NextFunction, Request, Response, RequestHandler } from 'express'
import { ActivityPubSignature } from '../../shared'
import { isSignatureVerified, logger } from '../helpers'
import { fetchRemoteAccountAndCreatePod } from '../helpers/activitypub'
import { database as db, ACTIVITY_PUB_ACCEPT_HEADER } from '../initializers'
import { each, eachSeries, waterfall } from 'async'
async function checkSignature (req: Request, res: Response, next: NextFunction) {
const signatureObject: ActivityPubSignature = req.body.signature
@ -17,35 +14,40 @@ async function checkSignature (req: Request, res: Response, next: NextFunction)
// We don't have this account in our database, fetch it on remote
if (!account) {
account = await getAccountFromWebfinger(signatureObject.creator)
const accountResult = await fetchRemoteAccountAndCreatePod(signatureObject.creator)
if (!account) {
if (!accountResult) {
return res.sendStatus(403)
}
// Save our new account in database
account = accountResult.account
await account.save()
}
const verified = await isSignatureVerified(account, req.body)
if (verified === false) return res.sendStatus(403)
res.locals.signature.account = account
res.locals.signature = {
account
}
return next()
}
function executeIfActivityPub (fun: any | any[]) {
function executeIfActivityPub (fun: RequestHandler | RequestHandler[]) {
return (req: Request, res: Response, next: NextFunction) => {
if (req.header('Accept') !== 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"') {
if (req.header('Accept') !== ACTIVITY_PUB_ACCEPT_HEADER) {
return next()
}
if (Array.isArray(fun) === true) {
fun[0](req, res, next) // FIXME: doesn't work
return eachSeries(fun as RequestHandler[], (f, cb) => {
f(req, res, cb)
}, next)
}
return fun(req, res, next)
return (fun as RequestHandler)(req, res, next)
}
}