mirror of https://gitlab.com/bashrc2/epicyon
flake8 format
parent
2f8d97701a
commit
dfb1263f1a
147
delete.py
147
delete.py
|
|
@ -6,10 +6,7 @@ __maintainer__="Bob Mottram"
|
|||
__email__ = "bob@freedombone.net"
|
||||
__status__ = "Production"
|
||||
|
||||
import os
|
||||
import json
|
||||
from utils import getStatusNumber
|
||||
from utils import createOutboxDir
|
||||
from utils import urlPermitted
|
||||
from utils import getNicknameFromActor
|
||||
from utils import getDomainFromActor
|
||||
|
|
@ -22,12 +19,13 @@ from webfinger import webfingerHandle
|
|||
from auth import createBasicAuthHeader
|
||||
from posts import getPersonBox
|
||||
|
||||
def createDelete(session,baseDir: str,federationList: [], \
|
||||
nickname: str, domain: str, port: int, \
|
||||
toUrl: str, ccUrl: str, httpPrefix: str, \
|
||||
objectUrl: str,clientToServer: bool, \
|
||||
sendThreads: [],postLog: [], \
|
||||
personCache: {},cachedWebfingers: {}, \
|
||||
|
||||
def createDelete(session, baseDir: str, federationList: [],
|
||||
nickname: str, domain: str, port: int,
|
||||
toUrl: str, ccUrl: str, httpPrefix: str,
|
||||
objectUrl: str, clientToServer: bool,
|
||||
sendThreads: [], postLog: [],
|
||||
personCache: {}, cachedWebfingers: {},
|
||||
debug: bool) -> {}:
|
||||
"""Creates a delete message
|
||||
Typically toUrl will be https://www.w3.org/ns/activitystreams#Public
|
||||
|
|
@ -48,11 +46,12 @@ def createDelete(session,baseDir: str,federationList: [], \
|
|||
|
||||
statusNumber, published = getStatusNumber()
|
||||
newDeleteId = \
|
||||
httpPrefix+'://'+fullDomain+'/users/'+nickname+'/statuses/'+statusNumber
|
||||
httpPrefix + '://' + fullDomain + '/users/' + \
|
||||
nickname + '/statuses/' + statusNumber
|
||||
newDelete = {
|
||||
"@context": "https://www.w3.org/ns/activitystreams",
|
||||
'actor': httpPrefix+'://'+fullDomain+'/users/'+nickname,
|
||||
'atomUri': httpPrefix+'://'+fullDomain+'/users/'+nickname+'/statuses/'+statusNumber,
|
||||
'atomUri': newDeleteId,
|
||||
'cc': [],
|
||||
'id': newDeleteId + '/activity',
|
||||
'object': objectUrl,
|
||||
|
|
@ -74,20 +73,22 @@ def createDelete(session,baseDir: str,federationList: [], \
|
|||
deleteDomain, deletePort = getDomainFromActor(objectUrl)
|
||||
|
||||
if deleteNickname and deleteDomain:
|
||||
sendSignedJson(newDelete,session,baseDir, \
|
||||
nickname,domain,port, \
|
||||
deleteNickname,deleteDomain,deletePort, \
|
||||
'https://www.w3.org/ns/activitystreams#Public', \
|
||||
httpPrefix,True,clientToServer,federationList, \
|
||||
sendThreads,postLog,cachedWebfingers,personCache,debug)
|
||||
sendSignedJson(newDelete, session, baseDir,
|
||||
nickname, domain, port,
|
||||
deleteNickname, deleteDomain, deletePort,
|
||||
'https://www.w3.org/ns/activitystreams#Public',
|
||||
httpPrefix, True, clientToServer, federationList,
|
||||
sendThreads, postLog, cachedWebfingers,
|
||||
personCache, debug)
|
||||
|
||||
return newDelete
|
||||
|
||||
def sendDeleteViaServer(baseDir: str,session, \
|
||||
fromNickname: str,password: str, \
|
||||
fromDomain: str,fromPort: int, \
|
||||
httpPrefix: str,deleteObjectUrl: str, \
|
||||
cachedWebfingers: {},personCache: {}, \
|
||||
|
||||
def sendDeleteViaServer(baseDir: str, session,
|
||||
fromNickname: str, password: str,
|
||||
fromDomain: str, fromPort: int,
|
||||
httpPrefix: str, deleteObjectUrl: str,
|
||||
cachedWebfingers: {}, personCache: {},
|
||||
debug: bool, projectVersion: str) -> {}:
|
||||
"""Creates a delete request message via c2s
|
||||
"""
|
||||
|
|
@ -101,12 +102,14 @@ def sendDeleteViaServer(baseDir: str,session, \
|
|||
if ':' not in fromDomain:
|
||||
fromDomainFull = fromDomain + ':' + str(fromPort)
|
||||
|
||||
actor = httpPrefix + '://' + fromDomainFull + \
|
||||
'/users/' + fromNickname
|
||||
toUrl = 'https://www.w3.org/ns/activitystreams#Public'
|
||||
ccUrl=httpPrefix+'://'+fromDomainFull+'/users/'+fromNickname+'/followers'
|
||||
ccUrl = actor + '/followers'
|
||||
|
||||
newDeleteJson = {
|
||||
"@context": "https://www.w3.org/ns/activitystreams",
|
||||
'actor': httpPrefix+'://'+fromDomainFull+'/users/'+fromNickname,
|
||||
'actor': actor,
|
||||
'cc': [ccUrl],
|
||||
'object': deleteObjectUrl,
|
||||
'to': [toUrl],
|
||||
|
|
@ -117,7 +120,7 @@ def sendDeleteViaServer(baseDir: str,session, \
|
|||
|
||||
# lookup the inbox for the To handle
|
||||
wfRequest = \
|
||||
webfingerHandle(session,handle,httpPrefix,cachedWebfingers, \
|
||||
webfingerHandle(session, handle, httpPrefix, cachedWebfingers,
|
||||
fromDomain, projectVersion)
|
||||
if not wfRequest:
|
||||
if debug:
|
||||
|
|
@ -127,9 +130,11 @@ def sendDeleteViaServer(baseDir: str,session, \
|
|||
postToBox = 'outbox'
|
||||
|
||||
# get the actor inbox for the To handle
|
||||
inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName= \
|
||||
getPersonBox(baseDir,session,wfRequest,personCache, \
|
||||
projectVersion,httpPrefix,fromNickname, \
|
||||
(inboxUrl, pubKeyId, pubKey,
|
||||
fromPersonId, sharedInbox,
|
||||
capabilityAcquisition, avatarUrl,
|
||||
displayName) = getPersonBox(baseDir, session, wfRequest, personCache,
|
||||
projectVersion, httpPrefix, fromNickname,
|
||||
fromDomain, postToBox)
|
||||
|
||||
if not inboxUrl:
|
||||
|
|
@ -144,27 +149,28 @@ def sendDeleteViaServer(baseDir: str,session, \
|
|||
authHeader = createBasicAuthHeader(fromNickname, password)
|
||||
|
||||
headers = {
|
||||
'host': fromDomain, \
|
||||
'Content-type': 'application/json', \
|
||||
'host': fromDomain,
|
||||
'Content-type': 'application/json',
|
||||
'Authorization': authHeader
|
||||
}
|
||||
postResult = \
|
||||
postJson(session, newDeleteJson, [], inboxUrl, headers, "inbox:write")
|
||||
#if not postResult:
|
||||
# if debug:
|
||||
# print('DEBUG: POST announce failed for c2s to '+inboxUrl)
|
||||
# return 5
|
||||
if not postResult:
|
||||
if debug:
|
||||
print('DEBUG: POST announce failed for c2s to ' + inboxUrl)
|
||||
return 5
|
||||
|
||||
if debug:
|
||||
print('DEBUG: c2s POST delete request success')
|
||||
|
||||
return newDeleteJson
|
||||
|
||||
def deletePublic(session,baseDir: str,federationList: [], \
|
||||
nickname: str, domain: str, port: int, httpPrefix: str, \
|
||||
objectUrl: str,clientToServer: bool, \
|
||||
sendThreads: [],postLog: [], \
|
||||
personCache: {},cachedWebfingers: {}, \
|
||||
|
||||
def deletePublic(session, baseDir: str, federationList: [],
|
||||
nickname: str, domain: str, port: int, httpPrefix: str,
|
||||
objectUrl: str, clientToServer: bool,
|
||||
sendThreads: [], postLog: [],
|
||||
personCache: {}, cachedWebfingers: {},
|
||||
debug: bool) -> {}:
|
||||
"""Makes a public delete activity
|
||||
"""
|
||||
|
|
@ -175,22 +181,24 @@ def deletePublic(session,baseDir: str,federationList: [], \
|
|||
fromDomain = domain + ':' + str(port)
|
||||
|
||||
toUrl = 'https://www.w3.org/ns/activitystreams#Public'
|
||||
ccUrl=httpPrefix+'://'+fromDomain+'/users/'+nickname+'/followers'
|
||||
return createDelete(session,baseDir,federationList, \
|
||||
nickname,domain,port, \
|
||||
toUrl,ccUrl,httpPrefix, \
|
||||
objectUrl,clientToServer, \
|
||||
sendThreads,postLog, \
|
||||
personCache,cachedWebfingers, \
|
||||
ccUrl = httpPrefix + '://' + fromDomain + \
|
||||
'/users/' + nickname + '/followers'
|
||||
return createDelete(session, baseDir, federationList,
|
||||
nickname, domain, port,
|
||||
toUrl, ccUrl, httpPrefix,
|
||||
objectUrl, clientToServer,
|
||||
sendThreads, postLog,
|
||||
personCache, cachedWebfingers,
|
||||
debug)
|
||||
|
||||
def deletePostPub(session,baseDir: str,federationList: [], \
|
||||
nickname: str, domain: str, port: int, httpPrefix: str, \
|
||||
deleteNickname: str, deleteDomain: str, \
|
||||
deletePort: int, deleteHttpsPrefix: str, \
|
||||
deleteStatusNumber: int,clientToServer: bool, \
|
||||
sendThreads: [],postLog: [], \
|
||||
personCache: {},cachedWebfingers: {}, \
|
||||
|
||||
def deletePostPub(session, baseDir: str, federationList: [],
|
||||
nickname: str, domain: str, port: int, httpPrefix: str,
|
||||
deleteNickname: str, deleteDomain: str,
|
||||
deletePort: int, deleteHttpsPrefix: str,
|
||||
deleteStatusNumber: int, clientToServer: bool,
|
||||
sendThreads: [], postLog: [],
|
||||
personCache: {}, cachedWebfingers: {},
|
||||
debug: bool) -> {}:
|
||||
"""Deletes a given status post
|
||||
"""
|
||||
|
|
@ -204,15 +212,16 @@ def deletePostPub(session,baseDir: str,federationList: [], \
|
|||
deleteHttpsPrefix + '://' + deletedDomain + '/users/' + \
|
||||
deleteNickname + '/statuses/' + str(deleteStatusNumber)
|
||||
|
||||
return deletePublic(session,baseDir,federationList, \
|
||||
nickname,domain,port,httpPrefix, \
|
||||
objectUrl,clientToServer, \
|
||||
sendThreads,postLog, \
|
||||
personCache,cachedWebfingers, \
|
||||
return deletePublic(session, baseDir, federationList,
|
||||
nickname, domain, port, httpPrefix,
|
||||
objectUrl, clientToServer,
|
||||
sendThreads, postLog,
|
||||
personCache, cachedWebfingers,
|
||||
debug)
|
||||
|
||||
def outboxDelete(baseDir: str,httpPrefix: str, \
|
||||
nickname: str,domain: str, \
|
||||
|
||||
def outboxDelete(baseDir: str, httpPrefix: str,
|
||||
nickname: str, domain: str,
|
||||
messageJson: {}, debug: bool,
|
||||
allowDeletion: bool) -> None:
|
||||
""" When a delete request is received by the outbox from c2s
|
||||
|
|
@ -236,9 +245,9 @@ def outboxDelete(baseDir: str,httpPrefix: str, \
|
|||
if debug:
|
||||
print('DEBUG: c2s delete request arrived in outbox')
|
||||
deletePrefix = httpPrefix + '://' + domain
|
||||
if not allowDeletion and \
|
||||
(not messageJson['object'].startswith(deletePrefix) or \
|
||||
not messageJson['actor'].startswith(deletePrefix)):
|
||||
if (not allowDeletion and
|
||||
(not messageJson['object'].startswith(deletePrefix) or
|
||||
not messageJson['actor'].startswith(deletePrefix))):
|
||||
if debug:
|
||||
print('DEBUG: delete not permitted from other instances')
|
||||
return
|
||||
|
|
@ -256,22 +265,26 @@ def outboxDelete(baseDir: str,httpPrefix: str, \
|
|||
deleteNickname = getNicknameFromActor(messageId)
|
||||
if deleteNickname != nickname:
|
||||
if debug:
|
||||
print("DEBUG: you can't delete a post which wasn't created by you (nickname does not match)")
|
||||
print("DEBUG: you can't delete a post which " +
|
||||
"wasn't created by you (nickname does not match)")
|
||||
return
|
||||
deleteDomain, deletePort = getDomainFromActor(messageId)
|
||||
if ':' in domain:
|
||||
domain = domain.split(':')[0]
|
||||
if deleteDomain != domain:
|
||||
if debug:
|
||||
print("DEBUG: you can't delete a post which wasn't created by you (domain does not match)")
|
||||
print("DEBUG: you can't delete a post which " +
|
||||
"wasn't created by you (domain does not match)")
|
||||
return
|
||||
removeModerationPostFromIndex(baseDir, messageId, debug)
|
||||
postFilename=locatePost(baseDir,deleteNickname,deleteDomain,messageId)
|
||||
postFilename = locatePost(baseDir, deleteNickname, deleteDomain,
|
||||
messageId)
|
||||
if not postFilename:
|
||||
if debug:
|
||||
print('DEBUG: c2s delete post not found in inbox or outbox')
|
||||
print(messageId)
|
||||
return True
|
||||
deletePost(baseDir,httpPrefix,deleteNickname,deleteDomain,postFilename,debug)
|
||||
deletePost(baseDir, httpPrefix, deleteNickname, deleteDomain,
|
||||
postFilename, debug)
|
||||
if debug:
|
||||
print('DEBUG: post deleted via c2s - ' + postFilename)
|
||||
|
|
|
|||
Loading…
Reference in New Issue