libretic/transfer.sh
6
0
Fork 0
mirror of https://github.com/dutchcoders/transfer.sh.git synced 2024-11-26 22:20:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Switch to Salted Key Generation

Browse source
This commit is contained in:
stefanbenten 2019-08-29 16:33:37 +02:00
parent d5e07fe2f4
commit c1691c58dc
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/storage.go
View file

@ -576,7 +576,7 @@ func NewStorjStorage(endpoint, apiKey, bucket, encKey string, logger *log.Logger
var instance StorjStorage var instance StorjStorage
var err error var err error
ctx := context.Background() ctx := context.TODO()
instance.uplink, err = uplink.NewUplink(ctx, nil) instance.uplink, err = uplink.NewUplink(ctx, nil)
if err != nil { if err != nil {
@ -585,7 +585,7 @@ func NewStorjStorage(endpoint, apiKey, bucket, encKey string, logger *log.Logger
key, err := uplink.ParseAPIKey(apiKey) key, err := uplink.ParseAPIKey(apiKey)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not parse api key %v", err) return nil, fmt.Errorf("could not parse api key: %v", err)
} }
instance.project, err = instance.uplink.OpenProject(ctx, endpoint, key) instance.project, err = instance.uplink.OpenProject(ctx, endpoint, key)
@ -593,7 +593,12 @@ func NewStorjStorage(endpoint, apiKey, bucket, encKey string, logger *log.Logger
return nil, fmt.Errorf("could not open project: %v", err) return nil, fmt.Errorf("could not open project: %v", err)
} }
access := uplink.NewEncryptionAccessWithDefaultKey(toStorjKey(encKey)) saltenckey, err := instance.project.SaltedKeyFromPassphrase(ctx, encKey)
if err != nil {
return nil, fmt.Errorf("could not generate salted enc key: %v", err)
}
access := uplink.NewEncryptionAccessWithDefaultKey(*saltenckey)
instance.bucket, err = instance.project.OpenBucket(ctx, bucket, access) instance.bucket, err = instance.project.OpenBucket(ctx, bucket, access)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not open bucket %q: %v", bucket, err) return nil, fmt.Errorf("could not open bucket %q: %v", bucket, err)