Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
b76c63a9
Commit
b76c63a9
authored
Jul 27, 2017
by
Saksham Sharma
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add unit tests for KMS transformer initialization
parent
49989439
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
97 additions
and
3 deletions
+97
-3
BUILD
...8s.io/apiserver/pkg/server/options/encryptionconfig/BUILD
+1
-0
encryptionconfig_test.go
.../server/options/encryptionconfig/encryptionconfig_test.go
+96
-3
No files found.
staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/BUILD
View file @
b76c63a9
...
@@ -36,5 +36,6 @@ go_test(
...
@@ -36,5 +36,6 @@ go_test(
deps = [
deps = [
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/value:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/value:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope:go_default_library",
],
],
)
)
staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/encryptionconfig_test.go
View file @
b76c63a9
...
@@ -18,11 +18,16 @@ package encryptionconfig
...
@@ -18,11 +18,16 @@ package encryptionconfig
import
(
import
(
"bytes"
"bytes"
"encoding/base64"
"fmt"
"io"
"os"
"strings"
"strings"
"testing"
"testing"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/storage/value"
"k8s.io/apiserver/pkg/storage/value"
"k8s.io/apiserver/pkg/storage/value/encrypt/envelope"
)
)
const
(
const
(
...
@@ -30,6 +35,10 @@ const (
...
@@ -30,6 +35,10 @@ const (
sampleContextText
=
"0123456789"
sampleContextText
=
"0123456789"
// Modify these in all configurations if changed
testEnvelopeServiceConfigPath
=
"testproviderconfig"
testEnvelopeServiceProviderName
=
"testprovider"
correctConfigWithIdentityFirst
=
`
correctConfigWithIdentityFirst
=
`
kind: EncryptionConfig
kind: EncryptionConfig
apiVersion: v1
apiVersion: v1
...
@@ -45,6 +54,10 @@ resources:
...
@@ -45,6 +54,10 @@ resources:
secret: c2VjcmV0IGlzIHNlY3VyZQ==
secret: c2VjcmV0IGlzIHNlY3VyZQ==
- name: key2
- name: key2
secret: dGhpcyBpcyBwYXNzd29yZA==
secret: dGhpcyBpcyBwYXNzd29yZA==
- kms:
name: testprovider
configfile: testproviderconfig
cachesize: 10
- aescbc:
- aescbc:
keys:
keys:
- name: key1
- name: key1
...
@@ -74,6 +87,10 @@ resources:
...
@@ -74,6 +87,10 @@ resources:
keys:
keys:
- name: key1
- name: key1
secret: YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY=
secret: YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY=
- kms:
name: testprovider
configfile: testproviderconfig
cachesize: 10
- aescbc:
- aescbc:
keys:
keys:
- name: key1
- name: key1
...
@@ -96,6 +113,10 @@ resources:
...
@@ -96,6 +113,10 @@ resources:
secret: c2VjcmV0IGlzIHNlY3VyZQ==
secret: c2VjcmV0IGlzIHNlY3VyZQ==
- name: key2
- name: key2
secret: dGhpcyBpcyBwYXNzd29yZA==
secret: dGhpcyBpcyBwYXNzd29yZA==
- kms:
name: testprovider
configfile: testproviderconfig
cachesize: 10
- identity: {}
- identity: {}
- secretbox:
- secretbox:
keys:
keys:
...
@@ -126,6 +147,40 @@ resources:
...
@@ -126,6 +147,40 @@ resources:
secret: c2VjcmV0IGlzIHNlY3VyZQ==
secret: c2VjcmV0IGlzIHNlY3VyZQ==
- name: key2
- name: key2
secret: dGhpcyBpcyBwYXNzd29yZA==
secret: dGhpcyBpcyBwYXNzd29yZA==
- kms:
name: testprovider
configfile: testproviderconfig
cachesize: 10
- identity: {}
- aesgcm:
keys:
- name: key1
secret: c2VjcmV0IGlzIHNlY3VyZQ==
- name: key2
secret: dGhpcyBpcyBwYXNzd29yZA==
`
correctConfigWithKMSFirst
=
`
kind: EncryptionConfig
apiVersion: v1
resources:
- resources:
- secrets
providers:
- kms:
name: testprovider
configfile: testproviderconfig
cachesize: 10
- secretbox:
keys:
- name: key1
secret: YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY=
- aescbc:
keys:
- name: key1
secret: c2VjcmV0IGlzIHNlY3VyZQ==
- name: key2
secret: dGhpcyBpcyBwYXNzd29yZA==
- identity: {}
- identity: {}
- aesgcm:
- aesgcm:
keys:
keys:
...
@@ -165,11 +220,42 @@ resources:
...
@@ -165,11 +220,42 @@ resources:
`
`
)
)
// testEnvelopeService is a mock envelope service which can be used to simulate remote Envelope services
// for testing of the envelope transformer with other transformers.
type
testEnvelopeService
struct
{
disabled
bool
}
func
(
t
*
testEnvelopeService
)
Decrypt
(
data
string
)
([]
byte
,
error
)
{
if
t
.
disabled
{
return
nil
,
fmt
.
Errorf
(
"Envelope service was disabled"
)
}
return
base64
.
StdEncoding
.
DecodeString
(
data
)
}
func
(
t
*
testEnvelopeService
)
Encrypt
(
data
[]
byte
)
(
string
,
error
)
{
if
t
.
disabled
{
return
""
,
fmt
.
Errorf
(
"Envelope service was disabled"
)
}
return
base64
.
StdEncoding
.
EncodeToString
(
data
),
nil
}
func
(
t
*
testEnvelopeService
)
SetDisabledStatus
(
status
bool
)
{
t
.
disabled
=
status
}
var
_
envelope
.
Service
=
&
testEnvelopeService
{}
func
TestEncryptionProviderConfigCorrect
(
t
*
testing
.
T
)
{
func
TestEncryptionProviderConfigCorrect
(
t
*
testing
.
T
)
{
// Creates two transformers with different ordering of identity and AES transformers.
os
.
OpenFile
(
testEnvelopeServiceConfigPath
,
os
.
O_CREATE
,
0666
)
// Transforms data using one of them, and tries to untransform using both of them.
defer
os
.
Remove
(
testEnvelopeServiceConfigPath
)
// Repeats this for both the possible combinations.
KMSPluginRegistry
.
Register
(
testEnvelopeServiceProviderName
,
func
(
config
io
.
Reader
)
(
envelope
.
Service
,
error
)
{
return
&
testEnvelopeService
{},
nil
})
// Creates compound/prefix transformers with different ordering of available transformers.
// Transforms data using one of them, and tries to untransform using the others.
// Repeats this for all possible combinations.
identityFirstTransformerOverrides
,
err
:=
ParseEncryptionConfiguration
(
strings
.
NewReader
(
correctConfigWithIdentityFirst
))
identityFirstTransformerOverrides
,
err
:=
ParseEncryptionConfiguration
(
strings
.
NewReader
(
correctConfigWithIdentityFirst
))
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"error while parsing configuration file: %s.
\n
The file was:
\n
%s"
,
err
,
correctConfigWithIdentityFirst
)
t
.
Fatalf
(
"error while parsing configuration file: %s.
\n
The file was:
\n
%s"
,
err
,
correctConfigWithIdentityFirst
)
...
@@ -190,11 +276,17 @@ func TestEncryptionProviderConfigCorrect(t *testing.T) {
...
@@ -190,11 +276,17 @@ func TestEncryptionProviderConfigCorrect(t *testing.T) {
t
.
Fatalf
(
"error while parsing configuration file: %s.
\n
The file was:
\n
%s"
,
err
,
correctConfigWithSecretboxFirst
)
t
.
Fatalf
(
"error while parsing configuration file: %s.
\n
The file was:
\n
%s"
,
err
,
correctConfigWithSecretboxFirst
)
}
}
kmsFirstTransformerOverrides
,
err
:=
ParseEncryptionConfiguration
(
strings
.
NewReader
(
correctConfigWithKMSFirst
))
if
err
!=
nil
{
t
.
Fatalf
(
"error while parsing configuration file: %s.
\n
The file was:
\n
%s"
,
err
,
correctConfigWithKMSFirst
)
}
// Pick the transformer for any of the returned resources.
// Pick the transformer for any of the returned resources.
identityFirstTransformer
:=
identityFirstTransformerOverrides
[
schema
.
ParseGroupResource
(
"secrets"
)]
identityFirstTransformer
:=
identityFirstTransformerOverrides
[
schema
.
ParseGroupResource
(
"secrets"
)]
aesGcmFirstTransformer
:=
aesGcmFirstTransformerOverrides
[
schema
.
ParseGroupResource
(
"secrets"
)]
aesGcmFirstTransformer
:=
aesGcmFirstTransformerOverrides
[
schema
.
ParseGroupResource
(
"secrets"
)]
aesCbcFirstTransformer
:=
aesCbcFirstTransformerOverrides
[
schema
.
ParseGroupResource
(
"secrets"
)]
aesCbcFirstTransformer
:=
aesCbcFirstTransformerOverrides
[
schema
.
ParseGroupResource
(
"secrets"
)]
secretboxFirstTransformer
:=
secretboxFirstTransformerOverrides
[
schema
.
ParseGroupResource
(
"secrets"
)]
secretboxFirstTransformer
:=
secretboxFirstTransformerOverrides
[
schema
.
ParseGroupResource
(
"secrets"
)]
kmsFirstTransformer
:=
kmsFirstTransformerOverrides
[
schema
.
ParseGroupResource
(
"secrets"
)]
context
:=
value
.
DefaultContext
([]
byte
(
sampleContextText
))
context
:=
value
.
DefaultContext
([]
byte
(
sampleContextText
))
originalText
:=
[]
byte
(
sampleText
)
originalText
:=
[]
byte
(
sampleText
)
...
@@ -207,6 +299,7 @@ func TestEncryptionProviderConfigCorrect(t *testing.T) {
...
@@ -207,6 +299,7 @@ func TestEncryptionProviderConfigCorrect(t *testing.T) {
{
aesCbcFirstTransformer
,
"aesCbcFirst"
},
{
aesCbcFirstTransformer
,
"aesCbcFirst"
},
{
secretboxFirstTransformer
,
"secretboxFirst"
},
{
secretboxFirstTransformer
,
"secretboxFirst"
},
{
identityFirstTransformer
,
"identityFirst"
},
{
identityFirstTransformer
,
"identityFirst"
},
{
kmsFirstTransformer
,
"kmsFirst"
},
}
}
for
_
,
testCase
:=
range
transformers
{
for
_
,
testCase
:=
range
transformers
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment