prostgles-server 4.0.16 → 4.0.18
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.
- package/dist/AuthHandler.js +214 -210
- package/dist/AuthHandler.js.map +1 -1
- package/dist/DBEventsManager.js +34 -31
- package/dist/DBEventsManager.js.map +1 -1
- package/dist/DBSchemaBuilder.js +3 -2
- package/dist/DBSchemaBuilder.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts +19 -14
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.js +159 -151
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.js.map +1 -1
- package/dist/DboBuilder/TableHandler.d.ts +9 -14
- package/dist/DboBuilder/TableHandler.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler.js +21 -41
- package/dist/DboBuilder/TableHandler.js.map +1 -1
- package/dist/DboBuilder/ViewHandler.d.ts +3 -3
- package/dist/DboBuilder/ViewHandler.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler.js +24 -9
- package/dist/DboBuilder/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.d.ts +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.d.ts.map +1 -1
- package/dist/DboBuilder/parseUpdateRules.d.ts.map +1 -1
- package/dist/DboBuilder/parseUpdateRules.js.map +1 -1
- package/dist/DboBuilder/runSQL.js +5 -5
- package/dist/DboBuilder/runSQL.js.map +1 -1
- package/dist/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder.js +85 -78
- package/dist/DboBuilder.js.map +1 -1
- package/dist/FileManager/FileManager.d.ts +143 -0
- package/dist/FileManager/FileManager.d.ts.map +1 -0
- package/dist/FileManager/FileManager.js +278 -0
- package/dist/FileManager/FileManager.js.map +1 -0
- package/dist/FileManager/initFileManager.d.ts +4 -0
- package/dist/FileManager/initFileManager.d.ts.map +1 -0
- package/dist/FileManager/initFileManager.js +209 -0
- package/dist/FileManager/initFileManager.js.map +1 -0
- package/dist/FileManager/parseFile.d.ts +15 -0
- package/dist/FileManager/parseFile.d.ts.map +1 -0
- package/dist/FileManager/parseFile.js +59 -0
- package/dist/FileManager/parseFile.js.map +1 -0
- package/dist/FileManager/upload.d.ts +6 -0
- package/dist/FileManager/upload.d.ts.map +1 -0
- package/dist/FileManager/upload.js +76 -0
- package/dist/FileManager/upload.js.map +1 -0
- package/dist/FileManager/uploadStream.d.ts +5 -0
- package/dist/FileManager/uploadStream.d.ts.map +1 -0
- package/dist/FileManager/uploadStream.js +70 -0
- package/dist/FileManager/uploadStream.js.map +1 -0
- package/dist/Filtering.d.ts +1 -1
- package/dist/Filtering.d.ts.map +1 -1
- package/dist/PostgresNotifListenManager.js +26 -20
- package/dist/PostgresNotifListenManager.js.map +1 -1
- package/dist/Prostgles.d.ts +2 -2
- package/dist/Prostgles.d.ts.map +1 -1
- package/dist/Prostgles.js +192 -172
- package/dist/Prostgles.js.map +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts +3 -3
- package/dist/PubSubManager/PubSubManager.js +164 -154
- package/dist/PubSubManager/PubSubManager.js.map +1 -1
- package/dist/PublishParser.d.ts +13 -13
- package/dist/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser.js +8 -2
- package/dist/PublishParser.js.map +1 -1
- package/dist/SchemaWatch.js +2 -1
- package/dist/SchemaWatch.js.map +1 -1
- package/dist/TableConfig/TableConfig.d.ts.map +1 -1
- package/dist/TableConfig/TableConfig.js +100 -92
- package/dist/TableConfig/TableConfig.js.map +1 -1
- package/lib/AuthHandler.js +1 -1
- package/lib/AuthHandler.ts +1 -1
- package/lib/DBSchemaBuilder.js +3 -2
- package/lib/DBSchemaBuilder.ts +3 -2
- package/lib/DboBuilder/TableHandler.d.ts +4 -9
- package/lib/DboBuilder/TableHandler.d.ts.map +1 -1
- package/lib/DboBuilder/TableHandler.js +1 -22
- package/lib/DboBuilder/TableHandler.ts +3 -31
- package/lib/DboBuilder/ViewHandler.ts +1 -1
- package/lib/DboBuilder/getSubscribeRelatedTables.d.ts +1 -1
- package/lib/DboBuilder/getSubscribeRelatedTables.d.ts.map +1 -1
- package/lib/DboBuilder/getSubscribeRelatedTables.ts +1 -1
- package/lib/DboBuilder/parseUpdateRules.d.ts.map +1 -1
- package/lib/DboBuilder/parseUpdateRules.ts +2 -2
- package/lib/DboBuilder.d.ts.map +1 -1
- package/lib/DboBuilder.js +0 -13
- package/lib/DboBuilder.ts +1 -16
- package/lib/{FileManager.d.ts → FileManager/FileManager.d.ts} +12 -20
- package/lib/FileManager/FileManager.d.ts.map +1 -0
- package/lib/FileManager/FileManager.js +303 -0
- package/lib/FileManager/FileManager.ts +378 -0
- package/lib/FileManager/initFileManager.d.ts +4 -0
- package/lib/FileManager/initFileManager.d.ts.map +1 -0
- package/lib/FileManager/initFileManager.js +231 -0
- package/lib/FileManager/initFileManager.ts +236 -0
- package/lib/FileManager/parseFile.d.ts +15 -0
- package/lib/FileManager/parseFile.d.ts.map +1 -0
- package/lib/FileManager/parseFile.js +58 -0
- package/lib/FileManager/parseFile.ts +69 -0
- package/lib/FileManager/upload.d.ts +6 -0
- package/lib/FileManager/upload.d.ts.map +1 -0
- package/lib/FileManager/upload.js +98 -0
- package/lib/FileManager/upload.ts +83 -0
- package/lib/FileManager/uploadStream.d.ts +5 -0
- package/lib/FileManager/uploadStream.d.ts.map +1 -0
- package/lib/FileManager/uploadStream.js +92 -0
- package/lib/FileManager/uploadStream.ts +80 -0
- package/lib/Filtering.d.ts +1 -1
- package/lib/Filtering.d.ts.map +1 -1
- package/lib/Filtering.ts +1 -1
- package/lib/JSONBValidation/validate_jsonb_schema_sql.ts +1 -1
- package/lib/Prostgles.d.ts +2 -2
- package/lib/Prostgles.d.ts.map +1 -1
- package/lib/Prostgles.js +8 -5
- package/lib/Prostgles.ts +10 -6
- package/lib/PublishParser.d.ts +13 -13
- package/lib/PublishParser.d.ts.map +1 -1
- package/lib/PublishParser.js +1 -0
- package/lib/PublishParser.ts +13 -12
- package/lib/TableConfig/TableConfig.d.ts.map +1 -1
- package/lib/TableConfig/TableConfig.js +12 -7
- package/lib/TableConfig/TableConfig.ts +13 -8
- package/package.json +3 -3
- package/tests/client/PID.txt +1 -1
- package/tests/client/index.d.ts.map +1 -1
- package/tests/client/index.ts +1 -3
- package/tests/client/package-lock.json +31 -4561
- package/tests/client/package.json +2 -2
- package/tests/client/tsconfig.json +1 -0
- package/tests/isomorphic_queries.d.ts.map +1 -1
- package/tests/isomorphic_queries.ts +3 -3
- package/tests/server/package-lock.json +13 -13
- package/tests/server/package.json +1 -1
- package/tests/server/tsconfig.json +1 -0
- package/tsconfig.json +3 -2
- package/lib/FileManager.d.ts.map +0 -1
- package/lib/FileManager.js +0 -676
- package/lib/FileManager.ts +0 -811
package/dist/AuthHandler.js
CHANGED
|
@@ -1,218 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const prostgles_types_1 = require("prostgles-types");
|
|
4
|
-
const FileManager_1 = require("./FileManager");
|
|
4
|
+
const FileManager_1 = require("./FileManager/FileManager");
|
|
5
5
|
class AuthHandler {
|
|
6
|
+
opts;
|
|
7
|
+
dbo;
|
|
8
|
+
db;
|
|
9
|
+
sidKeyName;
|
|
10
|
+
routes = {
|
|
11
|
+
catchAll: "*"
|
|
12
|
+
};
|
|
6
13
|
constructor(prostgles) {
|
|
7
|
-
this.routes = {
|
|
8
|
-
catchAll: "*"
|
|
9
|
-
};
|
|
10
|
-
this.validateSid = (sid) => {
|
|
11
|
-
if (!sid)
|
|
12
|
-
return undefined;
|
|
13
|
-
if (typeof sid !== "string")
|
|
14
|
-
throw "sid missing or not a string";
|
|
15
|
-
return sid;
|
|
16
|
-
};
|
|
17
|
-
this.matchesRoute = (route, clientFullRoute) => {
|
|
18
|
-
return route && clientFullRoute && (route === clientFullRoute ||
|
|
19
|
-
clientFullRoute.startsWith(route) && ["/", "?", "#"].includes(clientFullRoute[route.length] ?? ""));
|
|
20
|
-
};
|
|
21
|
-
this.isUserRoute = (pathname) => {
|
|
22
|
-
const pubRoutes = [
|
|
23
|
-
...this.opts?.expressConfig?.publicRoutes || [],
|
|
24
|
-
];
|
|
25
|
-
if (this.routes?.login)
|
|
26
|
-
pubRoutes.push(this.routes.login);
|
|
27
|
-
if (this.routes?.logoutGetPath)
|
|
28
|
-
pubRoutes.push(this.routes.logoutGetPath);
|
|
29
|
-
if (this.routes?.magicLinks?.route)
|
|
30
|
-
pubRoutes.push(this.routes.magicLinks.route);
|
|
31
|
-
return !pubRoutes.some(publicRoute => {
|
|
32
|
-
return this.matchesRoute(publicRoute, pathname); // publicRoute === pathname || pathname.startsWith(publicRoute) && ["/", "?", "#"].includes(pathname.slice(-1));
|
|
33
|
-
});
|
|
34
|
-
};
|
|
35
|
-
this.setCookieAndGoToReturnURLIFSet = (cookie, r) => {
|
|
36
|
-
const { sid, expires } = cookie;
|
|
37
|
-
const { res, req } = r;
|
|
38
|
-
if (sid) {
|
|
39
|
-
const maxAgeOneDay = 60 * 60 * 24; // 24 hours;
|
|
40
|
-
let cookieDuration = {
|
|
41
|
-
maxAge: maxAgeOneDay
|
|
42
|
-
};
|
|
43
|
-
if (expires && Number.isFinite(expires) && !isNaN(+new Date(expires))) {
|
|
44
|
-
// const maxAge = (+new Date(expires)) - Date.now();
|
|
45
|
-
cookieDuration = { expires: new Date(expires) };
|
|
46
|
-
const days = (+cookieDuration.expires - Date.now()) / (24 * 60 * 60e3);
|
|
47
|
-
if (days >= 400) {
|
|
48
|
-
console.warn(`Cookie expiration higher the limit of 400 days for Chrome: ${days}days`);
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
const cookieOpts = {
|
|
52
|
-
...cookieDuration,
|
|
53
|
-
httpOnly: true,
|
|
54
|
-
//signed: true // Indicates if the cookie should be signed
|
|
55
|
-
secure: true,
|
|
56
|
-
sameSite: "strict",
|
|
57
|
-
...(this.opts?.expressConfig?.cookieOptions || {})
|
|
58
|
-
};
|
|
59
|
-
const cookieData = sid;
|
|
60
|
-
if (!this.sidKeyName || !this.routes?.returnURL)
|
|
61
|
-
throw "sidKeyName or returnURL missing";
|
|
62
|
-
res.cookie(this.sidKeyName, cookieData, cookieOpts);
|
|
63
|
-
const successURL = getReturnUrl(req, this.routes.returnURL) || "/";
|
|
64
|
-
res.redirect(successURL);
|
|
65
|
-
}
|
|
66
|
-
else {
|
|
67
|
-
throw ("no user or session");
|
|
68
|
-
}
|
|
69
|
-
};
|
|
70
|
-
this.getUser = async (clientReq) => {
|
|
71
|
-
if (!this.sidKeyName || !this.opts?.getUser)
|
|
72
|
-
throw "sidKeyName or this.opts.getUser missing";
|
|
73
|
-
const sid = clientReq.httpReq?.cookies?.[this.sidKeyName];
|
|
74
|
-
if (!sid)
|
|
75
|
-
return undefined;
|
|
76
|
-
try {
|
|
77
|
-
return this.throttledFunc(async () => {
|
|
78
|
-
return this.opts.getUser(this.validateSid(sid), this.dbo, this.db, clientReq);
|
|
79
|
-
}, 50);
|
|
80
|
-
}
|
|
81
|
-
catch (err) {
|
|
82
|
-
console.error(err);
|
|
83
|
-
}
|
|
84
|
-
return undefined;
|
|
85
|
-
};
|
|
86
|
-
this.destroy = () => {
|
|
87
|
-
const app = this.opts?.expressConfig?.app;
|
|
88
|
-
const { login, logoutGetPath, magicLinks } = this.routes;
|
|
89
|
-
(0, FileManager_1.removeExpressRoute)(app, [login, logoutGetPath, magicLinks?.expressRoute]);
|
|
90
|
-
};
|
|
91
|
-
this.throttledFunc = (func, throttle = 500) => {
|
|
92
|
-
return new Promise(async (resolve, reject) => {
|
|
93
|
-
let result, error, finished = false;
|
|
94
|
-
/**
|
|
95
|
-
* Throttle response times to prevent timing attacks
|
|
96
|
-
*/
|
|
97
|
-
const interval = setInterval(() => {
|
|
98
|
-
if (finished) {
|
|
99
|
-
clearInterval(interval);
|
|
100
|
-
if (error) {
|
|
101
|
-
reject(error);
|
|
102
|
-
}
|
|
103
|
-
else {
|
|
104
|
-
resolve(result);
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
}, throttle);
|
|
108
|
-
try {
|
|
109
|
-
result = await func();
|
|
110
|
-
}
|
|
111
|
-
catch (err) {
|
|
112
|
-
console.log(err);
|
|
113
|
-
error = err;
|
|
114
|
-
}
|
|
115
|
-
finished = true;
|
|
116
|
-
});
|
|
117
|
-
};
|
|
118
|
-
this.loginThrottled = async (params, client) => {
|
|
119
|
-
if (!this.opts?.login)
|
|
120
|
-
throw "Auth login config missing";
|
|
121
|
-
const { responseThrottle = 500 } = this.opts;
|
|
122
|
-
return this.throttledFunc(async () => {
|
|
123
|
-
const result = await this.opts?.login?.(params, this.dbo, this.db, client);
|
|
124
|
-
const err = {
|
|
125
|
-
msg: "Bad login result type. \nExpecting: undefined | null | { sid: string; expires: number } but got: " + JSON.stringify(result)
|
|
126
|
-
};
|
|
127
|
-
if (!result)
|
|
128
|
-
throw err;
|
|
129
|
-
if (result && (typeof result.sid !== "string" || typeof result.expires !== "number") || !result && ![undefined, null].includes(result)) {
|
|
130
|
-
throw err;
|
|
131
|
-
}
|
|
132
|
-
if (result && result.expires < Date.now()) {
|
|
133
|
-
throw { msg: "auth.login() is returning an expired session. Can only login with a session.expires greater than Date.now()" };
|
|
134
|
-
}
|
|
135
|
-
return result;
|
|
136
|
-
}, responseThrottle);
|
|
137
|
-
};
|
|
138
|
-
this.isValidSocketSession = (socket, session) => {
|
|
139
|
-
const hasExpired = Boolean(session && session.expires <= Date.now());
|
|
140
|
-
if (this.opts?.expressConfig?.publicRoutes && !this.opts.expressConfig?.disableSocketAuthGuard) {
|
|
141
|
-
const error = "Session has expired";
|
|
142
|
-
if (hasExpired) {
|
|
143
|
-
if (session.onExpiration === "redirect")
|
|
144
|
-
socket.emit(prostgles_types_1.CHANNELS.AUTHGUARD, {
|
|
145
|
-
shouldReload: session.onExpiration === "redirect",
|
|
146
|
-
error
|
|
147
|
-
});
|
|
148
|
-
throw error;
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
return Boolean(session && !hasExpired);
|
|
152
|
-
};
|
|
153
|
-
this.makeSocketAuth = async (socket) => {
|
|
154
|
-
if (!this.opts)
|
|
155
|
-
return {};
|
|
156
|
-
const auth = {};
|
|
157
|
-
if (this.opts.expressConfig?.publicRoutes && !this.opts.expressConfig?.disableSocketAuthGuard) {
|
|
158
|
-
auth.pathGuard = true;
|
|
159
|
-
socket.removeAllListeners(prostgles_types_1.CHANNELS.AUTHGUARD);
|
|
160
|
-
socket.on(prostgles_types_1.CHANNELS.AUTHGUARD, async (params, cb = (_err, _res) => { }) => {
|
|
161
|
-
try {
|
|
162
|
-
const { pathname, origin } = typeof params === "string" ? JSON.parse(params) : (params || {});
|
|
163
|
-
if (pathname && typeof pathname !== "string") {
|
|
164
|
-
console.warn("Invalid pathname provided for AuthGuardLocation: ", pathname);
|
|
165
|
-
}
|
|
166
|
-
/** These origins */
|
|
167
|
-
const IGNORED_API_ORIGINS = ["file://"];
|
|
168
|
-
if (!IGNORED_API_ORIGINS.includes(origin) && pathname && typeof pathname === "string" && this.isUserRoute(pathname) && !(await this.getClientInfo({ socket }))?.user) {
|
|
169
|
-
cb(null, { shouldReload: true });
|
|
170
|
-
}
|
|
171
|
-
else {
|
|
172
|
-
cb(null, { shouldReload: false });
|
|
173
|
-
}
|
|
174
|
-
}
|
|
175
|
-
catch (err) {
|
|
176
|
-
console.error("AUTHGUARD err: ", err);
|
|
177
|
-
cb(err);
|
|
178
|
-
}
|
|
179
|
-
});
|
|
180
|
-
}
|
|
181
|
-
const { register, logout } = this.opts;
|
|
182
|
-
const login = this.loginThrottled;
|
|
183
|
-
let handlers = [
|
|
184
|
-
{ func: (params, dbo, db, client) => register?.(params, dbo, db), ch: prostgles_types_1.CHANNELS.REGISTER, name: "register" },
|
|
185
|
-
{ func: (params, dbo, db, client) => login(params, client), ch: prostgles_types_1.CHANNELS.LOGIN, name: "login" },
|
|
186
|
-
{ func: (params, dbo, db, client) => logout?.(this.getSID({ socket }), dbo, db), ch: prostgles_types_1.CHANNELS.LOGOUT, name: "logout" }
|
|
187
|
-
].filter(h => h.func);
|
|
188
|
-
const userData = await this.getClientInfo({ socket });
|
|
189
|
-
if (userData) {
|
|
190
|
-
auth.user = userData.clientUser;
|
|
191
|
-
handlers = handlers.filter(h => h.name === "logout");
|
|
192
|
-
}
|
|
193
|
-
handlers.map(({ func, ch, name }) => {
|
|
194
|
-
auth[name] = true;
|
|
195
|
-
socket.removeAllListeners(ch);
|
|
196
|
-
socket.on(ch, async (params, cb = (..._callback) => { }) => {
|
|
197
|
-
try {
|
|
198
|
-
if (!socket)
|
|
199
|
-
throw "socket missing??!!";
|
|
200
|
-
const id_address = socket?.conn?.remoteAddress;
|
|
201
|
-
const user_agent = socket.handshake?.headers?.["user-agent"];
|
|
202
|
-
const res = await func(params, this.dbo, this.db, { user_agent, id_address });
|
|
203
|
-
if (name === "login" && res && res.sid) {
|
|
204
|
-
/* TODO: Re-send schema to client */
|
|
205
|
-
}
|
|
206
|
-
cb(null, true);
|
|
207
|
-
}
|
|
208
|
-
catch (err) {
|
|
209
|
-
console.error(name + " err", err);
|
|
210
|
-
cb(err);
|
|
211
|
-
}
|
|
212
|
-
});
|
|
213
|
-
});
|
|
214
|
-
return { auth, userData };
|
|
215
|
-
};
|
|
216
14
|
this.opts = prostgles.opts.auth;
|
|
217
15
|
if (prostgles.opts.auth?.expressConfig) {
|
|
218
16
|
const { magicLinks, returnURL, loginRoute, logoutGetPath } = prostgles.opts.auth.expressConfig;
|
|
@@ -233,6 +31,82 @@ class AuthHandler {
|
|
|
233
31
|
this.dbo = prostgles.dbo;
|
|
234
32
|
this.db = prostgles.db;
|
|
235
33
|
}
|
|
34
|
+
validateSid = (sid) => {
|
|
35
|
+
if (!sid)
|
|
36
|
+
return undefined;
|
|
37
|
+
if (typeof sid !== "string")
|
|
38
|
+
throw "sid missing or not a string";
|
|
39
|
+
return sid;
|
|
40
|
+
};
|
|
41
|
+
matchesRoute = (route, clientFullRoute) => {
|
|
42
|
+
return route && clientFullRoute && (route === clientFullRoute ||
|
|
43
|
+
clientFullRoute.startsWith(route) && ["/", "?", "#"].includes(clientFullRoute[route.length] ?? ""));
|
|
44
|
+
};
|
|
45
|
+
isUserRoute = (pathname) => {
|
|
46
|
+
const pubRoutes = [
|
|
47
|
+
...this.opts?.expressConfig?.publicRoutes || [],
|
|
48
|
+
];
|
|
49
|
+
if (this.routes?.login)
|
|
50
|
+
pubRoutes.push(this.routes.login);
|
|
51
|
+
if (this.routes?.logoutGetPath)
|
|
52
|
+
pubRoutes.push(this.routes.logoutGetPath);
|
|
53
|
+
if (this.routes?.magicLinks?.route)
|
|
54
|
+
pubRoutes.push(this.routes.magicLinks.route);
|
|
55
|
+
return !pubRoutes.some(publicRoute => {
|
|
56
|
+
return this.matchesRoute(publicRoute, pathname); // publicRoute === pathname || pathname.startsWith(publicRoute) && ["/", "?", "#"].includes(pathname.slice(-1));
|
|
57
|
+
});
|
|
58
|
+
};
|
|
59
|
+
setCookieAndGoToReturnURLIFSet = (cookie, r) => {
|
|
60
|
+
const { sid, expires } = cookie;
|
|
61
|
+
const { res, req } = r;
|
|
62
|
+
if (sid) {
|
|
63
|
+
const maxAgeOneDay = 60 * 60 * 24; // 24 hours;
|
|
64
|
+
let cookieDuration = {
|
|
65
|
+
maxAge: maxAgeOneDay
|
|
66
|
+
};
|
|
67
|
+
if (expires && Number.isFinite(expires) && !isNaN(+new Date(expires))) {
|
|
68
|
+
// const maxAge = (+new Date(expires)) - Date.now();
|
|
69
|
+
cookieDuration = { expires: new Date(expires) };
|
|
70
|
+
const days = (+cookieDuration.expires - Date.now()) / (24 * 60 * 60e3);
|
|
71
|
+
if (days >= 400) {
|
|
72
|
+
console.warn(`Cookie expiration higher the limit of 400 days for Chrome: ${days}days`);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
const cookieOpts = {
|
|
76
|
+
...cookieDuration,
|
|
77
|
+
httpOnly: true,
|
|
78
|
+
//signed: true // Indicates if the cookie should be signed
|
|
79
|
+
secure: true,
|
|
80
|
+
sameSite: "strict",
|
|
81
|
+
...(this.opts?.expressConfig?.cookieOptions || {})
|
|
82
|
+
};
|
|
83
|
+
const cookieData = sid;
|
|
84
|
+
if (!this.sidKeyName || !this.routes?.returnURL)
|
|
85
|
+
throw "sidKeyName or returnURL missing";
|
|
86
|
+
res.cookie(this.sidKeyName, cookieData, cookieOpts);
|
|
87
|
+
const successURL = getReturnUrl(req, this.routes.returnURL) || "/";
|
|
88
|
+
res.redirect(successURL);
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
throw ("no user or session");
|
|
92
|
+
}
|
|
93
|
+
};
|
|
94
|
+
getUser = async (clientReq) => {
|
|
95
|
+
if (!this.sidKeyName || !this.opts?.getUser)
|
|
96
|
+
throw "sidKeyName or this.opts.getUser missing";
|
|
97
|
+
const sid = clientReq.httpReq?.cookies?.[this.sidKeyName];
|
|
98
|
+
if (!sid)
|
|
99
|
+
return undefined;
|
|
100
|
+
try {
|
|
101
|
+
return this.throttledFunc(async () => {
|
|
102
|
+
return this.opts.getUser(this.validateSid(sid), this.dbo, this.db, clientReq);
|
|
103
|
+
}, 50);
|
|
104
|
+
}
|
|
105
|
+
catch (err) {
|
|
106
|
+
console.error(err);
|
|
107
|
+
}
|
|
108
|
+
return undefined;
|
|
109
|
+
};
|
|
236
110
|
async init() {
|
|
237
111
|
if (!this.opts)
|
|
238
112
|
return;
|
|
@@ -369,6 +243,58 @@ class AuthHandler {
|
|
|
369
243
|
}
|
|
370
244
|
}
|
|
371
245
|
}
|
|
246
|
+
destroy = () => {
|
|
247
|
+
const app = this.opts?.expressConfig?.app;
|
|
248
|
+
const { login, logoutGetPath, magicLinks } = this.routes;
|
|
249
|
+
(0, FileManager_1.removeExpressRoute)(app, [login, logoutGetPath, magicLinks?.expressRoute]);
|
|
250
|
+
};
|
|
251
|
+
throttledFunc = (func, throttle = 500) => {
|
|
252
|
+
return new Promise(async (resolve, reject) => {
|
|
253
|
+
let result, error, finished = false;
|
|
254
|
+
/**
|
|
255
|
+
* Throttle response times to prevent timing attacks
|
|
256
|
+
*/
|
|
257
|
+
const interval = setInterval(() => {
|
|
258
|
+
if (finished) {
|
|
259
|
+
clearInterval(interval);
|
|
260
|
+
if (error) {
|
|
261
|
+
reject(error);
|
|
262
|
+
}
|
|
263
|
+
else {
|
|
264
|
+
resolve(result);
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
}, throttle);
|
|
268
|
+
try {
|
|
269
|
+
result = await func();
|
|
270
|
+
}
|
|
271
|
+
catch (err) {
|
|
272
|
+
console.log(err);
|
|
273
|
+
error = err;
|
|
274
|
+
}
|
|
275
|
+
finished = true;
|
|
276
|
+
});
|
|
277
|
+
};
|
|
278
|
+
loginThrottled = async (params, client) => {
|
|
279
|
+
if (!this.opts?.login)
|
|
280
|
+
throw "Auth login config missing";
|
|
281
|
+
const { responseThrottle = 500 } = this.opts;
|
|
282
|
+
return this.throttledFunc(async () => {
|
|
283
|
+
const result = await this.opts?.login?.(params, this.dbo, this.db, client);
|
|
284
|
+
const err = {
|
|
285
|
+
msg: "Bad login result type. \nExpecting: undefined | null | { sid: string; expires: number } but got: " + JSON.stringify(result)
|
|
286
|
+
};
|
|
287
|
+
if (!result)
|
|
288
|
+
throw err;
|
|
289
|
+
if (result && (typeof result.sid !== "string" || typeof result.expires !== "number") || !result && ![undefined, null].includes(result)) {
|
|
290
|
+
throw err;
|
|
291
|
+
}
|
|
292
|
+
if (result && result.expires < Date.now()) {
|
|
293
|
+
throw { msg: "auth.login() is returning an expired session. Can only login with a session.expires greater than Date.now()" };
|
|
294
|
+
}
|
|
295
|
+
return result;
|
|
296
|
+
}, responseThrottle);
|
|
297
|
+
};
|
|
372
298
|
/**
|
|
373
299
|
* Will return first sid value found in : http cookie or query params
|
|
374
300
|
* Based on sid names in auth
|
|
@@ -461,6 +387,84 @@ class AuthHandler {
|
|
|
461
387
|
}, 5);
|
|
462
388
|
return res;
|
|
463
389
|
}
|
|
390
|
+
isValidSocketSession = (socket, session) => {
|
|
391
|
+
const hasExpired = Boolean(session && session.expires <= Date.now());
|
|
392
|
+
if (this.opts?.expressConfig?.publicRoutes && !this.opts.expressConfig?.disableSocketAuthGuard) {
|
|
393
|
+
const error = "Session has expired";
|
|
394
|
+
if (hasExpired) {
|
|
395
|
+
if (session.onExpiration === "redirect")
|
|
396
|
+
socket.emit(prostgles_types_1.CHANNELS.AUTHGUARD, {
|
|
397
|
+
shouldReload: session.onExpiration === "redirect",
|
|
398
|
+
error
|
|
399
|
+
});
|
|
400
|
+
throw error;
|
|
401
|
+
}
|
|
402
|
+
}
|
|
403
|
+
return Boolean(session && !hasExpired);
|
|
404
|
+
};
|
|
405
|
+
makeSocketAuth = async (socket) => {
|
|
406
|
+
if (!this.opts)
|
|
407
|
+
return {};
|
|
408
|
+
const auth = {};
|
|
409
|
+
if (this.opts.expressConfig?.publicRoutes && !this.opts.expressConfig?.disableSocketAuthGuard) {
|
|
410
|
+
auth.pathGuard = true;
|
|
411
|
+
socket.removeAllListeners(prostgles_types_1.CHANNELS.AUTHGUARD);
|
|
412
|
+
socket.on(prostgles_types_1.CHANNELS.AUTHGUARD, async (params, cb = (_err, _res) => { }) => {
|
|
413
|
+
try {
|
|
414
|
+
const { pathname, origin } = typeof params === "string" ? JSON.parse(params) : (params || {});
|
|
415
|
+
if (pathname && typeof pathname !== "string") {
|
|
416
|
+
console.warn("Invalid pathname provided for AuthGuardLocation: ", pathname);
|
|
417
|
+
}
|
|
418
|
+
/** These origins */
|
|
419
|
+
const IGNORED_API_ORIGINS = ["file://"];
|
|
420
|
+
if (!IGNORED_API_ORIGINS.includes(origin) && pathname && typeof pathname === "string" && this.isUserRoute(pathname) && !(await this.getClientInfo({ socket }))?.user) {
|
|
421
|
+
cb(null, { shouldReload: true });
|
|
422
|
+
}
|
|
423
|
+
else {
|
|
424
|
+
cb(null, { shouldReload: false });
|
|
425
|
+
}
|
|
426
|
+
}
|
|
427
|
+
catch (err) {
|
|
428
|
+
console.error("AUTHGUARD err: ", err);
|
|
429
|
+
cb(err);
|
|
430
|
+
}
|
|
431
|
+
});
|
|
432
|
+
}
|
|
433
|
+
const { register, logout } = this.opts;
|
|
434
|
+
const login = this.loginThrottled;
|
|
435
|
+
let handlers = [
|
|
436
|
+
{ func: (params, dbo, db, client) => register?.(params, dbo, db), ch: prostgles_types_1.CHANNELS.REGISTER, name: "register" },
|
|
437
|
+
{ func: (params, dbo, db, client) => login(params, client), ch: prostgles_types_1.CHANNELS.LOGIN, name: "login" },
|
|
438
|
+
{ func: (params, dbo, db, client) => logout?.(this.getSID({ socket }), dbo, db), ch: prostgles_types_1.CHANNELS.LOGOUT, name: "logout" }
|
|
439
|
+
].filter(h => h.func);
|
|
440
|
+
const userData = await this.getClientInfo({ socket });
|
|
441
|
+
if (userData) {
|
|
442
|
+
auth.user = userData.clientUser;
|
|
443
|
+
handlers = handlers.filter(h => h.name === "logout");
|
|
444
|
+
}
|
|
445
|
+
handlers.map(({ func, ch, name }) => {
|
|
446
|
+
auth[name] = true;
|
|
447
|
+
socket.removeAllListeners(ch);
|
|
448
|
+
socket.on(ch, async (params, cb = (..._callback) => { }) => {
|
|
449
|
+
try {
|
|
450
|
+
if (!socket)
|
|
451
|
+
throw "socket missing??!!";
|
|
452
|
+
const id_address = socket?.conn?.remoteAddress;
|
|
453
|
+
const user_agent = socket.handshake?.headers?.["user-agent"];
|
|
454
|
+
const res = await func(params, this.dbo, this.db, { user_agent, id_address });
|
|
455
|
+
if (name === "login" && res && res.sid) {
|
|
456
|
+
/* TODO: Re-send schema to client */
|
|
457
|
+
}
|
|
458
|
+
cb(null, true);
|
|
459
|
+
}
|
|
460
|
+
catch (err) {
|
|
461
|
+
console.error(name + " err", err);
|
|
462
|
+
cb(err);
|
|
463
|
+
}
|
|
464
|
+
});
|
|
465
|
+
});
|
|
466
|
+
return { auth, userData };
|
|
467
|
+
};
|
|
464
468
|
}
|
|
465
469
|
exports.default = AuthHandler;
|
|
466
470
|
/**
|
package/dist/AuthHandler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../lib/AuthHandler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AuthHandler.js","sourceRoot":"","sources":["../lib/AuthHandler.ts"],"names":[],"mappings":"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"}
|
package/dist/DBEventsManager.js
CHANGED
|
@@ -4,41 +4,44 @@ exports.DBEventsManager = void 0;
|
|
|
4
4
|
const PostgresNotifListenManager_1 = require("./PostgresNotifListenManager");
|
|
5
5
|
const prostgles_types_1 = require("prostgles-types");
|
|
6
6
|
class DBEventsManager {
|
|
7
|
+
notifies = {};
|
|
8
|
+
notice = {
|
|
9
|
+
socketChannel: prostgles_types_1.CHANNELS.NOTICE_EV,
|
|
10
|
+
socketUnsubChannel: prostgles_types_1.CHANNELS.NOTICE_EV + "unsubscribe",
|
|
11
|
+
sockets: []
|
|
12
|
+
};
|
|
13
|
+
notifManager;
|
|
14
|
+
db_pg;
|
|
15
|
+
pgp;
|
|
7
16
|
constructor(db_pg, pgp) {
|
|
8
|
-
this.notifies = {};
|
|
9
|
-
this.notice = {
|
|
10
|
-
socketChannel: prostgles_types_1.CHANNELS.NOTICE_EV,
|
|
11
|
-
socketUnsubChannel: prostgles_types_1.CHANNELS.NOTICE_EV + "unsubscribe",
|
|
12
|
-
sockets: []
|
|
13
|
-
};
|
|
14
|
-
this.onNotif = ({ channel, payload }) => {
|
|
15
|
-
// console.log(36, { channel, payload }, Object.keys(this.notifies));
|
|
16
|
-
(0, prostgles_types_1.getKeys)(this.notifies)
|
|
17
|
-
.filter(ch => ch === channel)
|
|
18
|
-
.map(ch => {
|
|
19
|
-
const sub = this.notifies[ch];
|
|
20
|
-
sub.sockets.map(s => {
|
|
21
|
-
s.emit(sub.socketChannel, payload);
|
|
22
|
-
});
|
|
23
|
-
sub.localFuncs.map(lf => {
|
|
24
|
-
lf(payload);
|
|
25
|
-
});
|
|
26
|
-
});
|
|
27
|
-
};
|
|
28
|
-
this.onNotice = (notice) => {
|
|
29
|
-
if (this.notice && this.notice.sockets.length) {
|
|
30
|
-
this.notice.sockets.map(s => {
|
|
31
|
-
s.emit(this.notice.socketChannel, notice);
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
};
|
|
35
|
-
this.getNotifChannelName = async (channel) => {
|
|
36
|
-
const c = await this.db_pg.one("SELECT quote_ident($1) as c", channel);
|
|
37
|
-
return c.c;
|
|
38
|
-
};
|
|
39
17
|
this.db_pg = db_pg;
|
|
40
18
|
this.pgp = pgp;
|
|
41
19
|
}
|
|
20
|
+
onNotif = ({ channel, payload }) => {
|
|
21
|
+
// console.log(36, { channel, payload }, Object.keys(this.notifies));
|
|
22
|
+
(0, prostgles_types_1.getKeys)(this.notifies)
|
|
23
|
+
.filter(ch => ch === channel)
|
|
24
|
+
.map(ch => {
|
|
25
|
+
const sub = this.notifies[ch];
|
|
26
|
+
sub.sockets.map(s => {
|
|
27
|
+
s.emit(sub.socketChannel, payload);
|
|
28
|
+
});
|
|
29
|
+
sub.localFuncs.map(lf => {
|
|
30
|
+
lf(payload);
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
onNotice = (notice) => {
|
|
35
|
+
if (this.notice && this.notice.sockets.length) {
|
|
36
|
+
this.notice.sockets.map(s => {
|
|
37
|
+
s.emit(this.notice.socketChannel, notice);
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
getNotifChannelName = async (channel) => {
|
|
42
|
+
const c = await this.db_pg.one("SELECT quote_ident($1) as c", channel);
|
|
43
|
+
return c.c;
|
|
44
|
+
};
|
|
42
45
|
async addNotify(query, socket, func) {
|
|
43
46
|
if (typeof query !== "string" || (!socket && !func)) {
|
|
44
47
|
throw "Expecting (query: string, socket?, localFunc?) But received: " + JSON.stringify({ query, socket, func });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBEventsManager.js","sourceRoot":"","sources":["../lib/DBEventsManager.ts"],"names":[],"mappings":";;;AAAA,6EAA6F;AAE7F,qDAAoD;AAGpD,MAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"DBEventsManager.js","sourceRoot":"","sources":["../lib/DBEventsManager.ts"],"names":[],"mappings":"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"}
|
package/dist/DBSchemaBuilder.js
CHANGED
|
@@ -66,17 +66,18 @@ exports.getDBSchema = getDBSchema;
|
|
|
66
66
|
const p = 1;
|
|
67
67
|
p.dbo.dwad?.insert;
|
|
68
68
|
ddb.dwad?.delete;
|
|
69
|
+
//@ts-ignore
|
|
69
70
|
(0, _1.default)({
|
|
70
71
|
dbConnection: 1,
|
|
71
72
|
publish: async (params) => {
|
|
72
|
-
const
|
|
73
|
+
const _rows = await params.dbo.dwadwa?.find?.({});
|
|
73
74
|
return "*";
|
|
74
75
|
},
|
|
75
76
|
onReady: (dbo) => {
|
|
76
77
|
dbo.tdwa?.find();
|
|
77
78
|
}
|
|
78
79
|
});
|
|
79
|
-
const
|
|
80
|
+
const _auth = {
|
|
80
81
|
sidKeyName: "sid_token",
|
|
81
82
|
getUser: async (sid, db, _db) => {
|
|
82
83
|
db.dwadaw?.find;
|