From f605c25877208b4e07d3e7bcbaab2dd43b8e98a4 Mon Sep 17 00:00:00 2001 From: rikinsk Date: Mon, 6 May 2019 14:25:10 +0530 Subject: [PATCH 1/4] sanitize migration filenames from console --- console/package-lock.json | 21 +++++++++++++++++++ console/package.json | 1 + .../components/Services/Data/DataActions.js | 4 +++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/console/package-lock.json b/console/package-lock.json index c2b50ebb77256..c76a17fbf2395 100644 --- a/console/package-lock.json +++ b/console/package-lock.json @@ -13569,6 +13569,14 @@ "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=", "dev": true }, + "sanitize-filename": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz", + "integrity": "sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=", + "requires": { + "truncate-utf8-bytes": "^1.0.0" + } + }, "sass-graph": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", @@ -14684,6 +14692,14 @@ "glob": "^7.1.2" } }, + "truncate-utf8-bytes": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", + "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=", + "requires": { + "utf8-byte-length": "^1.0.1" + } + }, "tryer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", @@ -15142,6 +15158,11 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, + "utf8-byte-length": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", + "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=" + }, "util": { "version": "0.10.3", "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", diff --git a/console/package.json b/console/package.json index 838dcfe923554..d96357398a7c6 100644 --- a/console/package.json +++ b/console/package.json @@ -94,6 +94,7 @@ "redux": "^4.0.0", "redux-logger": "^3.0.6", "redux-thunk": "^2.2.0", + "sanitize-filename": "^1.6.1", "semver": "5.5.1", "subscriptions-transport-ws": "^0.9.12", "uuid": "^3.0.1", diff --git a/console/src/components/Services/Data/DataActions.js b/console/src/components/Services/Data/DataActions.js index abf0349e7c6b4..4dd35135940f0 100644 --- a/console/src/components/Services/Data/DataActions.js +++ b/console/src/components/Services/Data/DataActions.js @@ -1,3 +1,5 @@ +import sanitize from 'sanitize-filename'; + import Endpoints, { globalCookiePolicy } from '../../../Endpoints'; import requestAction from '../../../utils/requestAction'; import defaultState from './DataState'; @@ -551,7 +553,7 @@ const makeMigrationCall = ( }; const migrationBody = { - name: migrationName, + name: sanitize(migrationName), up: upQuery.args, down: downQuery.args, }; From fffb82daa9bc7ff9155da2a6a63aa60e576ecd06 Mon Sep 17 00:00:00 2001 From: rikinsk Date: Mon, 6 May 2019 14:37:27 +0530 Subject: [PATCH 2/4] fix migrations files in community --- .../1556045092147_set_fk_public_todos_user_id.down.yaml | 0 .../migrations/1556045092147_set_fk_public_todos_user_id.up.yaml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename "community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_\"user_id\".down.yaml" => community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_user_id.down.yaml (100%) rename "community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_\"user_id\".up.yaml" => community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_user_id.up.yaml (100%) diff --git "a/community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_\"user_id\".down.yaml" b/community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_user_id.down.yaml similarity index 100% rename from "community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_\"user_id\".down.yaml" rename to community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_user_id.down.yaml diff --git "a/community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_\"user_id\".up.yaml" b/community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_user_id.up.yaml similarity index 100% rename from "community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_\"user_id\".up.yaml" rename to community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_user_id.up.yaml From b75cc8f94fdc9ff98f9ffbeca56519488e76a7d8 Mon Sep 17 00:00:00 2001 From: Rikin Kachhia Date: Mon, 6 May 2019 18:07:20 +0530 Subject: [PATCH 3/4] Delete 1556045092147_set_fk_public_todos_user_id.down.yaml --- .../1556045092147_set_fk_public_todos_user_id.down.yaml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_user_id.down.yaml diff --git a/community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_user_id.down.yaml b/community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_user_id.down.yaml deleted file mode 100644 index 05cd4e02241c8..0000000000000 --- a/community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_user_id.down.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- args: - sql: alter table "public"."todos" drop constraint todos_user_id_fkey; - type: run_sql From d8c454deebfc26aba7ae7dd2dc33bf16539e5909 Mon Sep 17 00:00:00 2001 From: Rikin Kachhia Date: Mon, 6 May 2019 18:07:29 +0530 Subject: [PATCH 4/4] Delete 1556045092147_set_fk_public_todos_user_id.up.yaml --- .../1556045092147_set_fk_public_todos_user_id.up.yaml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_user_id.up.yaml diff --git a/community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_user_id.up.yaml b/community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_user_id.up.yaml deleted file mode 100644 index 216ce5c31631d..0000000000000 --- a/community/learn/graphql-tutorials/backend-services/hasura/migrations/1556045092147_set_fk_public_todos_user_id.up.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- args: - sql: alter table "public"."todos" add constraint todos_user_id_fkey foreign key - ("user_id") references "public"."users"("id") on update cascade on delete cascade; - type: run_sql