acebase-server 1.11.0 → 1.12.0

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 (157) hide show
  1. package/dist/cjs/logger.js +74 -0
  2. package/dist/cjs/logger.js.map +1 -0
  3. package/dist/cjs/middleware/admin-only.js +29 -0
  4. package/dist/cjs/middleware/admin-only.js.map +1 -0
  5. package/dist/cjs/middleware/user.js +4 -4
  6. package/dist/cjs/middleware/user.js.map +1 -1
  7. package/dist/cjs/routes/auth-change-password.js +7 -4
  8. package/dist/cjs/routes/auth-change-password.js.map +1 -1
  9. package/dist/cjs/routes/auth-delete.js +9 -7
  10. package/dist/cjs/routes/auth-delete.js.map +1 -1
  11. package/dist/cjs/routes/auth-forgot-password.js +9 -6
  12. package/dist/cjs/routes/auth-forgot-password.js.map +1 -1
  13. package/dist/cjs/routes/auth-reset-password.js +5 -3
  14. package/dist/cjs/routes/auth-reset-password.js.map +1 -1
  15. package/dist/cjs/routes/auth-signout.js +6 -4
  16. package/dist/cjs/routes/auth-signout.js.map +1 -1
  17. package/dist/cjs/routes/auth-signup.js +17 -15
  18. package/dist/cjs/routes/auth-signup.js.map +1 -1
  19. package/dist/cjs/routes/auth-update.js +9 -6
  20. package/dist/cjs/routes/auth-update.js.map +1 -1
  21. package/dist/cjs/routes/auth-verify-email.js +6 -3
  22. package/dist/cjs/routes/auth-verify-email.js.map +1 -1
  23. package/dist/cjs/routes/data-index-create.js +3 -5
  24. package/dist/cjs/routes/data-index-create.js.map +1 -1
  25. package/dist/cjs/routes/data-index-delete.js +2 -4
  26. package/dist/cjs/routes/data-index-delete.js.map +1 -1
  27. package/dist/cjs/routes/data-index-list.js +2 -4
  28. package/dist/cjs/routes/data-index-list.js.map +1 -1
  29. package/dist/cjs/routes/data-reflect.js +2 -4
  30. package/dist/cjs/routes/data-reflect.js.map +1 -1
  31. package/dist/cjs/routes/data-schema-get.js +2 -4
  32. package/dist/cjs/routes/data-schema-get.js.map +1 -1
  33. package/dist/cjs/routes/data-schema-set.js +2 -4
  34. package/dist/cjs/routes/data-schema-set.js.map +1 -1
  35. package/dist/cjs/routes/data-schema-test.js +2 -4
  36. package/dist/cjs/routes/data-schema-test.js.map +1 -1
  37. package/dist/cjs/routes/data-schemas-list.js +2 -4
  38. package/dist/cjs/routes/data-schemas-list.js.map +1 -1
  39. package/dist/cjs/routes/data-set.js +8 -7
  40. package/dist/cjs/routes/data-set.js.map +1 -1
  41. package/dist/cjs/routes/data-transaction.js +15 -8
  42. package/dist/cjs/routes/data-transaction.js.map +1 -1
  43. package/dist/cjs/routes/data-update.js +8 -6
  44. package/dist/cjs/routes/data-update.js.map +1 -1
  45. package/dist/cjs/routes/meta-logs.js +50 -0
  46. package/dist/cjs/routes/meta-logs.js.map +1 -0
  47. package/dist/cjs/routes/meta.js +3 -0
  48. package/dist/cjs/routes/meta.js.map +1 -1
  49. package/dist/cjs/routes/oauth2-signin.js +9 -6
  50. package/dist/cjs/routes/oauth2-signin.js.map +1 -1
  51. package/dist/cjs/server.js +3 -1
  52. package/dist/cjs/server.js.map +1 -1
  53. package/dist/cjs/shared/env.js.map +1 -1
  54. package/dist/cjs/shared/signin.js +8 -3
  55. package/dist/cjs/shared/signin.js.map +1 -1
  56. package/dist/cjs/start.js +3 -0
  57. package/dist/cjs/start.js.map +1 -1
  58. package/dist/cjs/websocket/index.js +42 -23
  59. package/dist/cjs/websocket/index.js.map +1 -1
  60. package/dist/esm/logger.js +52 -0
  61. package/dist/esm/logger.js.map +1 -0
  62. package/dist/esm/middleware/admin-only.js +25 -0
  63. package/dist/esm/middleware/admin-only.js.map +1 -0
  64. package/dist/esm/middleware/user.js +4 -4
  65. package/dist/esm/middleware/user.js.map +1 -1
  66. package/dist/esm/routes/auth-change-password.js +6 -3
  67. package/dist/esm/routes/auth-change-password.js.map +1 -1
  68. package/dist/esm/routes/auth-delete.js +7 -5
  69. package/dist/esm/routes/auth-delete.js.map +1 -1
  70. package/dist/esm/routes/auth-forgot-password.js +8 -6
  71. package/dist/esm/routes/auth-forgot-password.js.map +1 -1
  72. package/dist/esm/routes/auth-reset-password.js +4 -2
  73. package/dist/esm/routes/auth-reset-password.js.map +1 -1
  74. package/dist/esm/routes/auth-signout.js +4 -2
  75. package/dist/esm/routes/auth-signout.js.map +1 -1
  76. package/dist/esm/routes/auth-signup.js +12 -10
  77. package/dist/esm/routes/auth-signup.js.map +1 -1
  78. package/dist/esm/routes/auth-update.js +8 -6
  79. package/dist/esm/routes/auth-update.js.map +1 -1
  80. package/dist/esm/routes/auth-verify-email.js +6 -2
  81. package/dist/esm/routes/auth-verify-email.js.map +1 -1
  82. package/dist/esm/routes/data-index-create.js +4 -6
  83. package/dist/esm/routes/data-index-create.js.map +1 -1
  84. package/dist/esm/routes/data-index-delete.js +3 -5
  85. package/dist/esm/routes/data-index-delete.js.map +1 -1
  86. package/dist/esm/routes/data-index-list.js +3 -5
  87. package/dist/esm/routes/data-index-list.js.map +1 -1
  88. package/dist/esm/routes/data-reflect.js +1 -4
  89. package/dist/esm/routes/data-reflect.js.map +1 -1
  90. package/dist/esm/routes/data-schema-get.js +3 -5
  91. package/dist/esm/routes/data-schema-get.js.map +1 -1
  92. package/dist/esm/routes/data-schema-set.js +3 -5
  93. package/dist/esm/routes/data-schema-set.js.map +1 -1
  94. package/dist/esm/routes/data-schema-test.js +3 -5
  95. package/dist/esm/routes/data-schema-test.js.map +1 -1
  96. package/dist/esm/routes/data-schemas-list.js +3 -5
  97. package/dist/esm/routes/data-schemas-list.js.map +1 -1
  98. package/dist/esm/routes/data-set.js +6 -5
  99. package/dist/esm/routes/data-set.js.map +1 -1
  100. package/dist/esm/routes/data-transaction.js +12 -5
  101. package/dist/esm/routes/data-transaction.js.map +1 -1
  102. package/dist/esm/routes/data-update.js +6 -4
  103. package/dist/esm/routes/data-update.js.map +1 -1
  104. package/dist/esm/routes/meta-logs.js +36 -0
  105. package/dist/esm/routes/meta-logs.js.map +1 -0
  106. package/dist/esm/routes/meta.js +3 -0
  107. package/dist/esm/routes/meta.js.map +1 -1
  108. package/dist/esm/routes/oauth2-signin.js +8 -5
  109. package/dist/esm/routes/oauth2-signin.js.map +1 -1
  110. package/dist/esm/server.js +3 -1
  111. package/dist/esm/server.js.map +1 -1
  112. package/dist/esm/shared/env.js.map +1 -1
  113. package/dist/esm/shared/signin.js +7 -3
  114. package/dist/esm/shared/signin.js.map +1 -1
  115. package/dist/esm/start.js +3 -0
  116. package/dist/esm/start.js.map +1 -1
  117. package/dist/esm/websocket/index.js +37 -22
  118. package/dist/esm/websocket/index.js.map +1 -1
  119. package/dist/types/logger.d.ts +35 -0
  120. package/dist/types/middleware/admin-only.d.ts +19 -0
  121. package/dist/types/routes/meta-logs.d.ts +20 -0
  122. package/dist/types/rules.d.ts +2 -2
  123. package/dist/types/shared/env.d.ts +3 -1
  124. package/dist/types/shared/signin.d.ts +1 -1
  125. package/dist/types/websocket/index.d.ts +4 -0
  126. package/package.json +5 -5
  127. package/src/logger.ts +56 -0
  128. package/src/middleware/admin-only.ts +29 -0
  129. package/src/middleware/user.ts +4 -4
  130. package/src/routes/auth-change-password.ts +6 -3
  131. package/src/routes/auth-delete.ts +7 -5
  132. package/src/routes/auth-forgot-password.ts +10 -6
  133. package/src/routes/auth-reset-password.ts +5 -2
  134. package/src/routes/auth-signout.ts +5 -2
  135. package/src/routes/auth-signup.ts +13 -10
  136. package/src/routes/auth-update.ts +8 -6
  137. package/src/routes/auth-verify-email.ts +11 -3
  138. package/src/routes/data-index-create.ts +4 -7
  139. package/src/routes/data-index-delete.ts +3 -6
  140. package/src/routes/data-index-list.ts +3 -6
  141. package/src/routes/data-reflect.ts +1 -4
  142. package/src/routes/data-schema-get.ts +3 -5
  143. package/src/routes/data-schema-set.ts +3 -6
  144. package/src/routes/data-schema-test.ts +3 -6
  145. package/src/routes/data-schemas-list.ts +3 -5
  146. package/src/routes/data-set.ts +10 -6
  147. package/src/routes/data-transaction.ts +14 -5
  148. package/src/routes/data-update.ts +8 -4
  149. package/src/routes/meta-logs.ts +57 -0
  150. package/src/routes/meta.ts +4 -0
  151. package/src/routes/oauth2-signin.ts +11 -7
  152. package/src/rules.ts +1 -1
  153. package/src/server.ts +3 -1
  154. package/src/shared/env.ts +2 -1
  155. package/src/shared/signin.ts +10 -4
  156. package/src/start.ts +3 -0
  157. package/src/websocket/index.ts +40 -23
