RLS policy tests (#306)

chore: add rls policy tests

.eslintrc.js

@@ -1,5 +1,5 @@
 module.exports = {
-  ignorePatterns: ['src/test/assets/**', 'src/test/db/**'],
+  ignorePatterns: ['src/test/assets/**', 'src/test/db/**', 'src/test/*.yaml'],
   parser: '@typescript-eslint/parser',
   extends: ['plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended'],
   parserOptions: {

jest.config.js

@@ -1,5 +1,6 @@
 module.exports = {
   preset: 'ts-jest',
+  testSequencer: './jest.sequencer.js',
   transform: {
     '^.+\\.(t|j)sx?$': 'ts-jest',
   },

jest.sequencer.js

@@ -0,0 +1,27 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const Sequencer = require('@jest/test-sequencer').default
+
+// https://stackoverflow.com/a/68009048
+
+const isRLSTest = (test) => {
+  return test.path.includes('rls')
+}
+
+const isTusTest = (test) => {
+  return test.path.includes('tus')
+}
+
+class CustomSequencer extends Sequencer {
+  sort(tests) {
+    const copyTests = Array.from(tests)
+    const normalTests = copyTests.filter((t) => !isRLSTest(t) && !isTusTest(t))
+    const tusTests = copyTests.filter((t) => isTusTest(t))
+    const rlsTests = copyTests.filter((t) => isRLSTest(t))
+    return super
+      .sort(normalTests)
+      .concat(tusTests)
+      .concat(rlsTests.sort((a, b) => (a.path > b.path ? 1 : -1)))
+  }
+}
+
+module.exports = CustomSequencer

package.json

@@ -10,9 +10,10 @@
     "migration:run": "ts-node-dev ./src/scripts/migrate-call.ts",
     "docs:export": "ts-node-dev ./src/scripts/export-docs.ts",
     "test:dummy-data": "ts-node-dev -r dotenv/config ./src/test/db/import-dummy-data.ts",
-    "test": "npm run infra:restart && npm run test:dummy-data && jest --runInBand",
-    "test:coverage": "npm run infra:restart && npm run test:dummy-data && jest --runInBand --coverage",
+    "test": "npm run infra:restart && npm run test:dummy-data && jest --runInBand --forceExit",
+    "test:coverage": "npm run infra:restart && npm run test:dummy-data && jest --runInBand --coverage --forceExit",
     "prettier:check": "prettier -c src/**",
+    "format": "prettier -c --write src/**",
     "eslint:check": "eslint 'src/**'",
     "infra:stop": "docker-compose --project-directory . -f src/test/db/docker-compose.yml down --remove-orphans",
     "infra:start": "docker-compose --project-directory . -f src/test/db/docker-compose.yml up -d && sleep 5 && npm run migration:run",
@@ -66,8 +67,10 @@
     "@types/crypto-js": "^4.1.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.2.1",
+    "@types/js-yaml": "^4.0.5",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/lru-cache": "^7.10.10",
+    "@types/mustache": "^4.2.2",
     "@types/node": "^18.14.6",
     "@types/pg": "^8.6.4",
     "@typescript-eslint/eslint-plugin": "^5.12.1",
@@ -78,7 +81,9 @@
     "eslint-plugin-prettier": "^4.0.0",
     "form-data": "^4.0.0",
     "jest": "^29.2.2",
+    "js-yaml": "^4.1.0",
     "json-schema-to-ts": "^2.5.4",
+    "mustache": "^4.2.0",
     "pino-pretty": "^8.1.0",
     "prettier": "^2.5.1",
     "ts-jest": "^29.0.3",

src/storage/database/adapter.ts

@@ -83,7 +83,7 @@ export interface Database {
   updateBucket(
     bucketId: string,
     fields: Pick<Bucket, 'public' | 'file_size_limit' | 'allowed_mime_types'>
-  ): Promise<Bucket>
+  ): Promise<void>
 
   upsertObject(
     data: Pick<Obj, 'name' | 'owner' | 'bucket_id' | 'metadata' | 'version'>

src/storage/database/knex.ts

@@ -206,25 +206,21 @@ export class StorageKnexDB implements Database {
     bucketId: string,
     fields: Pick<Bucket, 'public' | 'file_size_limit' | 'allowed_mime_types'>
   ) {
-    const [bucket] = await this.runQuery('UpdateBucket', (knex) => {
-      return knex
-        .from<Bucket>('buckets')
-        .update({
-          public: fields.public,
-          file_size_limit: fields.file_size_limit,
-          allowed_mime_types: fields.allowed_mime_types,
-        })
-        .where('id', bucketId)
-        .returning('*')
+    const bucket = await this.runQuery('UpdateBucket', (knex) => {
+      return knex.from('buckets').where('id', bucketId).update({
+        public: fields.public,
+        file_size_limit: fields.file_size_limit,
+        allowed_mime_types: fields.allowed_mime_types,
+      })
     })
 
-    if (!bucket) {
+    if (bucket === 0) {
       throw new DBError('Bucket not found', 404, 'Bucket not found', undefined, {
         bucketId,
       })
     }
 
-    return bucket
+    return
   }
 
   async upsertObject(data: Pick<Obj, 'name' | 'owner' | 'bucket_id' | 'metadata' | 'version'>) {

src/test/common.ts

@@ -1,6 +1,8 @@
 import app from '../admin-app'
 import { S3Backend } from '../storage/backend'
 import { Queue } from '../queue'
+import { HeadBucketCommand, S3Client } from '@aws-sdk/client-s3'
+import { isS3Error } from '../storage'
 
 export const adminApp = app({})
 
@@ -78,3 +80,21 @@ export function useMockObject() {
     jest.clearAllMocks()
   })
 }
+
+export const checkBucketExists = async (client: S3Client, bucket: string) => {
+  const options = {
+    Bucket: bucket,
+  }
+
+  try {
+    await client.send(new HeadBucketCommand(options))
+    return true
+  } catch (error) {
+    const err = error as Error
+
+    if (err && isS3Error(err) && err.$metadata.httpStatusCode === 404) {
+      return false
+    }
+    throw error
+  }
+}