Rename TLS certificate subject_dn and issuer_dn to subjectDn and issu…

…erDn
greenbone · Nov 3, 2023 · c259f28 · c259f28
1 parent 6b15fec
commit c259f28
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 13 deletions.
diff --git a/src/gmp/models/__tests__/tlscertificate.js b/src/gmp/models/__tests__/tlscertificate.js
@@ -47,8 +47,8 @@ describe('TlsCertificate Model tests', () => {
     };
     const tlsCertificate = TlsCertificate.fromElement(element);
 
-    expect(tlsCertificate.issuer_dn).toEqual('CN=issuer');
-    expect(tlsCertificate.subject_dn).toEqual('CN=subject');
+    expect(tlsCertificate.issuerDn).toEqual('CN=issuer');
+    expect(tlsCertificate.subjectDn).toEqual('CN=subject');
   });
 
   test('should parse activation_time', () => {

diff --git a/src/gmp/models/report/__tests__/parser.js b/src/gmp/models/report/__tests__/parser.js
@@ -543,8 +543,8 @@ describe('report parser tests', () => {
             activation_time: 'unlimited',
             expiration_time: 'undefined',
             valid: false,
-            subject_dn: 'CN=LoremIpsumSubject2 C=Dolor',
-            issuer_dn: 'CN=LoremIpsumIssuer2 C=Dolor',
+            subject_dn: 'CN=LoremIpsumSubject3 C=Dolor',
+            issuer_dn: 'CN=LoremIpsumIssuer3 C=Dolor',
             serial: '00C387C32CBB861F5C',
             host: {},
             ports: {port: ['8441']},
@@ -577,6 +577,8 @@ describe('report parser tests', () => {
     expect(cert1.valid).toEqual(true);
     expect(cert1.ports).toBeUndefined();
     expect(cert1.port).toEqual(4021);
+    expect(cert1.issuerDn).toEqual('CN=LoremIpsumIssuer C=Dolor');
+    expect(cert1.subjectDn).toEqual('CN=LoremIpsumSubject C=Dolor');
 
     expect(cert2.fingerprint).toEqual(
       '57610B6A3C73866870678E638C7825743145B24',
@@ -587,6 +589,8 @@ describe('report parser tests', () => {
     expect(cert2.valid).toEqual(true);
     expect(cert2.ports).toBeUndefined();
     expect(cert2.port).toEqual(4023);
+    expect(cert2.issuerDn).toEqual('CN=LoremIpsumIssuer C=Dolor');
+    expect(cert2.subjectDn).toEqual('CN=LoremIpsumSubject C=Dolor');
 
     expect(cert3.fingerprint).toEqual('C137E9D559CC95ED130011FE4012DE56CAE2F8');
     expect(cert3.hostname).toEqual('');
@@ -597,6 +601,8 @@ describe('report parser tests', () => {
     expect(cert3.expirationTime).toBeUndefined();
     expect(cert3.ports).toBeUndefined();
     expect(cert3.port).toEqual(8445);
+    expect(cert3.issuerDn).toEqual('CN=LoremIpsumIssuer2 C=Dolor');
+    expect(cert3.subjectDn).toEqual('CN=LoremIpsumSubject2 C=Dolor');
 
     expect(cert4.fingerprint).toEqual('C137E9D559CC95ED130011FE4012DE56CAE2F8');
     expect(cert4.hostname).toEqual('');
@@ -607,6 +613,8 @@ describe('report parser tests', () => {
     expect(cert4.expirationTime).toBeUndefined();
     expect(cert4.ports).toBeUndefined();
     expect(cert4.port).toEqual(5061);
+    expect(cert4.issuerDn).toEqual('CN=LoremIpsumIssuer2 C=Dolor');
+    expect(cert4.subjectDn).toEqual('CN=LoremIpsumSubject2 C=Dolor');
 
     expect(cert5.fingerprint).toEqual('C137E9D559CC95ED130011FE4012DE56CAE2F8');
     expect(cert5.hostname).toBeUndefined();
@@ -617,6 +625,8 @@ describe('report parser tests', () => {
     expect(cert5.expirationTime).toBeUndefined();
     expect(cert5.ports).toBeUndefined();
     expect(cert5.port).toEqual(8441);
+    expect(cert5.issuerDn).toEqual('CN=LoremIpsumIssuer3 C=Dolor');
+    expect(cert5.subjectDn).toEqual('CN=LoremIpsumSubject3 C=Dolor');
   });
 
   test('should parse empty tls certificates', () => {

diff --git a/src/gmp/models/report/parser.js b/src/gmp/models/report/parser.js
@@ -96,8 +96,8 @@ export const parseTlsCertificates = (report, filter) => {
         ? undefined
         : parseDate(expiration_time);
     cert.valid = parseBoolean(valid);
-    cert.subject_dn = subject_dn;
-    cert.issuer_dn = issuer_dn;
+    cert.subjectDn = subject_dn;
+    cert.issuerDn = issuer_dn;
     cert.serial = serial;
     cert.hostname = isDefined(host) ? host.hostname : '';
     cert.ip = isDefined(host) ? host.ip : undefined;

diff --git a/src/gmp/models/tlscertificate.js b/src/gmp/models/tlscertificate.js
@@ -54,6 +54,12 @@ class TlsCertificate extends Model {
     // Use subject DN as name
     ret.name = ret.subject_dn;
 
+    ret.subjectDn = element.subject_dn;
+    delete ret.subject_dn;
+
+    ret.issuerDn = element.issuer_dn;
+    delete ret.issuer_dn;
+
     ret.activationTime =
       element.activation_time === 'undefined' ||
       element.activation_time === 'unlimited'

diff --git a/src/web/pages/reports/details/tlscertificatestab.js b/src/web/pages/reports/details/tlscertificatestab.js
@@ -31,7 +31,7 @@ import {
 } from 'web/utils/sort';
 
 const tlsCertificatesSortFunctions = {
-  dn: makeCompareString('subject_dn'),
+  dn: makeCompareString('subjectDn'),
   serial: makeCompareString('serial'),
   notvalidbefore: makeCompareDate('activationTime'),
   notvalidafter: makeCompareDate('expirationTime'),

diff --git a/src/web/pages/reports/details/tlscertificatestable.js b/src/web/pages/reports/details/tlscertificatestable.js
@@ -129,7 +129,7 @@ const Row = ({
       <TableData>
         <StyledSpan>
           <RowDetailsToggle name={entity.id} onClick={onToggleDetailsClick}>
-            <Div>{entity.subject_dn}</Div>
+            <Div>{entity.subjectDn}</Div>
           </RowDetailsToggle>
         </StyledSpan>
       </TableData>

diff --git a/src/web/pages/tlscertificates/details.js b/src/web/pages/tlscertificates/details.js
@@ -53,16 +53,16 @@ const TlsCertificateDetails = ({entity, links = true}) => {
           <Col width="90%" />
         </colgroup>
         <TableBody>
-          {isDefined(entity.subject_dn) && (
+          {isDefined(entity.subjectDn) && (
             <TableRow>
               <TableData>{_('Subject DN')}</TableData>
-              <TableData>{entity.subject_dn}</TableData>
+              <TableData>{entity.subjectDn}</TableData>
             </TableRow>
           )}
-          {isDefined(entity.issuer_dn) && (
+          {isDefined(entity.issuerDn) && (
             <TableRow>
               <TableData>{_('Issuer DN')}</TableData>
-              <TableData>{entity.issuer_dn}</TableData>
+              <TableData>{entity.issuerDn}</TableData>
             </TableRow>
           )}
           {isDefined(entity.valid) && (

diff --git a/src/web/pages/tlscertificates/row.js b/src/web/pages/tlscertificates/row.js
@@ -93,7 +93,7 @@ const Row = ({
       <TableData>
         <span>
           <RowDetailsToggle name={entity.id} onClick={onToggleDetailsClick}>
-            <Div>{entity.subject_dn}</Div>
+            <Div>{entity.subjectDn}</Div>
           </RowDetailsToggle>
         </span>
       </TableData>