protondrive: add whole-file differential tests
Files uploaded by the new client are read whole by the old library's readers, and files written by the old library (go-proton-api v1.0.4, Proton-API-Bridge v1.0.5), in the legacy and the v6 format, are downloaded by the new client through the fake server. Frozen fixtures of both formats keep the second direction tested once the old library is gone. protontest gains read-only access to a file as stored, seeding of a stored file, and users built from fixed address and root keys. It now signs no earlier than the signing key's creation time, which a key supplied by a test may be. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
dc7d977e17
commit
e76b6783b2
16 files changed
+683
-18
No files matched your search
@@ -7,11 +7,13 @@ package protondrive
|
||||
//
|
||||
// testdata/oldlib holds values written by the old library, so that they
|
||||
// stay readable once it is gone; TestFrozenFixtures, less its -update
|
||||
// branch, is all that need outlive it. Regenerate them with
|
||||
// branch, and TestFrozenFileFixture are all that need outlive it.
|
||||
// Regenerate them with
|
||||
//
|
||||
// go test ./backend/protondrive/ -run TestFrozenFixtures -update
|
||||
// go test ./backend/protondrive/ -run 'TestFrozenFixtures|TestOldLibraryFileReadable' -update
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"crypto/rand"
|
||||
"crypto/sha1"
|
||||
@@ -23,14 +25,17 @@ import (
|
||||
"flag"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/ProtonMail/go-crypto/openpgp/packet"
|
||||
"github.com/ProtonMail/gopenpgp/v3/constants"
|
||||
"github.com/ProtonMail/gopenpgp/v3/crypto"
|
||||
"github.com/ProtonMail/gopenpgp/v3/profile"
|
||||
"github.com/rclone/go-proton-api"
|
||||
"github.com/rclone/rclone/backend/protondrive/api"
|
||||
"github.com/rclone/rclone/backend/protondrive/protontest"
|
||||
"github.com/rclone/rclone/lib/rest"
|
||||
"github.com/relvacode/iso8601"
|
||||
@@ -200,21 +205,28 @@ func oldGenerateCryptoKey(t *testing.T, aead bool) (passphrase, armoredKey strin
|
||||
return passphrase, oldGenerateLockedKey(t, "Drive key", "noreply@protonmail.com", []byte(passphrase), aead)
|
||||
}
|
||||
|
||||
// oldGenerateNodeKeys mirrors generateNodeKeys and encryptWithSignature,
|
||||
// bridge crypto.go:93-135, also returning the passphrase, which the
|
||||
// bridge drops.
|
||||
// oldGenerateNodeKeys mirrors generateNodeKeys, bridge crypto.go:119-135,
|
||||
// also returning the passphrase, which the bridge drops.
|
||||
func oldGenerateNodeKeys(t *testing.T, kr, addrKR *crypto.KeyRing, aead bool) (passphrase, nodeKey, encPassphrase, passphraseSig string) {
|
||||
t.Helper()
|
||||
passphrase, nodeKey = oldGenerateCryptoKey(t, aead)
|
||||
enc, err := proton.EncryptMessageNonAead(kr, []byte(passphrase), nil)
|
||||
encPassphrase, passphraseSig = oldEncryptWithSignature(t, kr, addrKR, []byte(passphrase))
|
||||
return passphrase, nodeKey, encPassphrase, passphraseSig
|
||||
}
|
||||
|
||||
// oldEncryptWithSignature mirrors encryptWithSignature, bridge
|
||||
// crypto.go:88-117.
|
||||
func oldEncryptWithSignature(t *testing.T, kr, addrKR *crypto.KeyRing, b []byte) (enc, sig string) {
|
||||
t.Helper()
|
||||
msg, err := proton.EncryptMessageNonAead(kr, b, nil)
|
||||
require.NoError(t, err)
|
||||
encPassphrase, err = enc.Armor()
|
||||
enc, err = msg.Armor()
|
||||
require.NoError(t, err)
|
||||
sh, err := crypto.PGP().Sign().SigningKeys(addrKR).Detached().New()
|
||||
require.NoError(t, err)
|
||||
sig, err := sh.Sign([]byte(passphrase), crypto.Armor)
|
||||
rawSig, err := sh.Sign(b, crypto.Armor)
|
||||
require.NoError(t, err)
|
||||
return passphrase, nodeKey, encPassphrase, string(sig)
|
||||
return enc, string(rawSig)
|
||||
}
|
||||
|
||||
// oldEncryptBlock mirrors the block encryption of
|
||||
@@ -334,6 +346,156 @@ func writeOldLibFile(t *testing.T) oldLibFixture {
|
||||
return f
|
||||
}
|
||||
|
||||
// oldLibEmail is the address of the address key oldLibKeys generates.
|
||||
const oldLibEmail = "test@proton.test"
|
||||
|
||||
// oldBlockSize is UPLOAD_BLOCK_SIZE, bridge constants.go:6.
|
||||
const oldBlockSize = 4 << 20
|
||||
|
||||
// sdkFileKeys stands in for the client which created a crypto-refresh
|
||||
// file before the old library revised it: a node key advertising
|
||||
// SEIPDv2, locked with passphrase, and a v6 content key packet signed by
|
||||
// it, as the SDK's generateNodeKeys and generateContentKey write them.
|
||||
func sdkFileKeys(t *testing.T, passphrase string) (nodeKey, contentKeyPacket, contentKeyPacketSignature string) {
|
||||
t.Helper()
|
||||
p := profile.Default()
|
||||
p.AeadEncryption = &packet.AEADConfig{DefaultMode: packet.AEADModeGCM}
|
||||
key, err := crypto.PGPWithProfile(p).KeyGeneration().AddUserId("Drive key", "").New().GenerateKey()
|
||||
require.NoError(t, err)
|
||||
defer key.ClearPrivateParams()
|
||||
locked, err := crypto.PGP().LockKey(key, []byte(passphrase))
|
||||
require.NoError(t, err)
|
||||
nodeKey, err = locked.Armor()
|
||||
require.NoError(t, err)
|
||||
|
||||
token, err := crypto.RandomToken(32)
|
||||
require.NoError(t, err)
|
||||
sk := crypto.NewSessionKeyFromTokenWithAead(token, constants.AES256, true)
|
||||
eh, err := crypto.PGP().Encryption().Recipient(key).New()
|
||||
require.NoError(t, err)
|
||||
keyPacket, err := eh.EncryptSessionKey(sk)
|
||||
require.NoError(t, err)
|
||||
sh, err := crypto.PGP().Sign().SigningKey(key).Detached().New()
|
||||
require.NoError(t, err)
|
||||
sig, err := sh.Sign(sk.Key, crypto.Armor)
|
||||
require.NoError(t, err)
|
||||
return nodeKey, base64.StdEncoding.EncodeToString(keyPacket), string(sig)
|
||||
}
|
||||
|
||||
// writeOldLibStoredFile returns content stored as file name by the old
|
||||
// library, in a folder it created.
|
||||
//
|
||||
// Without v6 it is a new file, which the old library always writes in
|
||||
// the legacy format (bridge file_upload.go:87-257, 259-505). With v6 it
|
||||
// is the old library's revision of a crypto-refresh file, whose v6
|
||||
// content key selects SEIPDv2 blocks (bridge file_upload.go:229-252);
|
||||
// sdkFileKeys stands in for the node key and content key of the client
|
||||
// which created the file.
|
||||
func writeOldLibStoredFile(t *testing.T, name string, content []byte, modTime time.Time, v6 bool) frozenFile {
|
||||
t.Helper()
|
||||
keys, parentKR, addrKR := oldLibKeys(t)
|
||||
f := frozenFile{
|
||||
Comment: "File written by go-proton-api v1.0.4 and Proton-API-Bridge v1.0.5 with test-only keys, as stored by the server.",
|
||||
Email: oldLibEmail,
|
||||
Keys: protontest.FixedKeys{
|
||||
AddressKey: keys.AddressKey,
|
||||
AddressKeyPassphrase: keys.AddressKeyPassphrase,
|
||||
RootKey: keys.ParentKey,
|
||||
RootKeyPassphrase: keys.ParentKeyPassphrase,
|
||||
},
|
||||
Name: name,
|
||||
ModTime: modTime.Format("2006-01-02T15:04:05-0700"),
|
||||
Content: content,
|
||||
}
|
||||
|
||||
// The parent folder's hash key (bridge folder.go:83-136), read back
|
||||
// as the bridge does before creating a file in it.
|
||||
folder := proton.CreateFolderReq{}
|
||||
require.NoError(t, folder.SetNodeHashKey(parentKR))
|
||||
f.Keys.RootHashKey = folder.NodeHashKey
|
||||
verifyKR, err := joinKeyRings(addrKR, parentKR)
|
||||
require.NoError(t, err)
|
||||
hashKey, err := proton.Link{Type: proton.LinkTypeFolder, FolderProperties: &proton.FolderProperties{NodeHashKey: folder.NodeHashKey}}.GetHashKey(parentKR, verifyKR)
|
||||
require.NoError(t, err)
|
||||
|
||||
req := proton.CreateFileReq{MIMEType: "text/plain", SignatureAddress: oldLibEmail}
|
||||
var passphrase string
|
||||
if v6 {
|
||||
passphrase = oldGeneratePassphrase(t)
|
||||
req.NodeKey, req.ContentKeyPacket, req.ContentKeyPacketSignature = sdkFileKeys(t, passphrase)
|
||||
req.NodePassphrase, req.NodePassphraseSignature = oldEncryptWithSignature(t, parentKR, addrKR, []byte(passphrase))
|
||||
} else {
|
||||
passphrase, req.NodeKey, req.NodePassphrase, req.NodePassphraseSignature = oldGenerateNodeKeys(t, parentKR, addrKR, false)
|
||||
}
|
||||
require.NoError(t, req.SetName(name, addrKR, parentKR))
|
||||
require.NoError(t, req.SetHash(name, hashKey))
|
||||
nodeKR := unlockedKeyRing(t, req.NodeKey, passphrase)
|
||||
var sk *crypto.SessionKey
|
||||
if v6 {
|
||||
link := proton.Link{Type: proton.LinkTypeFile, FileProperties: &proton.FileProperties{ContentKeyPacket: req.ContentKeyPacket, ContentKeyPacketSignature: req.ContentKeyPacketSignature}}
|
||||
sk, err = link.GetSessionKey(nodeKR)
|
||||
} else {
|
||||
sk, err = req.SetContentKeyPacketAndSignature(nodeKR)
|
||||
}
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, v6, sk.IsV6())
|
||||
|
||||
// uploadAndCollectBlockData, bridge file_upload.go:259-426.
|
||||
var rev protontest.StoredRevision
|
||||
var manifest []byte
|
||||
blockSizes := make([]int64, 0)
|
||||
for i := 0; i < len(content); i += oldBlockSize {
|
||||
plain := content[i:min(i+oldBlockSize, len(content))]
|
||||
data, encSig, hash := oldEncryptBlock(t, plain, sk, nodeKR, addrKR)
|
||||
rev.Blocks = append(rev.Blocks, protontest.StoredBlock{Hash: hash, EncSignature: encSig, SignatureEmail: oldLibEmail, Data: data})
|
||||
manifest = append(manifest, hash...)
|
||||
blockSizes = append(blockSizes, int64(len(plain)))
|
||||
}
|
||||
|
||||
// commitNewRevision, bridge file_upload.go:429-458, with the
|
||||
// extended attributes of uploadFile, bridge file_upload.go:498-505.
|
||||
digest := sha1.Sum(content)
|
||||
commit := proton.CommitRevisionReq{ManifestSignature: oldSignManifest(t, manifest, addrKR), SignatureAddress: oldLibEmail}
|
||||
require.NoError(t, commit.SetEncXAttrString(addrKR, nodeKR, &proton.RevisionXAttrCommon{
|
||||
ModificationTime: f.ModTime,
|
||||
Size: int64(len(content)),
|
||||
BlockSizes: blockSizes,
|
||||
Digests: map[string]string{"SHA1": hex.EncodeToString(digest[:])},
|
||||
}))
|
||||
rev.ManifestSignature, rev.XAttr, rev.SignatureEmail = commit.ManifestSignature, commit.XAttr, commit.SignatureAddress
|
||||
|
||||
f.Stored = protontest.StoredFile{
|
||||
Link: protontest.StoredLink{
|
||||
Name: req.Name,
|
||||
NameHash: req.Hash,
|
||||
NodeKey: req.NodeKey,
|
||||
NodePassphrase: req.NodePassphrase,
|
||||
NodePassphraseSignature: req.NodePassphraseSignature,
|
||||
SignatureEmail: req.SignatureAddress,
|
||||
NameSignatureEmail: req.SignatureAddress,
|
||||
MediaType: req.MIMEType,
|
||||
ContentKeyPacket: req.ContentKeyPacket,
|
||||
ContentKeyPacketSignature: req.ContentKeyPacketSignature,
|
||||
},
|
||||
Revision: rev,
|
||||
}
|
||||
return f
|
||||
}
|
||||
|
||||
// saveFrozenFile writes f to dir, as loadFrozenFile reads it.
|
||||
func saveFrozenFile(t *testing.T, dir string, f frozenFile) {
|
||||
t.Helper()
|
||||
require.NoError(t, os.MkdirAll(dir, 0o755))
|
||||
for name, v := range frozenFileParts(&f) {
|
||||
data, err := json.MarshalIndent(v, "", "\t")
|
||||
require.NoError(t, err)
|
||||
require.NoError(t, os.WriteFile(filepath.Join(dir, name), append(data, '\n'), 0o644))
|
||||
}
|
||||
for i, b := range f.Stored.Revision.Blocks {
|
||||
require.NoError(t, os.WriteFile(filepath.Join(dir, blockFileName(i)), b.Data, 0o644))
|
||||
}
|
||||
}
|
||||
|
||||
// Old library readers.
|
||||
|
||||
// oldDecryptBlock mirrors decryptBlockIntoBuffer, bridge crypto.go:218-280.
|
||||
@@ -596,3 +758,103 @@ func TestFrozenFixtures(t *testing.T) {
|
||||
}
|
||||
assert.Equal(t, 2, n, "fixtures in %s", oldLibDir)
|
||||
}
|
||||
|
||||
func TestUploadReadableByOldLibraryCrypto(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
c, _, u := newUploadClient(t, clientOptions{})
|
||||
content := testContent(5<<20 + 3)
|
||||
n := uploadBytes(t, c, "Résumé – final.pdf", content)
|
||||
stored := u.StoredFile(n.ID)
|
||||
|
||||
// The account, share and root folder keys, unlocked by the old
|
||||
// library from the same responses.
|
||||
var user struct{ User proton.User }
|
||||
_, err := c.s.call(ctx, &rest.Opts{Method: "GET", Path: "/core/v4/users"}, nil, &user)
|
||||
require.NoError(t, err)
|
||||
var addrs struct{ Addresses []proton.Address }
|
||||
_, err = c.s.call(ctx, &rest.Opts{Method: "GET", Path: "/core/v4/addresses"}, nil, &addrs)
|
||||
require.NoError(t, err)
|
||||
var my api.MyFilesResponse
|
||||
_, err = c.s.call(ctx, &rest.Opts{Method: "GET", Path: "/drive/v2/shares/my-files"}, nil, &my)
|
||||
require.NoError(t, err)
|
||||
_, addrKRs, err := proton.Unlock(user.User, addrs.Addresses, []byte(u.KeyPassword()), nil)
|
||||
require.NoError(t, err)
|
||||
addrKR := addrKRs[my.Share.AddressID]
|
||||
require.NotNil(t, addrKR)
|
||||
require.Equal(t, u.Email(), stored.Link.SignatureEmail)
|
||||
shareKR, err := proton.Share{Key: my.Share.Key, Passphrase: my.Share.Passphrase, PassphraseSignature: my.Share.PassphraseSignature}.GetKeyRing(addrKR)
|
||||
require.NoError(t, err)
|
||||
root := my.Link.Link
|
||||
rootKR, err := proton.Link{NodeKey: root.NodeKey, NodePassphrase: root.NodePassphrase, NodePassphraseSignature: root.NodePassphraseSignature}.GetKeyRing(shareKR, addrKR)
|
||||
require.NoError(t, err)
|
||||
|
||||
// The file, read as DownloadFile and the block reader do (bridge
|
||||
// file_download.go:60-80, 100-125).
|
||||
link := proton.Link{
|
||||
Type: proton.LinkTypeFile,
|
||||
Name: stored.Link.Name,
|
||||
NodeKey: stored.Link.NodeKey,
|
||||
NodePassphrase: stored.Link.NodePassphrase,
|
||||
NodePassphraseSignature: stored.Link.NodePassphraseSignature,
|
||||
FileProperties: &proton.FileProperties{
|
||||
ContentKeyPacket: stored.Link.ContentKeyPacket,
|
||||
ContentKeyPacketSignature: stored.Link.ContentKeyPacketSignature,
|
||||
},
|
||||
}
|
||||
nodeKR, err := link.GetKeyRing(rootKR, addrKR)
|
||||
require.NoError(t, err)
|
||||
name, err := link.GetName(rootKR, addrKR)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, "Résumé – final.pdf", name)
|
||||
sk, err := link.GetSessionKey(nodeKR)
|
||||
require.NoError(t, err)
|
||||
blockVerifyKR, err := joinKeyRings(addrKR, nodeKR)
|
||||
require.NoError(t, err)
|
||||
require.Len(t, stored.Revision.Blocks, 2)
|
||||
var got, manifest []byte
|
||||
for i, b := range stored.Revision.Blocks {
|
||||
plain, err := oldDecryptBlock(sk, blockVerifyKR, nodeKR, base64.StdEncoding.EncodeToString(b.Hash), b.EncSignature, b.Data)
|
||||
require.NoError(t, err, "block %d", i+1)
|
||||
got = append(got, plain...)
|
||||
manifest = append(manifest, b.Hash...)
|
||||
}
|
||||
assert.True(t, bytes.Equal(content, got), "content differs")
|
||||
// The old library never checks the manifest; plain gopenpgp does.
|
||||
vh, err := crypto.PGP().Verify().VerificationKeys(addrKR).New()
|
||||
require.NoError(t, err)
|
||||
res, err := vh.VerifyDetached(manifest, []byte(stored.Revision.ManifestSignature), crypto.Armor)
|
||||
require.NoError(t, err)
|
||||
assert.NoError(t, res.SignatureError(), "manifest signature")
|
||||
|
||||
// Extended attributes, read as the bridge does (file.go:47-91).
|
||||
rev := proton.RevisionMetadata{XAttr: stored.Revision.XAttr}
|
||||
common, err := rev.GetDecXAttrString(addrKR, nodeKR)
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, common)
|
||||
assert.Equal(t, sha1Of(content), common.Digests["SHA1"])
|
||||
assert.Equal(t, int64(len(content)), common.Size)
|
||||
assert.Equal(t, []int64{4 << 20, 1<<20 + 3}, common.BlockSizes)
|
||||
modTime, err := iso8601.ParseString(common.ModificationTime)
|
||||
require.NoError(t, err)
|
||||
assert.True(t, testModTime.Equal(modTime), "%v", modTime)
|
||||
}
|
||||
|
||||
func TestOldLibraryFileReadable(t *testing.T) {
|
||||
modTime := time.Date(2023, 11, 20, 9, 30, 15, 0, time.FixedZone("", 5*3600+30*60))
|
||||
for _, format := range []string{"legacy", "v6"} {
|
||||
t.Run(format, func(t *testing.T) {
|
||||
v6 := format == "v6"
|
||||
for _, size := range []int{0, 2500, 5<<20 + 3} {
|
||||
t.Run(strconv.Itoa(size), func(t *testing.T) {
|
||||
checkFrozenFile(t, writeOldLibStoredFile(t, "Fichiers d'été.txt", testContent(size), modTime, v6))
|
||||
})
|
||||
}
|
||||
// A file of one block is frozen, as the larger one is too big
|
||||
// to keep.
|
||||
if *updateOldLib {
|
||||
f := writeOldLibStoredFile(t, "Résumé – final.txt", testContent(2500), modTime, v6)
|
||||
saveFrozenFile(t, filepath.Join(frozenFileDir, format), f)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -3,12 +3,15 @@ package protondrive
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/base64"
|
||||
"encoding/json"
|
||||
"io"
|
||||
"math"
|
||||
"math/rand/v2"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"strconv"
|
||||
"strings"
|
||||
@@ -17,6 +20,7 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/ProtonMail/go-crypto/openpgp/packet"
|
||||
"github.com/rclone/rclone/backend/protondrive/protontest"
|
||||
"github.com/rclone/rclone/lib/pool"
|
||||
"github.com/stretchr/testify/assert"
|
||||
@@ -594,3 +598,89 @@ func TestDownloadHostileBlockSizes(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// frozenFileDir holds files the old library (go-proton-api v1.0.4 and
|
||||
// Proton-API-Bridge v1.0.5) wrote, as the server stored them, one
|
||||
// directory per format: "legacy" (v3 PKESK content key, SEIPDv1 blocks)
|
||||
// and "v6" (v6 PKESK content key, SEIPDv2 blocks).
|
||||
const frozenFileDir = "testdata/oldlib/file"
|
||||
|
||||
// frozenFile is a file a client holding Keys stored, with what it
|
||||
// encrypted. In a directory, file.json holds it but Stored, which is
|
||||
// in link.json, revision.json and block-1.bin, block-2.bin...
|
||||
type frozenFile struct {
|
||||
Comment string
|
||||
Email string // address which signed everything, the owner's primary address
|
||||
Keys protontest.FixedKeys
|
||||
Name string
|
||||
ModTime string // as the writer recorded it in the extended attributes
|
||||
Content []byte
|
||||
Stored protontest.StoredFile `json:"-"`
|
||||
}
|
||||
|
||||
// frozenFileParts returns the names of the files of f in a directory
|
||||
// and the values they hold.
|
||||
func frozenFileParts(f *frozenFile) map[string]any {
|
||||
return map[string]any{"file.json": f, "link.json": &f.Stored.Link, "revision.json": &f.Stored.Revision}
|
||||
}
|
||||
|
||||
// blockFileName returns the name of the file holding block i, from 0.
|
||||
func blockFileName(i int) string {
|
||||
return "block-" + strconv.Itoa(i+1) + ".bin"
|
||||
}
|
||||
|
||||
// loadFrozenFile returns the file in dir.
|
||||
func loadFrozenFile(t *testing.T, dir string) frozenFile {
|
||||
t.Helper()
|
||||
var f frozenFile
|
||||
for name, v := range frozenFileParts(&f) {
|
||||
data, err := os.ReadFile(filepath.Join(dir, name))
|
||||
require.NoError(t, err)
|
||||
require.NoError(t, json.Unmarshal(data, v), name)
|
||||
}
|
||||
for i := range f.Stored.Revision.Blocks {
|
||||
data, err := os.ReadFile(filepath.Join(dir, blockFileName(i)))
|
||||
require.NoError(t, err)
|
||||
f.Stored.Revision.Blocks[i].Data = data
|
||||
}
|
||||
return f
|
||||
}
|
||||
|
||||
// checkFrozenFile stores f for a user holding its keys and checks that
|
||||
// the client reads its metadata, verifying every signature, and
|
||||
// downloads its content.
|
||||
func checkFrozenFile(t *testing.T, f frozenFile) {
|
||||
t.Helper()
|
||||
srv := protontest.New(t)
|
||||
u := srv.AddUserWithKeys(f.Email, "pass", f.Keys)
|
||||
c := newTestClientFor(t, srv, u, clientOptions{})
|
||||
n := getTestNode(t, c, u.SeedStoredFile(u.RootID(), f.Stored))
|
||||
assert.Equal(t, f.Name, n.Name)
|
||||
require.NotNil(t, n.X, "extended attributes")
|
||||
modTime, err := time.Parse("2006-01-02T15:04:05-0700", f.ModTime)
|
||||
require.NoError(t, err)
|
||||
assert.True(t, modTime.Equal(n.modTime()), "modification time %v, want %v", n.modTime(), modTime)
|
||||
assert.Equal(t, int64(len(f.Content)), n.size(true))
|
||||
assert.Equal(t, sha1Of(f.Content), n.sha1())
|
||||
data, err := readRange(t, c, n, 0, -1)
|
||||
require.NoError(t, err)
|
||||
assert.True(t, bytes.Equal(f.Content, data), "content differs: %d bytes, want %d", len(data), len(f.Content))
|
||||
assert.Empty(t, c.reported, "problems reported")
|
||||
}
|
||||
|
||||
func TestFrozenFileFixture(t *testing.T) {
|
||||
for format, want := range map[string]struct{ pkesk, seipd int }{"legacy": {3, 1}, "v6": {6, 2}} {
|
||||
t.Run(format, func(t *testing.T) {
|
||||
f := loadFrozenFile(t, filepath.Join(frozenFileDir, format))
|
||||
// The fixture is in the format its directory names.
|
||||
keyPacket, err := base64.StdEncoding.DecodeString(f.Stored.Link.ContentKeyPacket)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, want.pkesk, readPackets(t, keyPacket, 1)[0].(*packet.EncryptedKey).Version, "content key packet")
|
||||
require.NotEmpty(t, f.Stored.Revision.Blocks)
|
||||
for i, b := range f.Stored.Revision.Blocks {
|
||||
assert.Equal(t, want.seipd, readPackets(t, b.Data, 1)[0].(*packet.SymmetricallyEncrypted).Version, "block %d", i+1)
|
||||
}
|
||||
checkFrozenFile(t, f)
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -43,6 +43,13 @@ func signTime() int64 {
|
||||
return time.Now().Add(-24 * time.Hour).Unix()
|
||||
}
|
||||
|
||||
// signTimeOf returns when the fake signs with signer: signTime, or
|
||||
// signer's creation time if later, as for a key a test supplied which
|
||||
// was generated less than a day ago.
|
||||
func signTimeOf(signer *crypto.Key) int64 {
|
||||
return max(signTime(), signer.GetEntity().PrimaryKey.CreationTime.Unix())
|
||||
}
|
||||
|
||||
// newPassphrase returns base64 of 32 random bytes, the SDK's
|
||||
// generatePassphrase.
|
||||
func newPassphrase() []byte {
|
||||
@@ -101,7 +108,7 @@ func encryptArmored(data []byte, key, signer *crypto.Key, compress bool) string
|
||||
mustCrypto("encrypt session key", err)
|
||||
b := crypto.PGP().Encryption().SessionKey(sk)
|
||||
if signer != nil {
|
||||
b = b.SigningKey(signer).SignTime(signTime())
|
||||
b = b.SigningKey(signer).SignTime(signTimeOf(signer))
|
||||
}
|
||||
if compress {
|
||||
b = b.Compress()
|
||||
@@ -117,7 +124,7 @@ func encryptArmored(data []byte, key, signer *crypto.Key, compress bool) string
|
||||
|
||||
// signArmored returns an armored detached signature of data by signer.
|
||||
func signArmored(data []byte, signer *crypto.Key) string {
|
||||
sh, err := crypto.PGP().Sign().SigningKey(signer).Detached().SignTime(signTime()).New()
|
||||
sh, err := crypto.PGP().Sign().SigningKey(signer).Detached().SignTime(signTimeOf(signer)).New()
|
||||
mustCrypto("sign", err)
|
||||
sig, err := sh.Sign(data, crypto.Armor)
|
||||
mustCrypto("sign", err)
|
||||
@@ -126,7 +133,7 @@ func signArmored(data []byte, signer *crypto.Key) string {
|
||||
|
||||
// signBinary returns a binary detached signature of data by signer.
|
||||
func signBinary(data []byte, signer *crypto.Key) []byte {
|
||||
sh, err := crypto.PGP().Sign().SigningKey(signer).Detached().SignTime(signTime()).New()
|
||||
sh, err := crypto.PGP().Sign().SigningKey(signer).Detached().SignTime(signTimeOf(signer)).New()
|
||||
mustCrypto("sign", err)
|
||||
sig, err := sh.Sign(data, crypto.Bytes)
|
||||
mustCrypto("sign", err)
|
||||
|
||||
@@ -159,14 +159,20 @@ type download struct {
|
||||
// newDrive creates a volume, main share and root folder for addr as
|
||||
// the SDK's generateVolumeBootstrap does.
|
||||
func (s *Server) newDrive(addr *address) *drive {
|
||||
root := newDriveKey(false)
|
||||
_, hashKey := newHashKey(root.key)
|
||||
return s.newDriveWithRoot(addr, root, hashKey)
|
||||
}
|
||||
|
||||
// newDriveWithRoot is newDrive with the root folder's node key and
|
||||
// armored hash key given.
|
||||
func (s *Server) newDriveWithRoot(addr *address, root lockedKey, hashKey string) *drive {
|
||||
addrKey := addr.keys[0]
|
||||
share := newDriveKey(false)
|
||||
sharePass := sealPassphrase(share.passphrase, addrKey.key, addrKey.key)
|
||||
root := newDriveKey(false)
|
||||
s.rememberKey(share)
|
||||
s.rememberKey(root)
|
||||
rootPass := sealPassphrase(root.passphrase, share.key, addrKey.key)
|
||||
_, hashKey := newHashKey(root.key)
|
||||
return assembleDrive(addr.id, addrKey.id, addr.email, &createVolumeRequest{
|
||||
ShareKey: share.armored,
|
||||
SharePassphrase: sharePass.armored,
|
||||
|
||||
@@ -587,3 +587,38 @@ func TestSeedRevision(t *testing.T) {
|
||||
assert.True(t, bytes.Equal(content, d.Content), d.Path)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStoredFileRoundTrip(t *testing.T) {
|
||||
s := New(t)
|
||||
addrPass := newPassphrase()
|
||||
root := newDriveKey(false)
|
||||
_, hashKey := newHashKey(root.key)
|
||||
keys := FixedKeys{
|
||||
AddressKey: lockKey(generateKey("fixed", "fixed@proton.test"), addrPass),
|
||||
AddressKeyPassphrase: string(addrPass),
|
||||
RootKey: root.armored,
|
||||
RootKeyPassphrase: string(root.passphrase),
|
||||
RootHashKey: hashKey,
|
||||
}
|
||||
// Two users holding the same keys can read each other's stored files.
|
||||
one := s.AddUserWithKeys("one", "pass", keys)
|
||||
two := s.AddUserWithKeys("two", "pass", keys)
|
||||
content := patterned(blockSize + 5)
|
||||
id := one.SeedFile(one.RootID(), "f", content, time.Now())
|
||||
|
||||
f := one.StoredFile(id)
|
||||
assert.Equal(t, "one@proton.test", f.Link.SignatureEmail)
|
||||
require.Len(t, f.Revision.Blocks, 2)
|
||||
for _, b := range f.Revision.Blocks {
|
||||
sum := sha256.Sum256(b.Data)
|
||||
assert.Equal(t, sum[:], b.Hash)
|
||||
}
|
||||
two.SeedStoredFile(two.RootID(), f)
|
||||
for _, u := range []*User{one, two} {
|
||||
dump := u.Dump()
|
||||
require.Len(t, dump, 1)
|
||||
assert.NoError(t, dump[0].Err)
|
||||
assert.Equal(t, "f", dump[0].Path)
|
||||
assert.True(t, bytes.Equal(content, dump[0].Content))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,154 @@
|
||||
package protontest
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"time"
|
||||
|
||||
"github.com/ProtonMail/gopenpgp/v3/crypto"
|
||||
)
|
||||
|
||||
// StoredFile is a file node as the server stores it: the encrypted
|
||||
// metadata and content a client sent, with nothing decrypted.
|
||||
type StoredFile struct {
|
||||
Link StoredLink
|
||||
Revision StoredRevision // the active revision
|
||||
}
|
||||
|
||||
// StoredLink is the encrypted metadata of a file node.
|
||||
type StoredLink struct {
|
||||
Name string // armored, encrypted to the parent key
|
||||
NameHash string
|
||||
NodeKey string // armored, locked with the node passphrase
|
||||
NodePassphrase string // armored, encrypted to the parent key
|
||||
NodePassphraseSignature string
|
||||
SignatureEmail string
|
||||
NameSignatureEmail string
|
||||
MediaType string
|
||||
ContentKeyPacket string // base64
|
||||
ContentKeyPacketSignature string
|
||||
}
|
||||
|
||||
// StoredRevision is a revision of a file node.
|
||||
type StoredRevision struct {
|
||||
ManifestSignature string
|
||||
XAttr string // armored; empty if none
|
||||
SignatureEmail string
|
||||
Blocks []StoredBlock // in index order, from 1
|
||||
}
|
||||
|
||||
// StoredBlock is an encrypted block of a revision.
|
||||
type StoredBlock struct {
|
||||
Hash []byte // SHA-256 of Data
|
||||
EncSignature string
|
||||
SignatureEmail string
|
||||
Data []byte `json:"-"`
|
||||
}
|
||||
|
||||
// StoredFile returns file id with its active revision as stored. It
|
||||
// panics if id is not a file with an active revision.
|
||||
func (u *User) StoredFile(id string) StoredFile {
|
||||
u.srv.mu.Lock()
|
||||
defer u.srv.mu.Unlock()
|
||||
l := u.mustDriveLocked().links[id]
|
||||
if l == nil || l.typ != linkTypeFile {
|
||||
panic("protontest: no file " + id)
|
||||
}
|
||||
rev := l.activeRevision()
|
||||
if rev == nil {
|
||||
panic("protontest: file " + id + " has no active revision")
|
||||
}
|
||||
f := StoredFile{
|
||||
Link: StoredLink{
|
||||
Name: l.name,
|
||||
NameHash: l.nameHash,
|
||||
NodeKey: l.nodeKey,
|
||||
NodePassphrase: l.nodePass.armored,
|
||||
NodePassphraseSignature: l.nodePass.signature,
|
||||
SignatureEmail: l.signatureEmail,
|
||||
NameSignatureEmail: l.nameSignatureEmail,
|
||||
MediaType: l.mediaType,
|
||||
ContentKeyPacket: l.contentKeyPacket,
|
||||
ContentKeyPacketSignature: l.contentKeyPacketSignature,
|
||||
},
|
||||
Revision: StoredRevision{
|
||||
ManifestSignature: rev.manifestSignature,
|
||||
XAttr: rev.xattr,
|
||||
SignatureEmail: rev.signatureEmail,
|
||||
},
|
||||
}
|
||||
for _, b := range rev.blocks {
|
||||
f.Revision.Blocks = append(f.Revision.Blocks, StoredBlock{
|
||||
Hash: bytes.Clone(b.hash),
|
||||
EncSignature: b.encSignature,
|
||||
SignatureEmail: b.signatureEmail,
|
||||
Data: bytes.Clone(b.data),
|
||||
})
|
||||
}
|
||||
return f
|
||||
}
|
||||
|
||||
// SeedStoredFile creates a file in parentID from f, stored as given
|
||||
// without any check, and returns its ID. It panics as insertLink does.
|
||||
func (u *User) SeedStoredFile(parentID string, f StoredFile) (id string) {
|
||||
rev := &revision{
|
||||
id: randomID(),
|
||||
state: revisionStateActive,
|
||||
createTime: time.Now().Unix(),
|
||||
manifestSignature: f.Revision.ManifestSignature,
|
||||
xattr: f.Revision.XAttr,
|
||||
signatureEmail: f.Revision.SignatureEmail,
|
||||
}
|
||||
for i, b := range f.Revision.Blocks {
|
||||
rev.blocks = append(rev.blocks, &block{
|
||||
index: i + 1,
|
||||
hash: bytes.Clone(b.Hash),
|
||||
data: bytes.Clone(b.Data),
|
||||
encSignature: b.EncSignature,
|
||||
signatureEmail: b.SignatureEmail,
|
||||
})
|
||||
}
|
||||
return u.insertLink(parentID, &link{
|
||||
typ: linkTypeFile,
|
||||
name: f.Link.Name,
|
||||
nameHash: f.Link.NameHash,
|
||||
nodeKey: f.Link.NodeKey,
|
||||
nodePass: sealedPassphrase{armored: f.Link.NodePassphrase, signature: f.Link.NodePassphraseSignature},
|
||||
signatureEmail: f.Link.SignatureEmail,
|
||||
nameSignatureEmail: f.Link.NameSignatureEmail,
|
||||
mediaType: f.Link.MediaType,
|
||||
contentKeyPacket: f.Link.ContentKeyPacket,
|
||||
contentKeyPacketSignature: f.Link.ContentKeyPacketSignature,
|
||||
revisions: []*revision{rev},
|
||||
})
|
||||
}
|
||||
|
||||
// FixedKeys is key material for AddUserWithKeys, in place of keys the
|
||||
// fake would generate.
|
||||
type FixedKeys struct {
|
||||
AddressKey string // armored, locked with AddressKeyPassphrase
|
||||
AddressKeyPassphrase string
|
||||
RootKey string // armored root folder node key, locked with RootKeyPassphrase
|
||||
RootKeyPassphrase string
|
||||
RootHashKey string // armored root folder hash key, encrypted to the root key
|
||||
}
|
||||
|
||||
// AddUserWithKeys is AddUser with the primary address key and the root
|
||||
// folder's node key and hash key taken from keys, so that files stored
|
||||
// by a client holding those keys can be seeded with SeedStoredFile. The
|
||||
// user key and share key are generated as usual. It panics if a key
|
||||
// doesn't unlock.
|
||||
func (s *Server) AddUserWithKeys(username, password string, keys FixedKeys) *User {
|
||||
addrKey, err := crypto.NewPrivateKeyFromArmored(keys.AddressKey, []byte(keys.AddressKeyPassphrase))
|
||||
mustCrypto("unlock fixed address key", err)
|
||||
rootKey, err := crypto.NewPrivateKeyFromArmored(keys.RootKey, []byte(keys.RootKeyPassphrase))
|
||||
mustCrypto("unlock fixed root key", err)
|
||||
u := newUser(s, username, password, password)
|
||||
addr := u.addresses[0]
|
||||
k := addr.keys[0]
|
||||
k.passphrase, k.armored, k.key = []byte(keys.AddressKeyPassphrase), keys.AddressKey, addrKey
|
||||
k.sealPassphrase(u.keys[0])
|
||||
root := lockedKey{key: rootKey, passphrase: []byte(keys.RootKeyPassphrase), armored: keys.RootKey}
|
||||
u.drive = s.newDriveWithRoot(addr, root, keys.RootHashKey)
|
||||
s.addUser(u)
|
||||
return u
|
||||
}
|
||||
Binary file not shown.
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"Comment": "File written by go-proton-api v1.0.4 and Proton-API-Bridge v1.0.5 with test-only keys, as stored by the server.",
|
||||
"Email": "test@proton.test",
|
||||
"Keys": {
|
||||
"AddressKey": "-----BEGIN PGP PRIVATE KEY BLOCK-----\n\nxYYEavRvDRYJKwYBBAHaRw8BAQdAn9wJYMU3m+C4tvfsvhRU93tzuWRg310WMrdV\nsx2Kl4T+BwMICgcyih3EgXTgjvT1fS6rTeedqa5rUjieViZWwF1DULHxaKeQ/9NC\nip2/VVyd6BpmLjFxRS5lBVbtuNqclWyffNJB6PLi48PVdcRghoWirc0XdGVzdCA8\ndGVzdEBwcm90b24udGVzdD7CvwQTFggAcQWCavRvDQMLCQcJEDYqIcFTgR6HNRQA\nAAAAABwAEHNhbHRAbm90YXRpb25zLm9wZW5wZ3Bqcy5vcmdMNQHu/YNFFXJDfjYH\nttlIAhUIAxYAAgIZAQKbAwIeARYhBGxv8QxbcgWIUDOOgzYqIcFTgR6HAABfEgEA\n097HW3FEUM4p8QBfRygziST5G8Pdnta9qt/8K4FWp7YBAICE+ObxNiCrHaKFKw9N\n8ZtkygUpwLPa/9U/5jHp168Lx4sEavRvDRIKKwYBBAGXVQEFAQEHQCgylrutR9Kf\n40IBXiewlxsthm2s5Bb/Mf0WKds0xIgZAwEKCf4HAwgKBzKKHcSBdODoYR71RzME\nDPMye9wjrTDZvVN9Ce1+tnH35KvtqgTYpzi/65Uy0Sqg7hJO5r//90X6wMJTNnSp\n2bLBFY7MJRkPZpHYg1Hhwq4EGBYIAGAFgmr0bw0JEDYqIcFTgR6HNRQAAAAAABwA\nEHNhbHRAbm90YXRpb25zLm9wZW5wZ3Bqcy5vcmfMW1GevtJUOgpjFl+siG8BApsM\nFiEEbG/xDFtyBYhQM46DNiohwVOBHocAAOA2AP4l88/MhdP1y+MBfEy1H27j0d+x\nhgx159BCo5uDgrp0MwD6AycyNO8rXnRXpH8UXIbx1joU7lDPq2nqrW9m9V1ooAk=\n=vDgd\n-----END PGP PRIVATE KEY BLOCK-----",
|
||||
"AddressKeyPassphrase": "LzLbQlEPpaeI1rAGLEuCW2Gi35bR7rV9kmOhGO1i1o8=",
|
||||
"RootKey": "-----BEGIN PGP PRIVATE KEY BLOCK-----\n\nxYYEavRvDRYJKwYBBAHaRw8BAQdAkJLDdaqwDy4m5/Y2dacYwIkjkXAQxluj4igu\n68kVdbz+BwMIsmWbW1fOheTguxoV6ylBcmCr/3qb+TuFSTMkoqMwc84cRLv4xXzf\nBEzd5gAWhlixubeV6YBu3P63/3TTGzKxM3+nXLF6Mr/9GX/SsZ60Bs0iRHJpdmUg\na2V5IDxub3JlcGx5QHByb3Rvbm1haWwuY29tPsK/BBMWCABxBYJq9G8NAwsJBwkQ\nO8tFiQrA4nU1FAAAAAAAHAAQc2FsdEBub3RhdGlvbnMub3BlbnBncGpzLm9yZ/t4\nmbz8DuaNQ1vT/RFIIwYCFQgDFgACAhkBApsDAh4BFiEEYjEiVAYTl9y+qSUaO8tF\niQrA4nUAACGMAQCIefwEX02ipNhmV9eBYi2vq4uzW9qV6C+eFr66Y4HdtAD/ebQy\n0PmEFOk4X0lIq9qweqVOhhD4Hu0UaFmQ9A9qvAzHiwRq9G8NEgorBgEEAZdVAQUB\nAQdANv99N7oVHI9Wpz3c6Zbyem/iLYdVGvMZQyOEFYvu6gADAQoJ/gcDCLJlm1tX\nzoXk4C2C+l3NxlfgX5WLrgOgO+YQGy1kk5Kl2IvQDinoaC0sZT8wfBn/gXufXQcK\n0lqzn1DgCKnr/YSZjSdGMech2WGbTAvxpZzCrgQYFggAYAWCavRvDQkQO8tFiQrA\n4nU1FAAAAAAAHAAQc2FsdEBub3RhdGlvbnMub3BlbnBncGpzLm9yZ2pgeZSX9qPC\nKIxpuRRxFsICmwwWIQRiMSJUBhOX3L6pJRo7y0WJCsDidQAAkNQA/3p9r/crMHES\nGvfl4RIl9qHh6IcUbAduodC6SEwGCKUrAP0cfD3AKkgmtYBPFIYiW1g6i9cYT8f4\nYOw7KHzrzr/2Cw==\n=iBcU\n-----END PGP PRIVATE KEY BLOCK-----",
|
||||
"RootKeyPassphrase": "AjtWb9qdq42Nys8cIQy48farxWagZEFrZV1f9H0Cx1w=",
|
||||
"RootHashKey": "-----BEGIN PGP MESSAGE-----\n\nwV4D75G3Biss+HISAQdAWjqo2i4N2XgibdrHT+PAgad2HV0owQ/sKmmcnzEILxcw\nseO8euBxqvlvt1cEx/AtX5S/1Q+nJfq0RxG2nsLVWYt0jyTjyRZ2tNCoLwow9XNh\n0sBlAaTAs3K/ZUm/MUDS1GvLMtfgQbR1eLRS0VER++m+wG2FapA/mL9SM+3E8bIC\nT21SoACKmZxJc9VrCLPC2XvNbiPXVNcvdx2e8DJfs1VVxYe2P2F9a5N8gCSPkG/y\nS26vVlz42DEtt3EE/yqYMuY1AQGGxPohT9NE1uCOvcO/h/4MLqwR2SKtcXE1Tgcf\nQLvKPlLebzb5ZBF78bi+EXn+0dTM2reLCs5a3f5Vw3abL+b/wkSIHa97jjZpD8Jf\nSFJ8GS/bOviY6d6pJQafJby7/iP07zpkYq0kJObknao9PMy3j8POLXh5dmZIhWmo\ndJn/T+6sOuqNatF63ch8K4Q03E0NbyfnPcEgj5pGodKtTumulGPXRGBfvKVYhb06\nM5GtgDVKem4=\n=pGrY\n-----END PGP MESSAGE-----"
|
||||
},
|
||||
"Name": "Résumé – final.txt",
|
||||
"ModTime": "2023-11-20T09:30:15+0530",
|
||||
"Content": "DteMSjInE8AZ4F9UF/gjhwqq9DweL4x3dF4cCGrW8kx7WAa2Clsc2YbM0o+vbk2s6GcUYEMi62HpKPQKtGy3efgelagpzZAMK78/fSSdWXQp91NGrISUl/fjEeyAzQI1y3u4Wk03ntm43yf25CCD/2Hh8uEmHMttM4e7h6A09MrW5ro7XMwOQI362C+NuIlypUqbESZkrBnnu7ONrt2bdkYtQWDVqOKhfKs0vUrCJBaARJlgAlaXdy6vOKK7HL3QvTFYNDSeeuMERJvoXoShoZMpP5aNtDAOc4/Jvjadat1honfBerTZO0V6WsK1wQt4t9pV/US9cBHJeyVuJn0ChCd14GLRmXAUVz0PMB2N7QNiXbXZ6Cf8DFoSlZ3APIitSdTqoec51w+DQ+WphxYM9pX3xEnruGuxKgp3/rWisQju8l6dQe7Z7gzmSPnL6adIo044uuHQGpBwt7p2f6DPak6sdgtnjulwQpRLF5WemSVYpvWemxeBM2OVfyXMIvCymCHVTJB1QNYD8fB8d0Iw6pycqL/tTKUKvrMzXYDmafACsFsdUcsoLqFYn9Qv5JMtcxwTxWzit9fAo3tT9bdggM4jNgKM1Bu9C7M9fOJ5ZfanCOP7VdPcBon5XnqKz7ToVbl+r3C4EiwLpeFyz5sJFr7zmp1u0E35d85JyJoL3mJ6ko9TlkO1F76OoEBr8XHpXwfWXVozUfUlVcQehY5Q1oT4fPTrwcoDVOLg3Otxrcz37B5Dw8YSyoHKr9tE+xZ7SaFx7Oskna0p+Q+ttoy2GCIq7zjxJe2QZCy+pNZtg/RlhgJ/Qh6rw1TW+Yu5Q9UU7HonVt4NXuOVQF6T/ZDZ8m1GqXTn1thBBvqO5Fg3qUSlj7lHKhGCsFpjxZQtLLNzJIFMs/ujqWwq6pLONJEw+sUl4uFTy+PCAvWjDRlUhZ/3nmlQFl/8PX0nXp4Eg70oOWBi4l+f5lx7NJBpOIpimNH6qdsVI8+7MtnkGC36zyNlc3Zskz1HabOsLHwwUGAy0GmQH/jXX9MF35hUdOH13angj37evED+nYkUH5HWHh0vkDlmGDmye6ZkNHClSkuRIYKlhr5IANuPHgISD4H8Qwi1wfUpScM+rA6ecoq7AfILBPtVXN9K9hjR1HSfguEm77rK4hFOkbOb/QTnjjbj6hw7IeOyaMqRBjjLMTtsG8tXdqJPBZJ63CKmmdOJF7MS9zMiIMchZ1XufI4K9S51LyX5g+OM090QVvSzSo2quq4eWs9bj8Nkkz3wA61m9yYi3WZ9/obyJ7P0oOw++87egK5UryUh3y5+maPGpSwuYBXvlo8pqbDJ4stCtyfRtDrk/8aY6GgugygPphb6U/E8HP5MLHL1xeHLRxDw+7lebH/j2S3CWQWykltLBftQB8/FyoWHap97iC1yvz9h+lAxwlzK/KrIS2Qs11wIZFs2vciv4ocOqPO8FZVT+OB/rNh/XvMLVMb2GSaVXGjWaBGioLNd+FdsS3cR24/OjzVjecDwCkhH1EO9ey8+jQlz2Yk+3+xDViscwjqZ60FbU+0J4dgAy7pOTy9+6Gi52NQYu/Flvul5LT5fBDDoa62uIbhuxYpHsKD9vVpgtvenCRDmrYAA7QHBhAb0/hcYCN5RiLajxfChYLobFgGcf/z0t2fX8Zn90bkZ0H6FljeLEMBx0ttJtqBRDaQrK+o/3YpzRi4GPHxKvkFmanUPzZfWfLzwM0Mdou48eTFLjKzruOtzAMXStJ09R+QqaX0CJmBHQefg0as7Iyn96h0vtIbXpanb8pjZ/uxnHZVkV4HP+ztnNx2DFCbfMUkc1Fv6bamhOHyDSEL0c5R9T0LobllYzPNvRYC649LFtrGNwnFeeXMomx92DKPu+Nhlv1kp7NkjhiA0nz98C1+ELsEEB7Wh6ppq3eBLn17cFWbAELuER8JpjOBZ2rH9apC7Q+9/58BIo9rHsYcM6Yf/bpCRFoCbovEtOO296Cf/sMyS8ImKvIZBsTguSCu4nPktE1nKL04Myr0HQjXOK1sf+j3xokRTj8w/6SQ0OZRYS7TnMBuXsAvKVou1x8+jQwv9uAmqT0lZwJNBK8CK8ZHkZfMtFxki5f1YyzhUBAr8J4P8hJ0sv9mRDWCwp/T7K80W6XXAB3IdUOHvkCpWj1BuxbJ+wjWgRL7NCFAUHQkIKGGkthESSOOZSI358M6ZZwYpPr2y+x78BfQ+9tDJDtR+b7j7EdXIqf/ULuThBxvWX4wb9S7dsFWw+ur9tA6Fq0KSdNM4ed9l3Z3gHdGIwJ6o48ji1f9vvsWJXzjhEYJPJvfFb4c1gV9gr6CqNYuiYaoUWe6tNbGe+CPp/6saETXA4f8GzjGc5KsAyh2BFhS5p31xzjUAMyfZjLSidsLF3rtVwiOsBes+8//VsYG9hCBqvHLzN5FORCnax1/q50mHdwAzw4GHmF6ja9Cia5KzIxaBBTFcIlRCJdbExfj4PRzb7+Zdp1FaEVkPmkJPEtUjPU4c4GASwLnmcIkNz79ifE7Pz0ruYEGUyrwYVSjBKaaXJrDELbmxFYa9DbUyf18NZASP6ztRt4OeK2lOAd3PTIeXHYycc98bpZJbBabA/dj/je6EtTqN/1wXaH0OCVBIwqsDSVSgJK9Rjy5YAscUKLC+Z38i05cnsRbsBsRTyKalwgAB+hQ1DaRfw2hAVYD7SKrJQuSvXwL8PQ4wsbKQJn52oD6XuNhjcdGRIoGlRnKTsAjUv67srL5WEUzkPYNRgEYIq+EDjT9B/OfMBKH+gu2p8K04qaeS0BCrVYh/Lzf9kHuExcA/MDncTupkt0eJHibl2jQ+XJVavPAa6aQ9cLFkulm0NmNE7/NHb9C3ipbhTI9p83o+Q74L/ZvWPLW6yC689pf/tRBNJJcSN/YVIq2WbcMjCNxBiJsA2eCty6R4O0ICv18XsrrQU5lZP/PDiB038uAen8DPCH8xIQn/QKi9JD9mHhf8XUVmKL3u3656YuPvJ2faOjSGbZ9WfmY73GoN/1h4er2wbBmjKyVWYHlx81GLeYWx5rPbaLVaGxke0JaSIt2sS/pH7G5gX0g3gG0Il0VkWuFiJXiK8ifqWiLtutGUGH10ijKPijNNTC5VWvsKzZy6+s+G9EeCIEluuAiMklC0cTfdNLrWZ702hvh22P2PXaWp+tlknGI6Vw+ocaatdkaz5SKz9EdHzf0N/QsIDzqlFsmDHmQ7aElAFkK7KeIq43xjVfqU3b/fgPl7bJGuig6hv3B7csvPcgX1ZuuaFaknTErR2j+mVzBspVfkcVdLhCBLf+aCyenh22EGdCWYJf/gXd2fG+wfBQ=="
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"Name": "-----BEGIN PGP MESSAGE-----\n\nwV4D75G3Biss+HISAQdAeTQ04HdHu3aYN20zc8f3lCO/wa8C9lOB73AP9okbESEw\nXEGACuJqMH9Ww87+ZrXvnepYfTgfUgTt1RmgIYOvMn9oLskG/QppvpCa4WIR2z3J\n0sBDAR95/Z8E+5hfeo/AMnGWrGXAXWGhOkfkCAAthgPA/DCQ6JpLsod2Jn5WF1kf\n0oHheYBjMtowHd8XcmafBdQ5+v/mzoEOdorl6i+q+U5gzTkiHVwYA+iNa7zwoEdV\ng+vHtmG4ZLeJeYRzrjLHQ8pfZvRARjikPVbFPN0k8Fa3ISW8ccBeY7hVsNLY98wL\nEX3z46FdxGb1Hn3MY7K0JITWYPK897AoE+RHypqTKfQtze/UJw0rEuFXSTWNFGcC\nh3TiifPxzIot4PSpoNf8UneQR8I5660Iijo3yt1l9E/4yaAazFeXdEXJ0ZCJ4ZvU\nC7yA+RaHQfFp6dF/FgyNYN1UAFUv5g==\n=Uv5h\n-----END PGP MESSAGE-----",
|
||||
"NameHash": "d80859185c47f576afd1f7aa0e1a2dab9127c843b0d741a7602b4564fc37b656",
|
||||
"NodeKey": "-----BEGIN PGP PRIVATE KEY BLOCK-----\n\nxYYEavRvDRYJKwYBBAHaRw8BAQdADN8Yzwsl9W83z2uIQZ4Ux44dKhvc/Qojx8c7\nTEbZ+F7+BwMIikWiUxjYUjbgAd02ez9abEkUMQrYhuycQJAoE0QTKrZEKDzp+okY\ngksWkWVYmjQhMnwB/qbdwV5oYYkRe1nPcsbhAdFiVtvOCypcl9tyDs0iRHJpdmUg\na2V5IDxub3JlcGx5QHByb3Rvbm1haWwuY29tPsK/BBMWCABxBYJq9G8NAwsJBwkQ\nkUBZTYL0eA81FAAAAAAAHAAQc2FsdEBub3RhdGlvbnMub3BlbnBncGpzLm9yZ+Db\nYMKdZE69sZOTmHSwEi4CFQgDFgACAhkBApsDAh4BFiEERPv80oTZWPDRaMcIkUBZ\nTYL0eA8AAF1XAQCFiD0Z2XTx5XaCvGdq17JGAxCQ+grj5nQmtnDfJjQqdwEAytp3\nbrYVsGfHk0Tu2piZvChMokMHhcjNghFtFmKhywvHiwRq9G8NEgorBgEEAZdVAQUB\nAQdAW4iCSarmRG2nA3sr8gscojT6gfJkhZfQE4r5WUZ+nU8DAQoJ/gcDCIpFolMY\n2FI24H5TLfkSXpV3QP1or5Acny9UVCynWdnG1o6VGJLXrQwcJvSjS6m3sGx54jyz\noWDQylzqxe3EbQKcu1v/7PxFSP8xumCcVWPCrgQYFggAYAWCavRvDQkQkUBZTYL0\neA81FAAAAAAAHAAQc2FsdEBub3RhdGlvbnMub3BlbnBncGpzLm9yZy3CYMcltPWm\n/6tvXL3kLcUCmwwWIQRE+/zShNlY8NFoxwiRQFlNgvR4DwAAqwQA/3M0VdF+lqvq\n2IoRd7WSVwe/AlAvuBsEUsngfhWRL1pnAQDk9Puh0cuZnqkomh+y9SlZgDAwWwV1\nfwpjPOLA7xmbDA==\n=4jUT\n-----END PGP PRIVATE KEY BLOCK-----",
|
||||
"NodePassphrase": "-----BEGIN PGP MESSAGE-----\n\nwV4D75G3Biss+HISAQdAlymniWYnrqy+gLH0izGJYV3OLaVWKMr3aKCcCSU5J3Qw\nFMx6XX1hETVuI1H5Smfql5FXPGyhhQQdJhj/zt0KWvXzxmoqAzQYXmuxqBUYyeB6\n0l0B7gkXd44uLjzPpV6K3BuT0a50rEA+jtM0Yx7DHkGQdV9nIDUCsiny/4hAYUep\neUFWHS7u/APBqkKQ8MG3NnkGkhQE2mnLSIlcKl0rzELsejfAeP5xD04r6RY0rzw=\n=AVcs\n-----END PGP MESSAGE-----",
|
||||
"NodePassphraseSignature": "-----BEGIN PGP SIGNATURE-----\n\nwqsEABYIAF0Fgmr0bw0JEDYqIcFTgR6HNRQAAAAAABwAEHNhbHRAbm90YXRpb25z\nLm9wZW5wZ3Bqcy5vcmfzOVpw3MH8ZeApbtY+kBxrFiEEbG/xDFtyBYhQM46DNioh\nwVOBHocAADUEAQD53J/jV+suvOSZ27uuv99Dr9BT+X9JLGl5EdpIzWieKgEA4vD5\nGzxbMgz0Siz3yuVlnwXFt1rNI6oIEV5x+bxhBgc=\n=NRz6\n-----END PGP SIGNATURE-----",
|
||||
"SignatureEmail": "test@proton.test",
|
||||
"NameSignatureEmail": "test@proton.test",
|
||||
"MediaType": "text/plain",
|
||||
"ContentKeyPacket": "wV4DPENlinHdht0SAQdAq5Hb36qZH+/AGcTBA4dVAIMFaGu92geylFqmbS5LqUYw0yB4qPE7lUnVYZCysz+3bPCnxt/pDxx1Ktzw35ocUceim2ki+cr5b3mzc0ZVXhBt",
|
||||
"ContentKeyPacketSignature": "-----BEGIN PGP SIGNATURE-----\n\nwqsEABYIAF0Fgmr0bw4JEJFAWU2C9HgPNRQAAAAAABwAEHNhbHRAbm90YXRpb25z\nLm9wZW5wZ3Bqcy5vcmdEBzg7W/WHkXZnjiSnKULSFiEERPv80oTZWPDRaMcIkUBZ\nTYL0eA8AAIwUAQD5O16YIXf936L9zUviRububNQZheSxkX12fDGSLCxiDAEA0sqA\nbZ4D7d5X/kg9uVzEzG6nHUYYgXlzXYkPlVuK5wM=\n=WNUY\n-----END PGP SIGNATURE-----"
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"ManifestSignature": "-----BEGIN PGP SIGNATURE-----\n\nwqsEABYIAF0Fgmr0bw4JEDYqIcFTgR6HNRQAAAAAABwAEHNhbHRAbm90YXRpb25z\nLm9wZW5wZ3Bqcy5vcmcWDcsQsoZ9oxLWcCDf/2keFiEEbG/xDFtyBYhQM46DNioh\nwVOBHocAAHOQAQCug7+Y6J4HfxtEhgjzXvJPaU5RSKdJkZTJhJTXodyAugD8DbFv\nY1IDnwP7VOrfCD28G7zbx+7WCXWnixkS9XTZDwI=\n=YQiZ\n-----END PGP SIGNATURE-----",
|
||||
"XAttr": "-----BEGIN PGP MESSAGE-----\n\nwV4DPENlinHdht0SAQdAtLl5oIJ9RSeGAO3n4w1r6iQVzrNj7Y4WNgL3hyWhaTIw\njAOU7a/gztg7Q9yyKLKsrRED5j9UACo9q87qlgJKGaOyW58nfYsLdLF/oM2Bl97P\n0sDFAermVanvd3hEwvHUaZBDp7s7pIzglXER9AEALmmz3sK7yc6axP3ilXYz/+QS\nHDigy3SOLNHVwSwhGNAyAVtR4KOVXWdrfSkoSVkMtVDmL2wcmEoz43clvfjmX8Db\nXquYw/pAvDRzz1CYin8H3kok0IYPvueP7vIoQwPqbwYuJcJtcOP5OUdHcL+GXiBr\nvAEv9cN9bfzD32le+UowmODCFBI6Mbwl0CsrSxSonAcOeun0WP3dWDQ/Rrub3Jgb\nVEEt2qiSKVy9e6dkm8E91g9QB5VcnS+PmOq6ZHWTcOTREWa3sbHjUPMktQIyN6x2\nw5a36TtsIjW5+CrCvQqVTSOOxvIYAZSd0d+t/KCcKZYKPIo8Lyo74RYnZ4WqwHhv\nBrGULEbrxkofFZugRYKN9A9ZGA0FYdU83FfyACW4ACEdkLC5Na5zvd0gEKUGhZDg\ntuM7yYQyYxSuBr4JXQ87qjXwdhRYLKdjSiHwE0qaxc2vuHknHfuP7XHDflh7zu/9\nB5Cmzq0JGRY=\n=IxS/\n-----END PGP MESSAGE-----",
|
||||
"SignatureEmail": "test@proton.test",
|
||||
"Blocks": [
|
||||
{
|
||||
"Hash": "NFq37D8SE2nGxYSHBEYd1VVxjxpjpWcFLh4XYx55x8I=",
|
||||
"EncSignature": "-----BEGIN PGP MESSAGE-----\n\nwV4DPENlinHdht0SAQdAcw5K1cHCktkNtqI3nz+9A6hfL8nXF6wgHX1oPo7H+nUw\nRWZ8e9hYK3k2VqdYXtCVH8vKSHYUw2hqQ7NBWErFu0IuR3iM82ojiCWHSy9iwP9Z\n0sAeAUmlJSuI1pxhxi5KFeSSeyt34m6H+ZSqo1Bm0ammv/j9I2htUAlwD1MxQjWh\ns5qMzuIjmqAXddSl5rOxJ63uOi1oQ7PUXByX3Aa774uzRri/AxktU3L240K69KBY\nt1ZDPtcbFkWOHdpULGKyZx0M4t3U6uSKKoXCiqPg0URdYyLfQPd99QdO+iaT2IJQ\nxFqZFJeREqoMq/JdNXDFuB3YUTiY2U4h5Q3zZlkha1cucI0Vw3CtWuXCjGxOV2+s\nv4aTzgx3xaBVFYye6RvBvQ9H5V23MbLEXjFWSTw9+2QG\n=bKI/\n-----END PGP MESSAGE-----",
|
||||
"SignatureEmail": "test@proton.test"
|
||||
}
|
||||
]
|
||||
}
|
||||
Binary file not shown.
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"Comment": "File written by go-proton-api v1.0.4 and Proton-API-Bridge v1.0.5 with test-only keys, as stored by the server.",
|
||||
"Email": "test@proton.test",
|
||||
"Keys": {
|
||||
"AddressKey": "-----BEGIN PGP PRIVATE KEY BLOCK-----\n\nxYYEavRvDhYJKwYBBAHaRw8BAQdAK9KMjW9C7v+pTZRTdSaJoKpRH7hEvNt2vadO\n+xlslKD+BwMIeuKWy3nqqNLgyJkHVxrRTY8aXrIu4SWKaqXmfya5kjf9Vpz3jPOr\nAMG8UlemYISPKND4vDIH1KwgIlYmzeSGvFKNM4uh79IMB1UQlPUaj80XdGVzdCA8\ndGVzdEBwcm90b24udGVzdD7CvwQTFggAcQWCavRvDgMLCQcJEDEZag1Znw4rNRQA\nAAAAABwAEHNhbHRAbm90YXRpb25zLm9wZW5wZ3Bqcy5vcmf62UWSq94vdewVsf4V\nPPgdAhUIAxYAAgIZAQKbAwIeARYhBHRKJ7r8qGPfBLB8nzEZag1Znw4rAACKPAEA\npUoRkZ4PA97b31p4tcxiDxDq8+vCGSRcbOGIy7zyWTsA+gP6pJ1YiBihWwzjqRJ7\nA2Nh3O9qdDUl2pZuIbd+6kkAx4sEavRvDhIKKwYBBAGXVQEFAQEHQE1ZYlPor6hp\np/JymdN0RP8hwOdp7XCvpzX6T9LVc7IwAwEKCf4HAwh64pbLeeqo0uCCYMcH8sZ4\nsS5TkQnY3S61/PvRtIciSBpl353fENY1/UxNtJUN7rSMi40AHoT6KpNnwgadnJ9S\niaulXeiT4k+iErXgmOJfwq4EGBYIAGAFgmr0bw4JEDEZag1Znw4rNRQAAAAAABwA\nEHNhbHRAbm90YXRpb25zLm9wZW5wZ3Bqcy5vcmderwC7q8tW7yYhDBxKqb0tApsM\nFiEEdEonuvyoY98EsHyfMRlqDVmfDisAAH/QAP9qlgoAVkWFerW+Ll7Y7AFHzrz8\nxeljqce7mstNcNBTxQD/b3CmPsud/DQRYDAQcnfvI5A0zj5AbHJOzsVZ1uSglwA=\n=STTS\n-----END PGP PRIVATE KEY BLOCK-----",
|
||||
"AddressKeyPassphrase": "jtFl0UtLdaxKAp2riotfF9p/EItsTvm4KGaoU8H9nzQ=",
|
||||
"RootKey": "-----BEGIN PGP PRIVATE KEY BLOCK-----\n\nxYYEavRvDhYJKwYBBAHaRw8BAQdAUfpWS6jq6NlbEj8ib5mmcQi66xW5vEeoIAq1\nYMUi2Sb+BwMIQhWVzloq2eHgp3hhGkMK/5QE35kwbiWvFmS8ZLVpX+algC9KAzm9\nFoNUxxVvBefCRXsxDk+WNW6KYNYj/3LEKSxxeKa76CSR+HW2OebxRc0iRHJpdmUg\na2V5IDxub3JlcGx5QHByb3Rvbm1haWwuY29tPsK/BBMWCABxBYJq9G8OAwsJBwkQ\n86WVomfZwvE1FAAAAAAAHAAQc2FsdEBub3RhdGlvbnMub3BlbnBncGpzLm9yZ2YO\nAXSRmn9tSVb3O98Ml8cCFQgDFgACAhkBApsDAh4BFiEEzeF8wgFc3EAMg1Av86WV\nomfZwvEAAOVJAP0QZvjEOHxubUaK1mvkpnxq5N8yrQo6bgIQwHG7H4ZMuwD/cF19\numjGlWRyn70JMmXJhnkAtRMMe/NmNjlisjqQbwbHiwRq9G8OEgorBgEEAZdVAQUB\nAQdAGs6hyABNjLocAzB/VwnZ15/vmVGDJ29DF7PGd0j00k0DAQoJ/gcDCEIVlc5a\nKtnh4NOOCYUeyFjiJUxz6GKbBoe2zCoduDqkdRBcZ55w3JLFXSA3DFQlNs9YmWjU\nAuKLqqoP6jjB3G+vIjAY5NiEeT9ZxSosc03CrgQYFggAYAWCavRvDgkQ86WVomfZ\nwvE1FAAAAAAAHAAQc2FsdEBub3RhdGlvbnMub3BlbnBncGpzLm9yZ23wANY7umtv\nKVzkPbOyO8kCmwwWIQTN4XzCAVzcQAyDUC/zpZWiZ9nC8QAAq0gBANtmfu7B0LjH\nyGUQTgpCCqVWcSBFb7z0FamBku88FlKsAP4pesP+qogW1JVDIMsCwdH3VPmjDvKo\nlESeNrlmtMOeCA==\n=Vwit\n-----END PGP PRIVATE KEY BLOCK-----",
|
||||
"RootKeyPassphrase": "hNrnlFPjVikuNwKstxAD7YfnnSgYbSX60okTr9cgpuc=",
|
||||
"RootHashKey": "-----BEGIN PGP MESSAGE-----\n\nwV4DT0gof+Wvyb0SAQdAoUOzAgSKeSZ2jYT//UetkZHly0ZAFShaCmsWpg54Hz0w\nvTDfl7pm1RaAwrMEPlgqPAdhCxJ21xx8vqn6WyZkSpbxk38P7Ua9mS2H76vwFVhX\n0sBlAZ5F1+V/D5H+OXEzG/D9d0kByMfOZXTS//tBsIQFEp3S1/aVd762ckYQxFYa\nacydPV4vw6c/zt20uWfPoxgVag7oc6Vt9rbci/GQh9JWgqO4QI7vJAISRHsrAbqR\nR0xGMKgin9NXEda/Q3v0547nhvRYoPkzSxZD5LY24WqmbXaxebhLbw7eAlvaVdAj\nnbHwEY84dNXby38HdbOV5db2doPThQ2svr3zxzWzGQZ/C11hZ1yeDCAk62pLhvuD\nJ1vLftzsqNJJW82I+KLcKa6Hfy+jr5/2O85A8yRkTMtgMl3RyTz532tu02BvTfJX\n2nbV+fiUWBksEmnvFfSAJiCqHXEPM3voiSFI/1jCaQacKNUZBYMoaiqR+iCn8cM8\n8YvKbV+6Mhc=\n=MsV2\n-----END PGP MESSAGE-----"
|
||||
},
|
||||
"Name": "Résumé – final.txt",
|
||||
"ModTime": "2023-11-20T09:30:15+0530",
|
||||
"Content": "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"
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"Name": "-----BEGIN PGP MESSAGE-----\n\nwV4DT0gof+Wvyb0SAQdAzqPrDvdZMj0p4ZJMJgOXgPWvt4YbcOJDxcYDhePUCwMw\ncmJ49GV5yG6UHYLTKtX1Ah70ZknCKVqcsNlY5LUPLKq8kMfpZA2/5+UJL2AKu6Mf\n0sBDAWPW1H2lfdYrBC9zcwtmWdN9lyijgk1wT3u1es8rqEbLA8HMq6PlIjhXMx1N\nGtJ7QWkpqDW+Vx4xfd4xyI2EFq1Li/lpwPUb/XmMUWXVLsOn5uXdbG4WQnqyEsN2\n76V1KJ+ZCwDlhsFKygfX/6P24lhpTVwtuKRABmjYc01W6ru0IzrlEOIPkgx1Qu74\nSD/5oWaUhHqzf4yawCYKwjWXvfIo99pAOChFx93oIatp4dNdJYXpf2t/TC2x2q4k\n5WCjKXSF+8SFMMwqambVqqVLzRSA4lsX/xhRe2AC/lReUZxQ4kYez56v5CfBFJa4\nWhT/Kh8dRO2ognBHzpOl5GMQ3l9K4Q==\n=AHAa\n-----END PGP MESSAGE-----",
|
||||
"NameHash": "ee1651e750db34877561ba87feb967ab43c86d8493240e68d41d6be1105c749d",
|
||||
"NodeKey": "-----BEGIN PGP PRIVATE KEY BLOCK-----\n\nxYYEavRvDhYJKwYBBAHaRw8BAQdAlpRUrHdSh6CGI/gm4qvuHiP7ZYqjkcSWoWgZ\nRZUOEDb+BwMIIrRSWKcKioLgzK8gHptmgD4WtTZRMc96GzlG9jO4yDWnNuuAlLEA\n3Wyc2hxsQ9O8v462CCdVxMJwDmYpDosfH/P45uUR47JG5RDpJ0pc7M0JRHJpdmUg\na2V5wsAJBBMWCAB7BYJq9G8OAwsJBwkQuh8s3nRc5l01FAAAAAAAHAAQc2FsdEBu\nb3RhdGlvbnMub3BlbnBncGpzLm9yZ5E//emP4j8I8PVZSoPjls0CFQgDFgACAhkB\nApsDAh4JFiEEDAnHW9i0CCnc5lcOuh8s3nRc5l0JJwkDCQIHAwcCAAAtBwEAtNTV\nUhCTnbqfjeLLCv4Y0kh6JrYSBcIe3+/wE/jWFRkBAL657GpJNdo5J4KCdLOq++6M\nsLkWBuTRB+nBpOSDuDwIx4sEavRvDhIKKwYBBAGXVQEFAQEHQD8NjEN+Mw8YlMjC\nUY6QDqLOWW2Oj4E9thXKri+KQPQgAwEKCf4HAwgitFJYpwqKguAWMk33K8YKIjb7\nG4XQ/g80mtFFPWSIhc0Wo0sxLJgNlDn0aEgMjIwQcT0BFAeypf5CTEIlCpBCXCaE\nB/GmUzRYQQYuoW5Vwq4EGBYIAGAFgmr0bw4JELofLN50XOZdNRQAAAAAABwAEHNh\nbHRAbm90YXRpb25zLm9wZW5wZ3Bqcy5vcmcNlByg+DKKtrOjoUU3BZYFApsMFiEE\nDAnHW9i0CCnc5lcOuh8s3nRc5l0AACAfAP4j46vS4z6codkVg6Y6qU5rLBdOrAXX\nFLvx2Ovmc/I/VQEA3aX/QQLwr3OjxDG2Y5tgzkdh5vQHvGyyGrxbV8GFogE=\n=YilQ\n-----END PGP PRIVATE KEY BLOCK-----",
|
||||
"NodePassphrase": "-----BEGIN PGP MESSAGE-----\n\nwV4DT0gof+Wvyb0SAQdAn76CuNIP81fnjvrqZLOUDs7FyYKQAuWJvuKzDKsfq0Qw\n1jC0JJDbw6v8Z7D+yX3ptwTXuR0MRrGwL4cStCs7OFIpB6Ox7TFeYOZozEkgN2Gx\n0l0BabnoRQw71/Y34BU71bjS2JtBJdgtAnaUUJtQqFX4/yh2gwiSgBZCyGtdmR6L\nZRHb7GAR1odMunlKVWGeebEWkuwTDZh3bwakJIiJ6rmEOFXCWpca0Evwwmx0hvQ=\n=/fWR\n-----END PGP MESSAGE-----",
|
||||
"NodePassphraseSignature": "-----BEGIN PGP SIGNATURE-----\n\nwqsEABYIAF0Fgmr0bw4JEDEZag1Znw4rNRQAAAAAABwAEHNhbHRAbm90YXRpb25z\nLm9wZW5wZ3Bqcy5vcmeE/a/O4APZqrQx2t3OqF75FiEEdEonuvyoY98EsHyfMRlq\nDVmfDisAAKnuAQCTg6bxuZ6DHCbxJ3sePsadWE0pZ10g8yvAEC430QzPWQD5AdRT\njYutmiOxGTP+/o8C26Qn0dN3/UnJeP0IXabTJQs=\n=t6rg\n-----END PGP SIGNATURE-----",
|
||||
"SignatureEmail": "test@proton.test",
|
||||
"NameSignatureEmail": "test@proton.test",
|
||||
"MediaType": "text/plain",
|
||||
"ContentKeyPacket": "wWwGFQSaPeJrit/oMY8yL5ov4mgIXXKt+hIBB0BEjJYxOMM4Tloo9LQYIknTOTDny/aUKMzDWdMQTxNmUzBYAxOScflaQaf2XnnxWsLxojNiGxPrHxTTwGi9TeLEer2higDJ3Z1j+k4w5uCq260=",
|
||||
"ContentKeyPacketSignature": "-----BEGIN PGP SIGNATURE-----\n\nwqsEABYIAF0Fgmr0bw4JELofLN50XOZdNRQAAAAAABwAEHNhbHRAbm90YXRpb25z\nLm9wZW5wZ3Bqcy5vcmd+4zu7OKGk804K+tygWY5QFiEEDAnHW9i0CCnc5lcOuh8s\n3nRc5l0AACPVAQCPVlVWy7shMreq8TCyCA4jOGRo4COoGVd8wGcbsOc+ygEAgLgO\nwMxxG8KhaHxYWxeATLmVk7uM563s7olcB3fO0ww=\n=YtR/\n-----END PGP SIGNATURE-----"
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"ManifestSignature": "-----BEGIN PGP SIGNATURE-----\n\nwqsEABYIAF0Fgmr0bw4JEDEZag1Znw4rNRQAAAAAABwAEHNhbHRAbm90YXRpb25z\nLm9wZW5wZ3Bqcy5vcmfLYInRRlsZi/79JiYQiCMnFiEEdEonuvyoY98EsHyfMRlq\nDVmfDisAAFleAP9LGduZrUSJskWo8FyFJ+40vCnDDd6tiVJQtXkKInX2zAEAu0uU\niS7vYy5ECIe1GiucLKWf7ZTe8ViZwLCr5xoe8wI=\n=JyHg\n-----END PGP SIGNATURE-----",
|
||||
"XAttr": "-----BEGIN PGP MESSAGE-----\n\nwV4DL+JoCF1yrfoSAQdA3FvpTsekiqXyJ7fNjnNl+JNjnDpzcBYnrx1AIvjXyWww\nDkvEOYL40rcLu3jz8hjg3oCgXKsRdZipCOdUmFIhadmEVe/80Eo4NgJRe5G+Kl/G\n0sDFAWVKsfI/XTXzbdRh5Xjv8cqOIj1vrddcpSlEk3BOSHbwOxz3oDv+oLDKCd/Q\nMIVpvYzK5iMqS6iCfKByKkJDWIvIHRwEoKrF03c84BxGGwSaLzr6k8DT3qiiK4HP\nxZF8DZt2fi3W1qzY+i+EyFp3/R5cPseddqSPMwstlEAJ9olmZpBTNBi+63kBtecY\n5Zn4aEMbVu/UdO4OdK1zODdwppau6jNfizIHV9X61gGL8LduYBbZET6/EJhNupe8\nEsyu0UvBiIuGtnBNEAX9KteIcl8W5geAzo7EUjsLw3v4E2+n4fj4tOgr/JBeMnT1\nubiWG1X/UlTYPy4bnlizCAiD4L2q9/vLjBpB8G44yBh1u7qZ8zzB6g9GWRYFwxa2\nY8ZpKvxMWHL8e7ac+ypSC1esK8Grr9cTw0/FdnvmpLFCZ3Pp1pLisFsr9mftJ3u9\ndOso2JtH0mO8hYKarhKRODibRzNAcla5/WFvtKmXSptV4XdJmFi7I15VhlIRUKrn\nKZxWtdwB2/o=\n=wv8h\n-----END PGP MESSAGE-----",
|
||||
"SignatureEmail": "test@proton.test",
|
||||
"Blocks": [
|
||||
{
|
||||
"Hash": "XdCpF0qof0fvbm1XLFnZ3xcrRVkRoAQBjzCfKuW9AcM=",
|
||||
"EncSignature": "-----BEGIN PGP MESSAGE-----\n\nwV4DL+JoCF1yrfoSAQdAhdXWC3b48oxphs1MV96BLB0v4e6XAzNuK/tVWH3c620w\nYxtGg7CESnijospvfMk4C/QxFd9ok0yQXr/TDj26+f4aj+Obs+I90VPSSnmCuFaX\n0sAeAcGMZcQyCbLYtVp656YpNgN1WLUqB/MWO6kAxiUZMhoyCPi7uVECZKslnHcj\nLjLBqEhL0jg9KmIIDhhARU9GJKxmlcNpolDFBmEW7VwU2bbeg7lHyQclo0JEW7nw\nJWPkDGgN/X+MrDBRz5riVfYuLQe0mm0JSu2r0/VQ6prAWRSTQVAAWds2Iqqglk3Z\nFGMrcKRS7o5Y3kzht5YcFeeAPVD5IO3vjm2Z36wW/IBQmD4qivdkbW8lq2Kk8hhB\nnRDPogYdbytqEdjiCaH55k73qa5lba/MB9YXtfCE+LvF\n=pAaS\n-----END PGP MESSAGE-----",
|
||||
"SignatureEmail": "test@proton.test"
|
||||
}
|
||||
]
|
||||
}
|
||||
+6
-1
@@ -31,7 +31,12 @@ Small, specific, independently actionable. Remove only when actually done.
|
||||
`backend/protondrive/crypto_diff_internal_test.go` and the `-update`
|
||||
branch of `TestFrozenFixtures`, keeping the fixtures and their check;
|
||||
`github.com/relvacode/iso8601`, made a direct requirement for that test,
|
||||
goes back to indirect or away.
|
||||
goes back to indirect or away. `TestFrozenFileFixture`
|
||||
(`download_internal_test.go`, fixtures in `testdata/oldlib/file/`) stays
|
||||
as it is; its regeneration lives in `TestOldLibraryFileReadable`, which
|
||||
goes with the differential file. Only the frozen file fixtures are a
|
||||
single block: multi-block files from the old library are covered by
|
||||
`TestOldLibraryFileReadable` alone, so they lose coverage then.
|
||||
|
||||
- [ ] protondrive: `client.apiCall` retries POST and PUT mutations
|
||||
(create folder, move, rename, copy) after 5xx and network errors, as the
|
||||
|
||||
@@ -936,10 +936,37 @@ Reference: `client/js/src/internal/upload/` (`manager.ts`,
|
||||
**Files:**
|
||||
|
||||
- Modify: `backend/protondrive/crypto_diff_internal_test.go`
|
||||
- Modify: `backend/protondrive/download_internal_test.go`
|
||||
(`TestFrozenFileFixture` and its loader, which import no old library)
|
||||
- Create: `backend/protondrive/protontest/stored.go`
|
||||
- Modify: `backend/protondrive/protontest/drive.go`, `crypto.go`,
|
||||
`drive_test.go`
|
||||
- Create: `backend/protondrive/testdata/oldlib/file/{legacy,v6}/`
|
||||
(`file.json`, `link.json`, `revision.json`, `block-1.bin`)
|
||||
|
||||
**Interfaces:** Consumes Tasks 10 and 11, and the old library.
|
||||
|
||||
- [ ] **Step 1: Write failing tests**:
|
||||
- Produces (`protontest`):
|
||||
- `type StoredFile struct { Link StoredLink; Revision StoredRevision }`
|
||||
- a file node as stored, nothing decrypted. `StoredLink` has `Name,
|
||||
NameHash, NodeKey, NodePassphrase, NodePassphraseSignature,
|
||||
SignatureEmail, NameSignatureEmail, MediaType, ContentKeyPacket,
|
||||
ContentKeyPacketSignature string`; `StoredRevision` has
|
||||
`ManifestSignature, XAttr, SignatureEmail string; Blocks []StoredBlock`;
|
||||
`StoredBlock` has `Hash []byte; EncSignature, SignatureEmail string;
|
||||
Data []byte` (`json:"-"`).
|
||||
- `func (u *User) StoredFile(id string) StoredFile` - read-only copy of a
|
||||
file and its active revision.
|
||||
- `func (u *User) SeedStoredFile(parentID string, f StoredFile) (id string)`
|
||||
- installs `f` as given, without checks.
|
||||
- `type FixedKeys struct { AddressKey, AddressKeyPassphrase, RootKey,
|
||||
RootKeyPassphrase, RootHashKey string }` and
|
||||
`func (s *Server) AddUserWithKeys(username, password string, keys FixedKeys) *User`
|
||||
- `AddUser` with the primary address key and the root folder's node
|
||||
key and hash key supplied; user and share keys are generated.
|
||||
- The fake signs no earlier than the signing key's creation time.
|
||||
|
||||
- [x] **Step 1: Write failing tests**:
|
||||
- `TestUploadReadableByOldLibraryCrypto`: upload a 5 MiB file with
|
||||
Task 11 to the fake; take the stored link, revision, blocks and xattrs
|
||||
from the fake; decrypt the node, content key, every block and the
|
||||
@@ -948,8 +975,11 @@ Reference: `client/js/src/internal/upload/` (`manager.ts`,
|
||||
- `TestFrozenFileFixture`: add a frozen fixture `testdata/oldlib/file/`
|
||||
(link JSON, revision JSON, block files) written by the old-library
|
||||
path, and download it through Task 10 by loading it into the fake.
|
||||
- [ ] **Step 2: Run** - expect FAIL, then implement helper code until PASS.
|
||||
- [ ] **Step 3: Commit** `protondrive: add whole-file differential tests`.
|
||||
- `TestOldLibraryFileReadable`: files of 0 B, 2500 B and 5 MiB + 3
|
||||
written by the old library in both formats are downloaded through
|
||||
Task 10; with `-update` it rewrites the frozen fixtures.
|
||||
- [x] **Step 2: Run** - expect FAIL, then implement helper code until PASS.
|
||||
- [x] **Step 3: Commit** `protondrive: add whole-file differential tests`.
|
||||
|
||||
### Task 13: Hermetic contract-suite harness (old backend untouched)
|
||||
|
||||
|
||||
Reference in new issue
Block a user