Skip to content

Refactor PIV metadata certificate logic #32250

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

Merged
Joerger merged 7 commits into from
Sep 26, 2023
Merged

Refactor PIV metadata certificate logic #32250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ddfd825
Change PIV metadata cert to be self signed by an ephemeral key so it …
Joerger Sep 20, 2023
620c376
Refactor touch prompt logic.
Joerger Sep 20, 2023
f055112
Prompt user before overwriting non-teleport certificates instead of j…
Joerger Sep 20, 2023
0d9db66
Update RFD and Docs.
Joerger Sep 20, 2023
f254270
Address CR.
Joerger Sep 21, 2023
5ccbf10
Export some methods and variables for use in tests.
Joerger Sep 21, 2023
879182d
Address comments.
Joerger Sep 25, 2023
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
27 changes: 17 additions & 10 deletions api/utils/keys/hardwaresigner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,19 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package keys
package keys_test

import (
"context"
"crypto/ecdsa"
"crypto/elliptic"
"crypto/rand"
"os"
"testing"

"github.com/stretchr/testify/require"

"github.com/gravitational/teleport/api/utils/keys"
)

// TestHardwareSigner tests the HardwareSigner interface with hardware keys.
Expand All @@ -38,27 +43,29 @@ func TestHardwareSigner(t *testing.T) {
resetYubikey(ctx, t)

// Generate a new YubiKeyPrivateKey. It should return a valid attestation statement and key policy.
priv, err := GetOrGenerateYubiKeyPrivateKey(false)
priv, err := keys.GetOrGenerateYubiKeyPrivateKey(false)
require.NoError(t, err)

att, err := GetAttestationStatement(priv)
att, err := keys.GetAttestationStatement(priv)
require.NoError(t, err)
require.NotNil(t, att)

policy := GetPrivateKeyPolicy(priv)
require.Equal(t, PrivateKeyPolicyHardwareKey, policy)
policy := keys.GetPrivateKeyPolicy(priv)
require.Equal(t, keys.PrivateKeyPolicyHardwareKey, policy)
}

// TestNonHardwareSigner tests the HardwareSigner interface with non-hardware keys.
func TestNonHardwareSigner(t *testing.T) {
// Non-hardware keys should return a nil attestation statement and PrivateKeyPolicyNone.
priv, err := ParsePrivateKey(rsaKeyPEM)
priv, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
require.NoError(t, err)

key, err := keys.NewPrivateKey(priv, nil)
require.NoError(t, err)

att, err := GetAttestationStatement(priv)
att, err := keys.GetAttestationStatement(key)
require.NoError(t, err)
require.Nil(t, att)

policy := GetPrivateKeyPolicy(priv)
require.Equal(t, PrivateKeyPolicyNone, policy)
policy := keys.GetPrivateKeyPolicy(key)
require.Equal(t, keys.PrivateKeyPolicyNone, policy)
}
Loading