@ -14,7 +14,7 @@ import { BatchRequests } from './batchRequest';
import { SnodePool } from './snodePool' ; import { SnodePool } from './snodePool' ;
import { StringUtils , UserUtils } from '../../utils' ; import { StringUtils , UserUtils } from '../../utils' ;
import { ed25519Str , fromBase64ToArray , fromHexToArray } from '../../utils/String' ; import { ed25519Str , fromBase64ToArray , fromHexToArray } from '../../utils/String' ;
import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface' ;
export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.' ; export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.' ;
@ -30,124 +30,111 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
async ( ) = > {
async ( ) = > {
const snodeToMakeRequestTo = await SnodePool . getNodeFromSwarmOrThrow ( usPk ) ;
const snodeToMakeRequestTo = await SnodePool . getNodeFromSwarmOrThrow ( usPk ) ;
const builtRequest = await request . buildAndSignParameters ( ) ; // we need the timestamp to verify the signature below
const builtRequest = await request . buildAndSignParameters ( ) ; // we need the timestamp to verify the signature below
return pRetry (
const ret = await BatchRequests . doSnodeBatchRequestNoRetries (
async ( ) = > {
[ builtRequest ] ,
const ret = await BatchRequests . doSnodeBatchRequestNoRetries (
snodeToMakeRequestTo ,
[ builtRequest ] ,
10000 ,
snodeToMakeRequestTo ,
usPk ,
10000 ,
false
usPk ,
) ;
false
) ;
if ( ! ret || ! ret ? . [ 0 ] . body || ret [ 0 ] . code !== 200 ) {
if ( ! ret || ! ret ? . [ 0 ] . body || ret [ 0 ] . code !== 200 ) {
throw new Error (
throw new Error (
` Empty response got for ${ request . method } on snode ${ ed25519Str (
` Empty response got for ${ request . method } on snode ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
snodeToMakeRequestTo . pubkey_ed25519
) } `
) } `
) ;
) ;
}
}
try {
const firstResultParsedBody = ret [ 0 ] . body ;
const { swarm } = firstResultParsedBody ;
if ( ! swarm ) {
throw new Error (
` Invalid JSON swarm response got for ${ request . method } on snode ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } , $ { firstResultParsedBody } `
) ;
}
const swarmAsArray = Object . entries ( swarm ) as Array < Array < any > > ;
if ( ! swarmAsArray . length ) {
throw new Error (
` Invalid JSON swarmAsArray response got for ${ request . method } on snode ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } , $ { firstResultParsedBody } `
) ;
}
// results will only contains the snode pubkeys which returned invalid/empty results
const results : Array < string > = compact (
swarmAsArray . map ( snode = > {
const snodePubkey = snode [ 0 ] ;
const snodeJson = snode [ 1 ] ;
const isFailed = snodeJson . failed || false ;
if ( isFailed ) {
const reason = snodeJson . reason ;
const statusCode = snodeJson . code ;
if ( reason && statusCode ) {
window ? . log ? . warn (
` Could not ${ request . method } from ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } due to error : $ { reason } : $ { statusCode } `
) ;
// if we tried to make the delete on a snode not in our swarm, just trigger a pRetry error so the outer block here finds new snodes to make the request to.
if ( statusCode === 421 ) {
throw new pRetry . AbortError (
` 421 error on network ${ request . method } . Retrying with a new snode `
) ;
}
} else {
window ? . log ? . warn (
` Could not ${ request . method } from ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } `
) ;
}
return snodePubkey ;
}
const deletedObj = snodeJson . deleted as Record < number , Array < string > > ;
try {
const hashes : Array < string > = [ ] ;
const firstResultParsedBody = ret [ 0 ] . body ;
const { swarm } = firstResultParsedBody ;
for ( const key in deletedObj ) {
if ( ! swarm ) {
if ( deletedObj . hasOwnProperty ( key ) ) {
throw new Error (
hashes . push ( . . . deletedObj [ key ] ) ;
` Invalid JSON swarm response got for ${ request . method } on snode ${ ed25519Str (
}
snodeToMakeRequestTo . pubkey_ed25519
}
) } , $ { firstResultParsedBody } `
const sortedHashes = hashes . sort ( ) ;
) ;
const signatureSnode = snodeJson . signature as string ;
}
// The signature format is (with sortedHashes accross all namespaces) ( PUBKEY_HEX || TIMESTAMP || DELETEDHASH[0] || ... || DELETEDHASH[N] )
const swarmAsArray = Object . entries ( swarm ) as Array < Array < any > > ;
const dataToVerify = ` ${ usPk } ${ builtRequest . params . timestamp } ${ sortedHashes . join ( '' ) } ` ;
if ( ! swarmAsArray . length ) {
throw new Error (
const dataToVerifyUtf8 = StringUtils . encode ( dataToVerify , 'utf8' ) ;
` Invalid JSON swarmAsArray response got for ${ request . method } on snode ${ ed25519Str (
const isValid = sodium . crypto_sign_verify_detached (
snodeToMakeRequestTo . pubkey_ed25519
fromBase64ToArray ( signatureSnode ) ,
) } , $ { firstResultParsedBody } `
new Uint8Array ( dataToVerifyUtf8 ) ,
) ;
fromHexToArray ( snodePubkey )
}
// results will only contains the snode pubkeys which returned invalid/empty results
const results : Array < string > = compact (
swarmAsArray . map ( snode = > {
const snodePubkey = snode [ 0 ] ;
const snodeJson = snode [ 1 ] ;
const isFailed = snodeJson . failed || false ;
if ( isFailed ) {
const reason = snodeJson . reason ;
const statusCode = snodeJson . code ;
if ( reason && statusCode ) {
window ? . log ? . warn (
` Could not ${ request . method } from ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } due to error : $ { reason } : $ { statusCode } `
) ;
) ;
if ( ! isValid ) {
// if we tried to make the delete on a snode not in our swarm, just trigger a pRetry error so the outer block here finds new snodes to make the request to.
return snodePubkey ;
if ( statusCode === 421 ) {
throw new pRetry . AbortError (
` 421 error on network ${ request . method } . Retrying with a new snode `
) ;
}
}
return null ;
} else {
} )
window ? . log ? . warn (
) ;
` Could not ${ request . method } from ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } `
) ;
}
return snodePubkey ;
}
return results ;
const deletedObj = snodeJson . deleted as Record < number , Array < string > > ;
} catch ( e ) {
const hashes : Array < string > = [ ] ;
throw new Error (
` Invalid JSON response got for ${ request . method } on snode ${ ed25519Str (
for ( const key in deletedObj ) {
snodeToMakeRequestTo . pubkey_ed25519
if ( deletedObj . hasOwnProperty ( key ) ) {
) } , $ { ret } `
hashes . push ( . . . deletedObj [ key ] ) ;
) ;
}
}
}
} ,
const sortedHashes = hashes . sort ( ) ;
{
const signatureSnode = snodeJson . signature as string ;
retries : 3 ,
// The signature format is (with sortedHashes accross all namespaces) ( PUBKEY_HEX || TIMESTAMP || DELETEDHASH[0] || ... || DELETEDHASH[N] )
minTimeout : SnodeAPI.TEST_getMinTimeout ( ) ,
const dataToVerify = ` ${ usPk } ${ builtRequest . params . timestamp } ${ sortedHashes . join ( '' ) } ` ;
onFailedAttempt : e = > {
window ? . log ? . warn (
const dataToVerifyUtf8 = StringUtils . encode ( dataToVerify , 'utf8' ) ;
` ${ request . method } INNER request attempt # ${ e . attemptNumber } failed. ${ e . retriesLeft } retries left... `
const isValid = sodium . crypto_sign_verify_detached (
fromBase64ToArray ( signatureSnode ) ,
new Uint8Array ( dataToVerifyUtf8 ) ,
fromHexToArray ( snodePubkey )
) ;
) ;
} ,
if ( ! isValid ) {
}
return snodePubkey ;
) ;
}
return null ;
} )
) ;
return results ;
} catch ( e ) {
throw new Error (
` Invalid JSON response got for ${ request . method } on snode ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } , $ { ret } `
) ;
}
} ,
} ,
{
{
retries : 3 ,
retries : 5 ,
minTimeout : SnodeAPI.TEST_getMinTimeout ( ) ,
minTimeout : SnodeAPI.TEST_getMinTimeout ( ) ,
onFailedAttempt : e = > {
onFailedAttempt : e = > {
window ? . log ? . warn (
window ? . log ? . warn (
@ -167,141 +154,120 @@ const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
const TEST_getMinTimeout = ( ) = > 500 ; const TEST_getMinTimeout = ( ) = > 500 ;
/ * * / * *
* Locally deletes message and deletes message on the network ( all nodes that contain the message )
* Delete the specified message hashes from the our own swarm only .
* Note : legacy group did not support removing messages from the swarm .
* /
* /
const networkDeleteMessage s = async ( const networkDeleteMessage OurSwarm = async (
messagesHashes : Array < string > ,
messagesHashes : Array < string > ,
pubkey : PubkeyType | GroupPubkeyType
pubkey : PubkeyType
) : Promise < boolean > = > { ) : Promise < boolean > = > {
const sodium = await getSodiumRenderer ( ) ;
const sodium = await getSodiumRenderer ( ) ;
if ( PubKey . is05Pubkey ( pubkey ) && pubkey !== UserUtils . getOurPubKeyStrFromCache ( ) ) {
if ( ! PubKey . is05Pubkey ( pubkey ) || pubkey !== UserUtils . getOurPubKeyStrFromCache ( ) ) {
throw new Error ( 'networkDeleteMessage s with 05 pk can only delete for ourself ') ;
throw new Error ( 'networkDeleteMessage OurSwarm with 05 pk can only for our own swarm ') ;
}
}
const request = PubKey . is03Pubkey ( pubkey )
const request = new DeleteHashesFromUserNodeSubRequest ( { messagesHashes } ) ;
? new DeleteHashesFromGroupNodeSubRequest ( { messagesHashes , groupPk : pubkey } )
: new DeleteHashesFromUserNodeSubRequest ( { messagesHashes } ) ;
try {
try {
const success = await pRetry (
const success = await pRetry (
async ( ) = > {
async ( ) = > {
const snodeToMakeRequestTo = await SnodePool . getNodeFromSwarmOrThrow ( request . pubkey ) ;
const snodeToMakeRequestTo = await SnodePool . getNodeFromSwarmOrThrow ( request . pubkey ) ;
return pRetry (
const ret = await BatchRequests . doUnsignedSnodeBatchRequestNoRetries (
async ( ) = > {
[ request ] ,
const ret = await BatchRequests . doUnsignedSnodeBatchRequestNoRetries (
snodeToMakeRequestTo ,
[ request ] ,
10000 ,
snodeToMakeRequestTo ,
request . pubkey ,
10000 ,
false
request . pubkey ,
) ;
false
if ( ! ret || ! ret ? . [ 0 ] . body || ret [ 0 ] . code !== 200 ) {
throw new Error (
` networkDeleteMessageOurSwarm: Empty response got for ${ request . method } on snode ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } about pk : $ { ed25519Str ( request . pubkey ) } `
) ;
}
try {
const firstResultParsedBody = ret [ 0 ] . body ;
const { swarm } = firstResultParsedBody ;
if ( ! swarm ) {
throw new Error (
` networkDeleteMessageOurSwarm: Invalid JSON swarm response got for ${ request . method } on snode ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } , $ { firstResultParsedBody } `
) ;
) ;
debugger ;
}
const swarmAsArray = Object . entries ( swarm ) as Array < Array < any > > ;
if ( ! swarmAsArray . length ) {
throw new Error (
` networkDeleteMessageOurSwarm: Invalid JSON swarmAsArray response got for ${ request . method } on snode ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } , $ { firstResultParsedBody } `
) ;
}
// results will only contains the snode pubkeys which returned invalid/empty results
const results : Array < string > = compact (
swarmAsArray . map ( snode = > {
const snodePubkey = snode [ 0 ] ;
const snodeJson = snode [ 1 ] ;
if ( ! ret || ! ret ? . [ 0 ] . body || ret [ 0 ] . code !== 200 ) {
const isFailed = snodeJson . failed || false ;
throw new Error (
` Empty response got for ${ request . method } on snode ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } about pk : $ { ed25519Str ( request . pubkey ) } `
) ;
}
try {
const firstResultParsedBody = ret [ 0 ] . body ;
const { swarm } = firstResultParsedBody ;
if ( ! swarm ) {
throw new Error (
` Invalid JSON swarm response got for ${ request . method } on snode ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } , $ { firstResultParsedBody } `
) ;
}
const swarmAsArray = Object . entries ( swarm ) as Array < Array < any > > ;
if ( ! swarmAsArray . length ) {
throw new Error (
` Invalid JSON swarmAsArray response got for ${ request . method } on snode ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } , $ { firstResultParsedBody } `
) ;
}
// results will only contains the snode pubkeys which returned invalid/empty results
const results : Array < string > = compact (
swarmAsArray . map ( snode = > {
const snodePubkey = snode [ 0 ] ;
const snodeJson = snode [ 1 ] ;
const isFailed = snodeJson . failed || false ;
if ( isFailed ) {
const reason = snodeJson . reason ;
const statusCode = snodeJson . code ;
if ( reason && statusCode ) {
window ? . log ? . warn (
` Could not ${ request . method } from ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } due to error : $ { reason } : $ { statusCode } `
) ;
// if we tried to make the delete on a snode not in our swarm, just trigger a pRetry error so the outer block here finds new snodes to make the request to.
if ( statusCode === 421 ) {
throw new pRetry . AbortError (
` 421 error on network ${ request . method } . Retrying with a new snode `
) ;
}
} else {
window ? . log ? . warn (
` Could not ${ request . method } from ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } `
) ;
}
return snodePubkey ;
}
const responseHashes = snodeJson . deleted as Array < string > ;
if ( isFailed ) {
const signatureSnode = snodeJson . signature as string ;
const reason = snodeJson . reason ;
// The signature looks like ( PUBKEY_HEX || RMSG[0] || ... || RMSG[N] || DMSG[0] || ... || DMSG[M] )
const statusCode = snodeJson . code ;
const dataToVerify = ` ${ request . pubkey } ${ messagesHashes . join (
if ( reason && statusCode ) {
''
window ? . log ? . warn (
) } $ { responseHashes . join ( '' ) } ` ;
` networkDeleteMessageOurSwarm: Could not ${ request . method } from ${ ed25519Str (
const dataToVerifyUtf8 = StringUtils . encode ( dataToVerify , 'utf8' ) ;
snodeToMakeRequestTo . pubkey_ed25519
const isValid = sodium . crypto_sign_verify_detached (
) } due to error : $ { reason } : $ { statusCode } `
fromBase64ToArray ( signatureSnode ) ,
new Uint8Array ( dataToVerifyUtf8 ) ,
fromHexToArray ( snodePubkey )
) ;
) ;
if ( ! isValid ) {
} else {
return snodePubkey ;
window ? . log ? . warn (
}
` networkDeleteMessageOurSwarm: Could not ${ request . method } from ${ ed25519Str (
return null ;
snodeToMakeRequestTo . pubkey_ed25519
} )
) } `
) ;
) ;
}
return snodePubkey ;
}
return isEmpty ( results ) ;
const responseHashes = snodeJson . deleted as Array < string > ;
} catch ( e ) {
const signatureSnode = snodeJson . signature as string ;
throw new Error (
// The signature looks like ( PUBKEY_HEX || RMSG[0] || ... || RMSG[N] || DMSG[0] || ... || DMSG[M] )
` Invalid JSON response got for ${ request . method } on snode ${ ed25519Str (
const dataToVerify = ` ${ request . pubkey } ${ messagesHashes . join (
snodeToMakeRequestTo . pubkey_ed25519
''
) } , $ { ret } `
) } $ { responseHashes . join ( '' ) } ` ;
) ;
const dataToVerifyUtf8 = StringUtils . encode ( dataToVerify , 'utf8' ) ;
}
const isValid = sodium . crypto_sign_verify_detached (
} ,
fromBase64ToArray ( signatureSnode ) ,
{
new Uint8Array ( dataToVerifyUtf8 ) ,
retries : 3 ,
fromHexToArray ( snodePubkey )
minTimeout : SnodeAPI.TEST_getMinTimeout ( ) ,
onFailedAttempt : e = > {
window ? . log ? . warn (
` ${ request . method } INNER request attempt # ${ e . attemptNumber } failed. ${ e . retriesLeft } retries left... `
) ;
) ;
} ,
if ( ! isValid ) {
}
return snodePubkey ;
) ;
}
return null ;
} )
) ;
return isEmpty ( results ) ;
} catch ( e ) {
throw new Error (
` networkDeleteMessageOurSwarm: Invalid JSON response got for ${ request . method } on snode ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } , $ { ret } `
) ;
}
} ,
} ,
{
{
retries : 3 ,
retries : 5 ,
minTimeout : SnodeAPI.TEST_getMinTimeout ( ) ,
minTimeout : SnodeAPI.TEST_getMinTimeout ( ) ,
onFailedAttempt : e = > {
onFailedAttempt : e = > {
window ? . log ? . warn (
window ? . log ? . warn (
` ${ request . method } OUTER request attempt # ${ e . attemptNumber } failed. ${ e . retriesLeft } retries left... ${ e . message } `
` networkDeleteMessageOurSwarm: ${ request . method } request attempt # ${ e . attemptNumber } failed. ${ e . retriesLeft } retries left... ${ e . message } `
) ;
) ;
} ,
} ,
}
}
@ -309,13 +275,85 @@ const networkDeleteMessages = async (
return success ;
return success ;
} catch ( e ) {
} catch ( e ) {
window ? . log ? . warn ( ` failed to ${ request . method } message on network: ` , e ) ;
window ? . log ? . warn (
` networkDeleteMessageOurSwarm: failed to ${ request . method } message on network: ` ,
e
) ;
return false ;
}
} ;
/ * *
* Delete the specified message hashes from the 03 - group ' s swarm .
* Returns true when the hashes have been removed successufuly .
* Returns false when
* - we don ' t have the secretKey
* - if one of the hash was already not present in the swarm ,
* - if the request failed too many times
* /
const networkDeleteMessagesForGroup = async (
messagesHashes : Array < string > ,
groupPk : GroupPubkeyType
) : Promise < boolean > = > {
if ( ! PubKey . is03Pubkey ( groupPk ) ) {
throw new Error ( 'networkDeleteMessagesForGroup with 05 pk can only delete for ourself' ) ;
}
const group = await UserGroupsWrapperActions . getGroup ( groupPk ) ;
if ( ! group || ! group . secretKey || isEmpty ( group . secretKey ) ) {
window . log . warn (
` networkDeleteMessagesForGroup: not deleting from swarm of 03-group ${ messagesHashes . length } hashes as we do not the adminKey `
) ;
return false ;
}
try {
const request = new DeleteHashesFromGroupNodeSubRequest ( {
messagesHashes ,
groupPk ,
secretKey : group.secretKey ,
} ) ;
await pRetry (
async ( ) = > {
const snodeToMakeRequestTo = await SnodePool . getNodeFromSwarmOrThrow ( request . pubkey ) ;
const ret = await BatchRequests . doUnsignedSnodeBatchRequestNoRetries (
[ request ] ,
snodeToMakeRequestTo ,
10000 ,
request . pubkey ,
false
) ;
if ( ! ret || ! ret ? . [ 0 ] . body || ret [ 0 ] . code !== 200 ) {
throw new Error (
` networkDeleteMessagesForGroup: Empty response got for ${ request . method } on snode ${ ed25519Str (
snodeToMakeRequestTo . pubkey_ed25519
) } about pk : $ { ed25519Str ( request . pubkey ) } `
) ;
}
} ,
{
retries : 5 ,
minTimeout : SnodeAPI.TEST_getMinTimeout ( ) ,
onFailedAttempt : e = > {
window ? . log ? . warn (
` networkDeleteMessagesForGroup: ${ request . method } request attempt # ${ e . attemptNumber } failed. ${ e . retriesLeft } retries left... ${ e . message } `
) ;
} ,
}
) ;
return true ;
} catch ( e ) {
window ? . log ? . warn ( ` networkDeleteMessagesForGroup: failed to delete messages on network: ` , e ) ;
return false ;
return false ;
}
}
} ; } ;
export const SnodeAPI = { export const SnodeAPI = {
TEST_getMinTimeout ,
TEST_getMinTimeout ,
networkDeleteMessages ,
networkDeleteMessagesForGroup ,
networkDeleteMessageOurSwarm ,
forceNetworkDeletion ,
forceNetworkDeletion ,
} ; } ;
Audric Ackermann
12 months ago