@@ -1 +1 @@
1
- {"version":3,"file":"oauth2-signin.js","sourceRoot":"","sources":["../../../src/routes/oauth2-signin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauth2-signin.js","sourceRoot":"","sources":["../../../src/routes/oauth2-signin.ts"],"names":[],"mappings":"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"}
@@ -17,6 +17,7 @@ import addWebManagerRoutes from './routes/webmanager.js';
17
17
  import addMetadataRoutes from './routes/meta.js';
18
18
  import addSwaggerMiddleware from './middleware/swagger.js';
19
19
  import addCacheMiddleware from './middleware/cache.js';
20
+ import { DatabaseLog } from './logger.js';
20
21
  // type PrivateLocalSettings = AceBaseLocalSettings & { storage: PrivateStorageSettings };
21
22
  export class AceBaseServerNotReadyError extends Error {
22
23
  constructor() { super('Server is not ready yet'); }
@@ -100,6 +101,7 @@ export class AceBaseServer extends SimpleEventEmitter {
100
101
  const securityRef = authDb ? authDb === db ? db.ref('__auth__/security') : authDb.ref('security') : null;
101
102
  const authRef = authDb ? authDb === db ? db.ref('__auth__/accounts') : authDb.ref('accounts') : null;
102
103
  const logRef = authDb ? authDb === db ? db.ref('__log__') : authDb.ref('log') : null;
104
+ const logger = new DatabaseLog(logRef);
103
105
  // Setup rules
104
106
  const rulesFilePath = `${this.config.path}/${this.db.name}.acebase/rules.json`;
105
107
  const rules = new PathBasedRules(rulesFilePath, config.auth.defaultAccessRule, { db, debug: this.debug, authEnabled: this.config.auth.enabled });
@@ -112,7 +114,7 @@ export class AceBaseServer extends SimpleEventEmitter {
112
114
  debug: this.debug,
113
115
  securityRef,
114
116
  authRef,
115
- logRef,
117
+ log: logger,
116
118
  tokenSalt: null,
117
119
  clients,
118
120
  authCache: null,
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"env.js","sourceRoot":"","sources":["../../../src/shared/env.ts"],"names":[],"mappings":"AA2BC,CAAC;AAQD,CAAC"}
1
+ {"version":3,"file":"env.js","sourceRoot":"","sources":["../../../src/shared/env.ts"],"names":[],"mappings":"AA4BC,CAAC;AAQD,CAAC"}
@@ -17,6 +17,8 @@ export class SignInError extends Error {
17
17
  * @returns
18
18
  */
19
19
  export const signIn = async (credentials, env, req) => {
20
+ const LOG_ACTION = 'auth.signin';
21
+ const LOG_DETAILS = { ip: req.ip, method: credentials.method };
20
22
  try {
21
23
  const query = env.authRef.query();
22
24
  let tokenDetails;
@@ -34,7 +36,7 @@ export const signIn = async (credentials, env, req) => {
34
36
  }
35
37
  break;
36
38
  }
37
- case 'private_token': {
39
+ case 'internal': {
38
40
  // Method used internally: uses the access token extracted from a public access token (see tokenDetails.access_token in above 'token' case)
39
41
  if (typeof credentials.access_token !== 'string') {
40
42
  throw new SignInError('invalid_details', 'sign in request has invalid arguments');
@@ -109,7 +111,9 @@ export const signIn = async (credentials, env, req) => {
109
111
  // Update db
110
112
  await snap.ref.update(updates);
111
113
  // Log history item
112
- env.logRef.push({ action: `signin`, type: credentials.method, [credentials.method]: credentials[credentials.method], ip: req.ip, date: new Date(), success: true });
114
+ if (credentials.method !== 'internal') {
115
+ env.log.event(LOG_ACTION, LOG_DETAILS);
116
+ }
113
117
  // Add to cache
114
118
  env.authCache.set(user.uid, user);
115
119
  // Bind user to current request
@@ -118,7 +122,7 @@ export const signIn = async (credentials, env, req) => {
118
122
  }
119
123
  catch (err) {
120
124
  // Log error
121
- env.logRef.push({ action: 'signin', type: credentials.method, [credentials.method]: credentials[credentials.method], success: false, code: err.code || 'unexpected', message: err.code ? null : err.message, ip: req.ip, date: new Date(), ...err.details });
125
+ env.log.error(LOG_ACTION, err.code ?? 'unexpected', LOG_DETAILS, typeof err.code === 'undefined' ? err : null);
122
126
  throw err;
123
127
  }
124
128
  };
@@ -1 +1 @@
1
- {"version":3,"file":"signin.js","sourceRoot":"","sources":["../../../src/shared/signin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"signin.js","sourceRoot":"","sources":["../../../src/shared/signin.ts"],"names":[],"mappings":"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"}
package/dist/esm/start.js CHANGED
@@ -40,6 +40,9 @@ if (+getVariable('TXLOG', 0) === 1) {
40
40
  maxAge: +getVariable('TXDAYS', 30)
41
41
  };
42
42
  }
43
+ if (+getVariable('AUTH', 1) === 0) {
44
+ options.authentication = { enabled: false };
45
+ }
43
46
  const server = new AceBaseServer(dbname, options);
44
47
  server.once("ready", () => {
45
48
  server.debug.log(`AceBase server running`);
@@ -1 +1 @@
1
- {"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,oEAAoE;AACpE,SAAS,WAAW,CAAC,IAAY,EAAE,YAAkB;IACjD,mDAAmD;IACnD,wDAAwD;IACxD,wCAAwC;IACxC,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1B,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;IAC/E,IAAI,GAAG,EAAE;QAAE,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KAAE;IACtC,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,WAAW,EAAE;QAAE,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KAAE;IAC3E,OAAO,YAAY,CAAC;AACxB,CAAC;AAAA,CAAC;AAEF,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AACxC,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;AAChD,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,YAAY;AAC3D,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACxC,MAAM,OAAO,GAAG,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;AAC5C,MAAM,OAAO,GAA0B,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AAC5D,IAAI,OAAO,GAAG,CAAC,EAAE;IACb,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IACrC,IAAI,CAAC,CAAC,QAAQ,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACnE;IACD,OAAO,CAAC,GAAG,GAAG;QACV,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC;QAC7B,IAAI,EAAE,OAAO;QACb,GAAG,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC;QACrC,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC;QAC/B,IAAI;KACP,CAAC;CACL;AACD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;IAChC,OAAO,CAAC,YAAY,GAAG;QACnB,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC;KACrC,CAAC;CACL;AACD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAClD,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;IACtB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC3C,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,kHAAkH;AAC/I,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,oEAAoE;AACpE,SAAS,WAAW,CAAC,IAAY,EAAE,YAAkB;IACjD,mDAAmD;IACnD,wDAAwD;IACxD,wCAAwC;IACxC,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1B,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;IAC/E,IAAI,GAAG,EAAE;QAAE,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KAAE;IACtC,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,WAAW,EAAE;QAAE,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KAAE;IAC3E,OAAO,YAAY,CAAC;AACxB,CAAC;AAAA,CAAC;AAEF,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AACxC,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;AAChD,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,YAAY;AAC3D,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACxC,MAAM,OAAO,GAAG,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;AAC5C,MAAM,OAAO,GAA0B,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AAC5D,IAAI,OAAO,GAAG,CAAC,EAAE;IACb,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IACrC,IAAI,CAAC,CAAC,QAAQ,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACnE;IACD,OAAO,CAAC,GAAG,GAAG;QACV,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC;QAC7B,IAAI,EAAE,OAAO;QACb,GAAG,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC;QACrC,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC;QAC/B,IAAI;KACP,CAAC;CACL;AACD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;IAChC,OAAO,CAAC,YAAY,GAAG;QACnB,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC;KACrC,CAAC;CACL;AACD,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;IAC/B,OAAO,CAAC,cAAc,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;CAC/C;AACD,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAClD,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;IACtB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC3C,OAAO,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,kHAAkH;AAC/I,CAAC,CAAC,CAAC"}
@@ -2,6 +2,12 @@ import { ColorStyle, Transport } from "acebase-core";
2
2
  import { ConnectedClient } from "../shared/clients.js";
3
3
  import { decodePublicAccessToken } from "../shared/tokens.js";
4
4
  import { createServer } from "./socket.io.js";
5
+ export class SocketRequestError extends Error {
6
+ constructor(code, message) {
7
+ super(message);
8
+ this.code = code;
9
+ }
10
+ }
5
11
  export const addWebsocketServer = (env) => {
6
12
  // TODO: Allow using uWebSockets.js server instead of Socket.IO
7
13
  const serverManager = createServer(env);
@@ -94,7 +100,7 @@ export const addWebsocketServer = (env) => {
94
100
  serverManager.send(event.socket, 'oauth2-signin', { error: err.message });
95
101
  }
96
102
  });
97
- const acknowlegdeRequest = (socket, requestId) => {
103
+ const acknowledgeRequest = (socket, requestId) => {
98
104
  // Send acknowledgement
99
105
  serverManager.send(socket, 'result', {
100
106
  success: true,
@@ -119,12 +125,12 @@ export const addWebsocketServer = (env) => {
119
125
  const subscriptionPath = event.data.path;
120
126
  const isSubscribed = () => subscriptionPath in client.subscriptions && client.subscriptions[subscriptionPath].some(s => s.event === event.data.event);
121
127
  if (isSubscribed()) {
122
- return acknowlegdeRequest(event.socket, event.data.req_id);
128
+ return acknowledgeRequest(event.socket, event.data.req_id);
123
129
  }
124
130
  // Get client
125
131
  // const client = clients.get(socket.id);
126
132
  if (!env.rules.userHasAccess(client.user, subscriptionPath, false)) {
127
- env.logRef.push({ action: 'subscribe', success: false, code: 'access_denied', uid: client.user ? client.user.uid : '-', path: subscriptionPath });
133
+ env.log.error('event.subscribe', 'access_denied', { uid: client.user?.uid ?? 'anonymous', path: subscriptionPath });
128
134
  return failRequest(event.socket, event.data.req_id, 'access_denied');
129
135
  }
130
136
  const callback = (err, path, currentValue, previousValue, context) => {
@@ -165,7 +171,7 @@ export const addWebsocketServer = (env) => {
165
171
  let subscr = { path: subscriptionPath, event: event.data.event, callback };
166
172
  pathSubs.push(subscr);
167
173
  env.db.api.subscribe(subscriptionPath, event.data.event, callback);
168
- acknowlegdeRequest(event.socket, event.data.req_id);
174
+ acknowledgeRequest(event.socket, event.data.req_id);
169
175
  });
170
176
  serverManager.on('unsubscribe', event => {
171
177
  // Client unsubscribes from events on a node
@@ -178,7 +184,7 @@ export const addWebsocketServer = (env) => {
178
184
  let pathSubs = client.subscriptions[event.data.path];
179
185
  if (!pathSubs) {
180
186
  // We have no knowledge of any active subscriptions on this path
181
- return acknowlegdeRequest(event.socket, event.data.req_id);
187
+ return acknowledgeRequest(event.socket, event.data.req_id);
182
188
  }
183
189
  let remove = pathSubs;
184
190
  if (event.data.event) {
@@ -195,7 +201,7 @@ export const addWebsocketServer = (env) => {
195
201
  // No subscriptions left on this path, remove the path entry
196
202
  delete client.subscriptions[event.data.path];
197
203
  }
198
- return acknowlegdeRequest(event.socket, event.data.req_id);
204
+ return acknowledgeRequest(event.socket, event.data.req_id);
199
205
  });
200
206
  serverManager.on('query-unsubscribe', event => {
201
207
  // Client unsubscribing from realtime query events
@@ -206,15 +212,17 @@ export const addWebsocketServer = (env) => {
206
212
  env.debug.verbose(`Client ${event.socket_id} is unsubscribing from realtime query "${event.data.query_id}"`);
207
213
  // const client = clients.get(socket.id);
208
214
  delete client.realtimeQueries[event.data.query_id];
209
- acknowlegdeRequest(event.socket, event.data.req_id);
215
+ acknowledgeRequest(event.socket, event.data.req_id);
210
216
  });
211
217
  const TRANSACTION_TIMEOUT_MS = 10000; // 10s to finish a started transaction
212
218
  serverManager.on('transaction-start', event => {
213
219
  // Start transaction
214
220
  const client = getClientBySocketId(event.socket_id, 'transaction-start');
215
- if (!client) {
221
+ if (!client || !event.data) {
216
222
  return;
217
223
  }
224
+ const LOG_ACTION = 'socket.transaction.start';
225
+ const LOG_DETAILS = { ip: event.socket.conn.remoteAddress, uid: client.user?.uid ?? null, path: event.data.path };
218
226
  env.debug.verbose(`Client ${event.socket_id} is sending transaction start request on path "${event.data.path}"`);
219
227
  const data = event.data;
220
228
  const tx = {
@@ -226,11 +234,14 @@ export const addWebsocketServer = (env) => {
226
234
  timeout: setTimeout(() => {
227
235
  delete client.transactions[tx.id];
228
236
  tx.finish(); // Finish without value cancels the transaction
237
+ env.log.error(LOG_ACTION, 'timeout', LOG_DETAILS);
229
238
  serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: 'timeout' });
230
239
  }, TRANSACTION_TIMEOUT_MS)
231
240
  };
232
- if (!env.rules.userHasAccess(client.user, data.path, true)) {
241
+ const access = env.rules.userHasAccess(client.user, data.path, true);
242
+ if (!access.allow) {
233
243
  // throw new AccessDeniedError(`access_denied`);
244
+ env.log.error(LOG_ACTION, 'unauthorized', { ...LOG_DETAILS, rule_code: access.code, rule_path: access.rulePath ?? null }, access.details);
234
245
  return serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: 'access_denied' });
235
246
  }
236
247
  // Bind to client
@@ -254,32 +265,36 @@ export const addWebsocketServer = (env) => {
254
265
  serverManager.on('transaction-finish', async (event) => {
255
266
  // Finish transaction
256
267
  const client = getClientBySocketId(event.socket_id, 'transaction-finish');
257
- if (!client) {
268
+ if (!client || !event.data) {
258
269
  return;
259
270
  }
271
+ const LOG_ACTION = 'socket.transaction.finish';
272
+ const LOG_DETAILS = { ip: event.socket.conn.remoteAddress, uid: client.user?.uid ?? null, path: event.data.path };
260
273
  const data = event.data;
261
274
  const tx = client.transactions[data.id];
262
275
  try {
263
276
  if (!tx || data.path !== tx.path) {
264
- throw new Error('transaction_not_found');
277
+ env.log.error(LOG_ACTION, tx ? 'wrong_path' : 'not_found', { ...LOG_DETAILS, id: data.id, tx_path: tx?.path ?? null });
278
+ throw new SocketRequestError('transaction_not_found', 'Transaction not found');
265
279
  }
266
280
  clearTimeout(tx.timeout);
267
281
  delete client.transactions[data.id];
268
- if (!env.rules.userHasAccess(client.user, data.path, true)) {
269
- throw new Error('access_denied');
282
+ const access = env.rules.userHasAccess(client.user, data.path, true);
283
+ if (!access.allow) {
284
+ env.log.error(LOG_ACTION, 'unauthorized', { ...LOG_DETAILS, rule_code: access.code, rule_path: access.rulePath ?? null }, access.details);
285
+ throw new SocketRequestError('access_denied', 'Access denied');
270
286
  }
271
287
  const newValue = 'val' in data.value ? Transport.deserialize(data.value) : undefined;
272
- try {
273
- const { cursor } = await tx.finish(newValue);
274
- env.debug.verbose(`Transaction ${tx.id} finished`);
275
- serverManager.send(event.socket, 'tx_completed', { id: tx.id, context: { cursor } });
276
- }
277
- catch (err) {
278
- serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: err.message });
279
- }
288
+ const { cursor } = await tx.finish(newValue);
289
+ env.debug.verbose(`Transaction ${tx.id} finished`);
290
+ serverManager.send(event.socket, 'tx_completed', { id: tx.id, context: { cursor } });
280
291
  }
281
292
  catch (err) {
282
- serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: err.message, data });
293
+ if (!(err instanceof SocketRequestError)) {
294
+ // Other errors have been logged already
295
+ env.log.error(LOG_ACTION, 'unexpected', LOG_DETAILS, err);
296
+ }
297
+ serverManager.send(event.socket, 'tx_error', { id: tx.id, reason: err.code ?? err.message, data });
283
298
  tx.finish(); // Finish with undefined, canceling the transaction
284
299
  }
285
300
  });
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/websocket/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/websocket/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,35 @@
1
+ import { DataReference } from "acebase-core";
2
+ export declare class DatabaseLog {
3
+ private logRef;
4
+ constructor(logRef: DataReference);
5
+ /**
6
+ * Logs an action initiated by a client/user with a positive or negative outcome. Used by `success` and `failure`
7
+ * @param action action identifier
8
+ * @param success whether the action was successful
9
+ * @param details any additional details to be logged
10
+ */
11
+ event(action: string, details: any): Promise<void>;
12
+ /**
13
+ * Logs a system warning
14
+ * @param action action identifier
15
+ * @param code warning code
16
+ * @param details any additional details to be logged
17
+ */
18
+ warning(action: string, code: string, details: any): Promise<void>;
19
+ /**
20
+ * Logs a system or client/user error
21
+ * @param action action identifier
22
+ * @param code error code
23
+ * @param details any additional details to be logged
24
+ */
25
+ error(action: string, code: string, details: any, unexpectedError?: any): Promise<void>;
26
+ /**
27
+ * Query the logs
28
+ * @returns
29
+ */
30
+ query(): import("acebase-core").DataReferenceQuery;
31
+ /**
32
+ * Reference to the logs database collection
33
+ */
34
+ get ref(): DataReference;
35
+ }
@@ -0,0 +1,19 @@
1
+ import { NextFunction } from "express";
2
+ import { RouteInitEnvironment, RouteRequest } from "../shared/env";
3
+ import type { Response } from "../shared/http";
4
+ /**
5
+ * Middleware function that checks if the current user is `admin`. An 403 Forbidden error will be sent in the response if
6
+ * authentication is enabled on the server and the user is not signed in as admin.
7
+ *
8
+ * Can be applied to any route by adding it in the router chain.
9
+ * @example
10
+ * app.get('/endpoint', adminOnly(env), (req, res) => {
11
+ * // If we get here we are either an admin,
12
+ * // or the server doesn't have authentication enabled.
13
+ * })
14
+ * @param env Middle
15
+ * @param errorMessage
16
+ * @returns
17
+ */
18
+ export declare const adminOnly: (env: RouteInitEnvironment, errorMessage?: string) => (req: RouteRequest, res: Response, next: NextFunction) => void;
19
+ export default adminOnly;
@@ -0,0 +1,20 @@
1
+ import { QueryOperator } from 'acebase-core/types/data-reference';
2
+ import { RouteInitEnvironment, RouteRequest } from '../shared/env';
3
+ declare type AceBaseLogLine = {
4
+ action: string;
5
+ ip: string;
6
+ date: string;
7
+ };
8
+ export declare type RequestQuery = {
9
+ take?: string;
10
+ skip?: string;
11
+ sort?: 'date';
12
+ filter_col?: string;
13
+ filter_op?: QueryOperator;
14
+ filter_val?: string;
15
+ };
16
+ export declare type RequestBody = null;
17
+ export declare type ResponseBody = AceBaseLogLine[];
18
+ export declare type Request = RouteRequest<any, ResponseBody, RequestBody, RequestQuery>;
19
+ export declare const addRoute: (env: RouteInitEnvironment) => void;
20
+ export default addRoute;
@@ -9,7 +9,7 @@ declare type HasAccessResult = {
9
9
  message?: string;
10
10
  rule?: string | boolean;
11
11
  rulePath?: string;
12
- details?: any;
12
+ details?: Error;
13
13
  } & ({
14
14
  allow: true;
15
15
  } | {
@@ -18,7 +18,7 @@ declare type HasAccessResult = {
18
18
  message: string;
19
19
  rule?: string | boolean;
20
20
  rulePath?: string;
21
- details?: any;
21
+ details?: Error;
22
22
  });
23
23
  export declare class PathBasedRules {
24
24
  private authEnabled;
@@ -1,4 +1,5 @@
1
1
  /// <reference types="node" />
2
+ /// <reference types="node" />
2
3
  /// <reference types="express" />
3
4
  import type { HttpApp, Request } from './http';
4
5
  import type { AceBase, DataReference } from 'acebase';
@@ -11,6 +12,7 @@ import type { Server as HttpServer } from 'http';
11
12
  import type { Server as SecureHttpServer } from 'https';
12
13
  import type { PathBasedRules } from '../rules';
13
14
  import { Api } from 'acebase-core/src/api';
15
+ import { DatabaseLog } from '../logger';
14
16
  export interface RouteInitEnvironment {
15
17
  server: HttpServer | SecureHttpServer;
16
18
  app: HttpApp;
@@ -22,7 +24,7 @@ export interface RouteInitEnvironment {
22
24
  debug: DebugLogger;
23
25
  securityRef: DataReference;
24
26
  authRef: DataReference;
25
- logRef: DataReference;
27
+ log: DatabaseLog;
26
28
  tokenSalt: string;
27
29
  clients: Map<string, ConnectedClient>;
28
30
  authCache: SimpleCache<string, DbUserAccountDetails>;
@@ -4,7 +4,7 @@ export declare type SignInCredentials = {
4
4
  method: 'token';
5
5
  access_token: string;
6
6
  } | {
7
- method: 'private_token';
7
+ method: 'internal';
8
8
  access_token: string;
9
9
  } | {
10
10
  method: 'email';
@@ -1,2 +1,6 @@
1
1
  import { RouteInitEnvironment } from "../shared/env";
2
+ export declare class SocketRequestError extends Error {
3
+ code: string;
4
+ constructor(code: string, message: string);
5
+ }
2
6
  export declare const addWebsocketServer: (env: RouteInitEnvironment) => import("./socket.io").SocketIOManager;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "acebase-server",
3
- "version": "1.11.0",
3
+ "version": "1.12.0",
4
4
  "description": "AceBase realtime database server (webserver endpoint to allow remote connections)",
5
5
  "main": "./dist/cjs/index.js",
6
6
  "module": "./dist/esm/index.js",
@@ -14,7 +14,7 @@
14
14
  "private": false,
15
15
  "repository": "github:appy-one/acebase-server",
16
16
  "scripts": {
17
- "start": "node dist/esm/start.js DBNAME=default DBPATH=.. HOST=localhost PORT=3000 TXLOG=1",
17
+ "start": "node dist/esm/start.js DBNAME=default DBPATH=.. HOST=localhost PORT=3000 TXLOG=1 AUTH=1",
18
18
  "test": "set NODE_ENV=development && npm run start",
19
19
  "build": "npm run build:clean && npm run build:esm && npm run build:cjs && npm run build:packages && echo Done!",
20
20
  "build:clean": "rm -fr dist/*",
@@ -57,8 +57,8 @@
57
57
  "author": "Ewout Stortenbeker <me@appy.one> (http://appy.one)",
58
58
  "license": "MIT",
59
59
  "dependencies": {
60
- "acebase": "^1.21.1",
61
- "acebase-core": "^1.18.0",
60
+ "acebase": "^1.22.0",
61
+ "acebase-core": "^1.20.0",
62
62
  "express": "^4.17.1",
63
63
  "socket.io": "^4.5.0",
64
64
  "swagger-jsdoc": "^6.1.0",
@@ -69,6 +69,6 @@
69
69
  "@types/node": "^10.17.60",
70
70
  "@types/socket.io": "^3.0.2",
71
71
  "tsc-esm-fix": "^2.12.4",
72
- "typescript": "^4.6.3"
72
+ "typescript": "^4.7.4"
73
73
  }
74
74
  }