@ -972,6 +972,18 @@ extension Attachment {
// MARK: - U p l o a d // MARK: - U p l o a d
extension Attachment { extension Attachment {
public enum Destination {
case fileServer
case openGroup ( OpenGroup )
var shouldEncrypt : Bool {
switch self {
case . fileServer : return true
case . openGroup : return false
}
}
}
public static func prepare ( _ db : Database , attachments : [ SignalAttachment ] , for interactionId : Int64 ) throws {
public static func prepare ( _ db : Database , attachments : [ SignalAttachment ] , for interactionId : Int64 ) throws {
// P r e p a r e a n y a t t a c h m e n t s
// P r e p a r e a n y a t t a c h m e n t s
try attachments . enumerated ( )
try attachments . enumerated ( )
@ -979,7 +991,7 @@ extension Attachment {
let maybeAttachment : Attachment ? = Attachment (
let maybeAttachment : Attachment ? = Attachment (
variant : ( signalAttachment . isVoiceMessage ?
variant : ( signalAttachment . isVoiceMessage ?
. voiceMessage :
. voiceMessage :
. standard
. standard
) ,
) ,
contentType : signalAttachment . mimeType ,
contentType : signalAttachment . mimeType ,
dataSource : signalAttachment . dataSource ,
dataSource : signalAttachment . dataSource ,
@ -1001,176 +1013,160 @@ extension Attachment {
}
}
internal func upload (
internal func upload (
_ db : Database ? = nil ,
to destination : Attachment . Destination ,
queue : DispatchQueue ,
queue : DispatchQueue
using upload : @ escaping ( Database , Data ) -> AnyPublisher < String , Error > ,
) -> AnyPublisher < String ? , Error > {
encrypt : Bool ,
success : ( ( String ? ) -> Void ) ? ,
failure : ( ( Error ) -> Void ) ?
) {
// T h i s c a n o c c u r i f a n A t t a c h m n e t U p l o a d J o b w a s e x p l i c i t l y c r e a t e d f o r a m e s s a g e
// T h i s c a n o c c u r i f a n A t t a c h m n e t U p l o a d J o b w a s e x p l i c i t l y c r e a t e d f o r a m e s s a g e
// d e p e n d a n t o n t h e a t t a c h m e n t b e i n g u p l o a d e d ( i n t h i s c a s e t h e a t t a c h m e n t h a s
// d e p e n d a n t o n t h e a t t a c h m e n t b e i n g u p l o a d e d ( i n t h i s c a s e t h e a t t a c h m e n t h a s
// a l r e a d y b e e n u p l o a d e d s o j u s t s u c c e e d )
// a l r e a d y b e e n u p l o a d e d s o j u s t s u c c e e d )
guard state != . uploaded else {
guard state != . uploaded else {
success ? ( Attachment . fileId ( for : self . downloadUrl ) )
return Just ( Attachment . fileId ( for : self . downloadUrl ) )
return
. setFailureType ( to : Error . self )
. eraseToAnyPublisher ( )
}
}
// G e t t h e a t t a c h m e n t
// G e t t h e a t t a c h m e n t
guard var data = try ? readDataFromFile ( ) else {
guard var data = try ? readDataFromFile ( ) else {
SNLog ( " Couldn't read attachment from disk. " )
SNLog ( " Couldn't read attachment from disk. " )
failure ? ( AttachmentError . noAttachment )
return Fail ( error : AttachmentError . noAttachment )
return
. eraseToAnyPublisher ( )
}
}
let attachmentId : String = self . id
let attachmentId : String = self . id
// I f t h e a t t a c h m e n t i s a d o w n l o a d e d a t t a c h m e n t , c h e c k i f i t c a m e f r o m t h e s e r v e r
return Storage . shared
// a n d i f s o j u s t s u c c e e d i m m e d i a t e l y ( n o u s e r e - u p l o a d i n g a n a t t a c h m e n t t h a t i s
. writePublisherFlatMap { db -> AnyPublisher < ( String ? , Data ? , Data ? ) , Error > in
// a l r e a d y p r e s e n t o n t h e s e r v e r ) - o r i f w e w a n t i t t o b e e n c r y p t e d a n d i t ' s n o t
// I f t h e a t t a c h m e n t i s a d o w n l o a d e d a t t a c h m e n t , c h e c k i f i t c a m e f r o m
// t h e n e n c r y p t i t
// t h e s e r v e r a n d i f s o j u s t s u c c e e d i m m e d i a t e l y ( n o u s e r e - u p l o a d i n g
//
// a n a t t a c h m e n t t h a t i s a l r e a d y p r e s e n t o n t h e s e r v e r ) - o r i f w e w a n t
// N o t e : T h e m o s t c o m m o n c a s e s f o r t h i s w i l l b e f o r L i n k P r e v i e w s o r Q u o t e s
// i t t o b e e n c r y p t e d a n d i t ' s n o t t h e n e n c r y p t i t
guard
//
state != . downloaded ||
// N o t e : T h e m o s t c o m m o n c a s e s f o r t h i s w i l l b e f o r L i n k P r e v i e w s o r Q u o t e s
serverId = = nil ||
guard
downloadUrl = = nil ||
state != . downloaded ||
! encrypt ||
serverId = = nil ||
encryptionKey = = nil ||
downloadUrl = = nil ||
digest = = nil
! destination . shouldEncrypt ||
else {
encryptionKey = = nil ||
// S a v e t h e f i n a l u p l o a d i n f o
digest = = nil
let uploadedAttachment : Attachment ? = {
else {
guard let db : Database = db else {
// S a v e t h e f i n a l u p l o a d i n f o
Storage . shared . write { db in
_ = try ? Attachment
try ? Attachment
. filter ( id : attachmentId )
. filter ( id : attachmentId )
. updateAll ( db , Attachment . Columns . state . set ( to : Attachment . State . uploaded ) )
. updateAll ( db , Attachment . Columns . state . set ( to : Attachment . State . uploaded ) )
return Just ( ( Attachment . fileId ( for : self . downloadUrl ) , nil , nil ) )
. setFailureType ( to : Error . self )
. eraseToAnyPublisher ( )
}
var encryptionKey : NSData = NSData ( )
var digest : NSData = NSData ( )
// E n c r y p t t h e a t t a c h m e n t i f n e e d e d
if destination . shouldEncrypt {
guard let ciphertext = Cryptography . encryptAttachmentData ( data , shouldPad : true , outKey : & encryptionKey , outDigest : & digest ) else {
SNLog ( " Couldn't encrypt attachment. " )
return Fail ( error : AttachmentError . encryptionFailed )
. eraseToAnyPublisher ( )
}
}
return self . with ( state : . uploaded )
data = ciphertext
}
// C h e c k t h e f i l e s i z e
SNLog ( " File size: \( data . count ) bytes. " )
if Double ( data . count ) > Double ( FileServerAPI . maxFileSize ) / FileServerAPI . fileSizeORMultiplier {
return Fail ( error : HTTPError . maxFileSizeExceeded )
. eraseToAnyPublisher ( )
}
}
// U p d a t e t h e a t t a c h m e n t t o t h e ' u p l o a d i n g ' s t a t e
_ = try ? Attachment
_ = try ? Attachment
. filter ( id : attachmentId )
. filter ( id : attachmentId )
. updateAll ( db , Attachment . Columns . state . set ( to : Attachment . State . uploaded ) )
. updateAll ( db , Attachment . Columns . state . set ( to : Attachment . State . upload ing ) )
return self . with ( state : . uploaded )
switch destination {
} ( )
case . openGroup ( let openGroup ) :
return OpenGroupAPI
guard uploadedAttachment != nil else {
. uploadFile (
SNLog ( " Couldn't update attachmentUpload job. " )
db ,
failure ? ( StorageError . failedToSave )
bytes : data . bytes ,
return
to : openGroup . roomToken ,
}
on : openGroup . server
)
success ? ( Attachment . fileId ( for : self . downloadUrl ) )
. map { _ , response -> ( String , Data ? , Data ? ) in
return
(
}
response . id ,
( destination . shouldEncrypt ? encryptionKey as Data : nil ) ,
var processedAttachment : Attachment = self
( destination . shouldEncrypt ? digest as Data : nil )
)
// E n c r y p t t h e a t t a c h m e n t i f n e e d e d
}
if encrypt {
. eraseToAnyPublisher ( )
var encryptionKey : NSData = NSData ( )
var digest : NSData = NSData ( )
case . fileServer :
// / * * N o t e : * * F i l e S e r v e r u p l o a d s d o n ' t n e e d d a t a b a s e a c c e s s s o
guard let ciphertext = Cryptography . encryptAttachmentData ( data , shouldPad : true , outKey : & encryptionKey , outDigest : & digest ) else {
return Just ( (
SNLog ( " Couldn't encrypt attachment. " )
nil ,
failure ? ( AttachmentError . encryptionFailed )
( destination . shouldEncrypt ? encryptionKey as Data : nil ) ,
return
( destination . shouldEncrypt ? digest as Data : nil )
) )
. setFailureType ( to : Error . self )
. eraseToAnyPublisher ( )
}
}
}
. flatMap { maybeFileId , encryptionKey , digest -> AnyPublisher < ( String ? , Data ? , Data ? ) , Error > in
processedAttachment = processedAttachment . with (
switch destination {
encryptionKey : encryptionKey as Data ,
case . openGroup :
digest : digest as Data
// / * * N o t e : * * O p e n G r o u p u p l o a d s n e e d d a t a b a s e a c c e s s s o t h i s s h o u l d
)
// / h a v e a l r e a d y b e e n u p l o a d e d
data = ciphertext
return Just ( ( maybeFileId , encryptionKey , digest ) )
}
. setFailureType ( to : Error . self )
. eraseToAnyPublisher ( )
// C h e c k t h e f i l e s i z e
SNLog ( " File size: \( data . count ) bytes. " )
case . fileServer :
if Double ( data . count ) > Double ( FileServerAPI . maxFileSize ) / FileServerAPI . fileSizeORMultiplier {
return FileServerAPI . upload ( data )
failure ? ( HTTP . Error . maxFileSizeExceeded )
. map { response -> ( String , Data ? , Data ? ) in ( response . id , encryptionKey , digest ) }
return
. eraseToAnyPublisher ( )
}
// U p d a t e t h e a t t a c h m e n t t o t h e ' u p l o a d i n g ' s t a t e
let updatedAttachment : Attachment ? = {
guard let db : Database = db else {
Storage . shared . write { db in
try ? Attachment
. filter ( id : attachmentId )
. updateAll ( db , Attachment . Columns . state . set ( to : Attachment . State . uploading ) )
}
}
return processedAttachment . with ( state : . uploading )
}
}
. flatMap { fileId , encryptionKey , digest -> AnyPublisher < String ? , Error > in
_ = try ? Attachment
// / S a v e t h e f i n a l u p l o a d i n f o
. filter ( id : attachmentId )
// /
. updateAll ( db , Attachment . Columns . state . set ( to : Attachment . State . uploading ) )
// / * * N o t e : * * W e * * M U S T * * u s e t h e ` . w i t h ` f u n c t i o n h e r e t o e n s u r e t h e ` i s V a l i d ` f l a g i s
// / u p d a t e d c o r r e c t l y
return processedAttachment . with ( state : . uploading )
Storage . shared
} ( )
. writePublisher { db in
try self
guard updatedAttachment != nil else {
. with (
SNLog ( " Couldn't update attachmentUpload job. " )
serverId : fileId ,
failure ? ( StorageError . failedToSave )
state : . uploaded ,
return
creationTimestamp : (
}
self . creationTimestamp ? ?
Date ( ) . timeIntervalSince1970
// P e r f o r m t h e u p l o a d
) ,
let uploadPublisher : AnyPublisher < String , Error > = {
downloadUrl : fileId . map { " \( FileServerAPI . server ) /file/ \( $0 ) " } ,
guard let db : Database = db else {
encryptionKey : encryptionKey ,
return Storage . shared . readPublisherFlatMap { db in upload ( db , data ) }
digest : digest
)
. saved ( db )
}
. map { _ in fileId }
. eraseToAnyPublisher ( )
}
}
. handleEvents (
return upload ( db , data )
} ( )
uploadPublisher
. sinkUntilComplete (
receiveCompletion : { result in
receiveCompletion : { result in
switch result {
switch result {
case . finished : break
case . finished : break
case . failure (let error ) :
case . failure :
Storage . shared . write { db in
Storage . shared . write { db in
try Attachment
try Attachment
. filter ( id : attachmentId )
. filter ( id : attachmentId )
. updateAll ( db , Attachment . Columns . state . set ( to : Attachment . State . failedUpload ) )
. updateAll ( db , Attachment . Columns . state . set ( to : Attachment . State . failedUpload ) )
}
}
failure ? ( error )
}
}
} ,
receiveValue : { fileId in
// / S a v e t h e f i n a l u p l o a d i n f o
// /
// / * * N o t e : * * W e * * M U S T * * u s e t h e ` . w i t h ` f u n c t i o n h e r e t o e n s u r e t h e ` i s V a l i d ` f l a g i s
// / u p d a t e d c o r r e c t l y
let uploadedAttachment : Attachment ? = Storage . shared . write { db in
try updatedAttachment ?
. with (
serverId : " \( fileId ) " ,
state : . uploaded ,
creationTimestamp : (
updatedAttachment ? . creationTimestamp ? ?
Date ( ) . timeIntervalSince1970
) ,
downloadUrl : " \( FileServerAPI . server ) /files/ \( fileId ) "
)
. saved ( db )
}
guard uploadedAttachment != nil else {
SNLog ( " Couldn't update attachmentUpload job. " )
failure ? ( StorageError . failedToSave )
return
}
success ? ( fileId )
}
}
)
)
. eraseToAnyPublisher ( )
}
}
} }
Morgan Pretty
2 years ago