@galadrim/galadmin 0.1.235 → 0.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (68) hide show
  1. package/.github/workflows/main.yml +33 -2
  2. package/README.md +65 -0
  3. package/dist/api.d.ts +16 -0
  4. package/dist/api.js +276 -215
  5. package/dist/api.js.map +1 -1
  6. package/dist/index.js +1 -1
  7. package/dist/index.js.map +1 -1
  8. package/dist/tsconfig.tsbuildinfo +1 -1
  9. package/dist/utils/dbManager.d.ts +6 -0
  10. package/dist/utils/dbManager.js +150 -10
  11. package/dist/utils/dbManager.js.map +1 -1
  12. package/dist/utils/imageDimensions.d.ts +5 -0
  13. package/dist/utils/imageDimensions.js +98 -0
  14. package/dist/utils/imageDimensions.js.map +1 -0
  15. package/jest.config.js +43 -0
  16. package/jest.integration.config.js +16 -0
  17. package/package.json +30 -10
  18. package/src/api.ts +403 -303
  19. package/src/front/ckeditor5-build/node_modules/.bin/semver +12 -0
  20. package/src/front/ckeditor5-build/node_modules/.bin/semver.cmd +17 -0
  21. package/src/front/ckeditor5-build/node_modules/.bin/semver.ps1 +28 -0
  22. package/src/front/ckeditor5-build/node_modules/semver/bin/semver.js +0 -0
  23. package/src/front/src/App.test.js +28 -0
  24. package/src/front/src/components/OutsideClickHandler.test.js +53 -0
  25. package/src/front/src/components/RedirectToFirstView.test.js +38 -0
  26. package/src/front/src/utils/checkRequiredColumns.test.js +46 -0
  27. package/src/front/src/utils/evalExpression.test.js +29 -0
  28. package/src/index.ts +1 -1
  29. package/src/utils/dbManager.ts +248 -102
  30. package/src/utils/imageDimensions.ts +112 -0
  31. package/tests/__mocks__/@aws-sdk/client-s3.js +6 -0
  32. package/tests/__mocks__/@aws-sdk/s3-request-presigner.js +3 -0
  33. package/tests/__mocks__/@google-cloud/storage.js +7 -0
  34. package/tests/__mocks__/argon2.js +3 -0
  35. package/tests/__mocks__/axios.js +7 -0
  36. package/tests/__mocks__/connect-pg-simple.js +24 -0
  37. package/tests/__mocks__/express-mysql-session.js +24 -0
  38. package/tests/__mocks__/mysql2/promise.js +3 -0
  39. package/tests/__mocks__/pg.js +3 -0
  40. package/tests/__mocks__/rollup.js +5 -0
  41. package/tests/__mocks__/ssh2-sftp-client.js +10 -0
  42. package/tests/api-helpers.test.ts +376 -0
  43. package/tests/dbManager.init.test.ts +129 -0
  44. package/tests/dbManager.test.ts +265 -0
  45. package/tests/edge-cases.test.ts +167 -0
  46. package/tests/helpers/app.ts +69 -0
  47. package/tests/helpers/fakeDb.ts +66 -0
  48. package/tests/helpers/fakePool.ts +76 -0
  49. package/tests/helpers/fixtures.ts +68 -0
  50. package/tests/imageDimensions.test.ts +111 -0
  51. package/tests/index.sessionStore.test.ts +19 -0
  52. package/tests/index.test.ts +363 -0
  53. package/tests/integration/__mocks__/axios.js +3 -0
  54. package/tests/integration/dbHarness.ts +381 -0
  55. package/tests/integration/dbManager.integration.test.ts +69 -0
  56. package/tests/integration/globalSetup.ts +43 -0
  57. package/tests/integration/globalTeardown.ts +42 -0
  58. package/tests/integration/routes.authorization.integration.test.ts +319 -0
  59. package/tests/integration/routes.config.integration.test.ts +189 -0
  60. package/tests/integration/routes.crud.integration.test.ts +805 -0
  61. package/tests/integration/routes.custom.integration.test.ts +376 -0
  62. package/tests/integration/routes.foreign.integration.test.ts +306 -0
  63. package/tests/integration/routes.importExport.integration.test.ts +404 -0
  64. package/tests/integration/routes.integration.test.ts +366 -0
  65. package/tests/integration/routes.postgresql.integration.test.ts +88 -0
  66. package/tests/integration/routes.records.integration.test.ts +634 -0
  67. package/tests/integration/routes.upload.integration.test.ts +425 -0
  68. package/tests/setup/silence-console.ts +15 -0
