LumeWeb
/
libhyperproxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: LumeWeb:3a1ea39a799f073431fcfea698b6c67a46de8c9a
Branches Tags
LumeWeb:master
LumeWeb:develop
LumeWeb:v0.0.2-develop.4
LumeWeb:v0.0.2-develop.3
LumeWeb:v0.0.2-develop.2
LumeWeb:v0.0.2-develop.1
LumeWeb:v0.0.1
...
compare: LumeWeb:f3e5cebe45981c344f2bf1fbf95448f90d9c8a52
Branches Tags
LumeWeb:develop
LumeWeb:master
LumeWeb:v0.0.2-develop.4
LumeWeb:v0.0.2-develop.3
LumeWeb:v0.0.2-develop.2
LumeWeb:v0.0.2-develop.1
LumeWeb:v0.0.1

3 Commits
3a1ea39a79 ... f3e5cebe45

Author SHA1 Message Date
Derrick Hammer f3e5cebe45
*update dist 2023-04-16 17:17:49 -04:00
Derrick Hammer 9cb6d0b6e4
* Fix typo in multiSocket.ts where "m" should be "m.id". 2023-04-16 17:17:31 -04:00
Derrick Hammer e3e6757e47
* Refactor multiSocket.ts to check for server mode before checking for allowedPorts inclusion when accepting a new socket connection. 2023-04-16 17:13:47 -04:00
2 changed files with 24 additions and 20 deletions
Show Stats Expand all files Collapse all files

18
dist/proxies/multiSocket.js vendored
View File

@ -164,17 +164,19 @@ class MultiSocketProxy extends proxy_js_1.default {
decode: this._server ? compact_encoding_1.json.decode : socketEncoding.decode, decode: this._server ? compact_encoding_1.json.decode : socketEncoding.decode,
}, },
async onmessage(m) { async onmessage(m) {
if (self._allowedPorts.length && if (self._server) {
!self._allowedPorts.includes(m.port)) { if (self._allowedPorts.length &&
self.get(await self._getPublicKey(peer)).messages.errorSocket.send({ !self._allowedPorts.includes(m.port)) {
id: m.id, self.get(await self._getPublicKey(peer)).messages.errorSocket.send({
err: new Error(`port ${m.port} not allowed`), id: m.id,
}); err: new Error(`port ${m.port} not allowed`),
return; });
return;
}
} }
m = m; m = m;
if (self._server) { if (self._server) {
new self.socketClass(nextSocketId(), m, self, self.get(await self._getPublicKey(peer)), m).connect(); new self.socketClass(nextSocketId(), m.id, self, self.get(await self._getPublicKey(peer)), m).connect();
return; return;
} }
const socket = self._sockets.get(m.id); const socket = self._sockets.get(m.id);

26
src/proxies/multiSocket.ts
View File

@ -204,17 +204,19 @@ export default class MultiSocketProxy extends Proxy {
decode: this._server ? json.decode : socketEncoding.decode, decode: this._server ? json.decode : socketEncoding.decode,
}, },
async onmessage(m: SocketRequest | TcpSocketConnectOpts) { async onmessage(m: SocketRequest | TcpSocketConnectOpts) {
if ( if (self._server) {
self._allowedPorts.length && if (
!self._allowedPorts.includes((m as TcpSocketConnectOpts).port) self._allowedPorts.length &&
) { !self._allowedPorts.includes((m as TcpSocketConnectOpts).port)
self.get(await self._getPublicKey(peer)).messages.errorSocket.send({ ) {
id: (m as SocketRequest).id, self.get(await self._getPublicKey(peer)).messages.errorSocket.send({
err: new Error( id: (m as SocketRequest).id,
`port ${(m as TcpSocketConnectOpts).port} not allowed` err: new Error(
), `port ${(m as TcpSocketConnectOpts).port} not allowed`
}); ),
return; });
return;
}
} }
m = m as SocketRequest; m = m as SocketRequest;
@ -222,7 +224,7 @@ export default class MultiSocketProxy extends Proxy {
if (self._server) { if (self._server) {
new self.socketClass( new self.socketClass(
nextSocketId(), nextSocketId(),
m, m.id,
self, self,
self.get(await self._getPublicKey(peer)) as PeerEntity, self.get(await self._getPublicKey(peer)) as PeerEntity,
m m