Merge branch 'master' into hs/acme-revocation

This commit is contained in:
Herman Slatman 2021-07-17 19:04:43 +02:00
commit a4cfb6698f
No known key found for this signature in database
GPG Key ID: F4D8A44EA0A75A4F
4 changed files with 16 additions and 9 deletions

9
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@ -0,0 +1,9 @@
blank_issues_enabled: true
contact_links:
- name: Ask on Discord
url: https://discord.gg/7xgjhVAg6g
about: You can ask for help here!
- name: Want to contribute to step certificates?
url: https://github.com/smallstep/certificates/blob/master/docs/CONTRIBUTING.md
about: Be sure to read contributing guidelines!

View File

@ -1,5 +1,5 @@
--- ---
name: Certificates Enhancement name: Enhancement
about: Suggest an enhancement to step certificates about: Suggest an enhancement to step certificates
title: '' title: ''
labels: enhancement, needs triage labels: enhancement, needs triage

View File

@ -1,14 +1,12 @@
name: labeler name: Pull Request Labeler
on: on:
pull_request: pull_request_target
branches:
- master
jobs: jobs:
label: label:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/labeler@v3 - uses: actions/labeler@v3.0.2
with: with:
repo-token: "${{ secrets.GITHUB_TOKEN }}" repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/labeler.yml

View File

@ -400,7 +400,7 @@ func logOtt(w http.ResponseWriter, token string) {
func LogCertificate(w http.ResponseWriter, cert *x509.Certificate) { func LogCertificate(w http.ResponseWriter, cert *x509.Certificate) {
if rl, ok := w.(logging.ResponseLogger); ok { if rl, ok := w.(logging.ResponseLogger); ok {
m := map[string]interface{}{ m := map[string]interface{}{
"serial": cert.SerialNumber, "serial": cert.SerialNumber.String(),
"subject": cert.Subject.CommonName, "subject": cert.Subject.CommonName,
"issuer": cert.Issuer.CommonName, "issuer": cert.Issuer.CommonName,
"valid-from": cert.NotBefore.Format(time.RFC3339), "valid-from": cert.NotBefore.Format(time.RFC3339),
@ -418,7 +418,7 @@ func LogCertificate(w http.ResponseWriter, cert *x509.Certificate) {
if len(val.CredentialID) > 0 { if len(val.CredentialID) > 0 {
m["provisioner"] = fmt.Sprintf("%s (%s)", val.Name, val.CredentialID) m["provisioner"] = fmt.Sprintf("%s (%s)", val.Name, val.CredentialID)
} else { } else {
m["provisioner"] = val.Name m["provisioner"] = string(val.Name)
} }
break break
} }