Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions cmd/phoenix/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -1031,8 +1031,8 @@ func cmdResolve(args []string) error {
}

// Decode response — handle sealed or plaintext
values := make(map[string]string)
errs := make(map[string]string)
var values map[string]string
var errs map[string]string

if sealPrivKey != nil {
var result struct {
Expand All @@ -1043,6 +1043,7 @@ func cmdResolve(args []string) error {
return fmt.Errorf("decoding response: %w", err)
}
errs = result.Errors
values = make(map[string]string)
for ref, raw := range result.SealedValues {
if envMap, ok := raw.(map[string]interface{}); ok {
if envRef, _ := envMap["ref"].(string); envRef != ref {
Expand Down Expand Up @@ -2284,8 +2285,8 @@ func cmdAgentSockResolve(args []string) error {
}

// Decode response — handle sealed or plaintext
values := make(map[string]string)
errs := make(map[string]string)
var values map[string]string
var errs map[string]string

if sealPrivKey != nil {
var result struct {
Expand All @@ -2296,6 +2297,7 @@ func cmdAgentSockResolve(args []string) error {
return fmt.Errorf("decoding response: %w", err)
}
errs = result.Errors
values = make(map[string]string)
for ref, raw := range result.SealedValues {
if envMap, ok := raw.(map[string]interface{}); ok {
if envRef, _ := envMap["ref"].(string); envRef != ref {
Expand Down
4 changes: 0 additions & 4 deletions internal/api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,6 @@ func (s *Server) attest(r *http.Request, path string, info *authInfo, nonceValid
return s.attestFull(r, path, info, nonceValidated, false, false)
}

func (s *Server) attestSigned(r *http.Request, path string, info *authInfo, nonceValidated, signatureVerified bool) error {
return s.attestFull(r, path, info, nonceValidated, signatureVerified, false)
}

func (s *Server) attestFull(r *http.Request, path string, info *authInfo, nonceValidated, signatureVerified, sealKeyValidated bool) error {
if s.policy == nil {
return nil
Expand Down
2 changes: 1 addition & 1 deletion internal/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
// go build -ldflags "-X github.com/phoenixsec/phoenix/internal/version.Version=1.0.0"
package version

var Version = "1.0.0"
var Version = "0.11.0"