(PE-37347) add bulk signing function #2801
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jonathannewman
force-pushed
the
PE-37347/add-bulk-signing-function
branch
from
d440a2e
to
d8efdb4
Compare
jonathannewman
commented
Dec 21, 2023
| @@ -1,34 +1,34 @@ | |||
| (ns puppetlabs.puppetserver.certificate-authority | |||
| (:import (java.io BufferedReader BufferedWriter FileNotFoundException InputStream ByteArrayOutputStream ByteArrayInputStream File Reader StringReader IOException) | |||
| (:require [clj-time.coerce :as time-coerce] | |||
There was a problem hiding this comment.
ran the cursive "organize imports" to clean this up.
jonathannewman
commented
Dec 21, 2023
| @@ -718,6 +718,29 @@ | |||
| (log/trace (i18n/trs "Finish append to serial file. ")))] | |||
| (ks-file/atomic-write infra-node-serials-path stream-content-fn))))))) | |||
|
|
|||
| (defn stream-content-to-file | |||
There was a problem hiding this comment.
Moved this out of "write-cert-to-inventory!" for reuse.
jonathannewman
commented
Dec 21, 2023
| (maybe-write-to-infra-serial! serial-number cert-name settings)))) | ||
|
|
||
| (schema/defn ^:always-validate |
There was a problem hiding this comment.
Same as above function, but assumes no locking needed
jonathannewman
commented
Dec 21, 2023
| @@ -1,34 +1,34 @@ | |||
| (ns puppetlabs.puppetserver.certificate-authority-test | |||
| (:import (java.io StringReader | |||
There was a problem hiding this comment.
Used Cursive to clean up imports.
jonathannewman
commented
Dec 21, 2023
| @@ -2109,18 +2109,18 @@ | |||
| subject (utils/cn "foo")] | |||
| (testing "should not support auto-renewal" | |||
| (is (false? (ca/supports-auto-renewal? (utils/generate-certificate-request keypair subject [] [])))) | |||
| (is (false? (ca/supports-auto-renewal? (utils/generate-certificate-request keypair subject [] [{:oid "1.3.6.1.4.1.34380.1.3.2" :value false}])))) | |||
There was a problem hiding this comment.
Did a find/replace on that magic string with the constant definition in ca. Thought it was easier to read.
jonathannewman
commented
Dec 21, 2023
| @@ -2251,3 +2251,131 @@ | |||
| (doseq [i (range 1 10000)] | |||
| (is (= (biginteger i) (ca/base-16-str->biginteger (format "0x%x" i))))))) | |||
|
|
|||
| (defn generate-csr | |||
There was a problem hiding this comment.
Helper function to generate a csr for the tests.
jonathannewman
commented
Dec 21, 2023
| (ca/sign-multiple-certificate-signing-requests! [(:subject-name csr-info)] settings report-activity)))))) | ||
| (testing "multiple entry with both bad and good csrs" | ||
| (let [count-range (range 0 100) | ||
| _ (println "begin generate good csrs") |
There was a problem hiding this comment.
This takes a little while (a few seconds), so I left the print statements in here to make it easier to understand why it is delayed.
jonathannewman
force-pushed
the
PE-37347/add-bulk-signing-function
branch
2 times, most recently
from
5e7cc35
to
a5ec471
Compare
This adds a new function that given a set of csr names, the CA settings and a function to report activity will attempt to sign all the csrs that are valid. The function returns a map that contains the names of the csrs that were signed, and those that weren't signed. The function validates alt-names, authorization-extensions, and signatures. Locking is done across the group to prevent lock contention. In local testing, it took ~5 seconds to process ~500 records, of which 100 were valid.
jonathannewman
force-pushed
the
PE-37347/add-bulk-signing-function
branch
from
a5ec471
to
dc6b63e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds a new function that given a set of csr names, the CA settings and a function to report activity will attempt to sign all the csrs that are valid. The function returns a map that contains the names of the csrs that were signed, and those that weren't signed.
The function validates alt-names, authorization-extensions, and signatures.
Locking is done across the group to prevent lock contention. In local testing, it took ~5 seconds to process ~500 records, of which 100 were valid.