@memberjunction/server 6.1.4 → 6.1.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 (227) hide show
  1. package/README.md +30 -0
  2. package/dist/.tsbuildinfo +1 -1
  3. package/dist/agentSessions/SessionManager.d.ts +5 -2
  4. package/dist/agentSessions/SessionManager.d.ts.map +1 -1
  5. package/dist/agentSessions/SessionManager.js +17 -8
  6. package/dist/agentSessions/SessionManager.js.map +1 -1
  7. package/dist/agentSessions/SessionRunIDVerifier.d.ts +63 -0
  8. package/dist/agentSessions/SessionRunIDVerifier.d.ts.map +1 -0
  9. package/dist/agentSessions/SessionRunIDVerifier.js +129 -0
  10. package/dist/agentSessions/SessionRunIDVerifier.js.map +1 -0
  11. package/dist/agentSessions/index.d.ts +1 -0
  12. package/dist/agentSessions/index.d.ts.map +1 -1
  13. package/dist/agentSessions/index.js +1 -0
  14. package/dist/agentSessions/index.js.map +1 -1
  15. package/dist/auth/actionAuthorization.d.ts +40 -0
  16. package/dist/auth/actionAuthorization.d.ts.map +1 -0
  17. package/dist/auth/actionAuthorization.js +94 -0
  18. package/dist/auth/actionAuthorization.js.map +1 -0
  19. package/dist/auth/exampleNewUserSubClass.js +2 -1
  20. package/dist/auth/exampleNewUserSubClass.js.map +1 -1
  21. package/dist/auth/magicLink/MagicLinkService.d.ts +17 -15
  22. package/dist/auth/magicLink/MagicLinkService.d.ts.map +1 -1
  23. package/dist/auth/magicLink/MagicLinkService.js +55 -38
  24. package/dist/auth/magicLink/MagicLinkService.js.map +1 -1
  25. package/dist/auth/magicLink/magicLinkCore.d.ts +14 -33
  26. package/dist/auth/magicLink/magicLinkCore.d.ts.map +1 -1
  27. package/dist/auth/magicLink/magicLinkCore.js +20 -52
  28. package/dist/auth/magicLink/magicLinkCore.js.map +1 -1
  29. package/dist/auth/newUsers.d.ts.map +1 -1
  30. package/dist/auth/newUsers.js +15 -11
  31. package/dist/auth/newUsers.js.map +1 -1
  32. package/dist/context.d.ts +6 -0
  33. package/dist/context.d.ts.map +1 -1
  34. package/dist/context.js +24 -34
  35. package/dist/context.js.map +1 -1
  36. package/dist/generated/graphql-schemas/__mj.d.ts.map +1 -1
  37. package/dist/generated/graphql-schemas/__mj.js +3417 -3428
  38. package/dist/generated/graphql-schemas/__mj.js.map +1 -1
  39. package/dist/generic/CacheInvalidationResolver.d.ts +44 -8
  40. package/dist/generic/CacheInvalidationResolver.d.ts.map +1 -1
  41. package/dist/generic/CacheInvalidationResolver.js +59 -19
  42. package/dist/generic/CacheInvalidationResolver.js.map +1 -1
  43. package/dist/generic/ResolverBase.d.ts +95 -11
  44. package/dist/generic/ResolverBase.d.ts.map +1 -1
  45. package/dist/generic/ResolverBase.js +186 -76
  46. package/dist/generic/ResolverBase.js.map +1 -1
  47. package/dist/generic/RunViewResolver.d.ts.map +1 -1
  48. package/dist/generic/RunViewResolver.js +12 -0
  49. package/dist/generic/RunViewResolver.js.map +1 -1
  50. package/dist/index.d.ts +1 -0
  51. package/dist/index.d.ts.map +1 -1
  52. package/dist/index.js +44 -45
  53. package/dist/index.js.map +1 -1
  54. package/dist/isolatedProvider.d.ts +20 -0
  55. package/dist/isolatedProvider.d.ts.map +1 -0
  56. package/dist/isolatedProvider.js +22 -0
  57. package/dist/isolatedProvider.js.map +1 -0
  58. package/dist/multiTenancy/index.d.ts.map +1 -1
  59. package/dist/multiTenancy/index.js +22 -2
  60. package/dist/multiTenancy/index.js.map +1 -1
  61. package/dist/postgresqlCompat.d.ts +8 -0
  62. package/dist/postgresqlCompat.d.ts.map +1 -0
  63. package/dist/postgresqlCompat.js +19 -0
  64. package/dist/postgresqlCompat.js.map +1 -0
  65. package/dist/postgresqlPoolSettings.d.ts +108 -0
  66. package/dist/postgresqlPoolSettings.d.ts.map +1 -0
  67. package/dist/postgresqlPoolSettings.js +134 -0
  68. package/dist/postgresqlPoolSettings.js.map +1 -0
  69. package/dist/realtimeWidget/widgetGuestElevation.d.ts +4 -2
  70. package/dist/realtimeWidget/widgetGuestElevation.d.ts.map +1 -1
  71. package/dist/realtimeWidget/widgetGuestElevation.js +4 -2
  72. package/dist/realtimeWidget/widgetGuestElevation.js.map +1 -1
  73. package/dist/resolvers/ActionResolver.d.ts +31 -5
  74. package/dist/resolvers/ActionResolver.d.ts.map +1 -1
  75. package/dist/resolvers/ActionResolver.js +75 -14
  76. package/dist/resolvers/ActionResolver.js.map +1 -1
  77. package/dist/resolvers/AdhocQueryResolver.d.ts +35 -17
  78. package/dist/resolvers/AdhocQueryResolver.d.ts.map +1 -1
  79. package/dist/resolvers/AdhocQueryResolver.js +92 -166
  80. package/dist/resolvers/AdhocQueryResolver.js.map +1 -1
  81. package/dist/resolvers/DatasetResolver.d.ts +24 -3
  82. package/dist/resolvers/DatasetResolver.d.ts.map +1 -1
  83. package/dist/resolvers/DatasetResolver.js +57 -8
  84. package/dist/resolvers/DatasetResolver.js.map +1 -1
  85. package/dist/resolvers/EntityRecordNameResolver.d.ts +8 -23
  86. package/dist/resolvers/EntityRecordNameResolver.d.ts.map +1 -1
  87. package/dist/resolvers/EntityRecordNameResolver.js +11 -48
  88. package/dist/resolvers/EntityRecordNameResolver.js.map +1 -1
  89. package/dist/resolvers/FetchEntityVectorsResolver.js +2 -2
  90. package/dist/resolvers/FetchEntityVectorsResolver.js.map +1 -1
  91. package/dist/resolvers/GetDataContextDataResolver.d.ts +33 -7
  92. package/dist/resolvers/GetDataContextDataResolver.d.ts.map +1 -1
  93. package/dist/resolvers/GetDataContextDataResolver.js +117 -38
  94. package/dist/resolvers/GetDataContextDataResolver.js.map +1 -1
  95. package/dist/resolvers/GetDataResolver.d.ts.map +1 -1
  96. package/dist/resolvers/GetDataResolver.js +13 -1
  97. package/dist/resolvers/GetDataResolver.js.map +1 -1
  98. package/dist/resolvers/QuerySystemUserResolver.d.ts.map +1 -1
  99. package/dist/resolvers/QuerySystemUserResolver.js +2 -1
  100. package/dist/resolvers/QuerySystemUserResolver.js.map +1 -1
  101. package/dist/resolvers/RealtimeClientSessionResolver.d.ts +83 -22
  102. package/dist/resolvers/RealtimeClientSessionResolver.d.ts.map +1 -1
  103. package/dist/resolvers/RealtimeClientSessionResolver.js +174 -72
  104. package/dist/resolvers/RealtimeClientSessionResolver.js.map +1 -1
  105. package/dist/resolvers/RemoteBrowserActionResolver.d.ts +2 -0
  106. package/dist/resolvers/RemoteBrowserActionResolver.d.ts.map +1 -1
  107. package/dist/resolvers/RemoteBrowserActionResolver.js +5 -1
  108. package/dist/resolvers/RemoteBrowserActionResolver.js.map +1 -1
  109. package/dist/resolvers/RunAIAgentResolver.d.ts.map +1 -1
  110. package/dist/resolvers/RunAIAgentResolver.js +2 -1
  111. package/dist/resolvers/RunAIAgentResolver.js.map +1 -1
  112. package/dist/resolvers/RunTemplateResolver.d.ts.map +1 -1
  113. package/dist/resolvers/RunTemplateResolver.js +12 -11
  114. package/dist/resolvers/RunTemplateResolver.js.map +1 -1
  115. package/dist/resolvers/SearchKnowledgeResolver.d.ts +1 -0
  116. package/dist/resolvers/SearchKnowledgeResolver.d.ts.map +1 -1
  117. package/dist/resolvers/SearchKnowledgeResolver.js +5 -0
  118. package/dist/resolvers/SearchKnowledgeResolver.js.map +1 -1
  119. package/dist/resolvers/SearchKnowledgeSystemUserResolver.d.ts.map +1 -1
  120. package/dist/resolvers/SearchKnowledgeSystemUserResolver.js +1 -0
  121. package/dist/resolvers/SearchKnowledgeSystemUserResolver.js.map +1 -1
  122. package/dist/resolvers/SyncDataResolver.d.ts.map +1 -1
  123. package/dist/resolvers/SyncDataResolver.js +6 -2
  124. package/dist/resolvers/SyncDataResolver.js.map +1 -1
  125. package/dist/resolvers/VectorizeEntityResolver.d.ts +1 -1
  126. package/dist/resolvers/VectorizeEntityResolver.d.ts.map +1 -1
  127. package/dist/resolvers/VectorizeEntityResolver.js +14 -10
  128. package/dist/resolvers/VectorizeEntityResolver.js.map +1 -1
  129. package/dist/resolvers/adhocTimeout.d.ts +7 -0
  130. package/dist/resolvers/adhocTimeout.d.ts.map +1 -0
  131. package/dist/resolvers/adhocTimeout.js +12 -0
  132. package/dist/resolvers/adhocTimeout.js.map +1 -0
  133. package/dist/rest/ViewOperationsHandler.d.ts +3 -1
  134. package/dist/rest/ViewOperationsHandler.d.ts.map +1 -1
  135. package/dist/rest/ViewOperationsHandler.js +29 -17
  136. package/dist/rest/ViewOperationsHandler.js.map +1 -1
  137. package/dist/services/TaskGraphActionRunner.d.ts +21 -8
  138. package/dist/services/TaskGraphActionRunner.d.ts.map +1 -1
  139. package/dist/services/TaskGraphActionRunner.js +43 -16
  140. package/dist/services/TaskGraphActionRunner.js.map +1 -1
  141. package/package.json +92 -92
  142. package/src/__tests__/ActionResolver.authorization.test.ts +353 -0
  143. package/src/__tests__/AdhocQueryResolver.bugs.test.ts +14 -35
  144. package/src/__tests__/AdhocQueryResolver.pagination.test.ts +6 -2
  145. package/src/__tests__/AdhocQueryResolver.scopeGuard.test.ts +3 -3
  146. package/src/__tests__/AdhocQueryResolver.sqlAuthorizer.test.ts +104 -0
  147. package/src/__tests__/DatasetResolver.itemFilters.test.ts +201 -0
  148. package/src/__tests__/EntityRecordNameResolver.fieldSecurity.test.ts +27 -72
  149. package/src/__tests__/EntityRecordNameResolver.rowSecurity.test.ts +152 -0
  150. package/src/__tests__/GetDataContextDataResolver.sqlItems.test.ts +416 -0
  151. package/src/__tests__/ListOperationsResolver.adhocScreen.test.ts +137 -0
  152. package/src/__tests__/RealtimeClientSessionResolver.configTamper.test.ts +383 -0
  153. package/src/__tests__/RealtimeClientSessionResolver.test.ts +310 -31
  154. package/src/__tests__/RemoteBrowserActionResolver.goalRunLink.test.ts +129 -0
  155. package/src/__tests__/ResolverBase.adhocReadScope.test.ts +227 -0
  156. package/src/__tests__/ResolverBase.aggregateScreen.test.ts +174 -0
  157. package/src/__tests__/ResolverBase.balancedClause.test.ts +155 -0
  158. package/src/__tests__/ResolverBase.clauseUnscopedRead.test.ts +127 -0
  159. package/src/__tests__/ResolverBase.filterEscaping.test.ts +24 -2
  160. package/src/__tests__/ResolverBase.isaPromotionCreate.test.ts +412 -0
  161. package/src/__tests__/RunTemplateResolver.test.ts +132 -0
  162. package/src/__tests__/RunViewResolver.cacheCheckScreen.test.ts +165 -0
  163. package/src/__tests__/SessionManager.test.ts +94 -17
  164. package/src/__tests__/SessionRunIDVerifier.test.ts +251 -0
  165. package/src/__tests__/TaskGraphActionRunner.durablePayload.test.ts +131 -0
  166. package/src/__tests__/TaskGraphActionRunner.storableOutputs.test.ts +76 -0
  167. package/src/__tests__/UpdateMJDataContextItem.oldValues.test.ts +220 -0
  168. package/src/__tests__/VectorizeEntityResolver.test.ts +106 -0
  169. package/src/__tests__/ViewOperationsHandler.clauseScreen.test.ts +157 -0
  170. package/src/__tests__/actionAuthorization.test.ts +130 -0
  171. package/src/__tests__/adhocTimeoutClamp.test.ts +26 -0
  172. package/src/__tests__/cacheInvalidationRecordData.test.ts +64 -0
  173. package/src/__tests__/isolatedProviderTransactions.test.ts +169 -0
  174. package/src/__tests__/magicLink.test.ts +15 -76
  175. package/src/__tests__/magicLinkService.consume.test.ts +230 -0
  176. package/src/__tests__/magicLinkService.provisionLog.test.ts +5 -0
  177. package/src/__tests__/multiTenancy.postgresRewrite.test.ts +181 -0
  178. package/src/__tests__/multiTenancy.security.test.ts +51 -0
  179. package/src/__tests__/multiTenancy.test.ts +1 -1
  180. package/src/__tests__/newUsers.test.ts +62 -5
  181. package/src/__tests__/postgresqlPoolSettings.test.ts +131 -0
  182. package/src/__tests__/translateBracketsToPG.test.ts +20 -0
  183. package/src/agentSessions/SessionManager.ts +23 -25
  184. package/src/agentSessions/SessionRunIDVerifier.ts +171 -0
  185. package/src/agentSessions/index.ts +1 -0
  186. package/src/auth/actionAuthorization.ts +119 -0
  187. package/src/auth/exampleNewUserSubClass.ts +2 -2
  188. package/src/auth/magicLink/MagicLinkService.ts +61 -39
  189. package/src/auth/magicLink/magicLinkCore.ts +19 -56
  190. package/src/auth/newUsers.ts +15 -11
  191. package/src/context.ts +25 -34
  192. package/src/generated/graphql-schemas/__mj.ts +3417 -3428
  193. package/src/generic/CacheInvalidationResolver.ts +74 -19
  194. package/src/generic/ResolverBase.ts +207 -80
  195. package/src/generic/RunViewResolver.ts +17 -0
  196. package/src/index.ts +49 -46
  197. package/src/isolatedProvider.ts +22 -0
  198. package/src/multiTenancy/index.ts +24 -2
  199. package/src/postgresqlCompat.ts +21 -0
  200. package/src/postgresqlPoolSettings.ts +213 -0
  201. package/src/realtimeWidget/widgetGuestElevation.ts +4 -2
  202. package/src/resolvers/ActionResolver.ts +84 -21
  203. package/src/resolvers/AdhocQueryResolver.ts +105 -187
  204. package/src/resolvers/DatasetResolver.ts +70 -10
  205. package/src/resolvers/EntityRecordNameResolver.ts +11 -52
  206. package/src/resolvers/FetchEntityVectorsResolver.ts +2 -2
  207. package/src/resolvers/GetDataContextDataResolver.ts +139 -41
  208. package/src/resolvers/GetDataResolver.ts +14 -1
  209. package/src/resolvers/QuerySystemUserResolver.ts +2 -1
  210. package/src/resolvers/RealtimeClientSessionResolver.ts +196 -77
  211. package/src/resolvers/RemoteBrowserActionResolver.ts +11 -1
  212. package/src/resolvers/RunAIAgentResolver.ts +4 -1
  213. package/src/resolvers/RunTemplateResolver.ts +13 -12
  214. package/src/resolvers/SearchKnowledgeResolver.ts +4 -0
  215. package/src/resolvers/SearchKnowledgeSystemUserResolver.ts +1 -0
  216. package/src/resolvers/SyncDataResolver.ts +6 -2
  217. package/src/resolvers/VectorizeEntityResolver.ts +16 -11
  218. package/src/resolvers/__tests__/GetDataResolver.validation.test.ts +95 -0
  219. package/src/resolvers/adhocTimeout.ts +12 -0
  220. package/src/rest/ViewOperationsHandler.ts +37 -18
  221. package/src/services/TaskGraphActionRunner.ts +45 -16
  222. package/dist/resolvers/adhoc-query-helpers.d.ts +0 -27
  223. package/dist/resolvers/adhoc-query-helpers.d.ts.map +0 -1
  224. package/dist/resolvers/adhoc-query-helpers.js +0 -42
  225. package/dist/resolvers/adhoc-query-helpers.js.map +0 -1
  226. package/src/__tests__/adhoc-query-helpers.test.ts +0 -50
  227. package/src/resolvers/adhoc-query-helpers.ts +0 -50
