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

Jump to bottom

DCDT fixes #104

Merged
merged 1 commit into from
Jul 30, 2024
Merged

DCDT fixes #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/components/direct/dcdt/DCDTCertificates.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const DCDTCertificates = () => {
setResultsAddress(value)
}
}

const dcdtDomain = 'dcdt31.healthit.gov'
return (
<Box>
<Typography variant="body1">
Expand Down Expand Up @@ -143,7 +143,7 @@ const DCDTCertificates = () => {
<>
<Typography variant="h4" p={2} pl={0}>
<strong>Direct Address: </strong>
{discoverCase[0].Direct_address_2015}
{discoverCase[0].Direct_address_2015?.replace('dcdt31prod.sitenv.org', dcdtDomain)}
</Typography>
<TestCasePanel testCaseFields={discoverCase} />
</>
Expand Down
6 changes: 3 additions & 3 deletions src/components/direct/dcdt/DiscoveryTool.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ const DiscoveryTool = () => {
Discovery Tool
</Link>,
]}
heading={'2015 Direct Certificate Discovery Tool'}
heading={'Direct Certificate Discovery Tool'}
description={
<>
The 2015 Direct Certificate Discovery Tool (DCDT) was created to support automated testing of systems that
plan to enact the Certificate Discovery and Provider Directory Implementation Guide, approved as normative
The Direct Certificate Discovery Tool (DCDT) was created to support automated testing of systems that plan
to enact the Certificate Discovery and Provider Directory Implementation Guide, approved as normative
specification by the Direct community, as of July 9, 2012. It is based on the written test package and
requirement traceability matrix created by the Modular Specifications project under the direction of the
Office of the National Coordinator (ONC) and National Institute of Standards and Technology (NIST).
Expand Down
12 changes: 6 additions & 6 deletions src/components/direct/dcdt/HostingResults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,21 +149,21 @@ const Results = ({ response }: ResultsProps) => {
{item.success ? 'true' : 'false'}
</Typography>
<Typography>
<strong>Processing Messages:</strong>
{item.procMsgs ? item.procMsgs : 'None'}
<strong>Processing Message(s): </strong>
{!_.isEmpty(item.procMsgs) ? item.procMsgs : 'None'}
</Typography>
<Typography>
<strong>Processing Steps:</strong>
<strong>Processed Step(s):</strong>
</Typography>
<List disablePadding sx={bulletedList('number')}>
{' '}
{item.procSteps.map((step, i) => {
return (
<div key={i}>
<CustomListItem name={step.desc.text} value={''} />
<CustomListItem name={step.desc.text.replace('.', '')} value={''} />
<List sx={bulletedList('circle')}>
<CustomListItem name={'Success'} value={step.success ? 'true' : 'false'} />
<CustomListItem name={'Messages'} value={''} />
<CustomListItem name={'Message(s)'} value={''} />
<List sx={bulletedList('circle')}>
{step.msgs.map((msg, i) => {
return (
Expand Down Expand Up @@ -193,7 +193,7 @@ const Results = ({ response }: ResultsProps) => {
{item.discoveredCertInfo ? item.discoveredCertInfo.cert : 'None'}
</pre>
<Typography>
<strong>Discovered InValid Certificate:</strong>
<strong>Discovered Invalid Certificate(s):</strong>
</Typography>
<pre style={{ whiteSpace: 'pre-line', wordWrap: 'break-word' }}>
{!_.isEmpty(item.invalidDiscoveredCertInfos) ? item.invalidDiscoveredCertInfos[0].cert : 'None'}
Expand Down
4 changes: 4 additions & 0 deletions src/components/direct/dcdt/HostingTestCases.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const hostingTestCases: TestCaseFields[] = [
RTM_Sections: '1, 3',
RFC_4398: 'Section 2.1',
Direct_SHT: 'Section 5.3',
Background_Certificate: [],
Instructions:
"Enter a Direct address corresponding to an address-bound X.509 certificate that is hosted by your system's DNS and then click Submit. DCDT will attempt to discover the certificate and display the result on the screen.",
},
Expand All @@ -29,6 +30,7 @@ const hostingTestCases: TestCaseFields[] = [
RTM_Sections: '1, 3',
RFC_4398: 'Section 2.1',
Direct_SHT: 'Section 5.3',
Background_Certificate: [],
Instructions:
"Enter a Direct address corresponding to a domain-bound X.509 certificate that is hosted by your system's DNS and then click Submit. DCDT will attempt to discover the certificate and display the result on the screen.",
},
Expand All @@ -43,6 +45,7 @@ const hostingTestCases: TestCaseFields[] = [
"This test case verifies that your system's LDAP server can host and return the expected address-bound X.509 certificate.",
RTM_Sections: '2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 19, 20, 21, 22',
RFC_2798: 'Section 9.1.2',
Background_Certificate: [],
Instructions:
"Enter a Direct address corresponding to an address-bound X.509 certificate that is hosted by your system's LDAP server and then click Submit. DCDT will attempt to discover the certificate and display the result on the screen.",
},
Expand All @@ -57,6 +60,7 @@ const hostingTestCases: TestCaseFields[] = [
"This test case verifies that your system's LDAP server can host and return the expected domain-bound X.509 certificate.",
RTM_Sections: '2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 19, 20, 21, 22',
RFC_2798: 'Section 9.1.2',
Background_Certificate: [],
Instructions:
"Enter a Direct address corresponding to a domain-bound X.509 certificate that is hosted by your system's LDAP server and then click Submit. DCDT will attempt to discover the certificate and display the result on the screen.",
},
Expand Down
9 changes: 6 additions & 3 deletions src/components/direct/dcdt/TestCasePanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,10 @@ const CertificateList = ({ certificateFields }: CertificateListProps) => {
<List key={i} sx={bulletedList('square')}>
{_.has(l, 'Type') && <CustomListItem name={'Type'} value={l.Type || ''} />}
{_.has(l, 'Mail_Address') && (
<CustomListItem name={'Mail Address'} value={l.Mail_Address || ''} />
<CustomListItem
name={'Mail Address'}
value={l.Mail_Address?.replace('dcdt30prod.sitenv.org', 'dcdt30.healthit.gov') || ''}
/>
)}
{_.has(l, 'Host') && <CustomListItem name={'Host'} value={l.Host || ''} />}
{_.has(l, 'Port') && <CustomListItem name={'Port'} value={l.Port || ''} />}
Expand Down Expand Up @@ -212,15 +215,15 @@ const TestCasePanel = ({ testCaseFields }: TestCasePanelProps) => {
{_.has(testCaseFields[0], 'Target_Certificate') && (
<Box>
<Typography variant="body2">
<strong>Target Certificate(s)</strong>
<strong>Target Certificate(s):</strong>
</Typography>
<CertificateList certificateFields={testCaseFields[0].Target_Certificate || []} />
</Box>
)}
{_.has(testCaseFields[0], 'Background_Certificate') && (
<Box>
<Typography variant="body2">
<strong>Background Certificate(s)</strong>
<strong>Background Certificate(s):</strong>
</Typography>
<CertificateList certificateFields={testCaseFields[0].Background_Certificate || []} />
</Box>
Expand Down