Skip to content

Go v4 exhaustive #35

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

Closed
lucasmcdonald3 wants to merge 9 commits into from
Closed

Go v4 exhaustive #35

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
7122214
m
Oct 1, 2025
407b759
m
Oct 1, 2025
0cdf3cd
m
Oct 1, 2025
e6682ca
merge
Oct 13, 2025
92b0276
m
Oct 13, 2025
0216071
m
Oct 13, 2025
e7c912f
disable net ig
Oct 13, 2025
c33f815
m
Oct 13, 2025
eb4c56a
m
Oct 13, 2025
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
3 changes: 2 additions & 1 deletion test-server/go-v4-server/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/aws/amazon-s3-encryption-client-python/test-server/go-server

go 1.21
go 1.24.0

require (
github.com/aws/amazon-s3-encryption-client-go/v4 v4.0.0
Expand Down Expand Up @@ -28,6 +28,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.26.5 // indirect
github.com/aws/smithy-go v1.19.0 // indirect
golang.org/x/crypto v0.42.0 // indirect
)

// S3EC Go V4 is not released to pkg.go.dev as of writing.
Expand Down
3 changes: 2 additions & 1 deletion test-server/go-v4-server/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

github.com/aws/aws-sdk-go-v2 v1.24.0 h1:890+mqQ+hTpNuw0gGP6/4akolQkSToDJgHfQE7AwGuk=
github.com/aws/aws-sdk-go-v2 v1.24.0/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 h1:OCs21ST2LrepDfD3lwlQiOqIGp6JiEUqG84GzTDoyJs=
Expand Down Expand Up @@ -43,3 +42,5 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
2 changes: 1 addition & 1 deletion test-server/go-v4-server/local-go-s3ec
Open in desktop
Submodule local-go-s3ec updated from cbb8bc to 1e87cc
19 changes: 18 additions & 1 deletion test-server/go-v4-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/aws/amazon-s3-encryption-client-go/v4/client"
"github.com/aws/amazon-s3-encryption-client-go/v4/materials"
"github.com/aws/amazon-s3-encryption-client-go/v4/commitment"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/service/kms"
Expand Down Expand Up @@ -42,6 +43,7 @@ type S3ECConfig struct {
EnableLegacyWrappingAlgorithms bool `json:"enableLegacyWrappingAlgorithms"`
SetBufferSize int64 `json:"setBufferSize"`
KeyMaterial KeyMaterial `json:"keyMaterial"`
CommitmentPolicy string `json:"commitmentPolicy"`
}

// KeyMaterial represents the key material for encryption
Expand Down Expand Up @@ -147,6 +149,19 @@ func (s *Server) createClient(w http.ResponseWriter, r *http.Request) {
return
}

var commitmentPolicy commitment.CommitmentPolicy
switch input.Config.CommitmentPolicy {
case "REQUIRE_ENCRYPT_REQUIRE_DECRYPT":
commitmentPolicy = commitment.REQUIRE_ENCRYPT_REQUIRE_DECRYPT
case "REQUIRE_ENCRYPT_ALLOW_DECRYPT":
commitmentPolicy = commitment.REQUIRE_ENCRYPT_ALLOW_DECRYPT
case "FORBID_ENCRYPT_ALLOW_DECRYPT":
commitmentPolicy = commitment.FORBID_ENCRYPT_ALLOW_DECRYPT
default:
s.createGenericServerError(w, fmt.Sprintf("Invalid commitment policy: %s", input.Config.CommitmentPolicy), http.StatusBadRequest)
return
}

// Create KMS keyring
kmsClient := kms.NewFromConfig(cfg)
keyring := materials.NewKmsKeyring(kmsClient, input.Config.KeyMaterial.KMSKeyID, func(options *materials.KeyringOptions) {
Expand All @@ -162,7 +177,9 @@ func (s *Server) createClient(w http.ResponseWriter, r *http.Request) {
// Create S3 encryption client
var s3EncryptionClient *client.S3EncryptionClientV4
s3PlaintextClient := s3.NewFromConfig(cfg)
s3EncryptionClient, err = client.New(s3PlaintextClient, cmm)
s3EncryptionClient, err = client.New(s3PlaintextClient, cmm, func(clientOptions *client.EncryptionClientOptions) {
clientOptions.CommitmentPolicy = commitmentPolicy
})

if err != nil {
s.createS3EncryptionClientError(w, fmt.Sprintf("Failed to create S3EC: %v", err), http.StatusInternalServerError)
Expand Down
4 changes: 2 additions & 2 deletions test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public class TestUtils {
Set.of(
// JAVA_V4,
// PYTHON_V3,
// GO_V4,
GO_V4,
// NET_V3,
// CPP_V3,
// PHP_V3,
Expand All @@ -119,7 +119,7 @@ public class TestUtils {
servers.put(PYTHON_V3, new LanguageServerTarget(PYTHON_V3, "8081"));
servers.put(GO_V3_CURRENT, new LanguageServerTarget(GO_V3_CURRENT, "8082"));
servers.put(NET_V2_CURRENT, new LanguageServerTarget(NET_V2_CURRENT, "8083"));
servers.put(NET_V3, new LanguageServerTarget(NET_V3, "8084"));
// servers.put(NET_V3, new LanguageServerTarget(NET_V3, "8084"));
servers.put(CPP_V2_CURRENT, new LanguageServerTarget(CPP_V2_CURRENT, "8085"));
servers.put(RUBY_V2_CURRENT, new LanguageServerTarget(RUBY_V2_CURRENT, "8086"));
servers.put(PHP_V2_CURRENT, new LanguageServerTarget(PHP_V2_CURRENT, "8087"));
Expand Down
Loading