-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Co-authored-by: Daniel Cousens <[email protected]> Co-authored-by: Emma Hamilton <[email protected]> Co-authored-by: Josh Calder <[email protected]>
- Loading branch information
4 people
authored
Feb 27, 2023
1 parent
279a50c
commit aad6314
Showing
11 changed files
with
1,168 additions
and
194 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@keystone-6/core': patch | ||
| --- | ||
|
|
||
| Updates `image-size` to `5.0.0` to mitigate [CVE-2022-36313](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-36313) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,237 @@ | ||
| import path from 'path'; | ||
| import { createHash } from 'crypto'; | ||
| import os from 'os'; | ||
| import fs from 'fs-extra'; | ||
| import fetch from 'node-fetch'; | ||
| // @ts-ignore | ||
| import Upload from 'graphql-upload/Upload.js'; | ||
| import mime from 'mime'; | ||
| import { file, text } from '@keystone-6/core/fields'; | ||
| import { list } from '@keystone-6/core'; | ||
| import { KeystoneConfig, StorageConfig } from '@keystone-6/core/types'; | ||
| import { setupTestRunner } from '@keystone-6/api-tests/test-runner'; | ||
| import { allowAll } from '@keystone-6/core/access'; | ||
| import { apiTestConfig } from '../utils'; | ||
|
|
||
| const fieldPath = path.resolve(__dirname, '../../..', 'packages/core/src/fields/types'); | ||
|
|
||
| export const prepareFile = (_filePath: string, kind: 'image' | 'file') => { | ||
| const filePath = path.resolve(fieldPath, kind, 'test-files', _filePath); | ||
| const upload = new Upload(); | ||
| upload.resolve({ | ||
| createReadStream: () => fs.createReadStream(filePath), | ||
| filename: path.basename(filePath), | ||
| // @ts-ignore | ||
| mimetype: mime.getType(filePath), | ||
| encoding: 'utf-8', | ||
| }); | ||
| return { upload }; | ||
| }; | ||
|
|
||
| type MatrixValue = 's3' | 'local'; | ||
| export const testMatrix: Array<MatrixValue> = ['local']; | ||
|
|
||
| if (process.env.S3_BUCKET_NAME) { | ||
| testMatrix.push('s3'); | ||
| } | ||
|
|
||
| const s3DefaultStorage = { | ||
| kind: 's3', | ||
| bucketName: process.env.S3_BUCKET_NAME!, | ||
| accessKeyId: process.env.S3_ACCESS_KEY_ID!, | ||
| secretAccessKey: process.env.S3_SECRET_ACCESS_KEY!, | ||
| region: process.env.S3_REGION!, | ||
| endpoint: process.env.S3_ENDPOINT, | ||
| forcePathStyle: process.env.S3_FORCE_PATH_STYLE === 'true', | ||
| } as const; | ||
|
|
||
| const getRunner = ({ | ||
| storage, | ||
| fields, | ||
| }: { | ||
| storage: Record<string, StorageConfig>; | ||
| fields: KeystoneConfig['lists'][string]['fields']; | ||
| }) => | ||
| setupTestRunner({ | ||
| config: apiTestConfig({ | ||
| db: {}, | ||
| storage, | ||
| lists: { | ||
| Test: list({ | ||
| access: allowAll, | ||
| fields: { | ||
| name: text(), | ||
| ...fields, | ||
| }, | ||
| }), | ||
| }, | ||
| }), | ||
| }); | ||
|
|
||
| const getFileHash = async ( | ||
| filename: string, | ||
| config: { matrixValue: 's3' } | { matrixValue: 'local'; folder: string } | ||
| ) => { | ||
| let contentFromURL; | ||
|
|
||
| if (config.matrixValue === 's3') { | ||
| contentFromURL = await fetch(filename).then(x => x.buffer()); | ||
| } else { | ||
| contentFromURL = await fs.readFile(path.join(config.folder, filename)); | ||
| } | ||
|
|
||
| return createHash('sha1').update(contentFromURL).digest('hex'); | ||
| }; | ||
|
|
||
| const checkFile = async ( | ||
| filename: string, | ||
| config: { matrixValue: 's3' } | { matrixValue: 'local'; folder: string } | ||
| ) => { | ||
| if (config.matrixValue === 's3') { | ||
| return await fetch(filename).then(x => x.status === 200); | ||
| } else { | ||
| return fs.existsSync(path.join(config.folder, filename)); | ||
| } | ||
| }; | ||
|
|
||
| describe('File - Crud special tests', () => { | ||
| const filename = 'keystone.jpeg'; | ||
| const fileHash = createHash('sha1') | ||
| .update(fs.readFileSync(path.resolve(fieldPath, 'image/test-files', filename))) | ||
| .digest('hex'); | ||
|
|
||
| const createItem = (context: any) => | ||
| context.query.Test.createOne({ | ||
| data: { secretFile: prepareFile(filename, 'image') }, | ||
| query: ` | ||
| id | ||
| secretFile { | ||
| filename | ||
| __typename | ||
| filesize | ||
| url | ||
| } | ||
| `, | ||
| }); | ||
|
|
||
| for (let matrixValue of testMatrix) { | ||
| const getConfig = (): StorageConfig => ({ | ||
| ...(matrixValue === 's3' | ||
| ? { ...s3DefaultStorage, preserve: false, type: 'file' } | ||
| : { | ||
| kind: 'local', | ||
| type: 'file', | ||
| storagePath: fs.mkdtempSync(path.join(os.tmpdir(), 'file-local-test')), | ||
| serverRoute: { path: '/files' }, | ||
| generateUrl: (path: string) => `http://localhost:3000/files${path}`, | ||
| }), | ||
| }); | ||
|
|
||
| const fields = { secretFile: file({ storage: 'test_file' }) }; | ||
|
|
||
| describe(matrixValue, () => { | ||
| describe('Create - upload', () => { | ||
| const config = getConfig(); | ||
| const hashConfig: { matrixValue: 'local'; folder: string } | { matrixValue: 's3' } = | ||
| config.kind === 'local' | ||
| ? { matrixValue: 'local', folder: `${config.storagePath}/`! } | ||
| : { matrixValue: config.kind }; | ||
| test( | ||
| 'Upload values should match expected corrected', | ||
| getRunner({ storage: { test_file: { ...config } }, fields })(async ({ context }) => { | ||
| const data = await createItem(context); | ||
| expect(data).not.toBe(null); | ||
|
|
||
| expect(data.secretFile).toEqual({ | ||
| /* | ||
| The url and filename here include a hash, and currently what we are doing | ||
| is just checking the url is modified correctly - that said, this sucks | ||
| as a test | ||
| */ | ||
| url: | ||
| matrixValue === 's3' | ||
| ? expect.stringContaining(`/${data.secretFile.filename}`) | ||
| : `http://localhost:3000/files/${data.secretFile.filename}`, | ||
| filename: data.secretFile.filename, | ||
| __typename: 'FileFieldOutput', | ||
| filesize: 3250, | ||
| }); | ||
| // check file exists at location | ||
| expect(fileHash).toEqual(await getFileHash(data.secretFile.filename, hashConfig)); | ||
| }) | ||
| ); | ||
| }); | ||
|
|
||
| describe('After Operation Hook', () => { | ||
| const config = getConfig(); | ||
| const hashConfig = | ||
| config.kind === 'local' | ||
| ? { matrixValue: config.kind, folder: `${config.storagePath}/`! } | ||
| : { matrixValue: config.kind }; | ||
| test( | ||
| 'with preserve: true', | ||
| getRunner({ storage: { test_file: { ...config, preserve: true } }, fields })( | ||
| async ({ context }) => { | ||
| const { | ||
| id, | ||
| secretFile: { filename }, | ||
| } = await createItem(context); | ||
|
|
||
| expect(await checkFile(filename, hashConfig)).toBeTruthy(); | ||
|
|
||
| const { | ||
| secretFile: { filename: filename2 }, | ||
| } = await context.query.Test.updateOne({ | ||
| where: { id }, | ||
| data: { secretFile: prepareFile('thinkmill.jpg', 'file') }, | ||
| query: `secretFile { filename }`, | ||
| }); | ||
|
|
||
| expect(await checkFile(filename, hashConfig)).toBeTruthy(); | ||
| expect(await checkFile(filename2, hashConfig)).toBeTruthy(); | ||
|
|
||
| await context.query.Test.deleteOne({ where: { id } }); | ||
|
|
||
| expect(await checkFile(filename, hashConfig)).toBeTruthy(); | ||
| // TODO test that just nulling the field doesn't delete it | ||
| } | ||
| ) | ||
| ); | ||
| test( | ||
| 'with preserve: false', | ||
| getRunner({ | ||
| storage: { test_file: { ...config, preserve: false } }, | ||
| fields, | ||
| })(async ({ context }) => { | ||
| const { | ||
| id, | ||
| secretFile: { filename }, | ||
| } = await createItem(context); | ||
|
|
||
| expect(await checkFile(filename, hashConfig)).toBeTruthy(); | ||
|
|
||
| const { | ||
| secretFile: { filename: filename2 }, | ||
| } = await context.query.Test.updateOne({ | ||
| where: { id }, | ||
| data: { secretFile: prepareFile('thinkmill.jpg', 'file') }, | ||
| query: ` | ||
| secretFile { | ||
| filename | ||
| }`, | ||
| }); | ||
|
|
||
| expect(await checkFile(filename2, hashConfig)).toBeTruthy(); | ||
| expect(await checkFile(filename, hashConfig)).toBeFalsy(); | ||
|
|
||
| await context.query.Test.deleteOne({ where: { id } }); | ||
|
|
||
| expect(await checkFile(filename2, hashConfig)).toBeFalsy(); | ||
|
|
||
| // TODO test that just nulling the field removes the file | ||
| }) | ||
| ); | ||
| }); | ||
| }); | ||
| } | ||
| }); |
Oops, something went wrong.