Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/sse s3 #106

Closed
wants to merge 9 commits into from
Closed

Feature/sse s3 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a0d644a
add in a new option to enable SSE-S3
Sep 7, 2016
108b687
add comment on reasion for AES256 const
Sep 7, 2016
ac22d06
for now hard code header values for testing
Sep 9, 2016
3eaef0b
set SSE type here too
Sep 9, 2016
3f2f364
read type from flags storage
Sep 9, 2016
59137fc
refer to const for AES256
Sep 9, 2016
2c66763
reference s3 const properly
Sep 9, 2016
7b366b1
conditionally add header
Sep 9, 2016
529b8a9
fix erroneous logic in setting header
Sep 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions internal/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import (
"time"

"github.com/codegangsta/cli"

"github.com/aws/aws-sdk-go/service/s3"
)

// Set up custom help text for goofys; in particular the usage section.
Expand Down Expand Up @@ -141,6 +143,13 @@ func NewApp() (app *cli.App) {
Usage: "Set Content-Type according to file extension and /etc/mime.types (default: off)",
},

/// http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUT.html
/// See http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html
cli.BoolFlag{
Name: "use-sse",
Usage: "Enable encryption at rest in S3 for all writes; without other flags, it will use AWS managed keys (SSE-S3) (default: off)",
},

/////////////////////////
// Tuning
/////////////////////////
Expand Down Expand Up @@ -197,6 +206,8 @@ type FlagStorage struct {
UsePathRequest bool
Profile string
UseContentType bool
UseSSE bool
SSEType string

// Tuning
StatCacheTTL time.Duration
Expand Down Expand Up @@ -253,13 +264,19 @@ func PopulateFlags(c *cli.Context) (flags *FlagStorage) {
UsePathRequest: c.Bool("use-path-request"),
Profile: c.String("profile"),
UseContentType: c.Bool("use-content-type"),
UseSSE: c.Bool("use-sse"),

// Debugging,
DebugFuse: c.Bool("debug_fuse"),
DebugS3: c.Bool("debug_s3"),
Foreground: c.Bool("f"),
}

// Set appropriate SSE type based on boolean flags
if flags.UseSSE {
flags.SSEType = s3.ServerSideEncryptionAes256 //SSE header string for non-KMS server-side encryption (SSE-S3)
}

// Handle the repeated "-o" flag.
for _, o := range c.StringSlice("o") {
parseOptions(flags.MountOptions, o)
Expand Down
8 changes: 8 additions & 0 deletions internal/goofys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,10 @@ func (fs *Goofys) copyObjectMultipart(size int64, from string, to string, mpuId
ContentType: fs.getMimeType(to),
}

if fs.flags.UseSSE {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not at a computer now but this seems redundant?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup. My mistake. Good eye!

params.ServerSideEncryption = &fs.flags.SSEType
}

resp, err := fs.s3.CreateMultipartUpload(params)
if err != nil {
return mapAwsError(err)
Expand Down Expand Up @@ -531,6 +535,10 @@ func (fs *Goofys) copyObjectMaybeMultipart(size int64, from string, to string) (
ContentType: fs.getMimeType(to),
}

if fs.flags.UseSSE {
params.ServerSideEncryption = &fs.flags.SSEType
}

_, err = fs.s3.CopyObject(params)
if err != nil {
err = mapAwsError(err)
Expand Down
8 changes: 8 additions & 0 deletions internal/handles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,10 @@ func (fh *FileHandle) initMPU(fs *Goofys) {
ContentType: fs.getMimeType(*fh.inode.FullName),
}

if fs.flags.UseSSE {
params.ServerSideEncryption = &fs.flags.SSEType
}

resp, err := fs.s3.CreateMultipartUpload(params)

fh.mu.Lock()
Expand Down Expand Up @@ -855,6 +859,10 @@ func (fh *FileHandle) flushSmallFile(fs *Goofys) (err error) {
ContentType: fs.getMimeType(*fh.inode.FullName),
}

if fs.flags.UseSSE {
params.ServerSideEncryption = &fs.flags.SSEType
}

fs.replicators.Take(1, true)
defer fs.replicators.Return(1)

Expand Down