Merge pull request 'support for file resumption' (#402) from filey into master

Reviewed-on: #402

functionality/filesharing/filesharing_functionality.go

@@ -2,19 +2,21 @@ package filesharing
 
 import (
 	"crypto/rand"
-	"cwtch.im/cwtch/model"
-	"cwtch.im/cwtch/model/attr"
-	"cwtch.im/cwtch/peer"
-	"cwtch.im/cwtch/protocol/files"
 	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"git.openprivacy.ca/openprivacy/log"
 	"io"
 	"math"
 	path "path/filepath"
 	"strconv"
+	"time"
+
+	"cwtch.im/cwtch/model"
+	"cwtch.im/cwtch/model/attr"
+	"cwtch.im/cwtch/peer"
+	"cwtch.im/cwtch/protocol/files"
+	"git.openprivacy.ca/openprivacy/log"
 )
 
 // Functionality groups some common UI triggered functions for contacts...
@@ -41,12 +43,11 @@ type OverlayMessage struct {
 // DownloadFile given a profile, a conversation handle and a file sharing key, start off a download process
 // to downloadFilePath
 func (f *Functionality) DownloadFile(profile peer.CwtchPeer, handle string, downloadFilePath string, manifestFilePath string, key string) {
-
 	// Store local.filesharing.filekey.manifest as the location of the manifest
 	profile.SetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fmt.Sprintf("%s.manifest", key), manifestFilePath)
 
-	// Store local.filesharing.filekey as the location of the download
-	profile.SetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, key, downloadFilePath)
+	// Store local.filesharing.filekey.path as the location of the download
+	profile.SetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fmt.Sprintf("%s.path", key), downloadFilePath)
 
 	// Get the value of conversation.filesharing.filekey.manifest.size from `handle`
 	profile.SendScopedZonedGetValToContact(handle, attr.ConversationScope, attr.FilesharingZone, fmt.Sprintf("%s.manifest.size", key))
@@ -89,6 +90,9 @@ func (f *Functionality) ShareFile(filepath string, profile peer.CwtchPeer, handl
 	// manifest.FileName gets redacted in filesharing_subsystem (to remove the system-specific file hierarchy),
 	// but we need to *store* the full path because the sender also uses it to locate the file
 	lenDiff := len(filepath) - len(path.Base(filepath))
+
+	profile.SetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fmt.Sprintf("%s.ts", key), strconv.FormatInt(time.Now().Unix(), 10))
+	profile.SetScopedZonedAttribute(attr.ConversationScope, attr.FilesharingZone, fmt.Sprintf("%s.manifest", key), string(serializedManifest))
 	profile.SetScopedZonedAttribute(attr.ConversationScope, attr.FilesharingZone, fmt.Sprintf("%s.manifest.size", key), strconv.Itoa(int(math.Ceil(float64(len(serializedManifest)-lenDiff)/float64(files.DefaultChunkSize)))))
 
 	profile.ShareFile(key, string(serializedManifest))

peer/cwtch_peer.go

@@ -1,7 +1,6 @@
 package peer
 
 import (
-	"cwtch.im/cwtch/model/constants"
 	"encoding/base32"
 	"encoding/base64"
 	"encoding/json"
@@ -13,6 +12,8 @@ import (
 	"sync"
 	"time"
 
+	"cwtch.im/cwtch/model/constants"
+
 	"cwtch.im/cwtch/event"
 	"cwtch.im/cwtch/model"
 	"cwtch.im/cwtch/model/attr"
@@ -28,7 +29,7 @@ var autoHandleableEvents = map[event.Type]bool{event.EncryptedGroupMessage: true
 	event.ServerStateChange: true, event.NewGroupInvite: true, event.NewMessageFromPeer: true,
 	event.PeerAcknowledgement: true, event.PeerError: true, event.SendMessageToPeerError: true, event.SendMessageToGroupError: true,
 	event.NewGetValMessageFromPeer: true, event.NewRetValMessageFromPeer: true, event.ProtocolEngineStopped: true, event.RetryServerRequest: true,
-	event.ManifestSizeReceived: true, event.ManifestReceived: true}
+	event.ManifestSizeReceived: true, event.ManifestReceived: true, event.FileDownloaded: true}
 
 // DefaultEventsToHandle specifies which events will be subscribed to
 //  when a peer has its Init() function called
@@ -787,6 +788,13 @@ func (cp *cwtchPeer) storeMessage(onion string, messageTxt string, sent time.Tim
 }
 
 func (cp *cwtchPeer) ShareFile(fileKey string, serializedManifest string) {
+	tsStr, exists := cp.GetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fmt.Sprintf("%s.ts", fileKey))
+	if exists {
+		ts, err := strconv.ParseInt(tsStr, 10, 64)
+		if err != nil || ts < time.Now().Unix()-2592000 {
+			log.Errorf("ignoring request to download a file offered more than 30 days ago")
+		}
+	}
 	cp.eventBus.Publish(event.NewEvent(event.ShareManifest, map[event.Field]string{event.FileKey: fileKey, event.SerializedManifest: serializedManifest}))
 }
 
@@ -879,6 +887,14 @@ func (cp *cwtchPeer) eventHandler() {
 						val, exists = cp.GetScopedZonedAttribute(attr.PublicScope, attr.ProfileZone, constants.Name)
 					}
 
+					if exists && zone == attr.FilesharingZone && strings.HasSuffix(zpath, ".manifest.size") {
+						fileKey := strings.TrimSuffix(zpath, ".manifest.size")
+						serializedManifest, exists2 := cp.GetScopedZonedAttribute(attr.ConversationScope, attr.FilesharingZone, fmt.Sprintf("%s.manifest", fileKey))
+						if exists2 {
+							cp.ShareFile(fileKey, serializedManifest)
+						}
+					}
+
 					resp := event.NewEvent(event.SendRetValMessageToPeer, map[event.Field]string{event.RemotePeer: onion, event.Exists: strconv.FormatBool(exists)})
 					resp.EventID = ev.EventID
 					if exists {
@@ -902,7 +918,7 @@ func (cp *cwtchPeer) eventHandler() {
 
 			manifestFilePath, exists := cp.GetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fmt.Sprintf("%v.manifest", fileKey))
 			if exists {
-				downloadFilePath, exists := cp.GetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fileKey)
+				downloadFilePath, exists := cp.GetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fmt.Sprintf("%v.path", fileKey))
 				if exists {
 					log.Debugf("downloading manifest to %v, file to %v", manifestFilePath, downloadFilePath)
 					var manifest files.Manifest
@@ -937,7 +953,9 @@ func (cp *cwtchPeer) eventHandler() {
 			} else {
 				log.Errorf("no download path found for manifest: %v", fileKey)
 			}
-
+		case event.FileDownloaded:
+			fileKey := ev.Data[event.FileKey]
+			cp.SetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fmt.Sprintf("%s.complete", fileKey), "true")
 		case event.NewRetValMessageFromPeer:
 			onion := ev.Data[event.RemotePeer]
 			scope := ev.Data[event.Scope]