Skip to content

Show DKIM keystore status in the key generation dialog #22

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

Open
gott-alexander wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Show DKIM keystore status in the key generation dialog #22

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
25 changes: 20 additions & 5 deletions src/components/Dialogs/dns/GenerateDkimKeys.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { makeStyles } from 'tss-react/mui';
import { Button, CircularProgress, Dialog, DialogContent, DialogTitle, Divider, MenuItem, TextField, Theme, Typography } from '@mui/material';
import { useTranslation } from 'react-i18next';
import { copyToClipboard } from '../../../utils';
import { Check, CopyAll, WarningAmber } from '@mui/icons-material';
import { Check, CopyAll, TaskAlt, WarningAmber } from '@mui/icons-material';
import { BaseDomain } from '../../../types/domains';
import { createDkimKeypair } from '../../../actions/domains';
import { useAppDispatch } from '../../../store';
Expand Down Expand Up @@ -64,16 +64,20 @@ function GenerateDkimKeys({ open, onClose, domain }: GenerateDkimKeysProps) {
const [mode, setMode] = useState("dns");
const [selector, setSelector] = useState("");
const [loading, setLoading] = useState(false);
const [redisStored, setRedisStored] = useState(true);
const [keyCopied, setKeyCopied] = useState(false);
const [commandsCopied, setCommandsCopied] = useState(false);
const [snackbar, setSnackbar] = useState("");

const handleKeygen = async () => {
setKeyCopied(false);
setLoading(true);
const key = await dispatch(createDkimKeypair(domain.ID, { type, mode, selector: selector || undefined }))
const response = await dispatch(createDkimKeypair(domain.ID, { type, mode, selector: selector || undefined }))
.catch((err) => setSnackbar(err));
setPubkey(key);
// Newer backends return {pubKey, redisStored, redisError}; older ones
// return the bare public key and always require manual installation.
setPubkey(typeof response === "string" ? response : (response?.pubKey ?? ""));
setRedisStored(typeof response === "object" && response !== null ? Boolean(response.redisStored) : false);
setLoading(false);
}

Expand Down Expand Up @@ -158,7 +162,18 @@ function GenerateDkimKeys({ open, onClose, domain }: GenerateDkimKeysProps) {
>
{t(keyCopied ? "Copied" : "Copy key")}
</Button>}
{!!pubKey && <div className={classes.manual}>
{!!pubKey && redisStored && <div className={classes.manual}>
<div className={classes.flexRow}>
<TaskAlt color='success' sx={{ mr: 2 }}/>
<Typography variant='h6'>
{t("The key has been installed on the server")}
</Typography>
</div>
<Typography sx={{ mb: 1 }}>
{t("The private key was pushed to the DKIM keystore and is used for signing automatically")}.
</Typography>
</div>}
{!!pubKey && !redisStored && <div className={classes.manual}>
<div className={classes.flexRow}>
<WarningAmber color='warning' sx={{ mr: 2 }}/>
<Typography variant='h6' color='warning'>
Expand All @@ -167,7 +182,7 @@ function GenerateDkimKeys({ open, onClose, domain }: GenerateDkimKeysProps) {
</div>
<Typography sx={{ mb: 1, fontWeight: "bold" }}>
{t("The private key has been generated on the server")}.{" "}
{t("Because the API cannot write to the grommunio-antispam directory, you need to make additional changes on the server manually")}:
{t("Because the API could not store it in the DKIM keystore, you need to make additional changes on the server manually")}:
</Typography>
<div className={classes.commands}>
<pre>
Expand Down