ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-10-04 03:40:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

404 hosts add update complete, fix certbot renewals

Browse Source 
and remove the need for email and agreement on cert requests
This commit is contained in:
Jamie Curnow
2025-09-23 18:02:00 +10:00
parent d85e515ab9
commit 18537b9288
32 changed files with 449 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
frontend/src/components/Form/DomainNamesField.tsx
View File

@@ -2,6 +2,7 @@ import { Field, useFormikContext } from "formik";
import type { ActionMeta, MultiValue } from "react-select";
import CreatableSelect from "react-select/creatable";
import { intl } from "src/locale";
import { validateDomain, validateDomains } from "src/modules/Validations";
export type SelectOption = {
label: string;
@@ -22,17 +23,10 @@ export function DomainNamesField({
label = "domain-names",
id = "domainNames",
maxDomains,
isWildcardPermitted,
dnsProviderWildcardSupported,
isWildcardPermitted = true,
dnsProviderWildcardSupported = true,
}: Props) {
const { values, setFieldValue } = useFormikContext();
const getDomainCount = (v: string[] | undefined): number => {
if (v?.length) {
return v.length;
}
return 0;
};
const { setFieldValue } = useFormikContext();
const handleChange = (v: MultiValue<SelectOption>, _actionMeta: ActionMeta<SelectOption>) => {
const doms = v?.map((i: SelectOption) => {
@@ -41,50 +35,18 @@ export function DomainNamesField({
setFieldValue(name, doms);
};
const isDomainValid = (d: string): boolean => {
const dom = d.trim().toLowerCase();
const v: any = values;
// Deny if the list of domains is hit
if (maxDomains && getDomainCount(v?.[name]) >= maxDomains) {
return false;
}
if (dom.length < 3) {
return false;
}
// Prevent wildcards
if ((!isWildcardPermitted || !dnsProviderWildcardSupported) && dom.indexOf("*") !== -1) {
return false;
}
// Prevent duplicate * in domain
if ((dom.match(/\*/g) || []).length > 1) {
return false;
}
// Prevent some invalid characters
if ((dom.match(/(@|,|!|&|\$|#|%|\^|\(|\))/g) || []).length > 0) {
return false;
}
// This will match *.com type domains,
return dom.match(/\*\.[^.]+$/m) === null;
};
const helperTexts: string[] = [];
if (maxDomains) {
helperTexts.push(intl.formatMessage({ id: "domain_names.max" }, { count: maxDomains }));
helperTexts.push(intl.formatMessage({ id: "domain-names.max" }, { count: maxDomains }));
}
if (!isWildcardPermitted) {
helperTexts.push(intl.formatMessage({ id: "wildcards-not-permitted" }));
helperTexts.push(intl.formatMessage({ id: "domain-names.wildcards-not-permitted" }));
} else if (!dnsProviderWildcardSupported) {
helperTexts.push(intl.formatMessage({ id: "wildcards-not-supported" }));
helperTexts.push(intl.formatMessage({ id: "domain-names.wildcards-not-supported" }));
}
return (
<Field name={name}>
<Field name={name} validate={validateDomains(isWildcardPermitted && dnsProviderWildcardSupported, maxDomains)}>
{({ field, form }: any) => (
<div className="mb-3">
<label className="form-label" htmlFor={id}>
@@ -97,21 +59,19 @@ export function DomainNamesField({
id={id}
closeMenuOnSelect={true}
isClearable={false}
isValidNewOption={isDomainValid}
isValidNewOption={validateDomain(isWildcardPermitted && dnsProviderWildcardSupported)}
isMulti
placeholder="Start typing to add domain..."
placeholder={intl.formatMessage({ id: "domain-names.placeholder" })}
onChange={handleChange}
value={field.value?.map((d: string) => ({ label: d, value: d }))}
/>
{form.errors[field.name] ? (
<div className="invalid-feedback">
{form.errors[field.name] && form.touched[field.name] ? form.errors[field.name] : null}
</div>
{form.errors[field.name] && form.touched[field.name] ? (
<small className="text-danger">{form.errors[field.name]}</small>
) : helperTexts.length ? (
helperTexts.map((i) => (
<div key={i} className="invalid-feedback text-info">
<small key={i} className="text-info">
{i}
</div>
</small>
))
) : null}
</div>