Skip to content
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

Add fixes for getIssuer and getSerial (#15) #138

Merged
merged 11 commits into from
Oct 6, 2023
Merged

Add fixes for getIssuer and getSerial (#15) #138

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
79e7d31
Add fixes for getIssuer and getSerial (#15)
RyanHopkins7 Sep 14, 2023
eea2569
Use array.prototype.find instead of a for loop to find commonName
RyanHopkins7 Sep 15, 2023
0ea2eb0
Remove static and private from searchForCommonName
RyanHopkins7 Sep 18, 2023
7384637
Use for of loop in searchForCommonName
RyanHopkins7 Sep 18, 2023
5bb43f0
Add compatability to getSerial
RyanHopkins7 Sep 18, 2023
4f006d0
Use double quotes in getSerial
RyanHopkins7 Sep 18, 2023
7456fb5
Fix typo and suggest using getSerial("v2") in deprecation warning
RyanHopkins7 Sep 19, 2023
f80fef8
Use cert.getCommonName to get serial in CertManager
RyanHopkins7 Sep 19, 2023
e1d90d7
Remove unnecessary param from getCommonName
RyanHopkins7 Sep 19, 2023
d456c3b
Change names of variables / functions in CertManager to indicate that…
RyanHopkins7 Sep 24, 2023
e033fa4
Merge branch 'master' into master
JamesCullum Oct 6, 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
37 changes: 22 additions & 15 deletions lib/certUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,19 @@ class Certificate {
}

getCommonName() {
const X509_COMMON_NAME_KEY = "2.5.4.3";

let commonName = ""; // Default in case no subject is found
return this.searchForCommonName(this._cert.subject.typesAndValues);
}

// Search the subject's attributes for the common name of the certificate
const subjectAttributes = this._cert.subject.typesAndValues;
for (let index = 0; index < subjectAttributes.length; index++) {
const attribute = subjectAttributes[index];
if (attribute.type === X509_COMMON_NAME_KEY) {
commonName = attribute.value.valueBlock.value;
break;
searchForCommonName(attributes) {
const X509_COMMON_NAME_KEY = "2.5.4.3";
// Search the attributes for the common name of the certificate
for (const attr of attributes) {
if (attr.type === X509_COMMON_NAME_KEY) {
return attr.value.valueBlock.value;
}
}
return commonName;
// Return empty string if not found
return "";
}

verify() {
Expand Down Expand Up @@ -79,11 +78,19 @@ class Certificate {
}

getIssuer() {
return this._cert.issuer.typesAndValues[0].value.valueBlock.value;
return this.searchForCommonName(this._cert.issuer.typesAndValues);
}

getSerial() {
return this._cert.subject.typesAndValues[0].value.valueBlock.value;
getSerial(compatability) {
RyanHopkins7 marked this conversation as resolved.
Show resolved Hide resolved
if (compatability === undefined) {
console.warn("[DEPRECATION WARNING] Please use getSerial(\"v1\") or getSerial(\"v2\").");
RyanHopkins7 marked this conversation as resolved.
Show resolved Hide resolved
} else if (compatability === "v1") {
console.warn("[DEPRECATION WARNING] Please migrate to getSerial(\"v2\") which will return just the serial number.");
}

return (compatability === "v2")
? this._cert.serialNumber.valueBlock.toString()
: this.getCommonName(this._cert.serialNumber.valueBlock);
}

getVersion() {
Expand Down Expand Up @@ -480,7 +487,7 @@ const certMap = new Map();
class CertManager {
static addCert(certBuf) {
const cert = new Certificate(certBuf);
const serial = cert.getSerial();
const serial = cert.getIssuer();
RyanHopkins7 marked this conversation as resolved.
Show resolved Hide resolved
certMap.set(serial, cert);

return true;
Expand Down
8 changes: 4 additions & 4 deletions test/certUtils.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,15 @@ describe("cert utils", function() {
describe("getSerial", function() {
it("returns correct serial for attestation", function() {
const cert = new Certificate(h.certs.yubiKeyAttestation);
const serial = cert.getSerial();
assert.strictEqual(serial, "Yubico U2F EE Serial 1432534688");
const serial = cert.getSerial("v2");
assert.strictEqual(serial, "1432534688");
JamesCullum marked this conversation as resolved.
Show resolved Hide resolved
});
it("returns correct serial for root", function() {
const cert = new Certificate(h.certs.yubicoRoot);
const serial = cert.getSerial();
const serial = cert.getSerial("v2");
assert.strictEqual(
serial,
"Yubico U2F Root CA Serial 457200631",
"457200631",
);
});
});
Expand Down
Loading