@based/server 6.2.5 → 6.2.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/auth/index.js
CHANGED
|
@@ -11,6 +11,7 @@ const parseAuthState_1 = __importDefault(require("./parseAuthState"));
|
|
|
11
11
|
exports.parseAuthState = parseAuthState_1.default;
|
|
12
12
|
const parseJSONAuthState_1 = __importDefault(require("./parseJSONAuthState"));
|
|
13
13
|
exports.parseJSONAuthState = parseJSONAuthState_1.default;
|
|
14
|
+
const auth_1 = require("../incoming/ws/auth");
|
|
14
15
|
class BasedAuth {
|
|
15
16
|
constructor(server, config = {}) {
|
|
16
17
|
this.verifyAuthState = defaultConfig_1.defaultVerifyAuthState;
|
|
@@ -48,6 +49,7 @@ class BasedAuth {
|
|
|
48
49
|
}
|
|
49
50
|
ctx.session.authState = verified;
|
|
50
51
|
if ((0, functions_1.isWsContext)(ctx)) {
|
|
52
|
+
(0, auth_1.reEvaulateUnauthorized)(this.server, ctx);
|
|
51
53
|
this.sendAuthState(ctx, verified);
|
|
52
54
|
}
|
|
53
55
|
return verified;
|
package/dist/auth/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA+D;AAE/D,gDASyB;AACzB,mDAA0E;AAC1E,sEAA6C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA+D;AAE/D,gDASyB;AACzB,mDAA0E;AAC1E,sEAA6C;AAIpC,yBAJF,wBAAc,CAIE;AAHvB,8EAAqD;AAI5C,6BAJF,4BAAkB,CAIE;AAH3B,8CAA4D;AAiB5D,MAAa,SAAS;IAOpB,YAAY,MAAmB,EAAE,SAAqB,EAAE;QAHxD,oBAAe,GAAoB,sCAAsB,CAAA;QACzD,cAAS,GAAc,gCAAgB,CAAA;QAGrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;IAC3B,CAAC;IAED,YAAY,CAAC,MAAkB;QAC7B,IAAI,CAAC,MAAM,EAAE;YACX,OAAM;SACP;QACD,IAAI,MAAM,CAAC,mBAAmB,EAAE;YAC9B,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAA;SACtD;QACD,IAAI,MAAM,CAAC,SAAS,EAAE;YACpB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;SAClC;QACD,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAA;SAC9C;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAClB,GAAY,EACZ,SAAqB;QAErB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAChB,OAAM;SACP;QAED,IAAI,CAAC,CAAC,WAAW,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE;YACjC,OAAM;SACP;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CACrD,IAAI,CAAC,MAAM,CAAC,MAAM,EACgC,GAAG,EACrD,SAAS,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,CACnC,CAAA;QAED,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YACrC,OAAM;SACP;QAED,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,QAAQ,CAAA;QAEhC,IAAI,IAAA,uBAAW,EAAC,GAAG,CAAC,EAAE;YACpB,IAAA,6BAAsB,EAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;YACxC,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;SAClC;QAED,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,eAAe,CAAC,SAAoB;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC1E,CAAC;IAED,eAAe,CAAC,SAAc;QAC5B,OAAO,IAAA,wBAAc,EAAC,SAAS,CAAC,CAAA;IAClC,CAAC;IAED,0CAA0C;IAC1C,aAAa,CAAC,GAA8B,EAAE,SAAoB;QAChE,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAClB,IAAA,6BAAkB,EAAC,IAAA,wBAAa,EAAC,SAAS,CAAC,CAAC,EAC5C,IAAI,EACJ,KAAK,CACN,CAAA;IACH,CAAC;CACF;AA9ED,8BA8EC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { BasedServer } from '../../server';
|
|
2
2
|
import { WebSocketSession, Context } from '@based/functions';
|
|
3
3
|
import { BinaryMessageHandler } from './types';
|
|
4
|
+
export declare const reEvaulateUnauthorized: (server: BasedServer, ctx: Context<WebSocketSession>) => void;
|
|
4
5
|
export declare const authMessage: BinaryMessageHandler;
|
|
5
6
|
export declare const sendAndVerifyAuthMessage: (server: BasedServer, ctx: Context<WebSocketSession>) => Promise<void>;
|
package/dist/incoming/ws/auth.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.sendAndVerifyAuthMessage = exports.authMessage = void 0;
|
|
3
|
+
exports.sendAndVerifyAuthMessage = exports.authMessage = exports.reEvaulateUnauthorized = void 0;
|
|
4
4
|
const protocol_1 = require("../../protocol");
|
|
5
5
|
const query_1 = require("./query");
|
|
6
6
|
const security_1 = require("../../security");
|
|
@@ -15,6 +15,46 @@ const parse = (payload) => {
|
|
|
15
15
|
return { error: 'invalid token' };
|
|
16
16
|
}
|
|
17
17
|
};
|
|
18
|
+
const reEvaulateUnauthorized = (server, ctx) => {
|
|
19
|
+
const session = ctx.session;
|
|
20
|
+
if (!session) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
if (session.unauthorizedObs?.size) {
|
|
24
|
+
session.unauthorizedObs.forEach((obs) => {
|
|
25
|
+
const { id, name, checksum, payload } = obs;
|
|
26
|
+
const route = {
|
|
27
|
+
name,
|
|
28
|
+
type: 'query',
|
|
29
|
+
};
|
|
30
|
+
(0, installFn_1.installFn)(server, ctx, route, id).then((spec) => {
|
|
31
|
+
if (spec) {
|
|
32
|
+
(0, query_1.enableSubscribe)(route, spec, server, ctx, payload, id, checksum);
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
// someting wrong...
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
});
|
|
39
|
+
session.unauthorizedObs.clear();
|
|
40
|
+
}
|
|
41
|
+
if (session.unauthorizedChannels?.size) {
|
|
42
|
+
session.unauthorizedChannels.forEach((channel) => {
|
|
43
|
+
const { id, name, payload } = channel;
|
|
44
|
+
const route = {
|
|
45
|
+
name,
|
|
46
|
+
type: 'channel',
|
|
47
|
+
};
|
|
48
|
+
(0, installFn_1.installFn)(server, ctx, route, id).then((spec) => {
|
|
49
|
+
if (spec) {
|
|
50
|
+
(0, channelSubscribe_1.enableChannelSubscribe)(route, spec, server, ctx, payload, id);
|
|
51
|
+
}
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
session.unauthorizedChannels.clear();
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
exports.reEvaulateUnauthorized = reEvaulateUnauthorized;
|
|
18
58
|
const authMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
19
59
|
if ((0, security_1.rateLimitRequest)(server, ctx, 10, server.rateLimit.ws)) {
|
|
20
60
|
ctx.session.ws.close();
|
|
@@ -35,39 +75,7 @@ const authMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
|
35
75
|
sendAuthMessage(ctx, verified);
|
|
36
76
|
return true;
|
|
37
77
|
}
|
|
38
|
-
|
|
39
|
-
session.unauthorizedObs.forEach((obs) => {
|
|
40
|
-
const { id, name, checksum, payload } = obs;
|
|
41
|
-
const route = {
|
|
42
|
-
name,
|
|
43
|
-
type: 'query',
|
|
44
|
-
};
|
|
45
|
-
(0, installFn_1.installFn)(server, ctx, route, id).then((spec) => {
|
|
46
|
-
if (spec) {
|
|
47
|
-
(0, query_1.enableSubscribe)(route, spec, server, ctx, payload, id, checksum);
|
|
48
|
-
}
|
|
49
|
-
else {
|
|
50
|
-
// someting wrong...
|
|
51
|
-
}
|
|
52
|
-
});
|
|
53
|
-
});
|
|
54
|
-
session.unauthorizedObs.clear();
|
|
55
|
-
}
|
|
56
|
-
if (session.unauthorizedChannels?.size) {
|
|
57
|
-
session.unauthorizedChannels.forEach((channel) => {
|
|
58
|
-
const { id, name, payload } = channel;
|
|
59
|
-
const route = {
|
|
60
|
-
name,
|
|
61
|
-
type: 'channel',
|
|
62
|
-
};
|
|
63
|
-
(0, installFn_1.installFn)(server, ctx, route, id).then((spec) => {
|
|
64
|
-
if (spec) {
|
|
65
|
-
(0, channelSubscribe_1.enableChannelSubscribe)(route, spec, server, ctx, payload, id);
|
|
66
|
-
}
|
|
67
|
-
});
|
|
68
|
-
});
|
|
69
|
-
session.unauthorizedChannels.clear();
|
|
70
|
-
}
|
|
78
|
+
(0, exports.reEvaulateUnauthorized)(server, ctx);
|
|
71
79
|
sendAuthMessage(ctx, verified);
|
|
72
80
|
})
|
|
73
81
|
.catch((err) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/incoming/ws/auth.ts"],"names":[],"mappings":";;;AAAA,6CAIuB;AAEvB,mCAAyC;AACzC,6CAAiD;AAQjD,yDAA2D;AAC3D,+CAA2C;AAE3C,MAAM,eAAe,GAAG,CAAC,GAA8B,EAAE,OAAY,EAAE,EAAE,CACvE,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,IAAA,6BAAkB,EAAC,IAAA,wBAAa,EAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;AAE/E,MAAM,KAAK,GAAG,CAAC,OAAe,EAAE,EAAE;IAChC,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;KAC3B;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,CAAA;KAClC;AACH,CAAC,CAAA;AAEM,MAAM,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/incoming/ws/auth.ts"],"names":[],"mappings":"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"}
|