@@ -1,14 +1,17 @@
1
1
  import { Resolver, Mutation, Arg, Ctx } from "type-graphql";
2
2
  import { ActionEngineServer } from "@memberjunction/actions";
3
3
  import { EntityActionEngineServer } from "@memberjunction/actions";
4
- import { Metadata, UserInfo, BaseEntity, CompositeKey, KeyValuePair, LogError } from "@memberjunction/core";
5
- import { ActionParam, ActionResult } from "@memberjunction/actions-base";
4
+ import { Metadata, UserInfo, BaseEntity, CompositeKey, KeyValuePair, LogError, RunView, DatabaseProviderBase } from "@memberjunction/core";
5
+ import { ActionParam, ActionResult, MJActionEntityExtended } from "@memberjunction/actions-base";
6
+ import { UserCache } from "@memberjunction/generic-database-provider";
6
7
  import { Field, InputType, ObjectType } from "type-graphql";
7
8
  import { KeyValuePairInput } from "../generic/KeyValuePairInput.js";
8
9
  import { AppContext, ProviderInfo } from "../types.js";
9
- import { CopyScalarsAndArrays, UUIDsEqual } from "@memberjunction/global";
10
+ import { CopyScalarsAndArrays, EscapeSQLString, UUIDsEqual } from "@memberjunction/global";
10
11
  import { GetReadOnlyProvider, GetReadWriteProvider } from "../util.js";
