Skip to content

ci: merge staging to master #869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxwell-aiden merged 5 commits into from
Feb 6, 2025
Merged

ci: merge staging to master #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fd0c31c
fix: find node checks findByX errors properly
tegefaulkes Nov 28, 2024
3d3d7b7
feat: added network segregation logic for separating networks via ref…
tegefaulkes Sep 10, 2024
e346d2d
fix: fixed error usage in `ClientService`
tegefaulkes Jan 10, 2025
514f11a
tests: fixed up tests to use `testNetworkName` for the network
tegefaulkes Feb 6, 2025
c9f7f8f
Merge pull request #804 from MatrixAI/feature-eng-373-prevent-rpc-cal…
tegefaulkes Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/PolykeyAgent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,14 @@ class PolykeyAgent {
optionsDefaulted.nodes.connectionInitialMaxStreamsBidi,
rpcParserBufferSize: optionsDefaulted.nodes.rpcParserBufferSize,
rpcCallTimeoutTime: optionsDefaulted.nodes.rpcCallTimeoutTime,
authenticateNetworkForwardCallback:
nodesUtils.nodesAuthenticateConnectionForwardBasicPublicFactory(
optionsDefaulted.network,
),
authenticateNetworkReverseCallback:
nodesUtils.nodesAuthenticateConnectionReverseBasicPublicFactory(
optionsDefaulted.network,
),
logger: logger.getChild(NodeConnectionManager.name),
});
nodeManager = new NodeManager({
Expand Down
3 changes: 2 additions & 1 deletion src/client/ClientService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ class ClientService {
const conn = evt.detail;
const streamHandler = (evt: wsEvents.EventWebSocketConnectionStream) => {
const stream = evt.detail;
// If the RPCServer is stopping or stopped then we want to reject new streams outright
if (!this.rpcServer[running] || this.rpcServer[status] === 'stopping') {
stream.cancel(Error('TMP RPCServer not running'));
stream.cancel(new errors.ErrorClientServiceNotRunning());
return;
}
this.rpcServer.handleStream(stream);
Expand Down
Loading