@@ -0,0 +1,12 @@
1
+ #!/bin/sh
2
+ basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
3
+
4
+ case `uname` in
5
+ *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
6
+ esac
7
+
8
+ if [ -x "$basedir/node" ]; then
9
+ exec "$basedir/node" "$basedir/../semver/bin/semver.js" "$@"
10
+ else
11
+ exec node "$basedir/../semver/bin/semver.js" "$@"
12
+ fi
@@ -0,0 +1,17 @@
1
+ @ECHO off
2
+ GOTO start
3
+ :find_dp0
4
+ SET dp0=%~dp0
5
+ EXIT /b
6
+ :start
7
+ SETLOCAL
8
+ CALL :find_dp0
9
+
10
+ IF EXIST "%dp0%\node.exe" (
11
+ SET "_prog=%dp0%\node.exe"
12
+ ) ELSE (
13
+ SET "_prog=node"
14
+ SET PATHEXT=%PATHEXT:;.JS;=;%
15
+ )
16
+
17
+ endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%" "%dp0%\..\semver\bin\semver.js" %*
@@ -0,0 +1,28 @@
1
+ #!/usr/bin/env pwsh
2
+ $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
3
+
4
+ $exe=""
5
+ if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
6
+ # Fix case when both the Windows and Linux builds of Node
7
+ # are installed in the same directory
8
+ $exe=".exe"
9
+ }
10
+ $ret=0
11
+ if (Test-Path "$basedir/node$exe") {
12
+ # Support pipeline input
13
+ if ($MyInvocation.ExpectingInput) {
14
+ $input | & "$basedir/node$exe" "$basedir/../semver/bin/semver.js" $args
15
+ } else {
16
+ & "$basedir/node$exe" "$basedir/../semver/bin/semver.js" $args
17
+ }
18
+ $ret=$LASTEXITCODE
19
+ } else {
20
+ # Support pipeline input
21
+ if ($MyInvocation.ExpectingInput) {
22
+ $input | & "node$exe" "$basedir/../semver/bin/semver.js" $args
23
+ } else {
24
+ & "node$exe" "$basedir/../semver/bin/semver.js" $args
25
+ }
26
+ $ret=$LASTEXITCODE
27
+ }
28
+ exit $ret
@@ -0,0 +1,28 @@
1
+ import { render } from "@testing-library/react";
2
+ import axios from "axios";
3
+ import App from "./App";
4
+
5
+ jest.mock("axios", () => ({
6
+ __esModule: true,
7
+ default: { defaults: {}, get: jest.fn(), post: jest.fn() },
8
+ }));
9
+
10
+ // RichTextInput patches window.Quill at module load; Quill only exists in
11
+ // the real app via a CDN script tag.
12
+ jest.mock("./components/inputs/RichTextInput", () => ({
13
+ __esModule: true,
14
+ default: () => null,
15
+ }));
16
+
17
+ // CRA's jest config resets mocks between tests, so behavior must be
18
+ // (re)declared here rather than in the mock factory.
19
+ beforeEach(() => {
20
+ axios.get.mockResolvedValue({ data: { isAuthenticated: false } });
21
+ });
22
+
23
+ describe("App", () => {
24
+ it("renders the login panel when the session is not authenticated", async () => {
25
+ const { findByText } = render(<App />);
26
+ expect(await findByText("Se connecter")).toBeTruthy();
27
+ });
28
+ });
@@ -0,0 +1,53 @@
1
+ import { render, fireEvent } from "@testing-library/react";
2
+ import OutsideClickHandler from "./OutsideClickHandler";
3
+
4
+ describe("OutsideClickHandler", () => {
5
+ it("renders its children", () => {
6
+ const { getByText } = render(
7
+ <OutsideClickHandler onOutsideClick={() => {}}>
8
+ <span>inner content</span>
9
+ </OutsideClickHandler>,
10
+ );
11
+ expect(getByText("inner content")).toBeTruthy();
12
+ });
13
+
14
+ it("does not fire when clicking inside", () => {
15
+ const onOutsideClick = jest.fn();
16
+ const { getByText } = render(
17
+ <OutsideClickHandler onOutsideClick={onOutsideClick}>
18
+ <span>inner</span>
19
+ </OutsideClickHandler>,
20
+ );
21
+ fireEvent.mouseDown(getByText("inner"));
22
+ expect(onOutsideClick).not.toHaveBeenCalled();
23
+ });
24
+
25
+ it("fires on a mousedown outside of the wrapper", () => {
26
+ const onOutsideClick = jest.fn();
27
+ const { getByText } = render(
28
+ <div>
29
+ <div data-testid="outside">outside</div>
30
+ <OutsideClickHandler onOutsideClick={onOutsideClick}>
31
+ <span>inner</span>
32
+ </OutsideClickHandler>
33
+ </div>,
34
+ );
35
+ fireEvent.mouseDown(getByText("outside"));
36
+ expect(onOutsideClick).toHaveBeenCalledTimes(1);
37
+ });
38
+
39
+ it("stops listening after unmount", () => {
40
+ const onOutsideClick = jest.fn();
41
+ const { unmount, getByText } = render(
42
+ <div>
43
+ <div>outside</div>
44
+ <OutsideClickHandler onOutsideClick={onOutsideClick}>
45
+ <span>inner</span>
46
+ </OutsideClickHandler>
47
+ </div>,
48
+ );
49
+ unmount();
50
+ fireEvent.mouseDown(document.body);
51
+ expect(onOutsideClick).not.toHaveBeenCalled();
52
+ });
53
+ });
@@ -0,0 +1,38 @@
1
+ import { render } from "@testing-library/react";
2
+ import { MemoryRouter, Route, Switch } from "react-router-dom";
3
+ import RedirectToFirstView from "./RedirectToFirstView";
4
+ import { ConfigContext } from "../contexts/ConfigContext";
5
+
6
+ function renderWithViews(views) {
7
+ return render(
8
+ <ConfigContext.Provider value={{ views }}>
9
+ <MemoryRouter initialEntries={["/"]}>
10
+ <Switch>
11
+ <Route exact path="/" component={RedirectToFirstView} />
12
+ <Route path="/records/0" render={() => <div>LANDING-records</div>} />
13
+ <Route path="/iframe/0" render={() => <div>LANDING-iframe</div>} />
14
+ <Route
15
+ path="/customView/0"
16
+ render={() => <div>LANDING-customView</div>}
17
+ />
18
+ </Switch>
19
+ </MemoryRouter>
20
+ </ConfigContext.Provider>,
21
+ );
22
+ }
23
+
24
+ describe("RedirectToFirstView", () => {
25
+ it.each([
26
+ ["table", "LANDING-records"],
27
+ ["iframe", "LANDING-iframe"],
28
+ ["custom", "LANDING-customView"],
29
+ ])("redirects a %s first view to its route", (type, landing) => {
30
+ const { getByText } = renderWithViews([{ type, label: "First" }]);
31
+ expect(getByText(landing)).toBeTruthy();
32
+ });
33
+
34
+ it("renders nothing when the config has no views", () => {
35
+ const { container } = renderWithViews([]);
36
+ expect(container.innerHTML).toBe("");
37
+ });
38
+ });
@@ -0,0 +1,46 @@
1
+ import checkRequiredColumns from "./checkRequiredColumns";
2
+
3
+ describe("checkRequiredColumns", () => {
4
+ beforeEach(() => {
5
+ global.window.swal = jest.fn();
6
+ });
7
+
8
+ const columns = [
9
+ { label: "Nom", name: "fruitName", required: true },
10
+ { label: "Note", name: "note", required: true },
11
+ { label: "Acidité", name: "acidity" },
12
+ ];
13
+
14
+ it("accepts data where every required column is filled", () => {
15
+ expect(
16
+ checkRequiredColumns(columns, { fruitName: "pomme", note: "ok" }),
17
+ ).toBe(true);
18
+ expect(global.window.swal).not.toHaveBeenCalled();
19
+ });
20
+
21
+ it("rejects data missing a required column and shows a message", () => {
22
+ expect(checkRequiredColumns(columns, { fruitName: "pomme", note: "" })).toBe(
23
+ false,
24
+ );
25
+ expect(global.window.swal).toHaveBeenCalledWith(
26
+ expect.objectContaining({
27
+ text: "Le champ requis Note n'a pas été rempli",
28
+ }),
29
+ );
30
+ });
31
+
32
+ it("uses the plural message when several required columns are missing", () => {
33
+ expect(checkRequiredColumns(columns, {})).toBe(false);
34
+ expect(global.window.swal).toHaveBeenCalledWith(
35
+ expect.objectContaining({
36
+ text: "Les champs requis Nom, Note n'ont pas été remplis",
37
+ }),
38
+ );
39
+ });
40
+
41
+ it("treats null as unfilled and optional columns as ignorable", () => {
42
+ expect(
43
+ checkRequiredColumns(columns, { fruitName: "pomme", note: "n", acidity: null }),
44
+ ).toBe(true);
45
+ });
46
+ });
@@ -0,0 +1,29 @@
1
+ import evalExpression from "./evalExpression";
2
+
3
+ describe("evalExpression", () => {
4
+ it("evaluates an arithmetic expression over the data", () => {
5
+ expect(evalExpression("a + b", { a: 1, b: 2 })).toBe(3);
6
+ });
7
+
8
+ it("interpolates string values", () => {
9
+ expect(
10
+ evalExpression("fruitName + ' !'", { fruitName: "pomme" }),
11
+ ).toBe("pomme !");
12
+ });
13
+
14
+ it("escapes single quotes in string data", () => {
15
+ expect(
16
+ evalExpression("name.toUpperCase()", { name: "l'orange" }),
17
+ ).toBe("L'ORANGE");
18
+ });
19
+
20
+ it("serializes object values", () => {
21
+ expect(evalExpression("obj.x", { obj: { x: 42 } })).toBe(42);
22
+ });
23
+
24
+ it("returns 'Error' for a broken expression instead of throwing", () => {
25
+ const consoleError = jest.spyOn(console, "error").mockImplementation();
26
+ expect(evalExpression("a +++", { a: 1 })).toBe("Error");
27
+ consoleError.mockRestore();
28
+ });
29
+ });
package/src/index.ts CHANGED
@@ -51,7 +51,7 @@ export default (config: Config): any => {
51
51
  }),
