mirror of
https://github.com/ultravioletrs/cocos.git
synced 2026-06-22 20:00:18 +00:00
da31d76c94
CI / checkproto (push) Has been cancelled
CI / lint (push) Has been cancelled
Rust CI Pipeline / rust-check (push) Has been cancelled
CI / test (agent) (push) Has been cancelled
CI / test (cli) (push) Has been cancelled
CI / test (cmd) (push) Has been cancelled
CI / test (internal) (push) Has been cancelled
CI / test (manager, true) (push) Has been cancelled
CI / test (pkg) (push) Has been cancelled
CI / upload-coverage (push) Has been cancelled
* feat(kbs): implement KBS client for attestation and resource retrieval - Added KBS client implementation in pkg/kbs/client.go with methods for attestation and resource retrieval. - Introduced necessary data structures for requests and responses. - Implemented error handling for various scenarios. test(kbs): add unit tests for KBS client - Created comprehensive tests for the KBS client in pkg/kbs/client_test.go. - Included tests for attestation success and failure cases, as well as resource retrieval. feat(registry): introduce HTTP and S3 registry implementations - Added HTTPRegistry for downloading resources over HTTP/HTTPS with retry logic in pkg/registry/http.go. - Implemented S3Registry for downloading resources from AWS S3 and S3-compatible services in pkg/registry/s3.go. - Included error handling and configuration options for both registries. chore(registry): define registry interface and configuration - Created registry interface and configuration struct in pkg/registry/registry.go. - Added default configuration settings for registry clients. docs(cvms): update README for CVMS server configuration and usage - Enhanced documentation for CVMS server with detailed command-line flags and usage examples. - Clarified direct upload and remote resource modes, including KBS integration. fix(cvms): integrate KBS for remote resource handling in main.go - Updated main.go to support remote datasets and algorithms using KBS. - Added validation for command-line flags to ensure proper configuration. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * fix: Move ifeq conditional outside define block in attestation-service.mk Make conditionals cannot be evaluated inside define...endef blocks when used as recipe bodies. Restructured to define the ATTESTATION_SERVICE_INSTALL_INIT_SYSTEMD block conditionally based on BR2_PACKAGE_CC_ATTESTATION_AGENT configuration. * feat: Implement remote resource downloading for algorithms and datasets using AWS S3/MinIO credentials. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * feat: Add comprehensive documentation and agent support for testing remote resource download with KBS attestation. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * feat: Improve agent logging for remote resource configuration and KBS status, and add a testing guide for remote resource downloads with KBS attestation. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * feat: Add a comprehensive guide for testing remote resource download with KBS attestation and update multiple package versions to a specific commit. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * feat: Add failure transitions for resource reception states and a comprehensive guide for testing remote resource downloads with KBS attestation. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * feat: Implement remote resource download with KBS attestation in the agent and add a comprehensive testing guide. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * test: Add comprehensive guide for testing remote resource download with KBS attestation and include a debug log in the attestation client. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * feat: Delegate KBS attestation and token retrieval to a new attestation-agent service and document remote resource testing. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * client fixes Signed-off-by: Sammy Oina <sammyoina@gmail.com> * raw evidence Signed-off-by: Sammy Oina <sammyoina@gmail.com> * fix: Build all Go files in cmd directories, not just main.go This fixes the issue where fetch_raw_evidence.go wasn't being included in the attestation-service build. * fix: Wrap binary evidence in JSON for KBS compatibility Fixes 'invalid character' error by wrapping raw binary evidence in a JSON structure with base64 encoding, as expected by KBS. * chore: Update buildroot packages toc28cefaeIncludes fixes for: 1. attestation-service build (including fetch_raw_evidence.go) 2. Agent KBS evidence format (wrapping binary in JSON) * fix: Implement KBS RCAR handshake with cookies Fixes 'cookie not found' error (401) from KBS by: 1. Adding CookieJar support to KBS client 2. Implementing GetChallenge() to perform /auth handshake and capture session cookie 3. Updating Agent to get challenge, decode nonce, and use it for evidence generation 4. Regenerating mocks * chore: Update buildroot packages tof6981ac5Includes KBS RCAR handshake fix (cookie support + GetChallenge loop) * fix: Update KBS client JSON tags to kebab-case Fixes deserialization error (401) from KBS by: 1. Using kebab-case (e.g. extra-params) for JSON tags as per protocol. 2. Initializing ExtraParams as empty object {} instead of null/omitted. * fix: Wrap attestation evidence in primary_evidence format Updates Agent to construct 'tee-evidence' payload with: - primary_evidence: containing the actual quote/data - additional_evidence: empty JSON object This matches the Confidential Containers KBS Attestation Protocol requirements. * fix: Update KBS protocol version to 0.4.0 KBS rejected 0.1.0 with a version mismatch error. Bumping to 0.4.0 to match server expectation. * fix: Generate ephemeral key for KBS RuntimeData Updates RuntimeData to include a valid ephemeral EC P-256 public key in JWK format, as required by the KBS RCAR protocol. Also fixes the KBS client struct to support TEEPubKey as an object. * fix: Update sample attestation quote to valid JSON The default attestation.bin was binary, but the KBS Sample Verifier expects a valid JSON quote containing 'svn' and 'report_data'. Updated the embedded bin file to contain this JSON structure. * fix: Generate dynamic JSON quote for Sample TEE in FetchRawEvidence The KBS Sample Verifier expects a JSON object with 'svn' and 'report_data'. Previously, we were returning raw binary data (reportData+nonce). This commit updates FetchRawEvidence to return a marshaled JSON structure with: - svn: "1" - report_data: base64(req.ReportData) * refactor: Delegate Sample Attestation to Provider Refactored sample attestation logic: - Moved JSON Quote generation into EmptyProvider (standalone mode). - Updated FetchRawEvidence to call provider.TeeAttestation instead of manual generation. This enables using the real CC Attestation Agent for UNSPECIFIED platform if configured. * feat: Add comprehensive debug logging and enforce CC AA usage Changes: - Updated EmptyProvider to return error instead of generating mock data This forces proper use of CC Attestation Agent's sample attester - Added detailed logging to attestation-service FetchRawEvidence: * Hex dump of evidence (first 200 bytes) * String preview of evidence * Total evidence length - Added detailed logging to agent service: * Raw evidence hex and string previews * KBS evidence JSON preview (first 500 bytes) * Evidence lengths at each transformation step This logging will help diagnose why KBS Sample Verifier is rejecting evidence. * fix: Enable CC AA by default and add attestation-service log forwarding Changes: - Set USE_CC_ATTESTATION_AGENT=true by default in systemd service - Added StandardOutput/StandardError to forward logs to /var/log/cocos/ - Updated HAL makefile to handle new default value - This ensures attestation-service uses CC AA's sample attester - Logs will now be visible in CVMS output for debugging * feat: Add gRPC log forwarding to attestation-service Implemented the same log forwarding mechanism used by the agent: - Added ProtoHandler to write logs to both stdout and logQueue - Connected to log client (/run/cocos/log.sock) for gRPC forwarding - Added goroutine to forward logs to CVMS via log client - Logs will now appear in CVMS output during computation runs This enables visibility into attestation-service debug output including: - CC AA connection status - Evidence generation details (hex dumps, string previews) - Any errors from providers * fix: Parse sample evidence JSON instead of base64-encoding it The attestation-service returns sample evidence as JSON: {"svn":"1","report_data":"base64..."} The agent was incorrectly base64-encoding this JSON string again. KBS Sample Verifier expects the parsed JSON object directly. Fixed by: - Parsing the JSON evidence from attestation-service - Passing the parsed object directly in primary_evidence.evidence - This matches what KBS Sample Verifier expects * debug: Increase KBS evidence logging preview to 1000 bytes Show the complete JSON structure being sent to KBS to debug the attestation failure. * debug: Add comprehensive CC AA configuration logging Added debug logs to show: - Whether CC AA is enabled in config - CC AA address being used - Connection success/failure - Which provider is ultimately selected - Warning when falling back to EmptyProvider This will help diagnose why EmptyProvider is being used instead of CC Attestation Agent. * debug: Add startup logging for log client connection Added log message to show if log client connection succeeds at attestation-service startup. This will help diagnose why logs aren't appearing in CVMS output. * feat: Add retry logic with exponential backoff to log client Added simple retry mechanism to handle concurrent log requests: - 3 retry attempts with exponential backoff (10ms, 20ms, 40ms) - Applies to both SendLog and SendEvent methods - Centralized in log client so all services benefit - Should eliminate 'failed to send log' errors from concurrent requests This fixes the issue where attestation-service logs weren't appearing in CVMS output due to dropped messages. * fix: Flatten sample evidence fields in primary_evidence for KBS KBS Sample Verifier expects svn and report_data at the top level of primary_evidence, not nested under an 'evidence' key. Changed structure from: {"primary_evidence": {"tee": "sample", "evidence": {"svn": "1", ...}}} To: {"primary_evidence": {"tee": "sample", "svn": "1", "report_data": "...", ...}} This matches what KBS expects when deserializing the Quote structure. * fix: Use sample quote directly as primary_evidence per KBS protocol According to KBS attestation protocol spec, for sample TEE type, primary_evidence should be the sample quote JSON directly: {"svn": "1", "report_data": "..."} Removed extra 'tee' and 'platform' fields that were causing KBS to fail deserializing the Quote structure. The 'tee' field is already sent in the Request payload during RCAR handshake. Refs: - https://github.com/confidential-containers/trustee/blob/main/kbs/docs/kbs_attestation_protocol.md - https://github.com/confidential-containers/guest-components/blob/main/attestation-agent/attester/src/sample/mod.rs * fix: Make CC AA required for sample attestation when configured When USE_CC_ATTESTATION_AGENT=true, attestation-service now requires AA to be available for NoCC/sample platform. This ensures sample evidence always comes from AA with the correct KBS format. Changes: - Error out if AA connection fails for NoCC platform when AA is configured - Only use EmptyProvider if AA is explicitly NOT configured - Prevents incorrect sample evidence format from EmptyProvider This ensures attestation-service delegates to AA for sample evidence generation instead of creating it itself. * fix: Implement proper RCAR protocol with tee-pubkey and runtime-data hash Fixed KBS attestation error 'REPORT_DATA is different from that in Sample Quote' Changes: 1. Generate ephemeral EC key pair BEFORE getting evidence from AA 2. Create runtime-data with nonce + tee-pubkey (JWK format) 3. Hash runtime-data (SHA-256) and use as report_data for AA 4. This binds the tee-pubkey to the TEE evidence per RCAR protocol The report_data in the evidence now matches what KBS expects: hash(runtime-data) instead of computation ID. This completes the full RCAR protocol implementation: - Request → Challenge → Attestation (with bound tee-pubkey) → Response * fix(agent): use simple nonce for Sample attestation report_data For Sample/NoCC attestation, use the raw nonce bytes directly as report_data instead of hashing runtime-data. This avoids JSON serialization mismatches with the KBS Sample verifier. Real TEEs (TDX/SNP) still use runtime-data hash binding to cryptographically bind the ephemeral tee-pubkey to the evidence. * fix(agent): use RFC 8785 canonical JSON for runtime-data hashing The KBS Sample attestation verifier (and likely others) expects the report_data to be the SHA-256 hash of the *canonical* JSON serialization (RFC 8785) of the runtime-data. Standard Go JSON marshaling does not guarantee key ordering, leading to hash mismatches. This change uses github.com/gowebpki/jcs to canonicalize the runtime-data before hashing, ensuring compatibility with the KBS RCAR implementation. Also reverted the temporary 'simple nonce' workaround. * feat(hal): add CoCo Keyprovider and Skopeo packages - Add coco-keyprovider buildroot package with systemd service - Add skopeo buildroot package for OCI image handling - Add ocicrypt_keyprovider.conf for encrypted image decryption - Update Config.in to include new packages This enables standard CoCo ecosystem integration for encrypted OCI images instead of custom S3/HTTP registry clients. * feat(oci): add OCI image handling package with Skopeo integration - Add pkg/oci/types.go with ResourceSource and ImageManifest types - Add pkg/oci/skopeo.go with Skopeo wrapper for pull/decrypt - Add pkg/oci/extract.go for extracting algorithms and datasets from layers This package provides OCI image handling using Skopeo and CoCo Keyprovider for encrypted image decryption, replacing custom S3/HTTP registry clients. * chore: regenerate protobuf files for updated cvms.proto * refactor(agent): replace S3/HTTP/KBS with OCI package - Remove pkg/kbs and pkg/registry imports - Add pkg/oci import for OCI image handling - Replace downloadAndDecryptResource with OCI-based implementation - Use Skopeo + CoCo Keyprovider for automatic decryption - Reduce code from ~240 lines to ~70 lines This eliminates custom KBS RCAR handshake, S3/HTTP registry clients, and manual decryption logic. CoCo Keyprovider handles all decryption automatically via ocicrypt protocol. * chore: remove obsolete pkg/kbs and pkg/registry packages - Delete pkg/kbs/ (custom KBS client, ~300 lines) - Delete pkg/registry/ (S3/HTTP registry clients, ~400 lines) - Remove unused imports from agent/service.go - Run go mod tidy to clean up dependencies These packages have been replaced by pkg/oci with Skopeo and CoCo Keyprovider for standard CoCo ecosystem integration. * fix(agent): update ResourceSource struct to include type and encryption fields Signed-off-by: Sammy Oina <sammyoina@gmail.com> * fix(hal): update CoCo Keyprovider to v0.16.0 and fix build path - Update version from v0.11.0 to v0.16.0 (matches attestation agent) - Fix install path: target is at repo root, not in coco_keyprovider subdir - This fixes the build error where coco_keyprovider binary wasn't found The cargo workspace in guest-components builds to a shared target/ directory at the repository root, not within each crate's subdirectory. * feat: Update remote resources testing guide to use kbs-client and coco-keyprovider for key management and encryption, enable insecure TLS for Skopeo, and enhance CVMS with Signed-off-by: Sammy Oina <sammyoina@gmail.com> * feat: Update component versions, revise image encryption documentation, and sanitize OCI image paths for Skopeo compatibility. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * feat: Add `decompress` option to Dataset and `algo_type`/`algo_args` to Algorithm protobuf messages, updating client, test, and build configurations. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * Update multiple package versions and enhance OCI image extraction error reporting for missing algorithm files. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * chore: Bump package versions, improve OCI image extraction debugging by returning seen files, and remove unused dataset type parsing from test code. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * refactor: Migrate OCI extraction to use structured logging with `slog` and `context`, and update package versions. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * feat: Bump multiple component versions, add encrypted status for computation inputs and algorithms, and refine OCI layer extraction warnings. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * logging Signed-off-by: Sammy Oina <sammyoina@gmail.com> * feat: Add `Encrypted` field to algorithm and dataset resource sources and update all component versions. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * feat: update component versions, integrate coco-keyprovider service, and configure ocicrypt key provider. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * feat: add support for KBS parameters and dataset/algorithm hash calculations in CVMS Signed-off-by: Sammy Oina <sammyoina@gmail.com> * feat: update resource download and extraction logic to support requirements.txt and improve hash verification Signed-off-by: Sammy Oina <sammyoina@gmail.com> * chore: Update dependencies, improve code style, and add GetRawEvidence to attestation client mocks. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * Refactor code structure for improved readability and maintainability Signed-off-by: Sammy Oina <sammyoina@gmail.com> * fix: update golangci configuration to include errcheck for build path and remove unnecessary exclusions Signed-off-by: Sammy Oina <sammyoina@gmail.com> * fix: streamline kernel command line handling in QEMU args construction Signed-off-by: Sammy Oina <sammyoina@gmail.com> * feat: add attestation binary and update checksum tests and policy structure Signed-off-by: Sammy Oina <sammyoina@gmail.com> * Add unit tests for attestation agent, attestation, log, crypto, OCI, and Skopeo clients - Implement tests for the attestation agent client including Unix socket and TCP address handling, token retrieval, and error scenarios. - Enhance attestation client tests to cover fetching raw evidence for various platforms (SNP, TDX, VTPM, SNPvTPM) and validate error handling. - Introduce log client tests to verify retry behavior for sending logs and events. - Create comprehensive tests for crypto package focusing on AES-GCM decryption, encrypted resource parsing, and key unwrapping. - Add tests for OCI package to validate algorithm and dataset extraction, including JSON serialization of OCILayout. - Implement Skopeo client tests to ensure proper functionality for image pulling, inspecting, and resource source handling. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * fix: handle JSON marshal errors in test cases for decrypt and extract functions Signed-off-by: Sammy Oina <sammyoina@gmail.com> * test: add comprehensive tests for algorithm and dataset extraction with various scenarios Signed-off-by: Sammy Oina <sammyoina@gmail.com> * refactor: replace hardcoded Python script content with constant variable Signed-off-by: Sammy Oina <sammyoina@gmail.com> * fix: remove redundant mock expectation for SendAgentConfig in TestCreateVMWithAaKbsParams Signed-off-by: Sammy Oina <sammyoina@gmail.com> * test: add tests for event sending failure, dataset extraction with path traversal, and Skopeo client behavior Signed-off-by: Sammy Oina <sammyoina@gmail.com> * test: add tests for download and decryption of resources with various URL formats Signed-off-by: Sammy Oina <sammyoina@gmail.com> * refactor: Introduce OCIClient interface for agent service to improve testability of OCI image operations and enhance related tests. Signed-off-by: Sammy Oina <sammyoina@gmail.com> * refactor: Change `get_uint64_from_tcb` to accept `TcbVersion` by value and use `u64::from` for type conversions. --------- Signed-off-by: Sammy Oina <sammyoina@gmail.com>
713 lines
18 KiB
Go
713 lines
18 KiB
Go
// Copyright (c) Ultraviolet
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package crypto
|
|
|
|
import (
|
|
"crypto/aes"
|
|
"crypto/cipher"
|
|
"crypto/ecdh"
|
|
"crypto/rand"
|
|
"crypto/sha256"
|
|
"encoding/base64"
|
|
"encoding/json"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"golang.org/x/crypto/hkdf"
|
|
)
|
|
|
|
// testAESKeyWrap implements RFC 3394 AES Key Wrap for use in test setup.
|
|
func testAESKeyWrap(kek, key []byte) ([]byte, error) {
|
|
block, err := aes.NewCipher(kek)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
n := len(key) / 8
|
|
a := []byte{0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6}
|
|
r := make([][]byte, n+1)
|
|
for i := 1; i <= n; i++ {
|
|
r[i] = make([]byte, 8)
|
|
copy(r[i], key[(i-1)*8:i*8])
|
|
}
|
|
|
|
for j := 0; j <= 5; j++ {
|
|
for i := 1; i <= n; i++ {
|
|
t := uint64(n*j + i)
|
|
b := make([]byte, 16)
|
|
copy(b[:8], a)
|
|
copy(b[8:], r[i])
|
|
block.Encrypt(b, b)
|
|
for k := 0; k < 8; k++ {
|
|
a[k] = b[k] ^ byte(t>>(56-8*k))
|
|
}
|
|
r[i] = make([]byte, 8)
|
|
copy(r[i], b[8:])
|
|
}
|
|
}
|
|
|
|
result := make([]byte, (n+1)*8)
|
|
copy(result[:8], a)
|
|
for i := 1; i <= n; i++ {
|
|
copy(result[i*8:(i+1)*8], r[i])
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
func TestDecryptAESGCM(t *testing.T) {
|
|
// Generate a valid key
|
|
key := make([]byte, 32)
|
|
_, err := rand.Read(key)
|
|
require.NoError(t, err)
|
|
|
|
// Generate valid plaintext
|
|
plaintext := []byte("test plaintext data")
|
|
|
|
// Create cipher and encrypt
|
|
block, err := aes.NewCipher(key)
|
|
require.NoError(t, err)
|
|
|
|
aesgcm, err := cipher.NewGCM(block)
|
|
require.NoError(t, err)
|
|
|
|
iv := make([]byte, aesgcm.NonceSize())
|
|
_, err = rand.Read(iv)
|
|
require.NoError(t, err)
|
|
|
|
aad := []byte("additional data")
|
|
ciphertext := aesgcm.Seal(nil, iv, plaintext, aad)
|
|
// Split ciphertext and tag
|
|
tag := ciphertext[len(ciphertext)-aesgcm.Overhead():]
|
|
ciphertextOnly := ciphertext[:len(ciphertext)-aesgcm.Overhead()]
|
|
|
|
tests := []struct {
|
|
name string
|
|
ciphertext []byte
|
|
key []byte
|
|
iv []byte
|
|
tag []byte
|
|
aad []byte
|
|
wantErr bool
|
|
errContain string
|
|
}{
|
|
{
|
|
name: "valid decryption",
|
|
ciphertext: ciphertextOnly,
|
|
key: key,
|
|
iv: iv,
|
|
tag: tag,
|
|
aad: aad,
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "invalid key length",
|
|
ciphertext: ciphertextOnly,
|
|
key: []byte("short"),
|
|
iv: iv,
|
|
tag: tag,
|
|
aad: aad,
|
|
wantErr: true,
|
|
errContain: "key must be 16, 24, or 32 bytes",
|
|
},
|
|
{
|
|
name: "wrong key",
|
|
ciphertext: ciphertextOnly,
|
|
key: make([]byte, 32),
|
|
iv: iv,
|
|
tag: tag,
|
|
aad: aad,
|
|
wantErr: true,
|
|
errContain: "decryption failed",
|
|
},
|
|
{
|
|
name: "corrupted tag",
|
|
ciphertext: ciphertextOnly,
|
|
key: key,
|
|
iv: iv,
|
|
tag: make([]byte, len(tag)),
|
|
aad: aad,
|
|
wantErr: true,
|
|
errContain: "decryption failed",
|
|
},
|
|
{
|
|
name: "wrong aad",
|
|
ciphertext: ciphertextOnly,
|
|
key: key,
|
|
iv: iv,
|
|
tag: tag,
|
|
aad: []byte("wrong aad"),
|
|
wantErr: true,
|
|
errContain: "decryption failed",
|
|
},
|
|
{
|
|
name: "16 byte key",
|
|
ciphertext: nil,
|
|
key: make([]byte, 16),
|
|
iv: nil,
|
|
tag: nil,
|
|
aad: nil,
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "24 byte key",
|
|
ciphertext: nil,
|
|
key: make([]byte, 24),
|
|
iv: nil,
|
|
tag: nil,
|
|
aad: nil,
|
|
wantErr: false,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
// For tests with nil ciphertext, create new cipher with specified key
|
|
if tt.ciphertext == nil && !tt.wantErr {
|
|
_, err := rand.Read(tt.key)
|
|
require.NoError(t, err)
|
|
|
|
block, err := aes.NewCipher(tt.key)
|
|
require.NoError(t, err)
|
|
|
|
aesgcm, err := cipher.NewGCM(block)
|
|
require.NoError(t, err)
|
|
|
|
tt.iv = make([]byte, aesgcm.NonceSize())
|
|
_, err = rand.Read(tt.iv)
|
|
require.NoError(t, err)
|
|
|
|
tt.aad = []byte("test aad")
|
|
ciphertext := aesgcm.Seal(nil, tt.iv, plaintext, tt.aad)
|
|
tt.tag = ciphertext[len(ciphertext)-aesgcm.Overhead():]
|
|
tt.ciphertext = ciphertext[:len(ciphertext)-aesgcm.Overhead()]
|
|
}
|
|
|
|
got, err := DecryptAESGCM(tt.ciphertext, tt.key, tt.iv, tt.tag, tt.aad)
|
|
|
|
if tt.wantErr {
|
|
assert.Error(t, err)
|
|
if tt.errContain != "" {
|
|
assert.Contains(t, err.Error(), tt.errContain)
|
|
}
|
|
} else {
|
|
require.NoError(t, err)
|
|
assert.Equal(t, plaintext, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestParseEncryptedResource(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
data []byte
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "valid encrypted resource",
|
|
data: func() []byte {
|
|
resource := EncryptedResource{
|
|
Ciphertext: []byte("encrypted data"),
|
|
EncryptedKey: []byte("wrapped key"),
|
|
IV: []byte("initialization vector"),
|
|
Tag: []byte("auth tag"),
|
|
AAD: []byte("additional data"),
|
|
}
|
|
data, err := json.Marshal(resource)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return data
|
|
}(),
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "valid encrypted resource with EPK",
|
|
data: func() []byte {
|
|
resource := EncryptedResource{
|
|
Ciphertext: []byte("encrypted data"),
|
|
EncryptedKey: []byte("wrapped key"),
|
|
IV: []byte("initialization vector"),
|
|
Tag: []byte("auth tag"),
|
|
EPK: &EphemeralPublicKey{
|
|
Curve: "P-256",
|
|
X: "AAAA",
|
|
Y: "BBBB",
|
|
},
|
|
}
|
|
data, err := json.Marshal(resource)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return data
|
|
}(),
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "invalid JSON",
|
|
data: []byte("not valid json"),
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "empty JSON",
|
|
data: []byte("{}"),
|
|
wantErr: false,
|
|
},
|
|
{
|
|
name: "empty data",
|
|
data: []byte{},
|
|
wantErr: true,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got, err := ParseEncryptedResource(tt.data)
|
|
|
|
if tt.wantErr {
|
|
assert.Error(t, err)
|
|
assert.Nil(t, got)
|
|
} else {
|
|
require.NoError(t, err)
|
|
assert.NotNil(t, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestZeroBytes(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
input []byte
|
|
}{
|
|
{
|
|
name: "zero empty slice",
|
|
input: []byte{},
|
|
},
|
|
{
|
|
name: "zero small slice",
|
|
input: []byte{1, 2, 3, 4, 5},
|
|
},
|
|
{
|
|
name: "zero large slice",
|
|
input: make([]byte, 1024),
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
// Fill with non-zero values
|
|
for i := range tt.input {
|
|
tt.input[i] = byte(i + 1)
|
|
}
|
|
|
|
zeroBytes(tt.input)
|
|
|
|
// Verify all bytes are zero
|
|
for i, b := range tt.input {
|
|
assert.Equal(t, byte(0), b, "byte at index %d should be 0", i)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestDecryptWithWrappedKey(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
encryptedResource EncryptedResource
|
|
privateKey *ecdh.PrivateKey
|
|
wantErr bool
|
|
errContain string
|
|
}{
|
|
{
|
|
name: "missing ephemeral public key",
|
|
encryptedResource: EncryptedResource{
|
|
Ciphertext: []byte("test"),
|
|
EncryptedKey: []byte("key"),
|
|
IV: []byte("iv"),
|
|
Tag: []byte("tag"),
|
|
EPK: nil,
|
|
},
|
|
privateKey: nil,
|
|
wantErr: true,
|
|
errContain: "ephemeral public key is required",
|
|
},
|
|
{
|
|
name: "invalid X coordinate encoding",
|
|
encryptedResource: EncryptedResource{
|
|
Ciphertext: []byte("test"),
|
|
EncryptedKey: []byte("key"),
|
|
IV: []byte("iv"),
|
|
Tag: []byte("tag"),
|
|
EPK: &EphemeralPublicKey{
|
|
Curve: "P-256",
|
|
X: "!!!invalid base64!!!",
|
|
Y: "AAAA",
|
|
},
|
|
},
|
|
privateKey: nil,
|
|
wantErr: true,
|
|
errContain: "invalid encrypted resource format",
|
|
},
|
|
{
|
|
name: "invalid Y coordinate encoding",
|
|
encryptedResource: EncryptedResource{
|
|
Ciphertext: []byte("test"),
|
|
EncryptedKey: []byte("key"),
|
|
IV: []byte("iv"),
|
|
Tag: []byte("tag"),
|
|
EPK: &EphemeralPublicKey{
|
|
Curve: "P-256",
|
|
X: base64.RawURLEncoding.EncodeToString(make([]byte, 32)),
|
|
Y: "!!!invalid base64!!!",
|
|
},
|
|
},
|
|
privateKey: nil,
|
|
wantErr: true,
|
|
errContain: "invalid encrypted resource format",
|
|
},
|
|
{
|
|
name: "invalid public key bytes",
|
|
encryptedResource: EncryptedResource{
|
|
Ciphertext: []byte("test"),
|
|
EncryptedKey: []byte("key"),
|
|
IV: []byte("iv"),
|
|
Tag: []byte("tag"),
|
|
EPK: &EphemeralPublicKey{
|
|
Curve: "P-256",
|
|
X: base64.RawURLEncoding.EncodeToString([]byte("short")),
|
|
Y: base64.RawURLEncoding.EncodeToString([]byte("short")),
|
|
},
|
|
},
|
|
privateKey: func() *ecdh.PrivateKey {
|
|
key, _ := ecdh.P256().GenerateKey(rand.Reader)
|
|
return key
|
|
}(),
|
|
wantErr: true,
|
|
errContain: "invalid encrypted resource format",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got, err := DecryptWithWrappedKey(tt.encryptedResource, tt.privateKey)
|
|
|
|
if tt.wantErr {
|
|
assert.Error(t, err)
|
|
if tt.errContain != "" {
|
|
assert.Contains(t, err.Error(), tt.errContain)
|
|
}
|
|
} else {
|
|
require.NoError(t, err)
|
|
assert.NotNil(t, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestUnwrapKey(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
wrappedKey []byte
|
|
kek []byte
|
|
wantErr bool
|
|
errContain string
|
|
}{
|
|
{
|
|
name: "wrapped key too short",
|
|
wrappedKey: []byte("short"),
|
|
kek: make([]byte, 32),
|
|
wantErr: true,
|
|
errContain: "wrapped key length must be a multiple of 8 and at least 24 bytes",
|
|
},
|
|
{
|
|
name: "wrapped key not multiple of 8",
|
|
wrappedKey: make([]byte, 25),
|
|
kek: make([]byte, 32),
|
|
wantErr: true,
|
|
errContain: "wrapped key length must be a multiple of 8 and at least 24 bytes",
|
|
},
|
|
{
|
|
name: "invalid kek length",
|
|
wrappedKey: make([]byte, 24),
|
|
kek: []byte("short"),
|
|
wantErr: true,
|
|
errContain: "decryption failed",
|
|
},
|
|
{
|
|
name: "integrity check failure",
|
|
wrappedKey: make([]byte, 24),
|
|
kek: make([]byte, 32),
|
|
wantErr: true,
|
|
errContain: "key unwrap integrity check failed",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got, err := unwrapKey(tt.wrappedKey, tt.kek)
|
|
|
|
if tt.wantErr {
|
|
assert.Error(t, err)
|
|
if tt.errContain != "" {
|
|
assert.Contains(t, err.Error(), tt.errContain)
|
|
}
|
|
} else {
|
|
require.NoError(t, err)
|
|
assert.NotNil(t, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestEncryptedResourceStructure(t *testing.T) {
|
|
t.Run("EphemeralPublicKey JSON serialization", func(t *testing.T) {
|
|
epk := EphemeralPublicKey{
|
|
Curve: "P-256",
|
|
X: "test_x",
|
|
Y: "test_y",
|
|
}
|
|
|
|
data, err := json.Marshal(epk)
|
|
require.NoError(t, err)
|
|
|
|
var decoded EphemeralPublicKey
|
|
err = json.Unmarshal(data, &decoded)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, epk.Curve, decoded.Curve)
|
|
assert.Equal(t, epk.X, decoded.X)
|
|
assert.Equal(t, epk.Y, decoded.Y)
|
|
})
|
|
|
|
t.Run("EncryptedResource JSON serialization", func(t *testing.T) {
|
|
resource := EncryptedResource{
|
|
Ciphertext: []byte("ciphertext"),
|
|
EncryptedKey: []byte("encrypted_key"),
|
|
IV: []byte("iv"),
|
|
Tag: []byte("tag"),
|
|
AAD: []byte("aad"),
|
|
EPK: &EphemeralPublicKey{
|
|
Curve: "P-256",
|
|
X: "x_coord",
|
|
Y: "y_coord",
|
|
},
|
|
}
|
|
|
|
data, err := json.Marshal(resource)
|
|
require.NoError(t, err)
|
|
|
|
var decoded EncryptedResource
|
|
err = json.Unmarshal(data, &decoded)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, resource.Ciphertext, decoded.Ciphertext)
|
|
assert.Equal(t, resource.EncryptedKey, decoded.EncryptedKey)
|
|
assert.Equal(t, resource.IV, decoded.IV)
|
|
assert.Equal(t, resource.Tag, decoded.Tag)
|
|
assert.Equal(t, resource.AAD, decoded.AAD)
|
|
assert.NotNil(t, decoded.EPK)
|
|
assert.Equal(t, resource.EPK.Curve, decoded.EPK.Curve)
|
|
})
|
|
}
|
|
|
|
func TestDecryptWithWrappedKeyFullRoundTrip(t *testing.T) {
|
|
t.Run("full ECDH + key wrap + AES-GCM round trip", func(t *testing.T) {
|
|
// Generate recipient private key (who will decrypt)
|
|
recipientKey, err := ecdh.P256().GenerateKey(rand.Reader)
|
|
require.NoError(t, err)
|
|
|
|
// Generate ephemeral key pair (used to encrypt)
|
|
ephemeralKey, err := ecdh.P256().GenerateKey(rand.Reader)
|
|
require.NoError(t, err)
|
|
|
|
// Compute shared secret: ephemeral_private ECDH recipient_public
|
|
sharedSecret, err := ephemeralKey.ECDH(recipientKey.PublicKey())
|
|
require.NoError(t, err)
|
|
|
|
// Derive KEK using HKDF (same as in DecryptWithWrappedKey)
|
|
kek := make([]byte, 32)
|
|
kdf := hkdf.New(sha256.New, sharedSecret, nil, nil)
|
|
_, err = kdf.Read(kek)
|
|
require.NoError(t, err)
|
|
|
|
// Generate random CEK (32 bytes)
|
|
cek := make([]byte, 32)
|
|
_, err = rand.Read(cek)
|
|
require.NoError(t, err)
|
|
|
|
// Wrap CEK using AES Key Wrap (RFC 3394)
|
|
wrappedKey, err := testAESKeyWrap(kek, cek)
|
|
require.NoError(t, err)
|
|
|
|
// Encrypt plaintext with AES-GCM using CEK
|
|
plaintext := []byte("hello world secret message for testing")
|
|
blk, err := aes.NewCipher(cek)
|
|
require.NoError(t, err)
|
|
aesgcm, err := cipher.NewGCM(blk)
|
|
require.NoError(t, err)
|
|
iv := make([]byte, aesgcm.NonceSize())
|
|
_, err = rand.Read(iv)
|
|
require.NoError(t, err)
|
|
|
|
// Go's Seal returns ciphertext || tag
|
|
combined := aesgcm.Seal(nil, iv, plaintext, nil)
|
|
ciphertext := combined[:len(combined)-aesgcm.Overhead()]
|
|
tag := combined[len(combined)-aesgcm.Overhead():]
|
|
|
|
// Get ephemeral public key coordinates (uncompressed: 0x04 || X(32) || Y(32))
|
|
epkPubBytes := ephemeralKey.PublicKey().Bytes()
|
|
xBytes := epkPubBytes[1:33]
|
|
yBytes := epkPubBytes[33:65]
|
|
|
|
resource := EncryptedResource{
|
|
Ciphertext: ciphertext,
|
|
EncryptedKey: wrappedKey,
|
|
IV: iv,
|
|
Tag: tag,
|
|
EPK: &EphemeralPublicKey{
|
|
Curve: "P-256",
|
|
X: base64.RawURLEncoding.EncodeToString(xBytes),
|
|
Y: base64.RawURLEncoding.EncodeToString(yBytes),
|
|
},
|
|
}
|
|
|
|
decrypted, err := DecryptWithWrappedKey(resource, recipientKey)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, plaintext, decrypted)
|
|
})
|
|
|
|
t.Run("full round trip with AAD", func(t *testing.T) {
|
|
recipientKey, err := ecdh.P256().GenerateKey(rand.Reader)
|
|
require.NoError(t, err)
|
|
|
|
ephemeralKey, err := ecdh.P256().GenerateKey(rand.Reader)
|
|
require.NoError(t, err)
|
|
|
|
sharedSecret, err := ephemeralKey.ECDH(recipientKey.PublicKey())
|
|
require.NoError(t, err)
|
|
|
|
kek := make([]byte, 32)
|
|
kdf := hkdf.New(sha256.New, sharedSecret, nil, nil)
|
|
_, err = kdf.Read(kek)
|
|
require.NoError(t, err)
|
|
|
|
cek := make([]byte, 16) // 16-byte CEK (AES-128)
|
|
_, err = rand.Read(cek)
|
|
require.NoError(t, err)
|
|
|
|
wrappedKey, err := testAESKeyWrap(kek, cek)
|
|
require.NoError(t, err)
|
|
|
|
plaintext := []byte("confidential data with AAD")
|
|
aad := []byte("additional authenticated data")
|
|
|
|
blk, err := aes.NewCipher(cek)
|
|
require.NoError(t, err)
|
|
aesgcm, err := cipher.NewGCM(blk)
|
|
require.NoError(t, err)
|
|
iv := make([]byte, aesgcm.NonceSize())
|
|
_, err = rand.Read(iv)
|
|
require.NoError(t, err)
|
|
|
|
combined := aesgcm.Seal(nil, iv, plaintext, aad)
|
|
ciphertext := combined[:len(combined)-aesgcm.Overhead()]
|
|
tag := combined[len(combined)-aesgcm.Overhead():]
|
|
|
|
epkPubBytes := ephemeralKey.PublicKey().Bytes()
|
|
xBytes := epkPubBytes[1:33]
|
|
yBytes := epkPubBytes[33:65]
|
|
|
|
resource := EncryptedResource{
|
|
Ciphertext: ciphertext,
|
|
EncryptedKey: wrappedKey,
|
|
IV: iv,
|
|
Tag: tag,
|
|
AAD: aad,
|
|
EPK: &EphemeralPublicKey{
|
|
Curve: "P-256",
|
|
X: base64.RawURLEncoding.EncodeToString(xBytes),
|
|
Y: base64.RawURLEncoding.EncodeToString(yBytes),
|
|
},
|
|
}
|
|
|
|
decrypted, err := DecryptWithWrappedKey(resource, recipientKey)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, plaintext, decrypted)
|
|
})
|
|
|
|
t.Run("wrong private key fails decryption", func(t *testing.T) {
|
|
recipientKey, err := ecdh.P256().GenerateKey(rand.Reader)
|
|
require.NoError(t, err)
|
|
wrongKey, err := ecdh.P256().GenerateKey(rand.Reader)
|
|
require.NoError(t, err)
|
|
|
|
ephemeralKey, err := ecdh.P256().GenerateKey(rand.Reader)
|
|
require.NoError(t, err)
|
|
|
|
sharedSecret, err := ephemeralKey.ECDH(recipientKey.PublicKey())
|
|
require.NoError(t, err)
|
|
|
|
kek := make([]byte, 32)
|
|
kdf := hkdf.New(sha256.New, sharedSecret, nil, nil)
|
|
_, err = kdf.Read(kek)
|
|
require.NoError(t, err)
|
|
|
|
cek := make([]byte, 32)
|
|
_, err = rand.Read(cek)
|
|
require.NoError(t, err)
|
|
|
|
wrappedKey, err := testAESKeyWrap(kek, cek)
|
|
require.NoError(t, err)
|
|
|
|
plaintext := []byte("secret")
|
|
blk, err := aes.NewCipher(cek)
|
|
require.NoError(t, err)
|
|
aesgcm, err := cipher.NewGCM(blk)
|
|
require.NoError(t, err)
|
|
iv := make([]byte, aesgcm.NonceSize())
|
|
_, err = rand.Read(iv)
|
|
require.NoError(t, err)
|
|
|
|
combined := aesgcm.Seal(nil, iv, plaintext, nil)
|
|
ciphertext := combined[:len(combined)-aesgcm.Overhead()]
|
|
tag := combined[len(combined)-aesgcm.Overhead():]
|
|
|
|
epkPubBytes := ephemeralKey.PublicKey().Bytes()
|
|
xBytes := epkPubBytes[1:33]
|
|
yBytes := epkPubBytes[33:65]
|
|
|
|
resource := EncryptedResource{
|
|
Ciphertext: ciphertext,
|
|
EncryptedKey: wrappedKey,
|
|
IV: iv,
|
|
Tag: tag,
|
|
EPK: &EphemeralPublicKey{
|
|
Curve: "P-256",
|
|
X: base64.RawURLEncoding.EncodeToString(xBytes),
|
|
Y: base64.RawURLEncoding.EncodeToString(yBytes),
|
|
},
|
|
}
|
|
|
|
// Using wrong key should fail
|
|
_, err = DecryptWithWrappedKey(resource, wrongKey)
|
|
assert.Error(t, err)
|
|
})
|
|
}
|
|
|
|
func TestErrorTypes(t *testing.T) {
|
|
t.Run("error constants are defined", func(t *testing.T) {
|
|
assert.NotNil(t, ErrDecryptionFailed)
|
|
assert.NotNil(t, ErrInvalidKey)
|
|
assert.NotNil(t, ErrInvalidCiphertext)
|
|
assert.NotNil(t, ErrInvalidFormat)
|
|
|
|
assert.Equal(t, "decryption failed", ErrDecryptionFailed.Error())
|
|
assert.Equal(t, "invalid decryption key", ErrInvalidKey.Error())
|
|
assert.Equal(t, "invalid ciphertext", ErrInvalidCiphertext.Error())
|
|
assert.Equal(t, "invalid encrypted resource format", ErrInvalidFormat.Error())
|
|
})
|
|
}
|