From f4ec1a78ff1f2c30993ae50658a9b119ee10b4ba Mon Sep 17 00:00:00 2001
From: Vitalii <takur12345@gmail.com>
Date: Tue, 23 Jan 2024 16:02:56 +0200
Subject: [PATCH] web/satellite/v2: fix bucket name validation

Fixed bucket name validation to match backend

Issue:
https://github.com/storj/storj/issues/6704

Change-Id: If60dfdade48bf7e2df348e8e4e0f08fbeb205997
---
 .../components/dialogs/CreateBucketDialog.vue | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/web/satellite/vuetify-poc/src/components/dialogs/CreateBucketDialog.vue b/web/satellite/vuetify-poc/src/components/dialogs/CreateBucketDialog.vue
index 4184432ba1f6..f00d07390dd9 100644
--- a/web/satellite/vuetify-poc/src/components/dialogs/CreateBucketDialog.vue
+++ b/web/satellite/vuetify-poc/src/components/dialogs/CreateBucketDialog.vue
@@ -120,7 +120,8 @@ const bucketsStore = useBucketsStore();
 const analyticsStore = useAnalyticsStore();
 const configStore = useConfigStore();
 
-const innerContent = ref<Component | null>(null);
+// Copied from here https://github.com/storj/storj/blob/f6646b0e88700b5e7113a76a8d07bf346b59185a/satellite/metainfo/validation.go#L38
+const ipRegexp = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/;
 
 const props = defineProps<{
     modelValue: boolean,
@@ -130,6 +131,7 @@ const emit = defineEmits<{
     (event: 'update:modelValue', value: boolean): void,
 }>();
 
+const innerContent = ref<Component | null>(null);
 const formValid = ref<boolean>(false);
 const bucketName = ref<string>('');
 const worker = ref<Worker | null>(null);
@@ -140,16 +142,21 @@ const model = computed<boolean>({
 });
 
 const bucketNameRules = computed(() => {
-
     return [
         (value: string) => (!!value || 'Bucket name is required.'),
-        (value: string) => ((value.length >= 3 && value.length <= 63)  || 'Name should be between 3 and 63 characters length.'),
+        (value: string) => ((value.length >= 3 && value.length <= 63) || 'Name should be between 3 and 63 characters length.'),
+        (value: string) => {
+            const labels = value.split('.');
+            for (let i = 0; i < labels.length; i++) {
+                const l = labels[i];
+                if (!l.length) return 'Bucket name part cannot start or end with a dot.';
+                if (!/^[a-z0-9]$/.test(l[0])) return 'Bucket name part must start with a lowercase letter or number.';
+                if (!/^[a-z0-9]$/.test(l[l.length - 1])) return 'Bucket name part must end with a lowercase letter or number.';
+                if (!/^[a-z0-9-.]+$/.test(l)) return 'Bucket name part must contain only lowercase letters, numbers or hyphens.';
+            }
+        },
         (value: string) => {
-            if (/^[a-z0-9-.]+$/.test(value)) return true;
-            if (/[A-Z]/.test(value)) return 'Uppercase characters are not allowed.';
-            if (/\s/.test(value)) return 'Spaces are not allowed.';
-            if (/[^a-zA-Z0-9-.]/.test(value)) return 'Other characters are not allowed.';
-            return true;
+            if (ipRegexp.test(value)) return 'Bucket name cannot be formatted as an IP address.';
         },
         (value: string) => (!allBucketNames.value.includes(value) || 'A bucket exists with this name.'),
     ];