From 0e946c7483fbedbfcbc45c6f105bc326c7e0c1fa Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 17 Jul 2025 12:46:54 +0300
Subject: [PATCH] rough validation of of domain in change handle flow

---
 .../components/ChangeHandleDialog.tsx         | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/screens/Settings/components/ChangeHandleDialog.tsx b/src/screens/Settings/components/ChangeHandleDialog.tsx
index 59e0042526..8e25f89e20 100644
--- a/src/screens/Settings/components/ChangeHandleDialog.tsx
+++ b/src/screens/Settings/components/ChangeHandleDialog.tsx
@@ -293,12 +293,19 @@ function ProvidedHandlePage({
   )
 }
 
+// simple domain regex - just catching chars that can't be part of a domain, like @
+// doesn't validate it's *actually* valid, as they might not be finished typing
+// however, does catch leading hypens/dots as well as consecutive dots -sfn
+const SIMPLE_DOMAIN_REGEX =
+  /^(?![.-])(?!.*\.\.)(?!.*[^a-zA-Z0-9.-])[a-zA-Z0-9.-]*-?$/
+
 function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
   const {_} = useLingui()
   const t = useTheme()
   const {currentAccount} = useSession()
   const [dnsPanel, setDNSPanel] = useState(true)
   const [domain, setDomain] = useState('')
+  const trimmedDomain = domain.trim()
   const agent = useAgent()
   const control = Dialog.useDialogContext()
   const fetchDid = useFetchDid()
@@ -337,6 +344,8 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
     },
   })
 
+  const isInvalid = !!trimmedDomain && !SIMPLE_DOMAIN_REGEX.test(trimmedDomain)
+
   return (
     <View style={[a.flex_1, a.gap_lg]}>
       {isSuccess && (
@@ -369,7 +378,7 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
           <TextField.LabelText>
             <Trans>Enter the domain you want to use</Trans>
           </TextField.LabelText>
-          <TextField.Root>
+          <TextField.Root isInvalid={isInvalid}>
             <TextField.Icon icon={AtIcon} />
             <Dialog.Input
               label={_(msg`New handle`)}
@@ -463,7 +472,7 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
                 a.border,
                 t.atoms.border_contrast_low,
               ]}>
-              <Text style={[a.text_md]}>_atproto.{domain}</Text>
+              <Text style={[a.text_md]}>_atproto.{trimmedDomain}</Text>
             </View>
           </>
         ) : (
@@ -480,7 +489,7 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
                 t.atoms.border_contrast_low,
               ]}>
               <Text style={[a.text_md]}>
-                https://{domain}/.well-known/atproto-did
+                https://{trimmedDomain}/.well-known/atproto-did
               </Text>
             </View>
             <Text>
@@ -523,7 +532,7 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
         <Button
           label={
             isVerified
-              ? _(msg`Update to ${domain}`)
+              ? _(msg`Update to ${trimmedDomain}`)
               : dnsPanel
                 ? _(msg`Verify DNS Record`)
                 : _(msg`Verify Text File`)
@@ -531,10 +540,10 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
           variant="solid"
           size="large"
           color="primary"
-          disabled={domain.trim().length === 0}
+          disabled={trimmedDomain.length === 0 || isInvalid}
           onPress={() => {
             if (isVerified) {
-              changeHandle({handle: domain})
+              changeHandle({handle: trimmedDomain})
             } else {
               verify()
             }
@@ -544,7 +553,7 @@ function OwnHandlePage({goToServiceHandle}: {goToServiceHandle: () => void}) {
           ) : (
             <ButtonText>
               {isVerified ? (
-                <Trans>Update to {domain}</Trans>
+                <Trans>Update to {trimmedDomain}</Trans>
               ) : dnsPanel ? (
                 <Trans>Verify DNS Record</Trans>
               ) : (