diff --git a/apps/design-system/__registry__/index.tsx b/apps/design-system/__registry__/index.tsx index 8cb28d22d8f..317efd5bca7 100644 --- a/apps/design-system/__registry__/index.tsx +++ b/apps/design-system/__registry__/index.tsx @@ -808,6 +808,61 @@ export const Index: Record = { subcategory: "undefined", chunks: [] }, + "radio-group-stacked-demo": { + name: "radio-group-stacked-demo", + type: "components:example", + registryDependencies: ["radio-group"], + component: React.lazy(() => import("@/registry/default/example/radio-group-stacked-demo")), + source: "", + files: ["registry/default/example/radio-group-stacked-demo.tsx"], + category: "undefined", + subcategory: "undefined", + chunks: [] + }, + "radio-group-stacked-form": { + name: "radio-group-stacked-form", + type: "components:example", + registryDependencies: ["radio-group","form"], + component: React.lazy(() => import("@/registry/default/example/radio-group-stacked-form")), + source: "", + files: ["registry/default/example/radio-group-stacked-form.tsx"], + category: "undefined", + subcategory: "undefined", + chunks: [] + }, + "radio-group-card-demo": { + name: "radio-group-card-demo", + type: "components:example", + registryDependencies: ["radio-group"], + component: React.lazy(() => import("@/registry/default/example/radio-group-card-demo")), + source: "", + files: ["registry/default/example/radio-group-card-demo.tsx"], + category: "undefined", + subcategory: "undefined", + chunks: [] + }, + "radio-group-card-form": { + name: "radio-group-card-form", + type: "components:example", + registryDependencies: ["radio-group","form"], + component: React.lazy(() => import("@/registry/default/example/radio-group-card-form")), + source: "", + files: ["registry/default/example/radio-group-card-form.tsx"], + category: "undefined", + subcategory: "undefined", + chunks: [] + }, + "radio-group-card-with-children": { + name: "radio-group-card-with-children", + type: "components:example", + registryDependencies: ["radio-group","form"], + component: React.lazy(() => import("@/registry/default/example/radio-group-card-with-children")), + source: "", + files: ["registry/default/example/radio-group-card-with-children.tsx"], + category: "undefined", + subcategory: "undefined", + chunks: [] + }, "resizable-demo": { name: "resizable-demo", type: "components:example", diff --git a/apps/design-system/components/source-panel.tsx b/apps/design-system/components/source-panel.tsx index 04dc897204c..51fac19dfa6 100644 --- a/apps/design-system/components/source-panel.tsx +++ b/apps/design-system/components/source-panel.tsx @@ -136,8 +136,8 @@ const SourcePanel = forwardRef & > diff --git a/apps/design-system/config/docs.ts b/apps/design-system/config/docs.ts index 2514adb0db0..3da933f5588 100644 --- a/apps/design-system/config/docs.ts +++ b/apps/design-system/config/docs.ts @@ -264,6 +264,16 @@ export const docsConfig: DocsConfig = { href: '/docs/components/radio-group', items: [], }, + { + title: 'Radio Group Stacked', + href: '/docs/components/radio-group-stacked', + items: [], + }, + { + title: 'Radio Group Card', + href: '/docs/components/radio-group-card', + items: [], + }, { title: 'Resizable', href: '/docs/components/resizable', diff --git a/apps/design-system/content/docs/components/radio-group-card.mdx b/apps/design-system/content/docs/components/radio-group-card.mdx new file mode 100644 index 00000000000..26adb02c514 --- /dev/null +++ b/apps/design-system/content/docs/components/radio-group-card.mdx @@ -0,0 +1,36 @@ +--- +title: Radio Group Card +description: A set of checkable buttons—known as radio buttons—where no more than one of the buttons can be checked at a time. +component: true +links: + doc: https://www.radix-ui.com/docs/primitives/components/radio-group + api: https://www.radix-ui.com/docs/primitives/components/radio-group#api-reference +source: + radix: true +--- + + + +## Usage + +```tsx +import { RadioGroupCard, RadioGroupCardItem } from 'ui' +``` + +```tsx + + + + + +``` + +## Examples + +### With children + + + +### Form + + diff --git a/apps/design-system/content/docs/components/radio-group-stacked.mdx b/apps/design-system/content/docs/components/radio-group-stacked.mdx new file mode 100644 index 00000000000..ff3c80616bf --- /dev/null +++ b/apps/design-system/content/docs/components/radio-group-stacked.mdx @@ -0,0 +1,32 @@ +--- +title: Radio Group Stacked +description: A set of checkable buttons—known as radio buttons—where no more than one of the buttons can be checked at a time. +component: true +links: + doc: https://www.radix-ui.com/docs/primitives/components/radio-group + api: https://www.radix-ui.com/docs/primitives/components/radio-group#api-reference +source: + radix: true +--- + + + +## Usage + +```tsx +import { RadioGroupStacked, RadioGroupStackedItem } from 'ui' +``` + +```tsx + + + + + +``` + +## Examples + +### Form + + diff --git a/apps/design-system/next.config.mjs b/apps/design-system/next.config.mjs index c76557bfa66..1d3df144ace 100644 --- a/apps/design-system/next.config.mjs +++ b/apps/design-system/next.config.mjs @@ -16,6 +16,20 @@ const nextConfig = { }, ], }, + async redirects() { + return [ + ...(process.env.NEXT_PUBLIC_BASE_PATH?.length + ? [ + { + source: '/', + destination: process.env.NEXT_PUBLIC_BASE_PATH, + basePath: false, + permanent: false, + }, + ] + : []), + ] + }, } export default withContentlayer(nextConfig) diff --git a/apps/design-system/registry/default/example/navigation-menu-demo.tsx b/apps/design-system/registry/default/example/navigation-menu-demo.tsx index eaf24a6ed66..24522235ace 100644 --- a/apps/design-system/registry/default/example/navigation-menu-demo.tsx +++ b/apps/design-system/registry/default/example/navigation-menu-demo.tsx @@ -3,7 +3,7 @@ import * as React from 'react' import Link from 'next/link' -import { cn } from '@/lib/utils' +import { cn } from 'ui' // import { Icons } from '@/components/icons' import { NavigationMenu, diff --git a/apps/design-system/registry/default/example/radio-group-card-demo.tsx b/apps/design-system/registry/default/example/radio-group-card-demo.tsx new file mode 100644 index 00000000000..85e885d6e28 --- /dev/null +++ b/apps/design-system/registry/default/example/radio-group-card-demo.tsx @@ -0,0 +1,11 @@ +import { RadioGroupCard, RadioGroupCardItem } from 'ui' + +export default function RadioGroupDemo() { + return ( + + + + + + ) +} diff --git a/apps/design-system/registry/default/example/radio-group-card-form.tsx b/apps/design-system/registry/default/example/radio-group-card-form.tsx new file mode 100644 index 00000000000..14d54b71ffb --- /dev/null +++ b/apps/design-system/registry/default/example/radio-group-card-form.tsx @@ -0,0 +1,83 @@ +'use client' + +import { zodResolver } from '@hookform/resolvers/zod' +import { useForm } from 'react-hook-form' +import { z } from 'zod' + +import { Button, RadioGroupCard, RadioGroupCardItem } from 'ui' +import { + Form_Shadcn_, + FormControl_Shadcn_, + FormField_Shadcn_, + FormItem_Shadcn_, + FormLabel_Shadcn_, + FormMessage_Shadcn_, +} from 'ui' +import { toast } from 'ui' + +const FormSchema = z.object({ + type: z.enum(['all', 'mentions', 'none'], { + required_error: 'You need to select a notification type.', + }), +}) + +export default function RadioGroupForm() { + const form = useForm>({ + resolver: zodResolver(FormSchema), + }) + + function onSubmit(data: z.infer) { + console.log(JSON.stringify(data, null, 2)) + toast({ + title: 'You submitted the following values:', + description: ( + 
+          {JSON.stringify(data, null, 2)}
+
+ ), + }) + } + + return ( + +
+ ( + + Notify me about... + + + + + + + + + + + + + + + + + + + + + + )} + /> + + +
+ ) +} diff --git a/apps/design-system/registry/default/example/radio-group-card-with-children.tsx b/apps/design-system/registry/default/example/radio-group-card-with-children.tsx new file mode 100644 index 00000000000..758221a1424 --- /dev/null +++ b/apps/design-system/registry/default/example/radio-group-card-with-children.tsx @@ -0,0 +1,21 @@ +import { RadioGroupCard, RadioGroupCardItem } from 'ui' +import SVG from 'react-inlinesvg' + +export default function RadioGroupDemo() { + const singleThemes = [ + { name: 'Dark', value: 'dark' }, // Classic Supabase dark + { name: 'Deep Dark', value: 'deep-dark' }, // Deep Dark Supabase dark + { name: 'Light', value: 'light' }, // Classic Supabase light + { name: 'System', value: 'system' }, // Classic Supabase light + ] as const + + return ( + + {singleThemes.map((theme) => ( + + + + ))} + + ) +} diff --git a/apps/design-system/registry/default/example/radio-group-stacked-demo.tsx b/apps/design-system/registry/default/example/radio-group-stacked-demo.tsx new file mode 100644 index 00000000000..b8de098b5fa --- /dev/null +++ b/apps/design-system/registry/default/example/radio-group-stacked-demo.tsx @@ -0,0 +1,26 @@ +import { RadioGroupStacked, RadioGroupStackedItem } from 'ui' + +export default function RadioGroupDemo() { + return ( + + + + + + ) +} diff --git a/apps/design-system/registry/default/example/radio-group-stacked-form.tsx b/apps/design-system/registry/default/example/radio-group-stacked-form.tsx new file mode 100644 index 00000000000..5c979c76c00 --- /dev/null +++ b/apps/design-system/registry/default/example/radio-group-stacked-form.tsx @@ -0,0 +1,82 @@ +'use client' + +import { zodResolver } from '@hookform/resolvers/zod' +import { useForm } from 'react-hook-form' +import { z } from 'zod' + +import { Button, RadioGroupStacked, RadioGroupStackedItem } from 'ui' +import { + Form_Shadcn_, + FormControl_Shadcn_, + FormField_Shadcn_, + FormItem_Shadcn_, + FormLabel_Shadcn_, + FormMessage_Shadcn_, +} from 'ui' +import { toast } from 'ui' + +const FormSchema = z.object({ + type: z.enum(['all', 'mentions', 'none'], { + required_error: 'You need to select a notification type.', + }), +}) + +export default function RadioGroupForm() { + const form = useForm>({ + resolver: zodResolver(FormSchema), + }) + + function onSubmit(data: z.infer) { + console.log(JSON.stringify(data, null, 2)) + toast({ + title: 'You submitted the following values:', + description: ( + 
+          {JSON.stringify(data, null, 2)}
+
+ ), + }) + } + + return ( + +
+ ( + + Notify me about... + + + + + + + + + + + + + + + + + + + + + + )} + /> + + +
+ ) +} diff --git a/apps/design-system/registry/examples.ts b/apps/design-system/registry/examples.ts index 38aeb7a4d6c..df9d8adab91 100644 --- a/apps/design-system/registry/examples.ts +++ b/apps/design-system/registry/examples.ts @@ -521,6 +521,36 @@ export const examples: Registry = [ registryDependencies: ['radio-group', 'form'], files: ['example/radio-group-form.tsx'], }, + { + name: 'radio-group-stacked-demo', + type: 'components:example', + registryDependencies: ['radio-group'], + files: ['example/radio-group-stacked-demo.tsx'], + }, + { + name: 'radio-group-stacked-form', + type: 'components:example', + registryDependencies: ['radio-group', 'form'], + files: ['example/radio-group-stacked-form.tsx'], + }, + { + name: 'radio-group-card-demo', + type: 'components:example', + registryDependencies: ['radio-group'], + files: ['example/radio-group-card-demo.tsx'], + }, + { + name: 'radio-group-card-form', + type: 'components:example', + registryDependencies: ['radio-group', 'form'], + files: ['example/radio-group-card-form.tsx'], + }, + { + name: 'radio-group-card-with-children', + type: 'components:example', + registryDependencies: ['radio-group', 'form'], + files: ['example/radio-group-card-with-children.tsx'], + }, { name: 'resizable-demo', type: 'components:example', diff --git a/apps/design-system/styles/mdx.css b/apps/design-system/styles/mdx.css index ade97193433..afac3b50ede 100644 --- a/apps/design-system/styles/mdx.css +++ b/apps/design-system/styles/mdx.css @@ -33,7 +33,7 @@ } [data-rehype-pretty-code-fragment] [data-line-numbers] > .line::before { - @apply text-zinc-50/40 text-xs; + @apply text-foreground-muted text-xs; counter-increment: line; content: counter(line); display: inline-block; @@ -43,7 +43,11 @@ } [data-rehype-pretty-code-fragment] .line--highlighted { - @apply bg-surface-200 dark:bg-surface-100; + @apply relative bg-surface-200 dark:bg-surface-100; +} + +[data-rehype-pretty-code-fragment] .line--highlighted { + @apply border-foreground-muted border-l-2; } [data-rehype-pretty-code-fragment] .line-highlighted span { diff --git a/apps/design-system/tsconfig.base.json b/apps/design-system/tsconfig.base.json new file mode 100644 index 00000000000..d72a9f3a278 --- /dev/null +++ b/apps/design-system/tsconfig.base.json @@ -0,0 +1,20 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + "display": "Default", + "compilerOptions": { + "composite": false, + "declaration": true, + "declarationMap": true, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "inlineSources": false, + "isolatedModules": true, + "moduleResolution": "node", + "noUnusedLocals": false, + "noUnusedParameters": false, + "preserveWatchOutput": true, + "skipLibCheck": true, + "strict": true + }, + "exclude": ["node_modules"] +} diff --git a/apps/docs/spec/supabase_js_v2.yml b/apps/docs/spec/supabase_js_v2.yml index 96f9fa8a3f9..8cb92c51011 100644 --- a/apps/docs/spec/supabase_js_v2.yml +++ b/apps/docs/spec/supabase_js_v2.yml @@ -6726,20 +6726,19 @@ functions: isSpotlight: true code: | ```js - supabase - .channel('room1') - .on('broadcast', { event: 'cursor-pos' }, payload => { - console.log('Cursor position received!', payload) - }) - .subscribe((status) => { - if (status === 'SUBSCRIBED') { - channel.send({ - type: 'broadcast', - event: 'cursor-pos', - payload: { x: Math.random(), y: Math.random() }, - }) - } - }) + const channel = supabase.channel("room1") + + channel.on("broadcast", { event: "cursor-pos" }, (payload) => { + console.log("Cursor position received!", payload); + }).subscribe((status) => { + if (status === "SUBSCRIBED") { + channel.send({ + type: "broadcast", + event: "cursor-pos", + payload: { x: Math.random(), y: Math.random() }, + }); + } + }); ``` - id: listen-to-presence-sync name: Listen to presence sync @@ -6909,6 +6908,10 @@ functions: } }) ``` + response: | + ``` + ok | timed out | error + ``` - id: send-a-message-via-rest name: Send a message via REST isSpotlight: true @@ -6981,6 +6984,26 @@ functions: .storage .listBuckets() ``` + response: | + ```json + { + "data": [ + { + "id": "avatars", + "name": "avatars", + "owner": "", + "public": false, + "file_size_limit": 1024, + "allowed_mime_types": [ + "image/png" + ], + "created_at": "2024-05-22T22:26:05.100Z", + "updated_at": "2024-05-22T22:26:05.100Z" + } + ], + "error": null + } + ``` - id: get-bucket title: getBucket() @@ -7000,6 +7023,24 @@ functions: .storage .getBucket('avatars') ``` + response: | + ```json + { + "data": { + "id": "avatars", + "name": "avatars", + "owner": "", + "public": false, + "file_size_limit": 1024, + "allowed_mime_types": [ + "image/png" + ], + "created_at": "2024-05-22T22:26:05.100Z", + "updated_at": "2024-05-22T22:26:05.100Z" + }, + "error": null + } + ``` - id: create-bucket title: createBucket() @@ -7023,6 +7064,15 @@ functions: fileSizeLimit: 1024 }) ``` + response: | + ```json + { + "data": { + "name": "avatars" + }, + "error": null + } + ``` - id: empty-bucket title: emptyBucket() @@ -7042,6 +7092,15 @@ functions: .storage .emptyBucket('avatars') ``` + response: | + ```json + { + "data": { + "message": "Successfully emptied" + }, + "error": null + } + ``` - id: update-bucket title: updateBucket() $ref: '@supabase/storage-js.packages/StorageBucketApi.default.updateBucket' @@ -7064,6 +7123,15 @@ functions: fileSizeLimit: 1024 }) ``` + response: | + ```json + { + "data": { + "message": "Successfully updated" + }, + "error": null + } + ``` - id: delete-bucket title: deleteBucket() @@ -7083,6 +7151,15 @@ functions: .storage .deleteBucket('avatars') ``` + response: | + ```json + { + "data": { + "message": "Successfully deleted" + }, + "error": null + } + ``` - id: from-upload title: from.upload() @@ -7108,6 +7185,14 @@ functions: upsert: false }) ``` + response: | + ```json + { + "data": { + "path": "avatars/public/avatar1.png" + }, + "error": null + } - id: upload-file-using-arraybuffer-from-base64-file-data name: Upload file using `ArrayBuffer` from base64 file data code: | @@ -7146,6 +7231,15 @@ functions: upsert: true }) ``` + response: | + ```json + { + "data": { + "path": "avatars/public/avatar1.png" + }, + "error": null + } + ``` - id: update-file-using-arraybuffer-from-base64-file-data name: Update file using `ArrayBuffer` from base64 file data code: | @@ -7179,6 +7273,15 @@ functions: .from('avatars') .move('public/avatar1.png', 'private/avatar2.png') ``` + response: | + ```json + { + "data": { + "message": "Successfully moved" + }, + "error": null + } + ``` - id: from-copy title: from.copy() @@ -7199,6 +7302,15 @@ functions: .from('avatars') .copy('public/avatar1.png', 'private/avatar2.png') ``` + response: | + ```json + { + "data": { + "path": "avatars/private/avatar2.png" + }, + "error": null + } + ``` - id: from-create-signed-url title: from.createSignedUrl() @@ -7219,6 +7331,15 @@ functions: .from('avatars') .createSignedUrl('folder/avatar1.png', 60) ``` + response: | + ```json + { + "data": { + "signedUrl": "https://example.supabase.co/storage/v1/object/sign/avatars/folder/avatar1.png?token=" + }, + "error": null + } + ``` - id: create-signed-url-with-transformations name: Create a signed URL for an asset with transformations isSpotlight: true @@ -7266,6 +7387,26 @@ functions: .from('avatars') .createSignedUrls(['folder/avatar1.png', 'folder/avatar2.png'], 60) ``` + response: | + ```json + { + "data": [ + { + "error": null, + "path": "folder/avatar1.png", + "signedURL": "/object/sign/avatars/folder/avatar1.png?token=", + "signedUrl": "https://example.supabase.co/storage/v1/object/sign/avatars/folder/avatar1.png?token=" + }, + { + "error": null, + "path": "folder/avatar2.png", + "signedURL": "/object/sign/avatars/folder/avatar2.png?token=", + "signedUrl": "https://example.supabase.co/storage/v1/object/sign/avatars/folder/avatar2.png?token=" + } + ], + "error": null + } + ``` - id: from-create-signed-upload-url title: from.createSignedUploadUrl() @@ -7286,6 +7427,17 @@ functions: .from('avatars') .createSignedUploadUrl('folder/cat.jpg') ``` + response: | + ```json + { + "data": { + "signedUrl": "https://example.supabase.co/storage/v1/object/upload/sign/avatars/folder/cat.jpg?token=", + "path": "folder/cat.jpg", + "token": "" + }, + "error": null + } + ``` - id: from-upload-to-signed-url title: from.uploadToSignedUrl() @@ -7306,6 +7458,16 @@ functions: .from('avatars') .uploadToSignedUrl('folder/cat.jpg', 'token-from-createSignedUploadUrl', file) ``` + response: | + ```json + { + "data": { + "path": "folder/cat.jpg", + "fullPath": "avatars/folder/cat.jpg" + }, + "error": null + } + ``` - id: from-get-public-url title: from.getPublicUrl() @@ -7327,6 +7489,14 @@ functions: .from('public-bucket') .getPublicUrl('folder/avatar1.png') ``` + response: | + ```json + { + "data": { + "publicUrl": "https://example.supabase.co/storage/v1/object/public/public-bucket/folder/avatar1.png" + } + } + ``` - id: transform-asset-in-public-bucket name: Returns the URL for an asset in a public bucket with transformations isSpotlight: true @@ -7374,6 +7544,13 @@ functions: .from('avatars') .download('folder/avatar1.png') ``` + response: | + ```json + { + "data": , + "error": null + } + ``` - id: download-file-with-transformations name: Download file with transformations isSpotlight: true @@ -7410,6 +7587,13 @@ functions: .from('avatars') .remove(['folder/avatar1.png']) ``` + response: | + ```json + { + "data": [], + "error": null + } + ``` - id: from-list title: from.list() @@ -7434,6 +7618,30 @@ functions: sortBy: { column: 'name', order: 'asc' }, }) ``` + response: | + ```json + { + "data": [ + { + "name": "avatar1.png", + "id": "e668cf7f-821b-4a2f-9dce-7dfa5dd1cfd2", + "updated_at": "2024-05-22T23:06:05.580Z", + "created_at": "2024-05-22T23:04:34.443Z", + "last_accessed_at": "2024-05-22T23:04:34.443Z", + "metadata": { + "eTag": "\"c5e8c553235d9af30ef4f6e280790b92\"", + "size": 32175, + "mimetype": "image/png", + "cacheControl": "max-age=3600", + "lastModified": "2024-05-22T23:06:05.574Z", + "contentLength": 32175, + "httpStatusCode": 200 + } + } + ], + "error": null + } + ``` - id: search-files-in-a-bucket name: Search files in a bucket code: | diff --git a/apps/studio/components/interfaces/Database/Backups/BackupsList.tsx b/apps/studio/components/interfaces/Database/Backups/BackupsList.tsx index cdf5084a0f8..e099ca8e7d3 100644 --- a/apps/studio/components/interfaces/Database/Backups/BackupsList.tsx +++ b/apps/studio/components/interfaces/Database/Backups/BackupsList.tsx @@ -4,7 +4,7 @@ import dayjs from 'dayjs' import { useRouter } from 'next/router' import { useState } from 'react' import toast from 'react-hot-toast' -import { IconAlertCircle, IconClock, Modal } from 'ui' +import { IconAlertCircle, IconClock, AlertDescription_Shadcn_, Alert_Shadcn_ } from 'ui' import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal' import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext' @@ -18,6 +18,7 @@ import { useCheckPermissions, useSelectedOrganization } from 'hooks' import { PROJECT_STATUS } from 'lib/constants' import BackupItem from './BackupItem' import BackupsEmpty from './BackupsEmpty' +import BackupsStorageAlert from './BackupsStorageAlert' const BackupsList = () => { const router = useRouter() @@ -88,6 +89,7 @@ const BackupsList = () => { title="You need additional permissions to trigger a scheduled backup" /> )} + {sortedBackups?.map((x, i: number) => { return ( diff --git a/apps/studio/components/interfaces/Database/Backups/BackupsStorageAlert.tsx b/apps/studio/components/interfaces/Database/Backups/BackupsStorageAlert.tsx new file mode 100644 index 00000000000..a6e677ab516 --- /dev/null +++ b/apps/studio/components/interfaces/Database/Backups/BackupsStorageAlert.tsx @@ -0,0 +1,17 @@ +import { AlertDescription_Shadcn_, Alert_Shadcn_ } from 'ui' +import { WarningIcon } from 'ui-patterns/Icons/StatusIcons' + +const BackupsStorageAlert = () => { + return ( + + + + Database backups do not include objects stored via the Storage API, as the database only + includes metadata about these objects. Restoring an old backup does not restore objects that + have been deleted since then. + + + ) +} + +export default BackupsStorageAlert diff --git a/apps/studio/components/interfaces/Database/Backups/PITR/PITRSelection.tsx b/apps/studio/components/interfaces/Database/Backups/PITR/PITRSelection.tsx index befe3e3f0ed..a396ea0786d 100644 --- a/apps/studio/components/interfaces/Database/Backups/PITR/PITRSelection.tsx +++ b/apps/studio/components/interfaces/Database/Backups/PITR/PITRSelection.tsx @@ -38,6 +38,7 @@ import { import PITRStatus from './PITRStatus' import TimeInput from './TimeInput' import { TimezoneSelection } from './TimezoneSelection' +import BackupsStorageAlert from '../BackupsStorageAlert' const PITRSelection = () => { const router = useRouter() @@ -138,6 +139,7 @@ const PITRSelection = () => { title="Restore your database from a backup" description="Database changes are watched and recorded, so that you can restore your database to any point in time" /> + {hasNoBackupsAvailable ? ( ) : ( diff --git a/apps/studio/components/interfaces/Support/SupportForm.tsx b/apps/studio/components/interfaces/Support/SupportForm.tsx index d08c9919843..fd07f9c0561 100644 --- a/apps/studio/components/interfaces/Support/SupportForm.tsx +++ b/apps/studio/components/interfaces/Support/SupportForm.tsx @@ -13,7 +13,6 @@ import { useFlag } from 'hooks' import useLatest from 'hooks/misc/useLatest' import { detectBrowser } from 'lib/helpers' import { useProfile } from 'lib/profile' -import { canSendTelemetry } from 'lib/telemetry' import { AlertCircle, ExternalLink, HelpCircle, Loader2, Mail, Plus, X } from 'lucide-react' import Link from 'next/link' import { useRouter } from 'next/router' @@ -79,9 +78,7 @@ const SupportForm = ({ setSentCategory, setSelectedProject }: SupportFormProps) }, onError: (error) => { toast.error(`Failed to submit support ticket: ${error.message}`) - if (canSendTelemetry()) { - Sentry.captureMessage('Failed to submit Support Form: ' + error.message) - } + Sentry.captureMessage('Failed to submit Support Form: ' + error.message) setIsSubmitting(false) }, }) diff --git a/apps/studio/data/fetchers.ts b/apps/studio/data/fetchers.ts index 894d2aec78c..e9197229044 100644 --- a/apps/studio/data/fetchers.ts +++ b/apps/studio/data/fetchers.ts @@ -2,7 +2,6 @@ import * as Sentry from '@sentry/nextjs' import { API_URL, IS_PLATFORM } from 'lib/constants' import { getAccessToken } from 'lib/gotrue' import { uuidv4 } from 'lib/helpers' -import { canSendTelemetry } from 'lib/telemetry' import createClient from 'openapi-fetch' import type { paths } from './api' // generated from openapi-typescript @@ -161,13 +160,9 @@ export const handleError = (error: any): never => { } console.error(error.stack) - if (canSendTelemetry()) { - // the error doesn't have a message or msg property, so we can't throw it as an error. Log it via Sentry so that we can - // add handling for it. - Sentry.captureMessage( - `Unable to throw an object as error. The object has the following keys: ${Object.keys(error)}.` - ) - } + // the error doesn't have a message or msg property, so we can't throw it as an error. Log it via Sentry so that we can + // add handling for it. + Sentry.captureException(error) // throw a generic error if we don't know what the error is. The message is intentionally vague because it might show // up in the UI. diff --git a/apps/studio/data/lint/lint-query.ts b/apps/studio/data/lint/lint-query.ts index 220df3a12c2..ea15206f8c7 100644 --- a/apps/studio/data/lint/lint-query.ts +++ b/apps/studio/data/lint/lint-query.ts @@ -1,923 +1,42 @@ import { UseQueryOptions, useQuery } from '@tanstack/react-query' -import { executeSql } from '../sql/execute-sql-query' +import { components } from 'api-types' +import { get, handleError } from 'data/fetchers' +import { ResponseError } from 'types' import { lintKeys } from './keys' -import { useProjectPostgrestConfigQuery } from 'data/config/project-postgrest-config-query' - -export const LINT_SQL = /* SQL */ `set local search_path = ''; - -( -with foreign_keys as ( - select - cl.relnamespace::regnamespace::text as schema_name, - cl.relname as table_name, - cl.oid as table_oid, - ct.conname as fkey_name, - ct.conkey as col_attnums - from - pg_catalog.pg_constraint ct - join pg_catalog.pg_class cl -- fkey owning table - on ct.conrelid = cl.oid - left join pg_catalog.pg_depend d - on d.objid = cl.oid - and d.deptype = 'e' - where - ct.contype = 'f' -- foreign key constraints - and d.objid is null -- exclude tables that are dependencies of extensions - and cl.relnamespace::regnamespace::text not in ( - 'pg_catalog', 'information_schema', 'auth', 'storage', 'vault', 'extensions' - ) -), -index_ as ( - select - pi.indrelid as table_oid, - indexrelid::regclass as index_, - string_to_array(indkey::text, ' ')::smallint[] as col_attnums - from - pg_catalog.pg_index pi - where - indisvalid -) -select - 'unindexed_foreign_keys' as name, - 'Unindexed foreign keys' as title, - 'INFO' as level, - 'EXTERNAL' as facing, - array['PERFORMANCE'] as categories, - 'Identifies foreign key constraints without a covering index, which can impact database performance.' as description, - format( - 'Table \`%s.%s\` has a foreign key \`%s\` without a covering index. This can lead to suboptimal query performance.', - fk.schema_name, - fk.table_name, - fk.fkey_name - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0001_unindexed_foreign_keys' as remediation, - jsonb_build_object( - 'schema', fk.schema_name, - 'name', fk.table_name, - 'type', 'table', - 'fkey_name', fk.fkey_name, - 'fkey_columns', fk.col_attnums - ) as metadata, - format('unindexed_foreign_keys_%s_%s_%s', fk.schema_name, fk.table_name, fk.fkey_name) as cache_key -from - foreign_keys fk - left join index_ idx - on fk.table_oid = idx.table_oid - and fk.col_attnums = idx.col_attnums - left join pg_catalog.pg_depend dep - on idx.table_oid = dep.objid - and dep.deptype = 'e' -where - idx.index_ is null - and fk.schema_name not in ( - '_timescaledb_cache', '_timescaledb_catalog', '_timescaledb_config', '_timescaledb_internal', 'auth', 'cron', 'extensions', 'graphql', 'graphql_public', 'information_schema', 'net', 'pgroonga', 'pgsodium', 'pgsodium_masks', 'pgtle', 'pgbouncer', 'pg_catalog', 'pgtle', 'realtime', 'repack', 'storage', 'supabase_functions', 'supabase_migrations', 'tiger', 'topology', 'vault' - ) - and dep.objid is null -- exclude tables owned by extensions -order by - fk.schema_name, - fk.table_name, - fk.fkey_name) -union all -( -select - 'auth_users_exposed' as name, - 'Exposed Auth Users' as title, - 'ERROR' as level, - 'EXTERNAL' as facing, - array['SECURITY'] as categories, - 'Detects if auth.users is exposed to anon or authenticated roles via a view or materialized view in schemas exposed to PostgREST, potentially compromising user data security.' as description, - format( - 'View/Materialized View "%s" in the public schema may expose \`auth.users\` data to anon or authenticated roles.', - c.relname - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0002_auth_users_exposed' as remediation, - jsonb_build_object( - 'schema', n.nspname, - 'name', c.relname, - 'type', 'view', - 'exposed_to', array_remove(array_agg(DISTINCT case when pg_catalog.has_table_privilege('anon', c.oid, 'SELECT') then 'anon' when pg_catalog.has_table_privilege('authenticated', c.oid, 'SELECT') then 'authenticated' end), null) - ) as metadata, - format('auth_users_exposed_%s_%s', n.nspname, c.relname) as cache_key -from - -- Identify the oid for auth.users - pg_catalog.pg_class auth_users_pg_class - join pg_catalog.pg_namespace auth_users_pg_namespace - on auth_users_pg_class.relnamespace = auth_users_pg_namespace.oid - and auth_users_pg_class.relname = 'users' - and auth_users_pg_namespace.nspname = 'auth' - -- Depends on auth.users - join pg_catalog.pg_depend d - on d.refobjid = auth_users_pg_class.oid - join pg_catalog.pg_rewrite r - on r.oid = d.objid - join pg_catalog.pg_class c - on c.oid = r.ev_class - join pg_catalog.pg_namespace n - on n.oid = c.relnamespace - join pg_catalog.pg_class pg_class_auth_users - on d.refobjid = pg_class_auth_users.oid -where - d.deptype = 'n' - and ( - pg_catalog.has_table_privilege('anon', c.oid, 'SELECT') - or pg_catalog.has_table_privilege('authenticated', c.oid, 'SELECT') - ) - and n.nspname = any(array(select trim(unnest(string_to_array(current_setting('pgrst.db_schemas', 't'), ','))))) - -- Exclude self - and c.relname <> '0002_auth_users_exposed' - -- There are 3 insecure configurations - and - ( - -- Materialized views don't support RLS so this is insecure by default - (c.relkind in ('m')) -- m for materialized view - or - -- Standard View, accessible to anon or authenticated that is security_definer - ( - c.relkind = 'v' -- v for view - -- Exclude security invoker views - and not ( - lower(coalesce(c.reloptions::text,'{}'))::text[] - && array[ - 'security_invoker=1', - 'security_invoker=true', - 'security_invoker=yes', - 'security_invoker=on' - ] - ) - ) - or - -- Standard View, security invoker, but no RLS enabled on auth.users - ( - c.relkind in ('v') -- v for view - -- is security invoker - and ( - lower(coalesce(c.reloptions::text,'{}'))::text[] - && array[ - 'security_invoker=1', - 'security_invoker=true', - 'security_invoker=yes', - 'security_invoker=on' - ] - ) - and not pg_class_auth_users.relrowsecurity - ) - ) -group by - n.nspname, - c.relname, - c.oid) -union all -( -with policies as ( - select - nsp.nspname as schema_name, - pb.tablename as table_name, - pc.relrowsecurity as is_rls_active, - polname as policy_name, - polpermissive as is_permissive, -- if not, then restrictive - (select array_agg(r::regrole) from unnest(polroles) as x(r)) as roles, - case polcmd - when 'r' then 'SELECT' - when 'a' then 'INSERT' - when 'w' then 'UPDATE' - when 'd' then 'DELETE' - when '*' then 'ALL' - end as command, - qual, - with_check - from - pg_catalog.pg_policy pa - join pg_catalog.pg_class pc - on pa.polrelid = pc.oid - join pg_catalog.pg_namespace nsp - on pc.relnamespace = nsp.oid - join pg_catalog.pg_policies pb - on pc.relname = pb.tablename - and nsp.nspname = pb.schemaname - and pa.polname = pb.policyname -) -select - 'auth_rls_initplan' as name, - 'Auth RLS Initialization Plan' as title, - 'WARN' as level, - 'EXTERNAL' as facing, - array['PERFORMANCE'] as categories, - 'Detects if calls to \`auth.()\` in RLS policies are being unnecessarily re-evaluated for each row' as description, - format( - 'Table \`%s.%s\` has a row level security policy \`%s\` that re-evaluates an auth.() for each row. This produces suboptimal query performance at scale. Resolve the issue by replacing \`auth.()\` with \`(select auth.())\`. See [docs](https://supabase.com/docs/guides/database/postgres/row-level-security#call-functions-with-select) for more info.', - schema_name, - table_name, - policy_name - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0003_auth_rls_initplan' as remediation, - jsonb_build_object( - 'schema', schema_name, - 'name', table_name, - 'type', 'table' - ) as metadata, - format('auth_rls_init_plan_%s_%s_%s', schema_name, table_name, policy_name) as cache_key -from - policies -where - is_rls_active - and schema_name not in ( - '_timescaledb_cache', '_timescaledb_catalog', '_timescaledb_config', '_timescaledb_internal', 'auth', 'cron', 'extensions', 'graphql', 'graphql_public', 'information_schema', 'net', 'pgroonga', 'pgsodium', 'pgsodium_masks', 'pgtle', 'pgbouncer', 'pg_catalog', 'pgtle', 'realtime', 'repack', 'storage', 'supabase_functions', 'supabase_migrations', 'tiger', 'topology', 'vault' - ) - and ( - -- Example: auth.uid() - ( - qual like '%auth.uid()%' - and lower(qual) not like '%select auth.uid()%' - ) - or ( - qual like '%auth.jwt()%' - and lower(qual) not like '%select auth.jwt()%' - ) - or ( - qual like '%auth.role()%' - and lower(qual) not like '%select auth.role()%' - ) - or ( - qual like '%auth.email()%' - and lower(qual) not like '%select auth.email()%' - ) - or ( - with_check like '%auth.uid()%' - and lower(with_check) not like '%select auth.uid()%' - ) - or ( - with_check like '%auth.jwt()%' - and lower(with_check) not like '%select auth.jwt()%' - ) - or ( - with_check like '%auth.role()%' - and lower(with_check) not like '%select auth.role()%' - ) - or ( - with_check like '%auth.email()%' - and lower(with_check) not like '%select auth.email()%' - ) - )) -union all -( -select - 'no_primary_key' as name, - 'No Primary Key' as title, - 'INFO' as level, - 'EXTERNAL' as facing, - array['PERFORMANCE'] as categories, - 'Detects if a table does not have a primary key. Tables without a primary key can be inefficient to interact with at scale.' as description, - format( - 'Table \`%s.%s\` does not have a primary key', - pgns.nspname, - pgc.relname - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0004_no_primary_key' as remediation, - jsonb_build_object( - 'schema', pgns.nspname, - 'name', pgc.relname, - 'type', 'table' - ) as metadata, - format( - 'no_primary_key_%s_%s', - pgns.nspname, - pgc.relname - ) as cache_key -from - pg_catalog.pg_class pgc - join pg_catalog.pg_namespace pgns - on pgns.oid = pgc.relnamespace - left join pg_catalog.pg_index pgi - on pgi.indrelid = pgc.oid - left join pg_catalog.pg_depend dep - on pgc.oid = dep.objid - and dep.deptype = 'e' -where - pgc.relkind = 'r' -- regular tables - and pgns.nspname not in ( - '_timescaledb_cache', '_timescaledb_catalog', '_timescaledb_config', '_timescaledb_internal', 'auth', 'cron', 'extensions', 'graphql', 'graphql_public', 'information_schema', 'net', 'pgroonga', 'pgsodium', 'pgsodium_masks', 'pgtle', 'pgbouncer', 'pg_catalog', 'pgtle', 'realtime', 'repack', 'storage', 'supabase_functions', 'supabase_migrations', 'tiger', 'topology', 'vault' - ) - and dep.objid is null -- exclude tables owned by extensions -group by - pgc.oid, - pgns.nspname, - pgc.relname -having - max(coalesce(pgi.indisprimary, false)::int) = 0) -union all -( -select - 'unused_index' as name, - 'Unused Index' as title, - 'INFO' as level, - 'EXTERNAL' as facing, - array['PERFORMANCE'] as categories, - 'Detects if an index has never been used and may be a candidate for removal.' as description, - format( - 'Index \`%s\` on table \`%s.%s\` has not been used', - psui.indexrelname, - psui.schemaname, - psui.relname - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0005_unused_index' as remediation, - jsonb_build_object( - 'schema', psui.schemaname, - 'name', psui.relname, - 'type', 'table' - ) as metadata, - format( - 'unused_index_%s_%s_%s', - psui.schemaname, - psui.relname, - psui.indexrelname - ) as cache_key - -from - pg_catalog.pg_stat_user_indexes psui - join pg_catalog.pg_index pi - on psui.indexrelid = pi.indexrelid - left join pg_catalog.pg_depend dep - on psui.relid = dep.objid - and dep.deptype = 'e' -where - psui.idx_scan = 0 - and not pi.indisunique - and not pi.indisprimary - and dep.objid is null -- exclude tables owned by extensions - and psui.schemaname not in ( - '_timescaledb_cache', '_timescaledb_catalog', '_timescaledb_config', '_timescaledb_internal', 'auth', 'cron', 'extensions', 'graphql', 'graphql_public', 'information_schema', 'net', 'pgroonga', 'pgsodium', 'pgsodium_masks', 'pgtle', 'pgbouncer', 'pg_catalog', 'pgtle', 'realtime', 'repack', 'storage', 'supabase_functions', 'supabase_migrations', 'tiger', 'topology', 'vault' - )) -union all -( -select - 'multiple_permissive_policies' as name, - 'Multiple Permissive Policies' as title, - 'WARN' as level, - 'EXTERNAL' as facing, - array['PERFORMANCE'] as categories, - 'Detects if multiple permissive row level security policies are present on a table for the same \`role\` and \`action\` (e.g. insert). Multiple permissive policies are suboptimal for performance as each policy must be executed for every relevant query.' as description, - format( - 'Table \`%s.%s\` has multiple permissive policies for role \`%s\` for action \`%s\`. Policies include \`%s\`', - n.nspname, - c.relname, - r.rolname, - act.cmd, - array_agg(p.polname order by p.polname) - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0006_multiple_permissive_policies' as remediation, - jsonb_build_object( - 'schema', n.nspname, - 'name', c.relname, - 'type', 'table' - ) as metadata, - format( - 'multiple_permissive_policies_%s_%s_%s_%s', - n.nspname, - c.relname, - r.rolname, - act.cmd - ) as cache_key -from - pg_catalog.pg_policy p - join pg_catalog.pg_class c - on p.polrelid = c.oid - join pg_catalog.pg_namespace n - on c.relnamespace = n.oid - join pg_catalog.pg_roles r - on p.polroles @> array[r.oid] - or p.polroles = array[0::oid] - left join pg_catalog.pg_depend dep - on c.oid = dep.objid - and dep.deptype = 'e', - lateral ( - select x.cmd - from unnest(( - select - case p.polcmd - when 'r' then array['SELECT'] - when 'a' then array['INSERT'] - when 'w' then array['UPDATE'] - when 'd' then array['DELETE'] - when '*' then array['SELECT', 'INSERT', 'UPDATE', 'DELETE'] - else array['ERROR'] - end as actions - )) x(cmd) - ) act(cmd) -where - c.relkind = 'r' -- regular tables - and p.polpermissive -- policy is permissive - and n.nspname not in ( - '_timescaledb_cache', '_timescaledb_catalog', '_timescaledb_config', '_timescaledb_internal', 'auth', 'cron', 'extensions', 'graphql', 'graphql_public', 'information_schema', 'net', 'pgroonga', 'pgsodium', 'pgsodium_masks', 'pgtle', 'pgbouncer', 'pg_catalog', 'pgtle', 'realtime', 'repack', 'storage', 'supabase_functions', 'supabase_migrations', 'tiger', 'topology', 'vault' - ) - and r.rolname not like 'pg_%' - and r.rolname not like 'supabase%admin' - and not r.rolbypassrls - and dep.objid is null -- exclude tables owned by extensions -group by - n.nspname, - c.relname, - r.rolname, - act.cmd -having - count(1) > 1) -union all -( -select - 'policy_exists_rls_disabled' as name, - 'Policy Exists RLS Disabled' as title, - 'ERROR' as level, - 'EXTERNAL' as facing, - array['SECURITY'] as categories, - 'Detects cases where row level security (RLS) policies have been created, but RLS has not been enabled for the underlying table.' as description, - format( - 'Table \`%s.%s\` has RLS policies but RLS is not enabled on the table. Policies include %s.', - n.nspname, - c.relname, - array_agg(p.polname order by p.polname) - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0007_policy_exists_rls_disabled' as remediation, - jsonb_build_object( - 'schema', n.nspname, - 'name', c.relname, - 'type', 'table' - ) as metadata, - format( - 'policy_exists_rls_disabled_%s_%s', - n.nspname, - c.relname - ) as cache_key -from - pg_catalog.pg_policy p - join pg_catalog.pg_class c - on p.polrelid = c.oid - join pg_catalog.pg_namespace n - on c.relnamespace = n.oid - left join pg_catalog.pg_depend dep - on c.oid = dep.objid - and dep.deptype = 'e' -where - c.relkind = 'r' -- regular tables - and n.nspname not in ( - '_timescaledb_cache', '_timescaledb_catalog', '_timescaledb_config', '_timescaledb_internal', 'auth', 'cron', 'extensions', 'graphql', 'graphql_public', 'information_schema', 'net', 'pgroonga', 'pgsodium', 'pgsodium_masks', 'pgtle', 'pgbouncer', 'pg_catalog', 'pgtle', 'realtime', 'repack', 'storage', 'supabase_functions', 'supabase_migrations', 'tiger', 'topology', 'vault' - ) - -- RLS is disabled - and not c.relrowsecurity - and dep.objid is null -- exclude tables owned by extensions -group by - n.nspname, - c.relname) -union all -( -select - 'rls_enabled_no_policy' as name, - 'RLS Enabled No Policy' as title, - 'INFO' as level, - 'EXTERNAL' as facing, - array['SECURITY'] as categories, - 'Detects cases where row level security (RLS) has been enabled on a table but no RLS policies have been created.' as description, - format( - 'Table \`%s.%s\` has RLS enabled, but no policies exist', - n.nspname, - c.relname - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0008_rls_enabled_no_policy' as remediation, - jsonb_build_object( - 'schema', n.nspname, - 'name', c.relname, - 'type', 'table' - ) as metadata, - format( - 'rls_enabled_no_policy_%s_%s', - n.nspname, - c.relname - ) as cache_key -from - pg_catalog.pg_class c - left join pg_catalog.pg_policy p - on p.polrelid = c.oid - join pg_catalog.pg_namespace n - on c.relnamespace = n.oid - left join pg_catalog.pg_depend dep - on c.oid = dep.objid - and dep.deptype = 'e' -where - c.relkind = 'r' -- regular tables - and n.nspname not in ( - '_timescaledb_cache', '_timescaledb_catalog', '_timescaledb_config', '_timescaledb_internal', 'auth', 'cron', 'extensions', 'graphql', 'graphql_public', 'information_schema', 'net', 'pgroonga', 'pgsodium', 'pgsodium_masks', 'pgtle', 'pgbouncer', 'pg_catalog', 'pgtle', 'realtime', 'repack', 'storage', 'supabase_functions', 'supabase_migrations', 'tiger', 'topology', 'vault' - ) - -- RLS is enabled - and c.relrowsecurity - and p.polname is null - and dep.objid is null -- exclude tables owned by extensions -group by - n.nspname, - c.relname) -union all -( -select - 'duplicate_index' as name, - 'Duplicate Index' as title, - 'WARN' as level, - 'EXTERNAL' as facing, - array['PERFORMANCE'] as categories, - 'Detects cases where two ore more identical indexes exist.' as description, - format( - 'Table \`%s.%s\` has identical indexes %s. Drop all except one of them', - n.nspname, - c.relname, - array_agg(pi.indexname order by pi.indexname) - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0009_duplicate_index' as remediation, - jsonb_build_object( - 'schema', n.nspname, - 'name', c.relname, - 'type', case - when c.relkind = 'r' then 'table' - when c.relkind = 'm' then 'materialized view' - else 'ERROR' - end, - 'indexes', array_agg(pi.indexname order by pi.indexname) - ) as metadata, - format( - 'duplicate_index_%s_%s_%s', - n.nspname, - c.relname, - array_agg(pi.indexname order by pi.indexname) - ) as cache_key -from - pg_catalog.pg_indexes pi - join pg_catalog.pg_namespace n - on n.nspname = pi.schemaname - join pg_catalog.pg_class c - on pi.tablename = c.relname - and n.oid = c.relnamespace - left join pg_catalog.pg_depend dep - on c.oid = dep.objid - and dep.deptype = 'e' -where - c.relkind in ('r', 'm') -- tables and materialized views - and n.nspname not in ( - '_timescaledb_cache', '_timescaledb_catalog', '_timescaledb_config', '_timescaledb_internal', 'auth', 'cron', 'extensions', 'graphql', 'graphql_public', 'information_schema', 'net', 'pgroonga', 'pgsodium', 'pgsodium_masks', 'pgtle', 'pgbouncer', 'pg_catalog', 'pgtle', 'realtime', 'repack', 'storage', 'supabase_functions', 'supabase_migrations', 'tiger', 'topology', 'vault' - ) - and dep.objid is null -- exclude tables owned by extensions -group by - n.nspname, - c.relkind, - c.relname, - replace(pi.indexdef, pi.indexname, '') -having - count(*) > 1) -union all -( -select - 'security_definer_view' as name, - 'Security Definer View' as title, - 'ERROR' as level, - 'EXTERNAL' as facing, - array['SECURITY'] as categories, - 'Detects views defined with the SECURITY DEFINER property. These views enforce Postgres permissions and row level security policies (RLS) of the view creator, rather than that of the querying user' as description, - format( - 'View \`%s.%s\` is defined with the SECURITY DEFINER property', - n.nspname, - c.relname - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0010_security_definer_view' as remediation, - jsonb_build_object( - 'schema', n.nspname, - 'name', c.relname, - 'type', 'view' - ) as metadata, - format( - 'security_definer_view_%s_%s', - n.nspname, - c.relname - ) as cache_key -from - pg_catalog.pg_class c - join pg_catalog.pg_namespace n - on n.oid = c.relnamespace - left join pg_catalog.pg_depend dep - on c.oid = dep.objid - and dep.deptype = 'e' -where - c.relkind = 'v' - and ( - pg_catalog.has_table_privilege('anon', c.oid, 'SELECT') - or pg_catalog.has_table_privilege('authenticated', c.oid, 'SELECT') - ) - and n.nspname = any(array(select trim(unnest(string_to_array(current_setting('pgrst.db_schemas', 't'), ','))))) - and n.nspname not in ( - '_timescaledb_cache', '_timescaledb_catalog', '_timescaledb_config', '_timescaledb_internal', 'auth', 'cron', 'extensions', 'graphql', 'graphql_public', 'information_schema', 'net', 'pgroonga', 'pgsodium', 'pgsodium_masks', 'pgtle', 'pgbouncer', 'pg_catalog', 'pgtle', 'realtime', 'repack', 'storage', 'supabase_functions', 'supabase_migrations', 'tiger', 'topology', 'vault' - ) - and dep.objid is null -- exclude views owned by extensions - and not ( - lower(coalesce(c.reloptions::text,'{}'))::text[] - && array[ - 'security_invoker=1', - 'security_invoker=true', - 'security_invoker=yes', - 'security_invoker=on' - ] - )) -union all -( -select - 'function_search_path_mutable' as name, - 'Function Search Path Mutable' as title, - 'WARN' as level, - 'EXTERNAL' as facing, - array['SECURITY'] as categories, - 'Detects functions with a mutable search_path parameter which could fail to execute successfully for some roles.' as description, - format( - 'Function \`%s.%s\` has a role mutable search_path', - n.nspname, - p.proname - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0011_function_search_path_mutable' as remediation, - jsonb_build_object( - 'schema', n.nspname, - 'name', p.proname, - 'type', 'function' - ) as metadata, - format( - 'function_search_path_mutable_%s_%s_%s', - n.nspname, - p.proname, - md5(p.prosrc) -- required when function is polymorphic - ) as cache_key -from - pg_catalog.pg_proc p - join pg_catalog.pg_namespace n - on p.pronamespace = n.oid - left join pg_catalog.pg_depend dep - on p.oid = dep.objid - and dep.deptype = 'e' -where - n.nspname not in ( - '_timescaledb_cache', '_timescaledb_catalog', '_timescaledb_config', '_timescaledb_internal', 'auth', 'cron', 'extensions', 'graphql', 'graphql_public', 'information_schema', 'net', 'pgroonga', 'pgsodium', 'pgsodium_masks', 'pgtle', 'pgbouncer', 'pg_catalog', 'pgtle', 'realtime', 'repack', 'storage', 'supabase_functions', 'supabase_migrations', 'tiger', 'topology', 'vault' - ) - and dep.objid is null -- exclude functions owned by extensions - -- Search path not set to '' - and not coalesce(p.proconfig, '{}') && array['search_path=""']) -union all -( -select - 'rls_disabled_in_public' as name, - 'RLS Disabled in Public' as title, - 'ERROR' as level, - 'EXTERNAL' as facing, - array['SECURITY'] as categories, - 'Detects cases where row level security (RLS) has not been enabled on tables in schemas exposed to PostgREST' as description, - format( - 'Table \`%s.%s\` is public, but RLS has not been enabled.', - n.nspname, - c.relname - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0013_rls_disabled_in_public' as remediation, - jsonb_build_object( - 'schema', n.nspname, - 'name', c.relname, - 'type', 'table' - ) as metadata, - format( - 'rls_disabled_in_public_%s_%s', - n.nspname, - c.relname - ) as cache_key -from - pg_catalog.pg_class c - join pg_catalog.pg_namespace n - on c.relnamespace = n.oid -where - c.relkind = 'r' -- regular tables - -- RLS is disabled - and not c.relrowsecurity - and ( - pg_catalog.has_table_privilege('anon', c.oid, 'SELECT') - or pg_catalog.has_table_privilege('authenticated', c.oid, 'SELECT') - ) - and n.nspname = any(array(select trim(unnest(string_to_array(current_setting('pgrst.db_schemas', 't'), ','))))) - and n.nspname not in ( - '_timescaledb_cache', '_timescaledb_catalog', '_timescaledb_config', '_timescaledb_internal', 'auth', 'cron', 'extensions', 'graphql', 'graphql_public', 'information_schema', 'net', 'pgroonga', 'pgsodium', 'pgsodium_masks', 'pgtle', 'pgbouncer', 'pg_catalog', 'pgtle', 'realtime', 'repack', 'storage', 'supabase_functions', 'supabase_migrations', 'tiger', 'topology', 'vault' - )) -union all -( -select - 'extension_in_public' as name, - 'Extension in Public' as title, - 'WARN' as level, - 'EXTERNAL' as facing, - array['SECURITY'] as categories, - 'Detects extensions installed in the \`public\` schema.' as description, - format( - 'Extension \`%s\` is installed in the public schema. Move it to another schema.', - pe.extname - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0014_extension_in_public' as remediation, - jsonb_build_object( - 'schema', pe.extnamespace::regnamespace, - 'name', pe.extname, - 'type', 'extension' - ) as metadata, - format( - 'extension_in_public_%s', - pe.extname - ) as cache_key -from - pg_catalog.pg_extension pe -where - -- plpgsql is installed by default in public and outside user control - -- confirmed safe - pe.extname not in ('plpgsql') - -- Scoping this to public is not optimal. Ideally we would use the postgres - -- search path. That currently isn't available via SQL. In other lints - -- we have used has_schema_privilege('anon', 'extensions', 'USAGE') but that - -- is not appropriate here as it would evaluate true for the extensions schema - and pe.extnamespace::regnamespace::text = 'public') -union all -( -with policies as ( - select - nsp.nspname as schema_name, - pb.tablename as table_name, - polname as policy_name, - qual, - with_check - from - pg_catalog.pg_policy pa - join pg_catalog.pg_class pc - on pa.polrelid = pc.oid - join pg_catalog.pg_namespace nsp - on pc.relnamespace = nsp.oid - join pg_catalog.pg_policies pb - on pc.relname = pb.tablename - and nsp.nspname = pb.schemaname - and pa.polname = pb.policyname -) -select - 'rls_references_user_metadata' as name, - 'RLS references user metadata' as title, - 'ERROR' as level, - 'EXTERNAL' as facing, - array['SECURITY'] as categories, - 'Detects when Supabase Auth user_metadata is referenced insecurely in a row level security (RLS) policy.' as description, - format( - 'Table \`%s.%s\` has a row level security policy \`%s\` that references Supabase Auth \`user_metadata\`. \`user_metadata\` is editable by end users and should never be used in a security context.', - schema_name, - table_name, - policy_name - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0015_rls_references_user_metadata' as remediation, - jsonb_build_object( - 'schema', schema_name, - 'name', table_name, - 'type', 'table' - ) as metadata, - format('rls_references_user_metadata_%s_%s_%s', schema_name, table_name, policy_name) as cache_key -from - policies -where - schema_name not in ( - '_timescaledb_cache', '_timescaledb_catalog', '_timescaledb_config', '_timescaledb_internal', 'auth', 'cron', 'extensions', 'graphql', 'graphql_public', 'information_schema', 'net', 'pgroonga', 'pgsodium', 'pgsodium_masks', 'pgtle', 'pgbouncer', 'pg_catalog', 'pgtle', 'realtime', 'repack', 'storage', 'supabase_functions', 'supabase_migrations', 'tiger', 'topology', 'vault' - ) - and ( - -- Example: auth.jwt() -> 'user_metadata' - -- False positives are possible, but it isn't practical to string match - -- If false positive rate is too high, this expression can iterate - qual like '%auth.jwt()%user_metadata%' - or qual like '%current_setting(%request.jwt.claims%)%user_metadata%' - or with_check like '%auth.jwt()%user_metadata%' - or with_check like '%current_setting(%request.jwt.claims%)%user_metadata%' - )) -union all -( -select - 'materialized_view_in_api' as name, - 'Materialized View in API' as title, - 'WARN' as level, - 'EXTERNAL' as facing, - array['SECURITY'] as categories, - 'Detects materialized views that are potentially accessible over the Data APIs.' as description, - format( - 'Materialized view \`%s.%s\` is selectable by anon or authenticated roles', - n.nspname, - c.relname - ) as detail, - 'https://supabase.com/docs/guides/database/database-linter?lint=0016_materialized_view_in_api' as remediation, - jsonb_build_object( - 'schema', n.nspname, - 'name', c.relname, - 'type', 'materialized view' - ) as metadata, - format( - 'materialized_view_in_api_%s_%s', - n.nspname, - c.relname - ) as cache_key -from - pg_catalog.pg_class c - join pg_catalog.pg_namespace n - on n.oid = c.relnamespace - left join pg_catalog.pg_depend dep - on c.oid = dep.objid - and dep.deptype = 'e' -where - c.relkind = 'm' - and ( - pg_catalog.has_table_privilege('anon', c.oid, 'SELECT') - or pg_catalog.has_table_privilege('authenticated', c.oid, 'SELECT') - ) - and n.nspname = any(array(select trim(unnest(string_to_array(current_setting('pgrst.db_schemas', 't'), ','))))) - and n.nspname not in ( - '_timescaledb_cache', '_timescaledb_catalog', '_timescaledb_config', '_timescaledb_internal', 'auth', 'cron', 'extensions', 'graphql', 'graphql_public', 'information_schema', 'net', 'pgroonga', 'pgsodium', 'pgsodium_masks', 'pgtle', 'pgbouncer', 'pg_catalog', 'pgtle', 'realtime', 'repack', 'storage', 'supabase_functions', 'supabase_migrations', 'tiger', 'topology', 'vault' - ) - and dep.objid is null)`.trim() - -// Array of all lint rules we handle right now. -export const LINT_TYPES = [ - 'unindexed_foreign_keys', - 'auth_users_exposed', - 'auth_rls_initplan', - 'no_primary_key', - 'unused_index', - 'multiple_permissive_policies', - 'policy_exists_rls_disabled', - 'rls_enabled_no_policy', - 'duplicate_index', - 'security_definer_view', - 'function_search_path_mutable', - 'rls_disabled_in_public', - 'extension_in_public', - 'auth_otp_long_expiry', - 'auth_otp_short_length', - 'rls_references_user_metadata', -] as const - -export type LINT_TYPES = (typeof LINT_TYPES)[number] - -export type Lint = { - name: LINT_TYPES - level: 'ERROR' | 'WARN' | 'INFO' - facing: string - categories: ['PERFORMANCE' | 'SECURITY'] - description: string - detail: string - remediation: any - metadata: { - schema?: string - name?: string - entity?: string - type?: 'table' | 'view' | 'auth' | 'function' | 'extension' - fkey_name?: string - fkey_columns?: number[] - } | null - cache_key: string -} export type ProjectLintsVariables = { projectRef?: string - connectionString?: string - exposedSchemas?: string +} +export type ProjectLintResponse = components['schemas']['ProjectLintResponse'] +export type Lint = ProjectLintResponse +export type LINT_TYPES = ProjectLintResponse['name'] + +export async function getProjectLints({ projectRef }: ProjectLintsVariables, signal?: AbortSignal) { + if (!projectRef) throw new Error('Project ref is required') + + const { data, error } = await get(`/platform/projects/{ref}/run-lints`, { + params: { path: { ref: projectRef } }, + signal, + }) + + if (error) handleError(error) + + return data } -const getProjectLints = async ( - { projectRef, connectionString, exposedSchemas }: ProjectLintsVariables, - signal?: AbortSignal -) => { - const exposedSchemasPrepend = `set local pgrst.db_schemas='${exposedSchemas}';` - - const { result } = await executeSql( - { - projectRef, - connectionString, - sql: exposedSchemasPrepend?.concat(LINT_SQL), - queryKey: lintKeys.lint(projectRef), - }, - signal - ) - - return result -} - -export type ProjectLintsData = Lint[] -export type ProjectLintsError = unknown +export type ProjectLintsData = Awaited> +export type ProjectLintsError = ResponseError export const useProjectLintsQuery = ( - { projectRef, connectionString }: Omit, + { projectRef }: ProjectLintsVariables, { enabled = true, ...options }: UseQueryOptions = {} -) => { - const { data, isSuccess } = useProjectPostgrestConfigQuery({ projectRef }) - - const exposedSchemas = data?.db_schema - - return useQuery( +) => + useQuery( lintKeys.lint(projectRef), - ({ signal }) => - getProjectLints({ projectRef, connectionString, exposedSchemas: exposedSchemas! }, signal), + ({ signal }) => getProjectLints({ projectRef }, signal), { - enabled: enabled && isSuccess && typeof projectRef !== 'undefined', + enabled: enabled && typeof projectRef !== 'undefined', ...options, } ) -} diff --git a/apps/studio/lib/telemetry.ts b/apps/studio/lib/telemetry.ts index 2bf7353414e..3b37e3a0637 100644 --- a/apps/studio/lib/telemetry.ts +++ b/apps/studio/lib/telemetry.ts @@ -114,18 +114,6 @@ const sendActivity = ( return post(`${API_URL}/telemetry/activity`, properties) } -/** - * Checks if the user has consented to sending telemetry data. Mainly used for Sentry reports. - */ -export const canSendTelemetry = () => { - const consent = - typeof window !== 'undefined' - ? localStorage.getItem(LOCAL_STORAGE_KEYS.TELEMETRY_CONSENT) - : null - - return IS_PLATFORM && consent === 'true' -} - /** * Generates a unique identifier for an anonymous user based on their gotrue id. */ diff --git a/apps/studio/pages/_app.tsx b/apps/studio/pages/_app.tsx index 79e6acff77d..84a9254b3ea 100644 --- a/apps/studio/pages/_app.tsx +++ b/apps/studio/pages/_app.tsx @@ -52,7 +52,7 @@ import { useRootQueryClient } from 'data/query-client' import { AuthProvider } from 'lib/auth' import { BASE_PATH, IS_PLATFORM, LOCAL_STORAGE_KEYS } from 'lib/constants' import { ProfileProvider } from 'lib/profile' -import { canSendTelemetry, getAnonId } from 'lib/telemetry' +import { getAnonId } from 'lib/telemetry' import { useAppStateSnapshot } from 'state/app-state' import HCaptchaLoadedStore from 'stores/hcaptcha-loaded-store' import { AppPropsWithLayout } from 'types' @@ -112,12 +112,10 @@ function CustomApp({ Component, pageProps }: AppPropsWithLayout) { ) const errorBoundaryHandler = (error: Error, info: ErrorInfo) => { - if (canSendTelemetry()) { - Sentry.withScope(function (scope) { - scope.setTag('globalErrorBoundary', true) - Sentry.captureException(error) - }) - } + Sentry.withScope(function (scope) { + scope.setTag('globalErrorBoundary', true) + Sentry.captureException(error) + }) console.error(error.stack) } @@ -152,11 +150,8 @@ function CustomApp({ Component, pageProps }: AppPropsWithLayout) { const user = useUser() useEffect(() => { - // don't set the sentry user id if - // - on self-hosted or CLI - // - the user has not consented to telemetry - // - the user hasn't logged in (so that Sentry errors show null user id instead of anonymous id) - if (!canSendTelemetry() || !user?.id) { + // don't set the sentry user id if the user hasn't logged in (so that Sentry errors show null user id instead of anonymous id) + if (!user?.id) { return } diff --git a/apps/studio/pages/project/[ref]/database/performance-advisor.tsx b/apps/studio/pages/project/[ref]/database/performance-advisor.tsx index e8e1c8e5f85..5f2bb67dff6 100644 --- a/apps/studio/pages/project/[ref]/database/performance-advisor.tsx +++ b/apps/studio/pages/project/[ref]/database/performance-advisor.tsx @@ -32,7 +32,6 @@ const ProjectLints: NextPageWithLayout = () => { const { data, isLoading, isRefetching, refetch } = useProjectLintsQuery({ projectRef: project?.ref, - connectionString: project?.connectionString, }) const activeLints = data?.filter((x) => x.categories.includes('PERFORMANCE')) || [] diff --git a/apps/studio/pages/project/[ref]/database/security-advisor.tsx b/apps/studio/pages/project/[ref]/database/security-advisor.tsx index 1321cc34799..432eec24d77 100644 --- a/apps/studio/pages/project/[ref]/database/security-advisor.tsx +++ b/apps/studio/pages/project/[ref]/database/security-advisor.tsx @@ -38,7 +38,6 @@ const ProjectLints: NextPageWithLayout = () => { refetch: refetchLintsQuery, } = useProjectLintsQuery({ projectRef: project?.ref, - connectionString: project?.connectionString, }) const { @@ -58,44 +57,6 @@ const ProjectLints: NextPageWithLayout = () => { let clientLints: Lint[] = [] - // [Alaister]: checking this client side for speed, but should be moved into the query if possible - if (authConfig?.EXTERNAL_EMAIL_ENABLED) { - if (authConfig.MAILER_OTP_EXP > 3600) { - clientLints.push({ - name: 'auth_otp_long_expiry', - level: 'WARN', - facing: 'EXTERNAL', - categories: ['SECURITY'], - description: 'OTP expiry exceeds recommended threshold', - detail: - 'We have detected that you have enabled the email provider with the OTP expiry set to more than an hour. It is recommended to set this value to less than an hour.', - cache_key: 'auth_otp_long_expiry', - remediation: 'https://supabase.com/docs/guides/platform/going-into-prod#security', - metadata: { - type: 'auth', - entity: 'Auth', - }, - }) - } - - if (authConfig.EXTERNAL_PHONE_ENABLED && authConfig.SMS_OTP_LENGTH < 6) { - clientLints.push({ - name: 'auth_otp_short_length', - level: 'WARN', - facing: 'EXTERNAL', - categories: ['SECURITY'], - description: 'OTP length is less than recommended threshold', - detail: 'We have detected that you have set the OTP length to less than 6 characters', - cache_key: 'auth_otp_short_length', - remediation: 'https://supabase.com/docs/guides/platform/going-into-prod#security', - metadata: { - type: 'auth', - entity: 'Auth', - }, - }) - } - } - const activeLints = [...(data ?? []), ...clientLints]?.filter((x) => x.categories.includes('SECURITY') ) diff --git a/apps/studio/sentry.client.config.ts b/apps/studio/sentry.client.config.ts index cc5d0576b79..c87aca25832 100644 --- a/apps/studio/sentry.client.config.ts +++ b/apps/studio/sentry.client.config.ts @@ -1,10 +1,23 @@ import * as Sentry from '@sentry/nextjs' +import { IS_PLATFORM } from 'common/constants/environment' +import { LOCAL_STORAGE_KEYS } from 'common/constants/local-storage' import { match } from 'path-to-regexp' Sentry.init({ dsn: process.env.NEXT_PUBLIC_SENTRY_DSN, tracesSampleRate: 0.01, debug: false, + beforeSend(event) { + const consent = + typeof window !== 'undefined' + ? localStorage.getItem(LOCAL_STORAGE_KEYS.TELEMETRY_CONSENT) + : null + + if (IS_PLATFORM && consent === 'true') { + return event + } + return null + }, integrations: [ new Sentry.BrowserTracing({ // TODO: update gotrue + api to support Access-Control-Request-Headers: authorization,baggage,sentry-trace,x-client-info diff --git a/apps/www/public/sitemap_www.xml b/apps/www/public/sitemap_www.xml index 43bed236a3c..fa82593d0ac 100644 --- a/apps/www/public/sitemap_www.xml +++ b/apps/www/public/sitemap_www.xml @@ -61,13 +61,13 @@ - https://supabase.com/auth + https://supabase.com/blog/ weekly 0.5 - https://supabase.com/blog/ + https://supabase.com/auth weekly 0.5 diff --git a/packages/ui/index.tsx b/packages/ui/index.tsx index 422743ab8b1..13c571b5d67 100644 --- a/packages/ui/index.tsx +++ b/packages/ui/index.tsx @@ -239,6 +239,9 @@ export { Separator } from './src/components/shadcn/ui/separator' export * from './src/components/shadcn/ui/resizable' +export * from './src/components/radio-group-stacked' +export * from './src/components/radio-group-card' + // links export * from './src/components/TextLink' diff --git a/packages/ui/src/components/radio-group-card.tsx b/packages/ui/src/components/radio-group-card.tsx new file mode 100644 index 00000000000..f0928ccd43b --- /dev/null +++ b/packages/ui/src/components/radio-group-card.tsx @@ -0,0 +1,92 @@ +'use client' + +import * as RadioGroupPrimitive from '@radix-ui/react-radio-group' +import { Circle } from 'lucide-react' +import * as React from 'react' + +import { cn } from '../lib/utils/cn' + +const RadioGroupCard = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => { + return +}) +RadioGroupCard.displayName = RadioGroupPrimitive.Root.displayName + +interface RadioGroupCardItemProps { + image?: React.ReactNode + label: string + showIndicator?: boolean +} + +const RadioGroupCardItem = React.forwardRef< + React.ElementRef, + RadioGroupCardItemProps & React.ComponentPropsWithoutRef +>(({ image, label, showIndicator = true, ...props }, ref) => { + return ( + + {props.children} +
+ {showIndicator && ( +
+ + + +
+ )} + + +
+ + ) +}) + +RadioGroupCardItem.displayName = RadioGroupPrimitive.Item.displayName + +export { RadioGroupCard, RadioGroupCardItem } diff --git a/packages/ui/src/components/radio-group-stacked.tsx b/packages/ui/src/components/radio-group-stacked.tsx new file mode 100644 index 00000000000..8073403887c --- /dev/null +++ b/packages/ui/src/components/radio-group-stacked.tsx @@ -0,0 +1,106 @@ +'use client' + +import * as RadioGroupPrimitive from '@radix-ui/react-radio-group' +import * as React from 'react' + +import { cn } from '../lib/utils/cn' +import { Label_Shadcn_ } from '../..' +import { Circle } from 'lucide-react' + +const RadioGroupStacked = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => { + return ( + + ) +}) + +RadioGroupStacked.displayName = 'RadioGroupStacked' + +interface RadioGroupStackedItemProps { + image?: React.ReactNode + label: string + showIndicator?: boolean + description?: string +} + +const RadioGroupStackedItem = React.forwardRef< + React.ElementRef, + RadioGroupStackedItemProps & React.ComponentPropsWithoutRef +>(({ image, label, showIndicator = true, ...props }, ref) => { + return ( + +
+ {showIndicator && ( +
+ + + +
+ )} +
+ + {label} + + {props.description && ( +

{props.description}

+ )} + {props.children} +
+
+ + ) +}) + +RadioGroupStackedItem.displayName = 'RadioGroupStackedItem' + +export { RadioGroupStacked, RadioGroupStackedItem } diff --git a/packages/ui/src/components/shadcn/ui/form.tsx b/packages/ui/src/components/shadcn/ui/form.tsx index 56503231f24..8d534dfd9af 100644 --- a/packages/ui/src/components/shadcn/ui/form.tsx +++ b/packages/ui/src/components/shadcn/ui/form.tsx @@ -69,17 +69,20 @@ type FormItemContextValue = { const FormItemContext = React.createContext({} as FormItemContextValue) -const FormItem = React.forwardRef>( - ({ className, ...props }, ref) => { - const id = React.useId() +const FormItem = React.forwardRef< + HTMLDivElement, + React.HTMLAttributes & { asChild?: boolean } +>(({ asChild, ...props }, ref) => { + const id = React.useId() - return ( - -
- - ) - } -) + const Comp = asChild ? Slot : 'div' + + return ( + + + + ) +}) FormItem.displayName = 'FormItem' const FormLabel = React.forwardRef<