11
12
  import { ResolverBase } from "../generic/ResolverBase.js";
13
+ import { IsScopeLimitedPrincipal } from "../auth/scopeLimitedPrincipal.js";
14
+ import { EvaluateActionRunAuthorization, IsOwner } from "../auth/actionAuthorization.js";
12
15
 
13
16
  /**
14
17
  * Input type for action parameters
@@ -55,8 +58,8 @@ export class RunActionInput {
55
58
  Params?: ActionParamInput[];
56
59
 
57
60
  /**
58
- * Whether to skip logging the action execution
59
- * Defaults to false
61
+ * Ignored. A run started through this API always writes an action execution log row; the field
62
+ * remains so that clients which send it still validate.
60
63
  */
61
64
  @Field(() => Boolean, { nullable: true })
62
65
  SkipActionLog?: boolean;
@@ -174,7 +177,13 @@ export class ActionResultOutput {
174
177
  @Resolver()
175
178
  export class ActionResolver extends ResolverBase {
176
179
  /**
177
- * Mutation for running an action
180
+ * Mutation for running an action.
181
+ *
182
+ * Scope-limited sessions are refused. Any other caller must be authorized for the action — see
183
+ * {@link EvaluateActionRunAuthorization}: an Owner may run any action; anyone else needs a role that
184
+ * holds an authorization linked to the action through `MJ: Action Authorizations`, or, when the
185
+ * action has no such link, an action class that authorizes its caller itself. The run is always
186
+ * logged.
178
187
  * @param input The input parameters for running the action
179
188
  * @param ctx The GraphQL context containing user authentication information
180
189
  * @returns The result of running the action
@@ -185,20 +194,16 @@ export class ActionResolver extends ResolverBase {
185
194
  @Ctx() ctx: AppContext
186
195
  ): Promise<ActionResultOutput> {
187
196
  try {
197
+ const user = this.getRunActionPrincipal(ctx);
198
+
188
199
  // Check API key scope authorization for action execution
189
200
  await this.CheckAPIKeyScopeAuthorization('action:execute', input.ActionID, ctx.userPayload);
190
201
 
191
- // Get the user from context
192
- const user = ctx.userPayload.userRecord;
193
- if (!user) {
194
- throw new Error("User is not authenticated");
195
- }
196
-
197
202
  // Initialize the action engine
198
203
  await ActionEngineServer.Instance.Config(false, user);
199
204
 
200
- // Get the action by ID
201
205
  const action = this.findActionById(input.ActionID);
206
+ await this.assertCanRunAction(action, user, ctx.providers);
202
207
 
203
208
  // Parse the parameters
204
209
  const params = this.parseActionParameters(input.Params);
@@ -206,7 +211,7 @@ export class ActionResolver extends ResolverBase {
206
211
  // Run the action — thread the request-scoped provider so provider-bound
207
212
  // actions (e.g. the semantic find-* / Search Entity actions, which call
208
213
  // params.Provider.SearchEntity) run against the caller's metadata layer.
209
- const result = await this.executeAction(action, user, params, ctx.providers, input.SkipActionLog);
214
+ const result = await this.executeAction(action, user, params, ctx.providers);
210
215
 
211
216
  // Return the result
212
217
  return this.createActionResult(result);
@@ -215,6 +220,66 @@ export class ActionResolver extends ResolverBase {
215
220
  }
216
221
  }
217
222
 
223
+ /**
224
+ * The authenticated caller of RunAction. A scope-limited session is refused: its confinement exists
225
+ * only as row-level-security filters, and an action can reach data and services those filters never
226
+ * cover.
227
+ * @throws Error when there is no user or the session is scope-limited
228
+ */
229
+ private getRunActionPrincipal(ctx: AppContext): UserInfo {
230
+ const user = ctx.userPayload?.userRecord;
231
+ if (!user) {
232
+ throw new Error("User is not authenticated");
233
+ }
234
+ if (IsScopeLimitedPrincipal(user)) {
235
+ throw new Error("RunAction is not permitted for scope-limited sessions");
236
+ }
237
+ return user;
238
+ }
239
+
240
+ /**
241
+ * Refuses the run unless the caller is authorized for the action — see
242
+ * {@link EvaluateActionRunAuthorization}. The `MJ: Action Authorizations` rows, the authorization
243
+ * tree and the role grants all come from the request's provider, or all from the global provider
244
+ * when the request carries none.
245
+ * @throws Error when the caller may not run the action
246
+ */
247
+ private async assertCanRunAction(action: MJActionEntityExtended, user: UserInfo, providers: Array<ProviderInfo>): Promise<void> {
248
+ if (IsOwner(user)) {
249
+ return; // an Owner may run any action, so nothing needs to be read
250
+ }
251
+ const provider = GetReadOnlyProvider(providers, { allowFallbackToReadWrite: true });
252
+ const actionAuthorizationIDs = await this.loadActionAuthorizationIDs(action.ID, provider);
253
+ const metadata = provider ?? Metadata.Provider; // global-provider-ok: fallback only when the request carries no provider
254
+ const actionAuthorizesCaller = ActionEngineServer.Instance.ActionAuthorizesCaller(action);
255
+ const decision = EvaluateActionRunAuthorization(user, actionAuthorizationIDs, metadata, actionAuthorizesCaller);
256
+ if (!decision.Allowed) {
257
+ throw new Error(`Not authorized to run action ${action.ID}: ${decision.Reason}`);
258
+ }
259
+ }
260
+
261
+ /**
262
+ * The AuthorizationID of each `MJ: Action Authorizations` row for the action. Read as the system
263
+ * user: this is the server's own authorization decision, so it must not depend on whether the
264
+ * caller can read that entity.
265
+ */
266
+ private async loadActionAuthorizationIDs(actionID: string, provider: DatabaseProviderBase | null): Promise<string[]> {
267
+ const systemUser = UserCache.Instance.GetSystemUser();
268
+ if (!systemUser) {
269
+ throw new Error("System user not found");
270
+ }
271
+ const result = await new RunView(provider).RunView<{ AuthorizationID: string }>({
272
+ EntityName: 'MJ: Action Authorizations',
273
+ ExtraFilter: `ActionID='${EscapeSQLString(actionID)}'`,
274
+ Fields: ['AuthorizationID'],
275
+ ResultType: 'simple'
276
+ }, systemUser);
277
+ if (!result.Success) {
278
+ throw new Error(`Could not read the authorizations for action ${actionID}: ${result.ErrorMessage}`);
279
+ }
280
+ return result.Results.map(row => row.AuthorizationID);
281
+ }
282
+
218
283
  /**
219
284
  * Finds an action by its ID
220
285
  * @param actionID The ID of the action to find
@@ -222,7 +287,7 @@ export class ActionResolver extends ResolverBase {
222
287
  * @throws Error if the action is not found
223
288
  * @private
224
289
  */
225
- private findActionById(actionID: string): any {
290
+ private findActionById(actionID: string): MJActionEntityExtended {
226
291
  const action = ActionEngineServer.Instance.Actions.find(a => UUIDsEqual(a.ID, actionID));
227
292
  if (!action) {
228
293
  throw new Error(`Action with ID ${actionID} not found`);
@@ -264,20 +329,18 @@ export class ActionResolver extends ResolverBase {
264
329
  }
265
330
 
266
331
  /**
267
- * Executes an action
332
+ * Executes an action. The run is always logged: a client cannot switch off the action execution log.
268
333
  * @param action The action to execute
269
334
  * @param user The user context
270
335
  * @param params The action parameters
271
- * @param skipActionLog Whether to skip action logging
272
336
  * @returns The action result
273
337
  * @private
274
338
  */
275
339
  private async executeAction(
276
- action: any,
340
+ action: MJActionEntityExtended,
277
341
  user: UserInfo,
278
342
  params: ActionParam[],
279
- providers: Array<ProviderInfo>,
280
- skipActionLog?: boolean
343
+ providers: Array<ProviderInfo>
281
344
  ): Promise<ActionResult> {
282
345
  // Resolve the request-scoped provider. Prefer read-write (actions may mutate);
283
346
  // fall back to read-only, then to the engine's global-Metadata default when no
@@ -287,7 +350,7 @@ export class ActionResolver extends ResolverBase {
287
350
  Action: action,
288
351
  ContextUser: user,
289
352
  Params: params,
290
- SkipActionLog: skipActionLog,
353
+ SkipActionLog: false,
291
354
  Filters: [],
292
355
  Provider: provider
293
356
  });
@@ -1,14 +1,15 @@
1
1
  import { Arg, Ctx, Query, Resolver, Field, Int, InputType } from 'type-graphql';
2
- import { DatabasePlatform, LogError } from '@memberjunction/core';
3
- import { SQLExpressionValidator } from '@memberjunction/global';
2
+ import { LogError } from '@memberjunction/core';
3
+ import type { DatabaseProviderBase, RunQueryResult, UserInfo } from '@memberjunction/core';
4
4
  import { RenderPipeline } from '@memberjunction/generic-database-provider';
5
+ import type { AdhocSQLAuthorizer } from '@memberjunction/actions';
5
6
  import { AppContext } from '../types.js';
6
- import { GetReadOnlyDataSource, GetReadOnlyProvider } from '../util.js';
7
+ import { configInfo } from '../config.js';
8
+ import { GetReadOnlyProvider } from '../util.js';
7
9
  import { ResolverBase } from '../generic/ResolverBase.js';
8
10
  import { IsScopeLimitedPrincipal } from '../auth/scopeLimitedPrincipal.js';
9
11
  import { RunQueryResultType } from './QueryResolver.js';
10
- import { exactTotalFromPage, resolveAdhocTotalRowCount } from './adhoc-query-helpers.js';
11
- import sql from 'mssql';
12
+ import { ClampAdhocTimeoutSeconds } from './adhocTimeout.js';
12
13
 
13
14
  /**
14
15
  * Input type for executing ad-hoc SQL queries directly.
@@ -32,10 +33,19 @@ class AdhocQueryInput {
32
33
  /**
33
34
  * Resolver for executing ad-hoc (unsaved) SQL queries.
34
35
  *
36
+ * The query runs through the read-only provider's own ad-hoc path (`RunQuery` with `SQL`), the
37
+ * same one in-process callers use, so it behaves identically on every database platform: the SQL
38
+ * is validated and rendered there, paged in the database with a count, run under the caller's
39
+ * timeout, and on PostgreSQL inside a read-only transaction that is rolled back.
40
+ *
35
41
  * Security:
36
- * - SQL validated via SQLExpressionValidator (full_query context) — blocks mutations, dangerous operations
37
- * - Executes on read-only connection pool only (no fallback to read-write)
38
- * - Configurable timeout (default 30s)
42
+ * - SQL validated by the provider (SQLExpressionValidator, single read query) — blocks mutations
43
+ * - Authorizes the RENDERED SQL: every table reference must be an entity base view the caller
44
+ * reads unscoped (CanRead, no row-level filter, no denied fields). Entities with row/field
45
+ * policy for this user are refused — raw SQL cannot apply that policy, so those reads belong
46
+ * on RunView.
47
+ * - Read-only provider only (no fallback to read-write)
48
+ * - Configurable timeout (default 30s), enforced by the database
39
49
  * - Requires authenticated user (standard GraphQL auth, no @RequireSystemUser)
40
50
  * - Refuses scope-limited principals (see {@link IsScopeLimitedPrincipal}). Raw SQL bypasses
41
51
  * RunView, entity permissions and row-level security, so the RLS scope tokens that confine a
@@ -52,201 +62,94 @@ export class AdhocQueryResolver extends ResolverBase {
52
62
  @Ctx() context: AppContext
53
63
  ): Promise<RunQueryResultType> {
54
64
  const startTime = Date.now();
55
-
65
+ // SECURITY: refuse principals whose read authority is narrower than their role grant.
66
+ // Ad-hoc SQL does not go through RunView, entity permissions or row-level security, so the
67
+ // RLS scope tokens that confine a magic-link session are never substituted. There is no
68
+ // filter to narrow, so the only correct answer for such a principal is no.
69
+ if (IsScopeLimitedPrincipal(context.userPayload?.userRecord)) {
70
+ return this.buildErrorResult('Ad-hoc SQL execution is not permitted for scope-limited sessions.');
71
+ }
72
+ const provider = GetReadOnlyProvider(context.providers, { allowFallbackToReadWrite: false });
73
+ if (!provider) {
74
+ return this.buildErrorResult('No read-only data source available for ad-hoc query execution');
75
+ }
76
+ const contextUser = context.userPayload?.userRecord;
77
+ const refusal = this.AuthorizeRenderedSQL(input.SQL, provider, contextUser);
78
+ if (refusal) {
79
+ return this.buildErrorResult(refusal, Date.now() - startTime);
80
+ }
81
+ const timeoutSeconds = ClampAdhocTimeoutSeconds(input.TimeoutSeconds, configInfo.databaseSettings.requestTimeout);
82
+ // A negative offset must not reach paging, where it would turn paging off.
83
+ const startRow = Math.max(0, Number.isInteger(input.StartRow) ? input.StartRow! : 0);
56
84
  try {
57
- // 1. SECURITY: refuse principals whose read authority is narrower than their role
58
- // grant. This resolver runs a raw SELECT on the read-only pool — it does NOT go
59
- // through RunView, entity permissions or row-level security, so the RLS scope tokens
60
- // that confine a magic-link session are never substituted here. There is no filter
61
- // to narrow, so the only correct answer for such a principal is no. Checked before
62
- // the SQL is even validated: authorization gates the work, it does not race it.
63
- if (IsScopeLimitedPrincipal(context.userPayload?.userRecord)) {
64
- return this.buildErrorResult('Ad-hoc SQL execution is not permitted for scope-limited sessions.');
65
- }
66
-
67
- // 2. Security: validate SQL using SQLExpressionValidator
68
- const validator = SQLExpressionValidator.Instance;
69
- const validation = validator.validateFullQuery(input.SQL);
70
- if (!validation.valid) {
71
- return this.buildErrorResult(validation.error || 'SQL validation failed');
72
- }
73
-
74
- // 3. Get READ-ONLY data source (no fallback to read-write)
75
- let readOnlyDS: sql.ConnectionPool;
76
- try {
77
- readOnlyDS = GetReadOnlyDataSource(context.dataSources, { allowFallbackToReadWrite: false });
78
- } catch {
79
- return this.buildErrorResult('No read-only data source available for ad-hoc query execution');
80
- }
81
-
82
- // 4. Resolve platform from the read-only provider for the render pipeline.
83
- let platform: DatabasePlatform = 'sqlserver';
84
- try {
85
- const provider = GetReadOnlyProvider(context.providers, { allowFallbackToReadWrite: false });
86
- if (provider?.PlatformKey) platform = provider.PlatformKey;
87
- } catch {
88
- // Provider not configured — keep the default platform.
89
- }
90
- const contextUser = context.userPayload?.userRecord;
91
-
92
- // 5. Route the SQL through RenderPipeline so composition tokens
93
- // resolve, comments and templates are processed, and the row cap
94
- // is applied at the database (via TOP / LIMIT / OFFSET-FETCH).
95
- //
96
- // Page whenever a positive MaxRows is requested — INCLUDING the first
97
- // page (StartRow 0). This yields OFFSET/FETCH data SQL *and* a
98
- // COUNT(*) query so the response reports the true total row count
99
- // rather than just the returned page size. It mirrors the saved-query
100
- // path (GenericDatabaseProvider.InternalRunQuery → WrapWithPaging).
101
- // (Previously paging was gated on StartRow > 0, so page 1 fell back to
102
- // a TOP-N cap with TotalRowCount = page size — hiding the pager.)
103
- // Clamp StartRow to a non-negative integer. A negative offset must not slip
104
- // past the paging gate (which would then run the query with no row cap at all).
105
- const startRow = Math.max(0, Number.isInteger(input.StartRow) ? input.StartRow! : 0);
106
- const maxRows = input.MaxRows;
107
- const usePaging = maxRows != null && Number.isInteger(maxRows) && maxRows > 0;
108
-
109
- let dataSQL: string;
110
- let countSQL: string | null = null;
111
- try {
112
- const rendered = RenderPipeline.Run(input.SQL, {
113
- Platform: platform,
114
- ContextUser: contextUser,
115
- ...(usePaging ? { Paging: { StartRow: startRow, MaxRows: maxRows! } } : {}),
116
- });
117
- dataSQL = rendered.FinalSQL;
118
- countSQL = rendered.PagingResult?.CountSQL ?? null;
119
- } catch (renderErr) {
120
- const renderMsg = renderErr instanceof Error ? renderErr.message : String(renderErr);
121
- return this.buildErrorResult(`Ad-hoc query rendering failed: ${renderMsg}`);
122
- }
123
-
124
- // 6. Execute the page (and, only when a full page needs it, the count) under
125
- // a shared wall-clock deadline derived from the request's timeout budget.
126
- const deadline = startTime + (input.TimeoutSeconds ?? 30) * 1000;
127
- const { recordset, totalRowCount } = await this.executeDataAndCount(
128
- readOnlyDS, dataSQL, countSQL, startRow, usePaging ? maxRows! : null, deadline
129
- );
130
- const executionTimeMs = Date.now() - startTime;
131
-
132
- // 7. Return as RunQueryResultType
133
- return {
134
- QueryID: '',
135
- QueryName: 'Ad-Hoc Query',
136
- Success: true,
137
- Results: JSON.stringify(recordset),
138
- RowCount: recordset.length,
139
- TotalRowCount: totalRowCount,
140
- PageNumber: usePaging ? Math.floor(startRow / maxRows!) + 1 : undefined,
141
- PageSize: usePaging ? maxRows! : undefined,
142
- ExecutionTime: executionTimeMs,
143
- ErrorMessage: ''
144
- };
85
+ const result = await provider.RunQuery({
86
+ SQL: input.SQL,
87
+ MaxRows: input.MaxRows,
88
+ StartRow: startRow,
89
+ TimeoutSeconds: timeoutSeconds,
90
+ }, contextUser);
91
+ return this.toResultType(result, startRow, input.MaxRows, timeoutSeconds, Date.now() - startTime);
145
92
  } catch (err: unknown) {
146
- const executionTimeMs = Date.now() - startTime;
147
93
  const errorMessage = err instanceof Error ? err.message : String(err);
148
-
149
- // Handle timeout
150
- if (errorMessage.includes('timeout') || errorMessage.includes('Timeout')) {
151
- return {
152
- QueryID: '',
153
- QueryName: 'Ad-Hoc Query',
154
- Success: false,
155
- Results: '[]',
156
- RowCount: 0,
157
- TotalRowCount: 0,
158
- PageNumber: undefined,
159
- PageSize: undefined,
160
- ExecutionTime: executionTimeMs,
161
- ErrorMessage: `Query execution exceeded ${input.TimeoutSeconds ?? 30} second timeout`
162
- };
163
- }
164
-
165
94
  LogError(`Ad-hoc query execution failed: ${errorMessage}`);
166
- return {
167
- QueryID: '',
168
- QueryName: 'Ad-Hoc Query',
169
- Success: false,
170
- Results: '[]',
171
- RowCount: 0,
172
- TotalRowCount: 0,
173
- PageNumber: undefined,
174
- PageSize: undefined,
175
- ExecutionTime: executionTimeMs,
176
- ErrorMessage: `Query execution failed: ${errorMessage}`
177
- };
95
+ return this.buildErrorResult(`Query execution failed: ${errorMessage}`, Date.now() - startTime);
178
96
  }
179
97
  }
180
98
 
181
99
  /**
182
- * Runs the page's data SQL, then — only when the page is FULL (so more rows may
183
- * exist) — a COUNT(*) for the true total. A short (or unpaged) page needs no
184
- * count: the exact total is `startRow + rowsReturned` (see {@link exactTotalFromPage}).
100
+ * SECURITY: authorizes the READ itself, against the SQL that will actually run. The provider
101
+ * validates that the SQL is a single read statement but places no restriction on WHAT is read.
102
+ * Rendering comes first because composition (`{{query:"..."}}`) and templates can introduce
103
+ * table references the raw input never named. Every table reference must be an entity base
104
+ * view the caller can read UNSCOPED — CanRead with no row-level filter and no denied fields —
105
+ * because raw SQL applies neither (see assertFullQueryUsesReadableEntityViews). The provider
106
+ * renders the same input the same way and only wraps it in server-built paging and a count,
107
+ * so the rendered SQL is the full set of reads. Returns the refusal message, or null.
185
108
  *
186
- * The count is NON-FATAL: some queries page fine but cannot be counted — e.g.
187
- * duplicate column names are legal in a result set but rejected inside the COUNT
188
- * CTE wrap. A count failure must never sink the whole result, so we log it and
189
- * report a lower-bound total (`startRow + rowsReturned`) and let the data render.
109
+ * `provider` is the read-only provider the SQL will run on; it supplies the platform and the
110
+ * entity metadata. {@link CreateAdhocSQLAuthorizer} exposes this check to the action engine.
190
111
  */
191
- private async executeDataAndCount(
192
- ds: sql.ConnectionPool,
193
- dataSQL: string,
194
- countSQL: string | null,
195
- startRow: number,
196
- maxRows: number | null,
197
- deadline: number,
198
- ): Promise<{ recordset: Record<string, unknown>[]; totalRowCount: number }> {
199
- const dataResult = await this.runSqlWithDeadline<Record<string, unknown>>(ds, dataSQL, deadline);
200
- const recordset = (dataResult.recordset ?? []) as Record<string, unknown>[];
201
-
202
- // Total already known from the page alone (unpaged, or a short page)? Skip the count.
203
- const exact = exactTotalFromPage(startRow, recordset.length, maxRows);
204
- if (exact != null || !countSQL) {
205
- return { recordset, totalRowCount: exact ?? recordset.length };
206
- }
207
-
208
- // Full page — a COUNT(*) is required to know the true total.
209
- const lowerBound = startRow + recordset.length;
112
+ public AuthorizeRenderedSQL(sqlText: string, provider: DatabaseProviderBase, contextUser: UserInfo | undefined): string | null {
210
113
  try {
211
- const countResult = await this.runSqlWithDeadline<{ TotalRowCount: number }>(ds, countSQL, deadline);
212
- return { recordset, totalRowCount: resolveAdhocTotalRowCount(countResult.recordset, lowerBound) };
213
- } catch (countErr) {
214
- const msg = countErr instanceof Error ? countErr.message : String(countErr);
215
- LogError(`Ad-hoc query row-count failed; reporting a lower-bound total (${lowerBound}). ${msg}`);
216
- return { recordset, totalRowCount: lowerBound };
114
+ const rendered = RenderPipeline.Run(sqlText, { Platform: provider.PlatformKey, ContextUser: contextUser, RequireReadStatement: true });
115
+ this.assertFullQueryUsesReadableEntityViews(rendered.Trace.AfterTemplates, provider, contextUser, 'ad-hoc SQL');
116
+ return null;
117
+ } catch (err) {
118
+ return err instanceof Error ? err.message : String(err);
217
119
  }
218
120
  }
219
121
 
220
- /**
221
- * Executes one SQL statement on the read-only pool, racing it against the shared
222
- * wall-clock `deadline`. The timer is always cleared on completion so a settled
223
- * query never leaves a dangling timeout armed.
224
- */
225
- private async runSqlWithDeadline<T>(
226
- ds: sql.ConnectionPool,
227
- sqlText: string,
228
- deadline: number,
229
- ): Promise<sql.IResult<T>> {
230
- const remaining = deadline - Date.now();
231
- if (remaining <= 0) {
232
- throw new Error('Query timeout exceeded');
233
- }
234
- let timer: ReturnType<typeof setTimeout> | undefined;
235
- try {
236
- return await Promise.race([
237
- new sql.Request(ds).query<T>(sqlText),
238
- new Promise<never>((_, reject) => {
239
- timer = setTimeout(() => reject(new Error('Query timeout exceeded')), remaining);
240
- }),
241
- ]);
242
- } finally {
243
- if (timer) {
244
- clearTimeout(timer);
245
- }
122
+ /** Maps the provider's result to the GraphQL shape, naming a timeout plainly. */
123
+ private toResultType(
124
+ result: RunQueryResult,
125
+ startRow: number,
126
+ maxRows: number | undefined,
127
+ timeoutSeconds: number,
128
+ executionTimeMs: number,
129
+ ): RunQueryResultType {
130
+ if (!result.Success) {
131
+ const message = result.ErrorMessage ?? 'Ad-hoc query failed';
132
+ return this.buildErrorResult(
133
+ /timeout/i.test(message) ? `Query execution exceeded ${timeoutSeconds} second timeout` : message,
134
+ executionTimeMs,
135
+ );
246
136
  }
137
+ const paged = maxRows != null && Number.isInteger(maxRows) && maxRows > 0;
138
+ return {
139
+ QueryID: '',
140
+ QueryName: 'Ad-Hoc Query',
141
+ Success: true,
142
+ Results: JSON.stringify(result.Results),
143
+ RowCount: result.RowCount,
144
+ TotalRowCount: result.TotalRowCount,
145
+ PageNumber: paged ? Math.floor(startRow / maxRows!) + 1 : undefined,
146
+ PageSize: paged ? maxRows : undefined,
147
+ ExecutionTime: executionTimeMs,
148
+ ErrorMessage: ''
149
+ };
247
150
  }
248
151
 
249
- private buildErrorResult(errorMessage: string): RunQueryResultType {
152
+ private buildErrorResult(errorMessage: string, executionTimeMs = 0): RunQueryResultType {
250
153
  return {
251
154
  QueryID: '',
252
155
  QueryName: 'Ad-Hoc Query',
@@ -256,8 +159,23 @@ export class AdhocQueryResolver extends ResolverBase {
256
159
  TotalRowCount: 0,
257
160
  PageNumber: undefined,
258
161
  PageSize: undefined,
259
- ExecutionTime: 0,
162
+ ExecutionTime: executionTimeMs,
260
163
  ErrorMessage: errorMessage
261
164
  };
262
165
  }
263
166
  }
167
+
168
+ /**
169
+ * The ad-hoc SQL checks MJServer registers with the action engine, so that Run Ad-hoc Query applies
170
+ * the same checks as {@link AdhocQueryResolver.ExecuteAdhocQuery}: the rendered SQL must be one read
171
+ * statement that reads only entity views the caller may read in full, and the timeout is limited by
172
+ * the server's request timeout.
173
+ * @param requestTimeoutMs the server's request timeout in milliseconds; 0 or less means no limit
174
+ */
175
+ export function CreateAdhocSQLAuthorizer(requestTimeoutMs: number): AdhocSQLAuthorizer {
176
+ const resolver = new AdhocQueryResolver();
177
+ return {
178
+ Authorize: (sql, provider, contextUser) => resolver.AuthorizeRenderedSQL(sql, provider, contextUser),
179
+ ClampTimeoutSeconds: (requestedSeconds) => ClampAdhocTimeoutSeconds(requestedSeconds, requestTimeoutMs),
180
+ };
181
+ }