Merge pull request #3 from KelvinTegelaar/main

[pull] main from KelvinTegelaar:main
mhcg · Jan 26, 2025 · efd8755 · efd8755
2 parents a29ecc3 + 1d499e8
commit efd8755
Show file tree

Hide file tree

Showing 69 changed files with 2,516 additions and 987 deletions.
diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml
diff --git a/public/assets/integrations/cloudflare.png b/public/assets/integrations/cloudflare.png
diff --git a/public/version.json b/public/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "7.0.5"
+  "version": "7.1.0"
 }
diff --git a/src/components/CippCards/CippBannerListCard.jsx b/src/components/CippCards/CippBannerListCard.jsx
@@ -13,9 +13,10 @@ import {
 } from "@mui/material";
 import ChevronDownIcon from "@heroicons/react/24/outline/ChevronDownIcon";
 import { CippPropertyListCard } from "./CippPropertyListCard";
+import { CippDataTable } from "../CippTable/CippDataTable";
 
 export const CippBannerListCard = (props) => {
-  const { items = [], isCollapsible = false, isFetching = false, ...other } = props;
+  const { items = [], isCollapsible = false, isFetching = false, children, ...other } = props;
   const [expanded, setExpanded] = useState(null);
 
   const handleExpand = useCallback((itemId) => {
@@ -113,17 +114,19 @@ export const CippBannerListCard = (props) => {
 
                     {/* Right Side: Status and Expand Icon */}
                     <Stack alignItems="center" direction="row" spacing={2}>
-                      <Stack alignItems="center" direction="row" spacing={1}>
-                        <Box
-                          sx={{
-                            backgroundColor: statusColor,
-                            borderRadius: "50%",
-                            height: 8,
-                            width: 8,
-                          }}
-                        />
-                        <Typography variant="body2">{item.statusText}</Typography>
-                      </Stack>
+                      {item?.statusText && (
+                        <Stack alignItems="center" direction="row" spacing={1}>
+                          <Box
+                            sx={{
+                              backgroundColor: statusColor,
+                              borderRadius: "50%",
+                              height: 8,
+                              width: 8,
+                            }}
+                          />
+                          <Typography variant="body2">{item.statusText}</Typography>
+                        </Stack>
+                      )}
                       {isCollapsible && (
                         <IconButton onClick={() => handleExpand(item.id)}>
                           <SvgIcon
@@ -142,11 +145,18 @@ export const CippBannerListCard = (props) => {
                   {isCollapsible && (
                     <Collapse in={isExpanded}>
                       <Divider />
-                      <CippPropertyListCard
-                        propertyItems={item.propertyItems || []}
-                        layout="dual"
-                        isFetching={item.isFetching || false}
-                      />
+                      <Stack spacing={1}>
+                        {item?.propertyItems?.length > 0 && (
+                          <CippPropertyListCard
+                            propertyItems={item.propertyItems || []}
+                            layout="dual"
+                            isFetching={item.isFetching || false}
+                          />
+                        )}
+                        {item?.table && <CippDataTable {...item.table} />}
+                        {item?.children && <Box sx={{ pl: 3 }}>{item.children}</Box>}
+                        {item?.actionButton && <Box sx={{ pl: 3, pb: 2 }}>{item.actionButton}</Box>}
+                      </Stack>
                     </Collapse>
                   )}
                 </li>
@@ -174,8 +184,12 @@ CippBannerListCard.propTypes = {
       subtext: PropTypes.string,
       statusColor: PropTypes.string,
       statusText: PropTypes.string,
+      actionButton: PropTypes.element,
       propertyItems: PropTypes.array,
+      table: PropTypes.object,
+      actionButton: PropTypes.element,
       isFetching: PropTypes.bool,
+      children: PropTypes.node,
     })
   ).isRequired,
   isCollapsible: PropTypes.bool,

diff --git a/src/components/CippCards/CippDomainCards.jsx b/src/components/CippCards/CippDomainCards.jsx
@@ -10,6 +10,8 @@ import {
   Typography,
   Chip,
   Stack,
+  Divider,
+  FormControlLabel,
 } from "@mui/material";
 import SearchIcon from "@mui/icons-material/Search";
 import ClearIcon from "@mui/icons-material/Clear";
@@ -19,7 +21,7 @@ import ErrorIcon from "@mui/icons-material/Error";
 import WarningIcon from "@mui/icons-material/Warning";
 import HelpIcon from "@mui/icons-material/Help";
 import MoreVertIcon from "@mui/icons-material/MoreVert";
-import { Controller, get, useForm } from "react-hook-form";
+import { Controller, useForm } from "react-hook-form";
 import { ApiGetCall } from "/src/api/ApiCall";
 import CippButtonCard from "/src/components/CippCards/CippButtonCard";
 import { CippCodeBlock } from "/src/components/CippComponents/CippCodeBlock";
@@ -268,6 +270,60 @@ function DomainResultCard({ title, data, isFetching, info, type }) {
             </>
           ),
         }
+      : type === "HTTPS"
+      ? {
+          children: (
+            <>
+              {data?.Tests?.map((test, index) => (
+                <>
+                  <CippPropertyListCard
+                    key={index}
+                    title={`Certificate info for ${test.Hostname}`}
+                    copyItems={true}
+                    showDivider={false}
+                    propertyItems={[
+                      {
+                        label: "Issuer",
+                        value:
+                          test.Certificate.Issuer.match(/O=([^,]+)/)?.[1] ||
+                          test.Certificate.Issuer,
+                      },
+                      {
+                        label: "Subject",
+                        value:
+                          test.Certificate.Subject.match(/CN=([^,]+)/)?.[1] ||
+                          test.Certificate.Subject,
+                      },
+                      {
+                        label: "Created",
+                        value: getCippFormatting(test.Certificate.NotBefore, "NotBefore"),
+                      },
+                      {
+                        label: "Expires",
+                        value: getCippFormatting(test.Certificate.NotAfter, "NotAfter"),
+                      },
+                      { label: "Serial Number", value: test.Certificate.SerialNumber },
+                      { label: "Thumbprint", value: test.Certificate.Thumbprint },
+                      {
+                        label: "DNS Names",
+                        value: getCippFormatting(
+                          test.Certificate.DnsNameList.map((dns) => dns.Unicode),
+                          "DNSName"
+                        ),
+                      },
+                    ]}
+                  />
+                  <ResultList
+                    passes={test.ValidationPasses}
+                    warns={test.ValidationWarns}
+                    fails={test.ValidationFails}
+                  />
+                  <Divider />
+                </>
+              ))}
+            </>
+          ),
+        }
       : {};
 
   return (
@@ -326,6 +382,9 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
   });
   const [optionsVisible, setOptionsVisible] = useState(false);
   const [domain, setDomain] = useState(propDomain);
+  const [selector, setSelector] = useState("");
+  const [spfRecord, setSpfRecord] = useState("");
+  const [subdomains, setSubdomains] = useState("");
   const enableHttps = watch("enableHttps");
 
   useEffect(() => {
@@ -337,13 +396,20 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
 
   const onSubmit = (values) => {
     setDomain(values.domain);
+    setSelector(values.dkimSelector);
+    setSpfRecord(values.spfRecord);
+    setSubdomains(values.subdomains);
   };
 
   const handleClear = () => {
     setValue("domain", "");
     setValue("spfRecord", "");
     setValue("dkimSelector", "");
     setValue("subdomains", "");
+    setDomain("");
+    setSelector("");
+    setSpfRecord("");
+    setSubdomains("");
   };
 
   // API calls with dynamic queryKey using domain
@@ -370,8 +436,8 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
 
   const { data: spfData, isFetching: spfLoading } = ApiGetCall({
     url: "/api/ListDomainHealth",
-    queryKey: `spf-${domain}`,
-    data: { Domain: domain, Action: "ReadSPFRecord" },
+    queryKey: `spf-${domain}-${spfRecord}`,
+    data: { Domain: domain, Action: "ReadSPFRecord", Record: spfRecord },
     waiting: !!domain,
   });
 
@@ -384,8 +450,8 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
 
   const { data: dkimData, isFetching: dkimLoading } = ApiGetCall({
     url: "/api/ListDomainHealth",
-    queryKey: `dkim-${domain}`,
-    data: { Domain: domain, Action: "ReadDkimRecord" },
+    queryKey: `dkim-${domain}-${selector}`,
+    data: { Domain: domain, Action: "ReadDkimRecord", Selector: selector },
     waiting: !!domain,
   });
 
@@ -403,6 +469,13 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
     waiting: !!domain,
   });
 
+  const { data: httpsData, isFetching: httpsLoading } = ApiGetCall({
+    url: "/api/ListDomainHealth",
+    queryKey: `https-${domain}-${subdomains}`,
+    data: { Domain: domain, Action: "TestHttpsCertificate", Subdomains: subdomains },
+    waiting: !!domain && enableHttps,
+  });
+
   // Adjust grid item size based on fullwidth prop
   const gridItemSize = fullwidth ? 12 : 4;
 
@@ -438,45 +511,50 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
               </Grid>
             </Grid>
             <Collapse in={optionsVisible}>
-              <Controller
-                name="spfRecord"
-                control={control}
-                render={({ field }) => (
-                  <TextField {...field} fullWidth label="SPF Record" className="mt-2" />
-                )}
-              />
-              <Controller
-                name="dkimSelector"
-                control={control}
-                render={({ field }) => (
-                  <TextField {...field} fullWidth label="DKIM Selector" className="mt-2" />
-                )}
-              />
-              <Controller
-                name="enableHttps"
-                control={control}
-                render={({ field }) => (
-                  <Switch {...field} checked={field.value} label="Enable HTTPS check" />
-                )}
-              />
-              {enableHttps && (
+              <Stack direction="column" spacing={1} sx={{ mt: 1 }}>
                 <Controller
-                  name="subdomains"
+                  name="spfRecord"
                   control={control}
                   render={({ field }) => (
-                    <TextField {...field} fullWidth label="HTTPS Subdomains" className="mt-2" />
+                    <TextField {...field} fullWidth label="SPF Record" className="mt-2" />
                   )}
                 />
-              )}
-              <Button
-                variant="outlined"
-                color="error"
-                startIcon={<ClearIcon />}
-                onClick={handleClear}
-                className="mt-2"
-              >
-                Clear
-              </Button>
+                <Controller
+                  name="dkimSelector"
+                  control={control}
+                  render={({ field }) => (
+                    <TextField {...field} fullWidth label="DKIM Selector" className="mt-2" />
+                  )}
+                />
+                <Controller
+                  name="enableHttps"
+                  control={control}
+                  render={({ field }) => (
+                    <FormControlLabel
+                      control={<Switch {...field} checked={field.value} />}
+                      label="Enable HTTPS check"
+                    />
+                  )}
+                />
+                {enableHttps && (
+                  <Controller
+                    name="subdomains"
+                    control={control}
+                    render={({ field }) => (
+                      <TextField {...field} fullWidth label="HTTPS Subdomains" className="mt-2" />
+                    )}
+                  />
+                )}
+                <Button
+                  variant="outlined"
+                  color="error"
+                  startIcon={<ClearIcon />}
+                  onClick={handleClear}
+                  className="mt-2"
+                >
+                  Clear
+                </Button>
+              </Stack>
             </Collapse>
           </CippButtonCard>
         </Grid>
@@ -605,6 +683,25 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
                 }
               />
             </Grid>
+            {enableHttps && (
+              <Grid item xs={12} md={gridItemSize}>
+                <DomainResultCard
+                  title="HTTPS Certificate"
+                  type="HTTPS"
+                  data={httpsData}
+                  isFetching={httpsLoading}
+                  info={
+                    <div>
+                      <ResultList
+                        passes={httpsData?.ValidationPasses}
+                        warns={httpsData?.ValidationWarns}
+                        fails={httpsData?.ValidationFails}
+                      />
+                    </div>
+                  }
+                />
+              </Grid>
+            )}
           </>
         )}
       </Grid>