moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates around Deletes

This commit is contained in:
Bryan Ashby 2023-03-12 14:22:41 -06:00
parent 6afbb29139
commit ea9d826a7c
No known key found for this signature in database
GPG Key ID: C2C1B501E4EFD994
1 changed files with 70 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
core/servers/content/web_handlers/activitypub.js
View File

@ -22,6 +22,7 @@ const EnigAssert = require('../../../enigma_assert');
const Message = require('../../../message'); const Message = require('../../../message');
const Events = require('../../../events'); const Events = require('../../../events');
const UserProps = require('../../../user_property'); const UserProps = require('../../../user_property');
const { Errors } = require('../../../enig_error');
// deps // deps
const _ = require('lodash'); const _ = require('lodash');
@ -238,22 +239,15 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
: this.webServer.notImplemented(resp); : this.webServer.notImplemented(resp);
} }
//
// Delete is a special beast:
// We will *likely* get a 410, 404, or a Tombstone when fetching the Actor
// Thus, we need some short circuiting
//
if (WellKnownActivity.Delete === activity.type) {
return this._inboxDeleteActivity(inboxType, signature, resp, activity);
}
// Fetch and validate the signature of the remote Actor // Fetch and validate the signature of the remote Actor
Actor.fromId(getActorId(activity), (err, remoteActor) => { Actor.fromId(getActorId(activity), (err, remoteActor) => {
if (err) { // if (err) {
return this.webServer.internalServerError(resp, err); // return this.webServer.internalServerError(resp, err);
} // }
if (!this._validateActorSignature(remoteActor, signature)) { const httpSigValidated =
remoteActor && this._validateActorSignature(remoteActor, signature);
if (activity.type !== WellKnownActivity.Delete && !httpSigValidated) {
return this.webServer.accessDenied(resp); return this.webServer.accessDenied(resp);
} }
@ -267,11 +261,21 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
case WellKnownActivity.Create: case WellKnownActivity.Create:
return this._inboxCreateActivity(resp, activity); return this._inboxCreateActivity(resp, activity);
case WellKnownActivity.Delete:
return this._inboxDeleteActivity(
inboxType,
signature,
resp,
activity,
httpSigValidated
);
case WellKnownActivity.Update: case WellKnownActivity.Update:
{ {
// Only Notes currently supported // Only Notes currently supported
const type = _.get(activity, 'object.type'); const type = _.get(activity, 'object.type');
if ('Note' === type) { if ('Note' === type) {
// :TODO: get rid of this extra indirection
return this._inboxMutateExistingObject( return this._inboxMutateExistingObject(
inboxType, inboxType,
signature, signature,
@ -463,7 +467,7 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
); );
} }
_inboxDeleteActivity(inboxType, signature, resp, activity) { _inboxDeleteActivity(inboxType, signature, resp, activity, httpSigValidated) {
const objectId = _.get(activity, 'object.id', activity.object); const objectId = _.get(activity, 'object.id', activity.object);
this.log.info({ inboxType, objectId }, 'Incoming Delete request'); this.log.info({ inboxType, objectId }, 'Incoming Delete request');
@ -510,14 +514,19 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
return nextObjInfo(null); return nextObjInfo(null);
} }
if ( return this._verifyObjectOwner(
!this._isSignatureValid( httpSigValidated,
activity.signature, objInfo.object,
objInfo.object.signature activity,
) err => {
) { if (err) {
this.log.warn( this.log.warn(
{ inboxType, collectionName, objectId }, {
error: err.message,
inboxType,
collectionName,
objectId,
},
'Will not Delete object: Signature mismatch' 'Will not Delete object: Signature mismatch'
); );
return nextObjInfo(null); return nextObjInfo(null);
@ -535,6 +544,8 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
return nextObjInfo(null); return nextObjInfo(null);
} }
); );
}
);
case Collections.Actors: case Collections.Actors:
// Validate signature; Delete Actor and Following entries if any // Validate signature; Delete Actor and Following entries if any
@ -590,13 +601,29 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
}); });
} }
_isSignatureValid(request, object) { _verifyObjectOwner(httpSigValidated, object, activity, cb) {
// :TODO: We need to validate signatures here -- this is no good if (httpSigValidated) {
// https://github.com/transmute-industries/RsaSignature2017 // owner signed
return ( return cb(null);
request.type === object.type && request.creator === object.creator }
//&&
// request.signatureValue === object.signatureValue const creator = activity.signature?.creator;
if (creator !== `${object.actor}#main-key`) {
return cb(Errors.ValidationFailed('Creator mismatch'));
}
//
// We can't fetch an Actor for deleted Actors, so
// we're left with a basic comparison (above)
//
if (object.type === 'Actor') {
return cb(null);
}
return cb(
Errors.ValidationFailed(
'Object does not appear to be owned by calling Activity'
)
); );
} }
@ -701,6 +728,8 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
} }
_validateActorSignature(actor, signature) { _validateActorSignature(actor, signature) {
// :TODO: If we stop enforcing HTTP signatures, we can check LD sigs here
const pubKey = actor.publicKey; const pubKey = actor.publicKey;
if (!_.isObject(pubKey)) { if (!_.isObject(pubKey)) {
this.log.debug('Expected object of "pubKey"'); this.log.debug('Expected object of "pubKey"');
@ -779,27 +808,6 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
}); });
} }
// _inboxDeleteActivityMutator(inboxType, resp, objectType, targetObjectId) {
// Collection.removeById(inboxType, targetObjectId, err => {
// if (err) {
// return this.webServer.internalServerError(resp, err);
// }
// this.log.info(
// {
// inboxType,
// objectId: targetObjectId,
// objectType,
// },
// `${objectType} Deleted`
// );
// // :TODO: we need to DELETE the existing stored Message object if this is a Note
// return this.webServer.accepted(resp);
// });
// }
_inboxUpdateObjectMutator(inboxType, resp, objectType, targetObjectId, activity) { _inboxUpdateObjectMutator(inboxType, resp, objectType, targetObjectId, activity) {
Collection.updateCollectionEntry(inboxType, targetObjectId, activity, err => { Collection.updateCollectionEntry(inboxType, targetObjectId, activity, err => {
if (err) { if (err) {