52
52
  createTableIfMissing: true,
53
53
  tableName: 'galadmin_sessions'
54
- }) : new SessionStore({
54
+ }) : new (SessionStore(session))({
55
55
  schema: { tableName: 'galadmin_sessions' }
56
56
  }, mysql2.createPool({
57
57
  host: config.mysql.host,
@@ -1,127 +1,273 @@
1
1
  import * as mysql from "mysql";
2
2
  import * as mysql2 from "mysql2";
3
- import * as pg from 'pg';
4
-
5
- function convertQuery(mysqlQuery, params) {
6
- let pgQuery = '';
7
- let pgParams = [];
8
-
9
- let paramIndex = 1;
10
- let charIndex = 0;
11
-
12
- while (charIndex < mysqlQuery.length) {
13
- if (mysqlQuery.charAt(charIndex) === '?' && mysqlQuery.charAt(charIndex + 1) === '?') {
14
- // Replace "??"
15
- pgQuery += params.shift();
16
- charIndex += 2; // Skip two characters
17
- } else if (mysqlQuery.charAt(charIndex) === '?') {
18
- // Replace "?"
19
- pgQuery += `$${paramIndex++}`;
20
- pgParams.push(params.shift());
21
- charIndex++; // Skip one character
3
+ import * as pg from "pg";
4
+
5
+ export function quoteIdentifier(name: string, dbType: string): string {
6
+ const quoteChar = dbType === "POSTGRESQL" ? '"' : "`";
7
+ return quoteChar + name + quoteChar;
8
+ }
9
+
10
+ function endOfLiteralOrComment(query: string, start: number): number {
11
+ const ch = query.charAt(start);
12
+ const next = query.charAt(start + 1);
13
+
14
+ if (ch === '-' && next === '-') {
15
+ const newline = query.indexOf('\n', start);
16
+ return newline === -1 ? query.length : newline;
17
+ }
18
+ if (ch === '/' && next === '*') {
19
+ const close = query.indexOf('*/', start + 2);
20
+ return close === -1 ? query.length : close + 2;
21
+ }
22
+ if (ch !== "'") {
23
+ return -1;
24
+ }
25
+
26
+ const prefix = query.charAt(start - 1);
27
+ const backslashEscapes = (prefix === 'E' || prefix === 'e') && !/[\w$]/.test(query.charAt(start - 2));
28
+
29
+ let index = start + 1;
30
+ while (index < query.length) {
31
+ const current = query.charAt(index);
32
+ if (backslashEscapes && current === '\\') {
33
+ index += 2;
34
+ } else if (current === "'" && query.charAt(index + 1) === "'") {
35
+ index += 2;
36
+ } else if (current === "'") {
37
+ return index + 1;
22
38
  } else {
23
- pgQuery += mysqlQuery.charAt(charIndex);
24
- charIndex++; // Go to next character
39
+ index++;
25
40
  }
26
41
  }
27
-
28
- return {
29
- pgQuery,
30
- pgParams,
31
- };
42
+ return query.length;
32
43
  }
33
44
 
34
- function quotePostgresQuery(query) {
35
- query = query.replace(/`/g, '"');
45
+ export function convertQuery(mysqlQuery, params) {
46
+ let pgQuery = "";
47
+ let pgParams = [];
36
48
 
37
- const reservedWords = ["1","COUNT","*","UPDATE","SELECT","SET","=","INSERT","INTO","DELETE","FROM","WHERE","AND","OR","JOIN","ON","AS","IN","ILIKE","LIKE","EXISTS","ALL","ANY","NOT","NULL","TRUE","FALSE","GROUP","BY","ORDER","LIMIT","OFFSET","DESC","VALUES","LEFT","RIGHT","USING","CONCAT","CASE","WHEN","THEN","ELSE","END","ASC","IS","INTERVAL","CURRENT_DATE","SUM","COALESCE","-","ROUND","DATE_TRUNC","<>","+","DISTINCT","MAX","MIN","AVG","BIT_AND","BIT_OR","BOOL_AND","BOOL_OR","XMLAGG","STRING_AGG","EVERY","CORR","COVAR_POP","COVAR_SAMP","VAR_POP","VAR_SAMP","VARIANCE","REGR_SLOPE","REGR_INTERCEPT","REGR_COUNT","REGR_R2","REGR_AVGX","REGR_AVGY","REGR_SXX","REGR_SXY","REGR_SYY"];
49
+ let paramIndex = 1;
50
+ let charIndex = 0;
38
51
 
39
- const wordsToAddQuotes = new Set()
40
- const parts = query.split(/[ ,\(\)]/);
52
+ // Placeholders (`?` / `??`) only carry meaning OUTSIDE string literals:
53
+ // a literal `?` inside '…' must survive verbatim instead of being turned
54
+ // into a $N placeholder that would consume a parameter slot.
55
+ while (charIndex < mysqlQuery.length) {
56
+ const ch = mysqlQuery.charAt(charIndex);
57
+ const next = mysqlQuery.charAt(charIndex + 1);
58
+ const verbatimEnd = endOfLiteralOrComment(mysqlQuery, charIndex);
41
59
 
42
- let inString = false;
60
+ if (verbatimEnd !== -1) {
61
+ pgQuery += mysqlQuery.slice(charIndex, verbatimEnd);
62
+ charIndex = verbatimEnd;
63
+ } else if (ch === "?" && next === "?") {
64
+ // Replace "??"
65
+ pgQuery += params.shift();
66
+ charIndex += 2; // Skip two characters
67
+ } else if (ch === "?") {
68
+ // Replace "?"
69
+ pgQuery += `$${paramIndex++}`;
70
+ pgParams.push(params.shift());
71
+ charIndex++; // Skip one character
72
+ } else {
73
+ pgQuery += ch;
74
+ charIndex++; // Go to next character
75
+ }
76
+ }
43
77
 
44
- for (let i = 0; i < parts.length; i++) {
45
- const part = parts[i].trim();
46
- if (!part) {
47
- continue
48
- }
49
- if (part.split(/['"]/).length % 2 === 0) {
50
- inString = !inString;
51
- }
78
+ return {
79
+ pgQuery,
80
+ pgParams,
81
+ };
82
+ }
52
83
 
53
- if (inString || part.startsWith("$") || part.includes("'") || part.includes('"') || reservedWords.includes(part.toUpperCase())) {
84
+ export function quotePostgresQuery(query) {
85
+ query = query.replace(/`/g, '"');
54
86
 
55
- } else {
56
- for (let x of part.split(".")) {
57
- if (isNaN(x)) {
58
- wordsToAddQuotes.add(x)
59
- }
60
- }
61
- }
87
+ const reservedWords = [
88
+ "1",
89
+ "COUNT",
90
+ "*",
91
+ "UPDATE",
92
+ "SELECT",
93
+ "SET",
94
+ "=",
95
+ "INSERT",
96
+ "INTO",
97
+ "DELETE",
98
+ "FROM",
99
+ "WHERE",
100
+ "AND",
101
+ "OR",
102
+ "JOIN",
103
+ "ON",
104
+ "AS",
105
+ "IN",
106
+ "ILIKE",
107
+ "LIKE",
108
+ "EXISTS",
109
+ "ALL",
110
+ "ANY",
111
+ "NOT",
112
+ "NULL",
113
+ "TRUE",
114
+ "FALSE",
115
+ "GROUP",
116
+ "BY",
117
+ "ORDER",
118
+ "LIMIT",
119
+ "OFFSET",
120
+ "DESC",
121
+ "VALUES",
122
+ "LEFT",
123
+ "RIGHT",
124
+ "USING",
125
+ "CONCAT",
126
+ "CONCAT_WS",
127
+ "CASE",
128
+ "WHEN",
129
+ "THEN",
130
+ "ELSE",
131
+ "END",
132
+ "ASC",
133
+ "IS",
134
+ "INTERVAL",
135
+ "CURRENT_DATE",
136
+ "SUM",
137
+ "COALESCE",
138
+ "HAVING",
139
+ "WITH",
140
+ "-",
141
+ "ROUND",
142
+ "DATE_TRUNC",
143
+ "<>",
144
+ "+",
145
+ "DISTINCT",
146
+ "MAX",
147
+ "MIN",
148
+ "AVG",
149
+ "BIT_AND",
150
+ "BIT_OR",
151
+ "BOOL_AND",
152
+ "BOOL_OR",
153
+ "XMLAGG",
154
+ "STRING_AGG",
155
+ "EVERY",
156
+ "CORR",
157
+ "COVAR_POP",
158
+ "COVAR_SAMP",
159
+ "VAR_POP",
160
+ "VAR_SAMP",
161
+ "VARIANCE",
162
+ "REGR_SLOPE",
163
+ "REGR_INTERCEPT",
164
+ "REGR_COUNT",
165
+ "REGR_R2",
166
+ "REGR_AVGX",
167
+ "REGR_AVGY",
168
+ "REGR_SXX",
169
+ "REGR_SXY",
170
+ "REGR_SYY",
171
+ "CONFLICT",
172
+ "DO",
173
+ "EXCLUDED",
174
+ "RETURNING",
175
+ ];
176
+
177
+ const wordsToAddQuotes = new Set();
178
+ const parts = query.split(/[ ,\(\)]/);
179
+
180
+ let inString = false;
181
+
182
+ for (let i = 0; i < parts.length; i++) {
183
+ const part = parts[i].trim();
184
+ if (!part) {
185
+ continue;
186
+ }
187
+ if (part.split(/['"]/).length % 2 === 0) {
188
+ inString = !inString;
62
189
  }
63
190
 
64
- let newQuery = query;
65
- for (let word of wordsToAddQuotes) {
66
- if (word !== "*") {
67
- newQuery = newQuery.replace(new RegExp(`(?<!["\'])\\b${word}\\b(?!["\'])`, 'g'), `"${word}"`)
191
+ if (
192
+ inString ||
193
+ part.startsWith("$") ||
194
+ part.includes("'") ||
195
+ part.includes('"') ||
196
+ reservedWords.includes(part.toUpperCase())
197
+ ) {
198
+ } else {
199
+ for (let x of part.split(".")) {
200
+ if (isNaN(x)) {
201
+ wordsToAddQuotes.add(x);
68
202
  }
203
+ }
69
204
  }
205
+ }
70
206
 
71
- newQuery = newQuery.replace(/\) LIKE /g, ") ILIKE ");
72
- newQuery = newQuery.replace(/ LIKE /g, "::text ILIKE ");
207
+ let newQuery = query;
208
+ for (let word of wordsToAddQuotes) {
209
+ if (word !== "*") {
210
+ newQuery = newQuery.replace(
211
+ new RegExp(`(?<!["\'])\\b${word}\\b(?!["\'])`, "g"),
212
+ `"${word}"`,
213
+ );
214
+ }
215
+ }
216
+
217
+ newQuery = newQuery.replace(/\) LIKE /g, ") ILIKE ");
218
+ newQuery = newQuery.replace(/ LIKE /g, "::text ILIKE ");
73
219
 
74
- return newQuery;
220
+ return newQuery;
75
221
  }
76
222
 
77
223
  export default class dbManager {
78
- _db;
79
- dbType;
80
-
81
- init(config) {
82
- if (config.mysql) {
83
- this._db = (config.useMysql2 ? mysql2 : mysql).createPool({
84
- connectionLimit: 10,
85
- host: config.mysql.host,
86
- user: config.mysql.user,
87
- password: config.mysql.password,
88
- database: config.mysql.database,
89
- port: config.mysql.port || 3306,
90
- charset: 'UTF8MB4_GENERAL_CI',
91
- dateStrings: true,
92
- // SECURITY: multi-statement queries let any SQL-injection escalate to stacked
93
- // writes / DROP. Keep OFF by default; opt in explicitly only if a config truly
94
- // relies on `;`-separated statements (none of galadmin's internal queries do).
95
- multipleStatements: config.mysql.multipleStatements === true
96
- });
97
- this.dbType = "MYSQL";
98
- } else if (config.postgresql) {
99
- this._db = new pg.Pool({
100
- host: config.postgresql.host,
101
- user: config.postgresql.user,
102
- password: config.postgresql.password,
103
- database: config.postgresql.database,
104
- port: config.postgresql.port || 5432,
105
- ssl: config.postgresql.ssl
106
- });
107
- this.dbType = "POSTGRESQL";
108
- }
109
- }
224
+ _db;
225
+ dbType;
110
226
 
111
- async query(queryString, args = []): Promise<any> {
112
- return new Promise((resolve, reject) => {
113
- if (this.dbType === "POSTGRESQL") {
114
- const result = convertQuery(queryString, args);
115
- queryString = quotePostgresQuery(result.pgQuery);
116
- args = result.pgParams;
117
- }
118
- this._db.query(queryString, args, (a, b, c) => {
119
- if (this.dbType === "MYSQL") {
120
- resolve({ err: a, rows: b, fields: c })
121
- } else if (this.dbType === "POSTGRESQL") {
122
- resolve({ err: a, rows: b?.rows, fields: b?.fields })
123
- }
124
- });
125
- });
227
+ init(config) {
228
+ if (config.mysql) {
229
+ this._db = (config.useMysql2 ? mysql2 : mysql).createPool({
230
+ connectionLimit: 10,
231
+ host: config.mysql.host,
232
+ user: config.mysql.user,
233
+ password: config.mysql.password,
234
+ database: config.mysql.database,
235
+ port: config.mysql.port || 3306,
236
+ charset: "UTF8MB4_GENERAL_CI",
237
+ dateStrings: true,
238
+ // SECURITY: multi-statement queries let any SQL-injection escalate to stacked
239
+ // writes / DROP. Keep OFF by default; opt in explicitly only if a config truly
240
+ // relies on `;`-separated statements (none of galadmin's internal queries do).
241
+ multipleStatements: config.mysql.multipleStatements === true,
242
+ });
243
+ this.dbType = "MYSQL";
244
+ } else if (config.postgresql) {
245
+ this._db = new pg.Pool({
246
+ host: config.postgresql.host,
247
+ user: config.postgresql.user,
248
+ password: config.postgresql.password,
249
+ database: config.postgresql.database,
250
+ port: config.postgresql.port || 5432,
251
+ ssl: config.postgresql.ssl,
252
+ });
253
+ this.dbType = "POSTGRESQL";
126
254
  }
255
+ }
256
+
257
+ async query(queryString, args = []): Promise<any> {
258
+ return new Promise((resolve, reject) => {
259
+ if (this.dbType === "POSTGRESQL") {
260
+ const result = convertQuery(queryString, args);
261
+ queryString = quotePostgresQuery(result.pgQuery);
262
+ args = result.pgParams;
263
+ }
264
+ this._db.query(queryString, args, (a, b, c) => {
265
+ if (this.dbType === "MYSQL") {
266
+ resolve({ err: a, rows: b, fields: c });
267
+ } else if (this.dbType === "POSTGRESQL") {
268
+ resolve({ err: a, rows: b?.rows, fields: b?.fields });
269
+ }
270
+ });
271
+ });
272
+ }
127
273
  }