Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 02:55:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: update activitypub helper resolveLocalUid to accept both webfinger name and full URL as input

Browse Source
This commit is contained in:
Julian Lam
2023-12-11 14:35:04 -05:00
parent c803b2124c
commit 1f79f54241
2 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/activitypub/helpers.js
View File

@@ -4,6 +4,7 @@ const request = require('request-promise-native');
const { generateKeyPairSync } = require('crypto');
const winston = require('winston');
const nconf = require('nconf');
const validator = require('validator');
const db = require('../database');
const ttl = require('../cache/ttl');
@@ -68,10 +69,26 @@ Helpers.generateKeys = async (uid) => {
return { publicKey, privateKey };
};
Helpers.resolveLocalUid = async (id) => {
const [slug, host] = id.split('@');
Helpers.resolveLocalUid = async (input) => {
let slug;
if (id.indexOf('@') === -1 || host !== nconf.get('url_parsed').host) {
if (validator.isURL(input, {
require_protocol: true,
require_host: true,
require_tld: false,
protocols: ['https'],
require_valid_protocol: true,
})) {
const { host, pathname } = new URL(input);
if (host === nconf.get('url_parsed').host) {
slug = pathname.split('/').filter(Boolean)[1];
} else {
throw new Error('[[activitypub:invalid-id]]');
}
} else if (input.indexOf('@') !== -1) { // Webfinger
([slug] = input.replace(/^acct:/, '').split('@'));
} else {
throw new Error('[[activitypub:invalid-id]]');
}