Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2
3.2.0
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ GEM
method_source (1.0.0)
mini_cache (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
mini_portile2 (2.8.6)
minitest (5.19.0)
msgpack (1.7.2)
nenv (0.3.0)
Expand All @@ -219,7 +219,7 @@ GEM
net-protocol
newrelic_rpm (8.16.0)
nio4r (2.7.0)
nokogiri (1.16.2)
nokogiri (1.16.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
notiffany (0.1.3)
Expand Down
1 change: 1 addition & 0 deletions app/models/certificate.rb
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ def token_for_valid_certificate(extra)
subject: subject_s,
issuer: issuer.to_s,
uuid: piv.uuid,
key_id: key_id,
)
)
end
Expand Down
3 changes: 2 additions & 1 deletion spec/controllers/identify_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
allow(OcspService).to receive(:new).and_return(ocsp_responder)
end

it 'returns a token with a uuid and subject and logs certificate metadata' do
it 'returns a token with a uuid, subject, key id, and logs certificate metadata' do
allow(IdentityConfig.store).to receive(:client_cert_escaped).and_return(true)

cert = Certificate.new(client_cert)
Expand Down Expand Up @@ -169,6 +169,7 @@
expect(token).to be_truthy

expect(token_contents['nonce']).to eq '123'
expect(token_contents['key_id']).to eq(cert.key_id)

# N.B.: we do this split/sort because DNs match without respect to
# ordering of components. OpenSSL::X509::Name doesn't match correctly.
Expand Down