Cristian Le
f730c0bec4
Sanitize usernames
2021-05-05 08:15:26 +09:00
Cristian Le
48666792c7
Draft: adding usernames to GetIdentityFunc
2021-05-05 08:15:26 +09:00
Cristian Le
79eec83f3e
Rename and reformat to PreferredUsername
2021-05-05 08:15:26 +09:00
Cristian Le
09a21fef26
Implement #550
...
- Read `preferred_username` from token
- Add `preferred_username` to the default Usernames
- Check the `admin` array for admin groups that the user might belong to
2021-05-05 08:15:26 +09:00
max furman
8c709fe3c2
Init config on load | Add wrapper for cli
2021-05-04 14:45:11 -07:00
Mariano Cano
2cbaee9c1d
Allow to use an alternative interface to store renewed certs.
...
This can be useful to know if a certificate has been renewed and
link one certificate with the 'parent'.
2021-04-29 15:55:22 -07:00
Herman Slatman
68d5f6d0d2
Merge branch 'master' into hs/scep
2021-04-29 22:18:00 +02:00
Mariano Cano
e6833ecee3
Add extension of db.AuthDB to store the fullchain.
...
Add a temporary solution to allow an extension of an db.AuthDB
interface that logs the fullchain of certificates instead of just
the leaf.
2021-04-26 12:28:51 -07:00
Herman Slatman
2336936b5c
Fix typo
2021-04-16 15:49:33 +02:00
Herman Slatman
9787728fbd
Mask challenge password after it has been read
2021-04-16 14:09:34 +02:00
Herman Slatman
0487686f69
Merge branch 'master' into hs/scep
2021-04-16 13:25:01 +02:00
Max
b724af30ad
Merge pull request #496 from smallstep/max/acme
...
Convert to ACME DB interface
2021-04-13 15:02:03 -07:00
Mariano Cano
aea2a7c9f3
Update sshd_config.tpl to a Match all block.
...
Fixes #479
2021-04-12 18:37:10 -07:00
Herman Slatman
b815478981
Make serving SCEP endpoints optional
...
Only when a SCEP provisioner is enabled, the SCEP endpoints
will now be available.
The SCEP endpoints will be served on an "insecure" server,
without TLS, only when an additional "insecureAddress" and a
SCEP provisioner are configured for the CA.
2021-03-26 16:05:33 +01:00
Herman Slatman
c5e4ea08b3
Merge branch 'master' into hs/scep
2021-03-26 15:22:41 +01:00
max furman
2ae43ef2dc
[acme db interface] wip errors
2021-03-25 12:05:46 -07:00
Mariano Cano
0b8528ce6b
Allow mTLS revocation without provisioner.
2021-03-22 13:37:31 -07:00
Herman Slatman
583d60dc0d
Address (most) PR comments
2021-03-21 16:42:41 +01:00
Mariano Cano
bcf70206ac
Add support for revocation using an extra provisioner in the RA.
2021-03-17 19:47:36 -07:00
Mariano Cano
a6115e29c2
Add initial implementation of StepCAS.
...
StepCAS allows to configure step-ca as an RA using another step-ca
as the main CA.
2021-03-17 19:33:35 -07:00
Herman Slatman
a4844fee7b
Make tests green
2021-03-12 16:58:52 +01:00
Herman Slatman
99952080c7
Make tests not fail hard on ECDSA keys
...
All tests for the Authority failed because the test data
contains ECDSA keys. ECDSA keys are no crypto.Decrypter,
resulting in a failure when instantiating the Authority.
2021-03-12 16:27:26 +01:00
Herman Slatman
e1cab4966f
Improve initialization of SCEP authority
2021-03-12 15:49:39 +01:00
Herman Slatman
8c5b12e21d
Add non-TLS server and improve crypto.Decrypter interface
...
A server without TLS was added to serve the SCEP endpoints. According
to the RFC, SCEP has to be served via HTTP. The `sscep` client, for
example, will stop any URL that does not start with `http://` from
being used, so serving SCEP seems to be the right way to do it.
This commit adds a second server for which no TLS configuration is
configured. A distinct field in the configuration, `insecureAddress`
was added to specify the address for the insecure server.
The SCEP endpoints will also still be served via HTTPS. Some clients
may be able to work with that.
This commit also improves how the crypto.Decrypter interface is
handled for the different types of KMSes supported by step. The
apiv1.Decrypter interface was added. Currently only SoftKMS
implements this interface, providing a crypto.Decrypter required
for SCEP operations.
2021-03-12 14:18:36 +01:00
Herman Slatman
538fe8114d
Fix linter issues
2021-03-10 22:39:20 +01:00
Herman Slatman
2536a08dc2
Add support for configuring capabilities (cacaps)
2021-03-07 00:50:00 +01:00
Herman Slatman
e4d7ea8fa0
Add support for challenge password
2021-03-07 00:30:37 +01:00
Herman Slatman
311c9d767b
Add AuthorizeSign method to SCEP authority
2021-02-26 14:00:47 +01:00
Herman Slatman
7ad90d10b3
Refactor initialization of SCEP authority
2021-02-26 00:32:21 +01:00
Herman Slatman
9e43dc85d8
Merge branch 'master' into hs/scep-master
2021-02-19 10:16:39 +01:00
Herman Slatman
713b571d7a
Refactor SCEP authority initialization and clean some code
2021-02-12 17:02:39 +01:00
Herman Slatman
ffdd58ea3c
Add rudimentary (and incomplete) support for SCEP
2021-02-12 12:03:08 +01:00
Mariano Cano
fbd2208044
Close key manager for safe reloads when a cgo module is used.
2021-02-01 17:14:44 -08:00
max furman
16665c97f0
Allow empty SAN in CSR for validation ...
...
- The default template will always use the SANs from the token.
- If there are any SANs they must be validated against the token.
2021-01-14 15:26:46 -06:00
Miclain Keffeler
cf063d1f4a
Revert "Begins to fix issue 87"
...
This reverts commit e2ba4159c3
.
2020-12-23 22:46:21 -06:00
Miclain Keffeler
21dc406382
Begins to fix issue 87
2020-12-23 22:46:21 -06:00
Miclain Keffeler
7545b4a625
leverage intermediate_ca.crt for appending certs.
2020-12-23 22:41:10 -06:00
Mariano Cano
5017b7d21f
Recalculate token id instead of validating it.
2020-12-17 14:52:34 -08:00
Mariano Cano
86c947babc
Upgrade crypto and fix test.
2020-12-17 14:17:08 -08:00
Mariano Cano
0cf594a003
Validate payload ID.
...
Related to #435
2020-12-17 13:35:14 -08:00
Anton Lundin
3e6137110b
Add support for using ssh-agent as a KMS
...
This adds a new KMS, SSHAgentKMS, which is a KMS to provide signing keys
for issuing ssh certificates signed by a key managed by a ssh-agent. It
uses the golang.org/x/crypto package to get a native Go implementation
to talk to a ssh-agent.
This was primarly written to be able to use gpg-agent to provide the
keys stored in a YubiKeys openpgp interface, but can be used for other
setups like proxying a ssh-agent over network.
That way the signing key for ssh certificates can be kept in a
"sign-only" hsm.
This code was written for my employer Intinor AB, but for simplicity
sake gifted to me to contribute upstream.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2020-11-04 09:06:23 +01:00
Mariano Cano
39b23c057d
Add all AWS certificates used to verify base64 signatures.
2020-10-28 17:47:44 -07:00
Mariano Cano
ef92a3a6d7
Move cas options under authority.
2020-10-19 18:08:51 -07:00
Mariano Cano
7d1686dc53
Add option to specify the AWS IID certificates to use.
...
This changes adds a new option `iidRoots` that allows a user to
define one or more certificates that will be used for AWS IID
signature validation.
Fixes #393
2020-10-13 17:51:24 -07:00
Mariano Cano
647b9b4541
Merge pull request #367 from smallstep/cas
...
Support for CAS Interface and CloudCAS
2020-10-05 18:09:01 -07:00
Mariano Cano
3e0ab8fba7
Fix typo.
2020-10-05 18:00:50 -07:00
Mariano Cano
d64427487d
Add comment about the missing error check.
2020-10-05 17:39:44 -07:00
Mariano Cano
072adc906e
Print root fingerprint for CloudCAS.
2020-09-22 13:23:48 -07:00
Mariano Cano
38fa780775
Add interface to get root certificate from CAS.
...
This change makes easier the configuration of cloudCAS as it does
not require to configure the root or intermediate certificate
in the ca.json. CloudCAS will get the root certificate using
the configured certificateAuthority.
2020-09-21 15:27:20 -07:00
Mariano Cano
4c8bf87dc1
Use new admin template for K8ssa and admin-OIDC provisioners.
...
This change replaces the .Insecure.CR template to one that sets
all the SANs, but uses key usages and extended key usages for
regular TLS certificates.
2020-09-21 12:49:16 -07:00
Mariano Cano
d79b4e709e
Create a hash of a token if a token id is empty.
2020-09-18 16:25:08 -07:00
Mariano Cano
60515d92c5
Remove unnecessary properties.
2020-09-16 13:31:26 -07:00
Mariano Cano
1550a21f68
Fix unit tests.
2020-09-15 18:14:21 -07:00
Mariano Cano
e17ce39e3a
Add support for Revoke using CAS.
2020-09-15 18:14:03 -07:00
Mariano Cano
bd8dd9da41
Do not read issuer and signer twice.
2020-09-10 19:13:17 -07:00
Mariano Cano
aad8f9e582
Pass issuer and signer to softCAS options.
...
Remove commented code and initialize CAS properly.
Minor fixes in CloudCAS.
2020-09-10 19:09:46 -07:00
Mariano Cano
1b1f73dec6
Early attempt to develop a CAS interface.
2020-09-08 19:26:32 -07:00
Mariano Cano
276e307a1d
Add extra tests for CustomSSHTemplateOptions
2020-09-08 15:43:39 -07:00
max furman
da9f0b09af
Ignore null
string for x509 and ssh templateData.
2020-09-08 13:59:22 -07:00
Mariano Cano
81c6e01269
Fix unit test.
2020-09-04 11:16:17 -07:00
max furman
ce9af5c20f
Standardize k8ssa check on issuer name
2020-08-31 20:56:00 -07:00
Mariano Cano
8ee246edda
Upgrade go.step.sm to v0.4.0
2020-08-31 12:30:54 -07:00
Mariano Cano
ce5e1b4934
Fix merge issue.
2020-08-28 14:44:43 -07:00
Mariano Cano
35bd3ec383
Merge pull request #329 from smallstep/ssh-cert-templates
...
SSH cert templates
2020-08-28 14:42:58 -07:00
Mariano Cano
cef0475e71
Make clear what's a template/unsigned certificate.
2020-08-28 14:33:26 -07:00
Mariano Cano
4d375a06f5
Make clearer what's an unsigned cert.
2020-08-28 14:29:18 -07:00
Mariano Cano
b7269b6579
Fix comment.
2020-08-28 14:22:13 -07:00
Mariano Cano
c94a1c51be
Merge branch 'master' into ssh-cert-templates
2020-08-24 15:08:28 -07:00
Mariano Cano
ba918100d0
Use go.step.sm/crypto/jose
...
Replace use of github.com/smallstep/cli/crypto with the new package
go.step.sm/crypto/jose.
2020-08-24 14:44:11 -07:00
max furman
46fc922afd
Remove unused code; fix usage wrong word; add gap time for unit test
2020-08-20 18:48:17 -07:00
max furman
81875074e3
tie -> the in comment
2020-08-20 15:15:15 -07:00
max furman
cb594ed2e0
go mod tidy and golang 1.15.0 cleanup ...
...
- cs.NegotiatedProtocolIsMutual has been deprecated but we still build
in travis with 1.14 so for now we'll ignore this linting error
- string(int) was resolving to string of a single rune rather than
string of digits -> use fmt.Sprint
2020-08-17 13:48:37 -07:00
Mariano Cano
b900a7a2fc
Fix error message in tests.
2020-08-14 15:38:54 -07:00
Mariano Cano
d30a95236d
Use always go.step.sm/crypto
2020-08-14 15:33:50 -07:00
Mariano Cano
aaaa7e9b4e
Merge branch 'master' into cert-templates
2020-08-14 10:45:41 -07:00
Mariano Cano
3577d696c7
Use new x509util in tls_test.go
2020-08-10 18:14:32 -07:00
Mariano Cano
0a59efd853
Use new x509util to generate the CA certificate.
2020-08-10 16:09:22 -07:00
Mariano Cano
4943ae58d8
Move TLSOption, TLSVersion, CipherSuites and ASN1DN to certificates.
2020-08-10 15:29:18 -07:00
Mariano Cano
e83e47a91e
Use sshutil and randutil from go.step.sm/crypto.
2020-08-10 11:26:51 -07:00
Mariano Cano
ce1eb0a01b
Use new x509util for renew/rekey.
2020-08-05 19:09:06 -07:00
Mariano Cano
f437b86a7b
Merge branch 'cert-templates' into ssh-cert-templates
2020-08-05 18:43:07 -07:00
Mariano Cano
c8d225a763
Use x509util from go.step.sm/crypto/x509util
2020-08-05 16:02:46 -07:00
Mariano Cano
37f84e9bb3
Add delay in test.
2020-08-03 19:01:15 -07:00
Mariano Cano
342cb713ee
Add test with custom templates.
2020-08-03 18:51:47 -07:00
Mariano Cano
8d89bbd62f
Remove unused code.
2020-08-03 18:39:02 -07:00
Mariano Cano
c4bbc81d9f
Fix authority tests.
2020-08-03 18:36:05 -07:00
Mariano Cano
413af88aad
Fix provisioning tests.
2020-08-03 18:10:29 -07:00
Mariano Cano
b66bdfabcd
Enforce an OIDC users to send all template variables.
2020-08-03 15:28:48 -07:00
Mariano Cano
9822305bb6
Use only the IID template on IID provisioners.
...
Use always sshutil.DefaultIIDCertificate and require at least one
principal on IID provisioners.
2020-08-03 15:11:42 -07:00
Mariano Cano
aa657cdb4b
Use SSHOptions inside provisioner options.
2020-07-30 18:44:52 -07:00
Mariano Cano
02379d494b
Add support for extensions and critical options on the identity
...
function.
2020-07-30 17:45:03 -07:00
Mariano Cano
8ff8d90f8c
On JWK and X5C validate the key id on the request.
2020-07-30 17:45:03 -07:00
Mariano Cano
a78f7e8913
Add template support on k8ssa provisioner.
2020-07-30 17:45:03 -07:00
Mariano Cano
6c36ceb158
Add initial template support for iid provisisioners.
2020-07-30 17:45:03 -07:00
Mariano Cano
8e7bf96769
Fix error prefix.
2020-07-30 17:45:03 -07:00
Mariano Cano
e0dce54338
Add missing argument.
2020-07-30 17:45:03 -07:00
Mariano Cano
c1fc45c872
Simplify SSH modifiers with options.
...
It also changes the behavior of the request options to modify only
the validity of the certificate.
2020-07-30 17:45:03 -07:00
Mariano Cano
ad28f0f59a
Move variable where it is used.
2020-07-30 17:45:03 -07:00
Mariano Cano
715eb4eacc
Add initial support for ssh templates on OIDC.
2020-07-30 17:45:03 -07:00
Mariano Cano
c2dc76550c
Add ssh certificate template to X5C provisioner.
2020-07-30 17:45:03 -07:00
Mariano Cano
380a0d6daf
Add ssh certificate templates to JWK provisioner.
2020-07-30 17:45:03 -07:00
Mariano Cano
f75a12e10a
Add omitempty tag option.
2020-07-30 17:45:03 -07:00
Mariano Cano
d7e590908e
Use sshutil for ssh renewing and rekeying.
2020-07-30 17:45:02 -07:00
Mariano Cano
b66d123572
Use sshutil for SSH certificate signing.
2020-07-30 17:45:02 -07:00
Mariano Cano
570ede45e7
Do not enforce number of principals or extensions.
2020-07-30 17:45:02 -07:00
Mariano Cano
631f1612a1
Add TemplateData to SignSSHOptions.
2020-07-30 17:45:02 -07:00
Mariano Cano
c6746425a3
Add methods to initialize ssh templates in provisioners.
2020-07-30 17:45:02 -07:00
Mariano Cano
3e80f41c19
Change provisioner options to have X509 as a field.
2020-07-30 17:44:22 -07:00
max furman
3f844c5e23
Update the way SubjectKeyId is calculated, and more ...
...
- swith lint to first in line for `make all`
- update tests to conform with new subjectkeyid
2020-07-28 12:00:07 -07:00
Mariano Cano
a7b65f1e1e
Add authority.Sign test with custom templates.
2020-07-22 19:18:45 -07:00
David Cowden
86efe7aff0
aws: use http.NoBody instead of nil
...
It's a little more descriptive.
2020-07-22 18:39:46 -07:00
David Cowden
2b121efc8f
aws: test constructor with empty IDMS string array
2020-07-22 18:33:44 -07:00
Mariano Cano
6c64fb3ed2
Rename provisioner options structs:
...
* provisioner.ProvisionerOptions => provisioner.Options
* provisioner.Options => provisioner.SignOptions
* provisioner.SSHOptions => provisioner.SingSSHOptions
2020-07-22 18:24:45 -07:00
David Cowden
dc39eef721
aws: test badIDMS functional path
...
The existing test only covers the constructor logic. Also test the live
code path that is executed when a bad IDMS version is supplied.
2020-07-22 17:40:26 -07:00
David Cowden
51f16ee2e0
aws: add tests covering metadata service versions
...
* Add constructor tests for the aws provisioner.
* Add a test to make sure the "v1" logic continues to work.
By and large, v2 is the way to go. However, there are some instances of
things that specifically request metadata service version 1 and so this
adds minimal coverage to make sure we don't accidentally break the path
should anyone need to depend on the former logic.
2020-07-22 16:52:06 -07:00
David Cowden
5efe5f3573
metadata-v2: pull in joshathysolate-master
...
Taking of this PR to get it across the goal line.
2020-07-22 04:15:34 -07:00
Mariano Cano
978ad7e2b6
Fix merged tests.
2020-07-21 14:34:55 -07:00
Mariano Cano
5ac3f8a160
Add provisioner options tests.
2020-07-21 14:21:54 -07:00
Mariano Cano
02c4f9817d
Set full token payload instead of only the known properties.
2020-07-21 14:21:54 -07:00
Mariano Cano
0c8376a7f6
Fix existing unit tests.
2020-07-21 14:21:54 -07:00
Mariano Cano
d64cb99a22
Fix authority package tests.
2020-07-21 14:21:48 -07:00
Mariano Cano
ccc705cdcd
Use alias x509legacy to cli x509util in tls.go.
2020-07-21 14:20:48 -07:00
Mariano Cano
8f0dd811af
Allow to send errors from template to cli.
2020-07-21 14:18:06 -07:00
Mariano Cano
a7fe0104c4
Remove ACME restrictions and add proper template support.
2020-07-21 14:18:06 -07:00
Mariano Cano
cf2989a848
Add token and subject to K8sSA provisioner to be used in custom
...
templates.
2020-07-21 14:18:06 -07:00
Mariano Cano
71be83b25e
Add iss#sub uri in OIDC certificates.
...
Admin will use the CR template if none is provided.
2020-07-21 14:18:06 -07:00
Mariano Cano
c58117b30d
Allow to use base64 when defining a template in the ca.json.
2020-07-21 14:18:06 -07:00
Mariano Cano
b2ca3176f5
Prepend insecure to user and CR variables names.
2020-07-21 14:18:06 -07:00
Mariano Cano
b11486f41f
Fix option method for template variable.
2020-07-21 14:18:06 -07:00
Mariano Cano
04f5053a7a
Add template support for x5c.
2020-07-21 14:18:06 -07:00
Mariano Cano
eb8886d828
Add CR subject as iid default subject.
...
Add a minimal subject with just a common name to iid provisioners
in case we want to use it.
2020-07-21 14:18:06 -07:00
Mariano Cano
e60ea419cc
Add template support for gcp provisioner.
2020-07-21 14:18:06 -07:00
Mariano Cano
32646c49bf
Add templates support to Azure provisioner.
2020-07-21 14:18:06 -07:00
Mariano Cano
a44f0ca866
Add token payload.
2020-07-21 14:18:06 -07:00
Mariano Cano
00fd41a3d0
Add template support to K8sSA provisioners.
2020-07-21 14:18:06 -07:00
Mariano Cano
13b704aeed
Add template support for AWS provisioner.
2020-07-21 14:18:05 -07:00
Mariano Cano
49b9aa6e3f
Fix log string.
2020-07-21 14:18:05 -07:00
Mariano Cano
4795e371bd
Add back the support for ca.json DN template.
2020-07-21 14:18:05 -07:00
Mariano Cano
e6fed5e0aa
Minor fixes and comments.
2020-07-21 14:18:05 -07:00
Mariano Cano
81cd288104
Enable templates in acme provisioners.
2020-07-21 14:18:05 -07:00
Mariano Cano
ca2fb42d68
Move options to the provisioner.
2020-07-21 14:18:05 -07:00
Mariano Cano
206bc6757a
Add initial support for templates in the OIDC provisioner.
2020-07-21 14:18:05 -07:00
Mariano Cano
95c3a41bf0
Rename UserData to TemplateData and fix unmarshaling.
2020-07-21 14:18:04 -07:00
Mariano Cano
9f3acc254b
Set the token payload in the JWK provisioner.
2020-07-21 14:18:04 -07:00
Mariano Cano
ef0ed0ff95
Integrate simple templates in the JWK provisioner.
2020-07-21 14:18:04 -07:00
Mariano Cano
d1d9ae42d6
Use certificates x509util instead of cli for certificate signing.
2020-07-21 14:18:04 -07:00
Mariano Cano
9032018cf2
Convert x509util.WithOptions to new modifiers.
2020-07-21 14:18:04 -07:00
Carl Tashian
912e298043
Whitelist -> Allowlist per https://tools.ietf.org/id/draft-knodel-terminology-01.html
2020-07-20 15:42:47 -07:00
max furman
fd05f3249b
A few last fixes and tests added for rekey/renew ...
...
- remove all `renewOrRekey`
- explicitly test difference between renew and rekey (diff pub keys)
- add back tests for renew
2020-07-09 12:11:40 -07:00
Max
ea9bc493b8
Merge pull request #307 from dharanikumar-s/master
...
Add support for rekeying Fixes #292
2020-07-09 11:39:00 -07:00