A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(api): allow single-label hosts when private IPs are allowed
Hampus04b91a701fdf
diff --git a/fluxer_api/pkgs/http_client/src/PublicInternetRequestUrlPolicy.ts b/fluxer_api/pkgs/http_client/src/PublicInternetRequestUrlPolicy.tsindex 63eb10b0c..322965f98 100644--- a/fluxer_api/pkgs/http_client/src/PublicInternetRequestUrlPolicy.ts+++ b/fluxer_api/pkgs/http_client/src/PublicInternetRequestUrlPolicy.ts@@ -5,7 +5,7 @@ import dns from 'node:dns';import type {LookupFunction} from 'node:net';import {BlockList, isIP} from 'node:net';import {ipToBytes} from '@fluxer/ip_utils/src/IpAddress';-import {isFqdnHostname} from '@fluxer/schema/src/primitives/UrlValidators';+import {isFqdnHostname, isSingleLabelHostname} from '@fluxer/schema/src/primitives/UrlValidators';import {formatUrlForDiagnostics} from '@pkgs/http_client/src/HttpClientDiagnostics';import type {FetchDispatcher,@@ -243,7 +243,7 @@ export function createPublicInternetRequestUrlPolicy(}return;}- if (!isFqdnHostname(normalizedHostname)) {+ if (!isFqdnHostname(normalizedHostname) && !(allowPrivateAddresses && isSingleLabelHostname(normalizedHostname))) {throw createBlockedRequestError(url, context, 'Hostname is not a valid FQDN');}const resolvedAddresses = await resolveHostname(normalizedHostname);diff --git a/fluxer_app/src/features/auth/components/NetworkBlockedHandler.tsx b/fluxer_app/src/features/auth/components/NetworkBlockedHandler.tsxindex ff11e396c..5da17df94 100644--- a/fluxer_app/src/features/auth/components/NetworkBlockedHandler.tsx+++ b/fluxer_app/src/features/auth/components/NetworkBlockedHandler.tsx@@ -9,19 +9,16 @@ import {getLocaleDirection} from '@app/features/i18n/utils/LocaleDirection';import {Button} from '@app/features/ui/button/Button';import * as ModalCommands from '@app/features/ui/commands/ModalCommands';import {modal} from '@app/features/ui/commands/ModalCommands';+import ModalState from '@app/features/ui/state/Modal';import type {NetworkBlock} from '@fluxer/schema/src/domains/auth/EnforcementNoticeSchemas';import {useLingui} from '@lingui/react/macro';import {observer} from 'mobx-react-lite';-let modalShown = false;+const NETWORK_BLOCKED_MODAL_KEY = 'network-blocked';const NetworkBlockedModal = observer(function NetworkBlockedModal({block}: {block: NetworkBlock}) {const {i18n} = useLingui();const dir = getLocaleDirection(i18n.locale);- const handleTryAgain = () => {- modalShown = false;- ModalCommands.pop();- };return (<Modal.Root size="small" centered className={styles.selectable} data-flx="auth.network-blocked-handler.modal-root"><div className={styles.directionScope} dir={dir} data-flx="auth.network-blocked-handler.direction-scope">@@ -32,7 +29,7 @@ const NetworkBlockedModal = observer(function NetworkBlockedModal({block}: {bloc</div></Modal.Content><Modal.Footer data-flx="auth.network-blocked-handler.footer">- <Button onClick={handleTryAgain} data-flx="auth.network-blocked-handler.button.try-again">+ <Button onClick={ModalCommands.pop} data-flx="auth.network-blocked-handler.button.try-again">{i18n._(TRY_AGAIN_DESCRIPTOR)}</Button></Modal.Footer>@@ -42,11 +39,11 @@ const NetworkBlockedModal = observer(function NetworkBlockedModal({block}: {bloc});export function showNetworkBlockedModal(block: NetworkBlock): void {- if (modalShown) {+ if (ModalState.hasModal(NETWORK_BLOCKED_MODAL_KEY)) {return;}- modalShown = true;- ModalCommands.push(+ ModalCommands.pushWithKey(modal(() => <NetworkBlockedModal block={block} data-flx="auth.network-blocked-handler.network-blocked-modal" />),+ NETWORK_BLOCKED_MODAL_KEY,);}diff --git a/packages/schema/src/primitives/UrlValidators.ts b/packages/schema/src/primitives/UrlValidators.tsindex 819d677f6..1b3823662 100644--- a/packages/schema/src/primitives/UrlValidators.ts+++ b/packages/schema/src/primitives/UrlValidators.ts@@ -62,6 +62,10 @@ export function isFqdnHostname(hostname: string): boolean {return !/^\d+$/.test(labels[labels.length - 1]);}+export function isSingleLabelHostname(hostname: string): boolean {+ return HOSTNAME_LABEL_REGEX.test(hostname) && !/^\d+$/.test(hostname);+}+export const HostnameType = z.string().overwrite((value) => {