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

More updates on Deletes, ActivityPub ACS in menu

This commit is contained in:
Bryan Ashby 2023-02-27 13:03:27 -07:00
parent 65e5fa1b77
commit b0fff20a02
No known key found for this signature in database
GPG Key ID: C2C1B501E4EFD994
3 changed files with 84 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
art/themes/luciano_blocktronics/activitypub_not_enabled.ans Normal file
View File

Binary file not shown.

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

@ -505,14 +505,30 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
if (inboxType !== collectionName) {
this.log.warn(
{ inboxType, collectionName, objectId },
'Will not Delete object(s) from mismatched collection!'
'Will not Delete object: Collection mismatch'
);
return nextObjInfo(null);
}
// Validate signature
if (
!this._isSignatureEqual(
activity.signature,
objInfo.object.signature
)
) {
this.log.warn(
{ inboxType, collectionName, objectId },
'Will not Delete object: Signature mismatch'
);
return nextObjInfo(null);
}
break;
return this._deleteObjectWithStats(
collectionName,
objInfo.object,
stats,
nextObjInfo
);
case Collections.Actors:
// Validate signature; Delete Actor and Following entries if any
@ -526,21 +542,15 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
}
return nextObjInfo(null);
} else {
// it's unparsable, so we'll delete it
Collection.removeById(collectionName, objectId, err => {
if (err) {
this.log.warn(
{ objectId, collectionName },
'Failed to remove object'
}
// Malformed; we'll go ahead and remove
return this._deleteObjectWithStats(
collectionName,
objInfo.object,
stats,
nextObjInfo
);
stats.failed.push({ collectionName, objectId });
} else {
stats.deleted.push({ collectionName, objectId });
}
return nextObjInfo(null);
});
}
},
err => {
if (err) {
@ -556,6 +566,32 @@ exports.getModule = class ActivityPubWebHandler extends WebHandlerModule {
return this.webServer.accepted(resp);
}
_deleteObjectWithStats(collectionName, object, stats, cb) {
const objectId = _.isString(object) ? object : object.id;
const type = object.type;
Collection.removeById(collectionName, objectId, err => {
if (err) {
this.log.warn(
{ objectId, collectionName, type },
'Failed to remove object'
);
stats.failed.push({ collectionName, objectId, type });
} else {
stats.deleted.push({ collectionName, objectId, type });
}
return cb(null);
});
}
_isSignatureEqual(sigA, sigB) {
return (
sigA.type === sigB.type &&
sigA.creator === sigB.creator &&
sigA.signatureValue === sigB.signatureValue
);
}
_inboxFollowActivity(resp, remoteActor, activity) {
this.log.info(
{ remoteActorId: remoteActor.id, localActorId: activity.object },

35
misc/menu_templates/activitypub.in.hjson
View File

@ -3,20 +3,36 @@
activityPubMenu: {
desc: ActivityPub Menu
art: activitypub_menu
prompt: activiytPubMenuCommand
prompt: activityPubMenuCommand
submit: [
{
value: {command: "S"}
action: [
{
acs: "AE1"
action: @menu:activityPubActorSearch
}
{
action: @menu:activityPubNotEnabled
}
]
}
{
value: {command: "C"}
action: @menu:activityPubUserConfig
}
{
value: {command: "S"}
value: {command: "M"}
action: [
{
acs: "AE1"
action: @menu:activityPubSocialManager
}
{
action: @menu:activityPubNotEnabled
}
]
}
{
value: {command: "Q"}
action: @menu:mainMenu
@ -25,10 +41,6 @@
value: { command: "E" }
action: @menu:privateMailMenu
}
{
value: { command: "G" }
action: @menu:fullLogoffSequence
}
]
}
@ -82,6 +94,7 @@
}
}
}
activityPubUserConfig: {
desc: ActivityPub Config
module: ./activitypub/user_config
@ -174,6 +187,7 @@
}
}
}
activityPubSocialManager: {
desc: ActivityPub Social Manager
module: ./activitypub/social_manager
@ -207,6 +221,15 @@
}
}
}
activityPubNotEnabled: {
desc: ActivityPub Not Enabled
art: activitypub_not_enabled
config: {
cls: true
pause: true
}
}
}
prompts: {