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

Add mx records to guidance #4699

Merged
merged 5 commits into from
Jul 28, 2023
Merged

Add mx records to guidance #4699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1eb3ec0
add MX records to email guidance
lcampbell2 Jul 25, 2023
344fefa
translations
lcampbell2 Jul 25, 2023
7cfe192
fix variable name in fr.po
lcampbell2 Jul 25, 2023
71cc3fb
Merge branch 'master' into add-mx-records-to-guidance
lcampbell2 Jul 28, 2023
2201716
remove red colour from warnings
lcampbell2 Jul 28, 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
82 changes: 54 additions & 28 deletions frontend/src/guidance/EmailGuidance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import { t, Trans } from '@lingui/macro'
import { object, string } from 'prop-types'
import { GuidanceTagList } from './GuidanceTagList'
import { StatusIcon } from '../components/StatusIcon'
import { InfoIcon } from '@chakra-ui/icons'
import { GuidanceSummaryCategories } from './GuidanceSummaryCategories'

export function EmailGuidance({ dnsResults, dmarcPhase, status }) {
Expand Down Expand Up @@ -68,7 +67,7 @@ export function EmailGuidance({ dnsResults, dmarcPhase, status }) {
return <ListItem key={idx}>{step}</ListItem>
})

const { dkim, dmarc, spf, timestamp } = dnsResults
const { dkim, dmarc, spf, timestamp, mxRecords } = dnsResults
const emailKeys = ['spf', 'dkim', 'dmarc']
let emailPassCount = 0
let emailInfoCount = 0
Expand Down Expand Up @@ -149,7 +148,7 @@ export function EmailGuidance({ dnsResults, dmarcPhase, status }) {
</AccordionItem>
)
return (
<Accordion allowMultiple defaultIndex={[0, 1, 2, 3]}>
<Accordion allowMultiple defaultIndex={[0, 1, 2, 3, 4]}>
<Text fontsize="lg">
<b>Last Scanned:</b> {formatTimestamp(timestamp)}
</Text>
Expand Down Expand Up @@ -252,31 +251,11 @@ export function EmailGuidance({ dnsResults, dmarcPhase, status }) {
},
)
) : (
<Box>
<Flex
px="2"
py="1"
bg="weakMuted"
borderWidth="1px"
borderColor="weak"
rounded="md"
align="center"
mb="1"
>
<InfoIcon color="weak" mr="2" />
<Text fontWeight="bold">
<Trans>
No DKIM selectors are currently attached to this domain. Please contact an admin of an affiliated
organization to add selectors.
</Trans>
</Text>
</Flex>
<GuidanceTagList
positiveTags={dkim.positiveTags}
neutralTags={dkim.neutralTags}
negativeTags={dkim.negativeTags}
/>
</Box>
<GuidanceTagList
positiveTags={dkim.positiveTags}
neutralTags={dkim.neutralTags}
negativeTags={dkim.negativeTags}
/>
)}
</AccordionPanel>
</AccordionItem>
Expand Down Expand Up @@ -324,6 +303,53 @@ export function EmailGuidance({ dnsResults, dmarcPhase, status }) {
/>
</AccordionPanel>
</AccordionItem>
<AccordionItem>
<Flex as={AccordionButton}>
<Text fontSize="2xl" ml="2">
MX
</Text>
<AccordionIcon boxSize="icons.xl" />
</Flex>
<AccordionPanel>
{mxRecords.hosts.map(({ preference, hostname, addresses }, idx) => {
return (
<Flex key={idx} px="2">
<Text fontSize="lg" w="50%">
<Trans>
<b>Hostname:</b> {hostname}
</Trans>
</Text>
<Text fontSize="lg" w="40%">
<Trans>
<b>IPs:</b> {addresses.join(', ')}
</Trans>
</Text>
<Text fontSize="lg" w="10%" ml="auto">
<Trans>
<b>Preference:</b> {preference}
</Trans>
</Text>
</Flex>
)
})}
{mxRecords.warnings.length > 0 && (
<Box px="2" py="2" rounded="md" mb="1">
<Text fontWeight="bold" fontSize="lg">
<Trans>Warnings:</Trans>
</Text>
{mxRecords.warnings.map((warning, idx) => {
return (
<Box key={idx} px="2">
<Text fontsize="lg">
<b>{idx + 1}.</b> {warning}
</Text>
</Box>
)
})}
</Box>
)}
</AccordionPanel>
</AccordionItem>
</Accordion>
)
}
Expand Down
Loading