Skip to content
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

Jump to bottom

fix: only update pending incoming connections if connection accepted #2790

Merged
merged 2 commits into from
Oct 28, 2024
Merged

fix: only update pending incoming connections if connection accepted #2790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53ebc60
fix: only update pending incoming connections if connection accepted
achingbrain Oct 26, 2024
02ccf31
chore: helpful to include implementation
achingbrain Oct 26, 2024
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
14 changes: 8 additions & 6 deletions packages/libp2p/src/upgrader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,30 +182,32 @@ export class DefaultUpgrader implements Upgrader {
* Upgrades an inbound connection
*/
async upgradeInbound (maConn: MultiaddrConnection, opts: UpgraderOptions = {}): Promise<Connection> {
let accepted = false

try {
this.metrics.dials?.increment({
inbound: true
})

const accept = await this.components.connectionManager.acceptIncomingConnection(maConn)
accepted = await this.components.connectionManager.acceptIncomingConnection(maConn)

if (!accept) {
if (!accepted) {
throw new ConnectionDeniedError('connection denied')
}

await this.shouldBlockConnection('denyInboundConnection', maConn)

const conn = await this._performUpgrade(maConn, 'inbound', opts)

return conn
return await this._performUpgrade(maConn, 'inbound', opts)
} catch (err) {
this.metrics.errors?.increment({
inbound: true
})

throw err
} finally {
this.components.connectionManager.afterUpgradeInbound()
if (accepted) {
this.components.connectionManager.afterUpgradeInbound()
}
}
}

Expand Down
19 changes: 18 additions & 1 deletion packages/libp2p/test/upgrading/upgrader.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ import { type Components, defaultComponents } from '../../src/components.js'
import { createLibp2p } from '../../src/index.js'
import { DEFAULT_MAX_OUTBOUND_STREAMS } from '../../src/registrar.js'
import { DefaultUpgrader } from '../../src/upgrader.js'
import type { Libp2p, Connection, ConnectionProtector, Stream, ConnectionEncrypter, SecuredConnection, PeerId, StreamMuxer, StreamMuxerFactory, StreamMuxerInit, Upgrader, PrivateKey } from '@libp2p/interface'
import type { Libp2p, Connection, ConnectionProtector, Stream, ConnectionEncrypter, SecuredConnection, PeerId, StreamMuxer, StreamMuxerFactory, StreamMuxerInit, Upgrader, PrivateKey, MultiaddrConnection } from '@libp2p/interface'
import type { ConnectionManager } from '@libp2p/interface-internal'

const addrs = [
multiaddr('/ip4/127.0.0.1/tcp/0'),
Expand Down Expand Up @@ -596,6 +597,22 @@ describe('Upgrader', () => {
expect(localConnectionProtector.protect.callCount).to.equal(0, 'used local connection protector')
expect(remoteConnectionProtector.protect.callCount).to.equal(0, 'used remote connection protector')
})

it('should not decrement inbound pending connection count if the connection is denied', async () => {
const connectionManager = stubInterface<ConnectionManager>()

// @ts-expect-error private field
localUpgrader.components.connectionManager = connectionManager

const maConn = stubInterface<MultiaddrConnection>()

connectionManager.acceptIncomingConnection.resolves(false)

await expect(localUpgrader.upgradeInbound(maConn)).to.eventually.be.rejected
.with.property('name', 'ConnectionDeniedError')

expect(connectionManager.afterUpgradeInbound.called).to.be.false()
})
})

describe('libp2p.upgrader', () => {
Expand Down
Loading