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

fix: require external confirmation of public addresses #2867

Merged
merged 5 commits into from
Dec 4, 2024
Merged

fix: require external confirmation of public addresses #2867

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
8165024
fix: require external confirmation of public addresses
achingbrain Nov 30, 2024
65e8641
Merge branch 'main' into fix/require-address-confirmation
achingbrain Nov 30, 2024
fba4a40
chore: remove redundant tests
achingbrain Nov 30, 2024
be37fc0
chore: pr comments and refactor autonat
achingbrain Dec 4, 2024
aa10df4
Merge branch 'main' into fix/require-address-confirmation
achingbrain Dec 4, 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
5 changes: 4 additions & 1 deletion packages/auto-tls/src/domain-mapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@ export class DomainMapper {
}

updateMappings (): void {
const publicIps = getPublicIps(this.addressManager.getAddresses())
const publicIps = getPublicIps(
this.addressManager.getAddressesWithMetadata()
.map(({ multiaddr }) => multiaddr)
)

// did our public IPs change?
const addedIp4 = []
Expand Down
132 changes: 104 additions & 28 deletions packages/auto-tls/test/domain-mapper.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,32 @@ describe('domain-mapper', () => {
const ip4 = '81.12.12.9'
const ip6 = '2001:4860:4860::8889'

components.addressManager.getAddresses.returns([
multiaddr('/ip4/127.0.0.1/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
multiaddr('/ip4/192.168.1.234/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
multiaddr('/dns4/example.com/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
multiaddr(`/ip4/${ip4}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`),
multiaddr(`/ip6/${ip6}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`)
])
components.addressManager.getAddressesWithMetadata.returns([{
multiaddr: multiaddr('/ip4/127.0.0.1/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
verified: true,
expires: Infinity,
type: 'transport'
}, {
multiaddr: multiaddr('/ip4/192.168.1.234/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
verified: true,
expires: Infinity,
type: 'transport'
}, {
multiaddr: multiaddr('/dns4/example.com/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
verified: true,
expires: Infinity,
type: 'transport'
}, {
multiaddr: multiaddr(`/ip4/${ip4}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`),
verified: true,
expires: Infinity,
type: 'ip-mapping'
}, {
multiaddr: multiaddr(`/ip6/${ip6}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`),
verified: true,
expires: Infinity,
type: 'ip-mapping'
}])

components.events.safeDispatchEvent('certificate:provision', {
detail: {
Expand All @@ -69,13 +88,32 @@ describe('domain-mapper', () => {
const ip4v1 = '81.12.12.9'
const ip6v1 = '2001:4860:4860::8889'

components.addressManager.getAddresses.returns([
multiaddr('/ip4/127.0.0.1/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
multiaddr('/ip4/192.168.1.234/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
multiaddr('/dns4/example.com/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
multiaddr(`/ip4/${ip4v1}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`),
multiaddr(`/ip6/${ip6v1}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`)
])
components.addressManager.getAddressesWithMetadata.returns([{
multiaddr: multiaddr('/ip4/127.0.0.1/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
verified: true,
expires: Infinity,
type: 'transport'
}, {
multiaddr: multiaddr('/ip4/192.168.1.234/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
verified: true,
expires: Infinity,
type: 'transport'
}, {
multiaddr: multiaddr('/dns4/example.com/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
verified: true,
expires: Infinity,
type: 'transport'
}, {
multiaddr: multiaddr(`/ip4/${ip4v1}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`),
verified: true,
expires: Infinity,
type: 'ip-mapping'
}, {
multiaddr: multiaddr(`/ip6/${ip6v1}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`),
verified: true,
expires: Infinity,
type: 'ip-mapping'
}])

components.events.safeDispatchEvent('certificate:provision', {
detail: {
Expand All @@ -94,13 +132,32 @@ describe('domain-mapper', () => {
const ip4v2 = '81.12.12.10'
const ip6v2 = '2001:4860:4860::8890'

components.addressManager.getAddresses.returns([
multiaddr('/ip4/127.0.0.1/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
multiaddr('/ip4/192.168.1.234/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
multiaddr('/dns4/example.com/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
multiaddr(`/ip4/${ip4v2}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`),
multiaddr(`/ip6/${ip6v2}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`)
])
components.addressManager.getAddressesWithMetadata.returns([{
multiaddr: multiaddr('/ip4/127.0.0.1/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
verified: true,
expires: Infinity,
type: 'transport'
}, {
multiaddr: multiaddr('/ip4/192.168.1.234/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
verified: true,
expires: Infinity,
type: 'transport'
}, {
multiaddr: multiaddr('/dns4/example.com/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
verified: true,
expires: Infinity,
type: 'transport'
}, {
multiaddr: multiaddr(`/ip4/${ip4v2}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`),
verified: true,
expires: Infinity,
type: 'ip-mapping'
}, {
multiaddr: multiaddr(`/ip6/${ip6v2}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`),
verified: true,
expires: Infinity,
type: 'ip-mapping'
}])

components.events.safeDispatchEvent('self:peer:update', {
detail: stubInterface<Peer>()
Expand All @@ -121,13 +178,32 @@ describe('domain-mapper', () => {
const ip4 = '81.12.12.9'
const ip6 = '2001:4860:4860::8889'

components.addressManager.getAddresses.returns([
multiaddr('/ip4/127.0.0.1/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
multiaddr('/ip4/192.168.1.234/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
multiaddr('/dns4/example.com/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
multiaddr(`/ip4/${ip4}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`),
multiaddr(`/ip6/${ip6}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`)
])
components.addressManager.getAddressesWithMetadata.returns([{
multiaddr: multiaddr('/ip4/127.0.0.1/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
verified: true,
expires: Infinity,
type: 'transport'
}, {
multiaddr: multiaddr('/ip4/192.168.1.234/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
verified: true,
expires: Infinity,
type: 'transport'
}, {
multiaddr: multiaddr('/dns4/example.com/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN'),
verified: true,
expires: Infinity,
type: 'transport'
}, {
multiaddr: multiaddr(`/ip4/${ip4}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`),
verified: true,
expires: Infinity,
type: 'ip-mapping'
}, {
multiaddr: multiaddr(`/ip6/${ip6}/tcp/1234/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN`),
verified: true,
expires: Infinity,
type: 'ip-mapping'
}])

components.events.safeDispatchEvent('self:peer:update', {
detail: stubInterface<Peer>()
Expand Down
28 changes: 21 additions & 7 deletions packages/auto-tls/test/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { DEFAULT_CERTIFICATE_DATASTORE_KEY, DEFAULT_CERTIFICATE_PRIVATE_KEY_NAME
import { importFromPem } from '../src/utils.js'
import { CERT, CERT_FOR_OTHER_KEY, EXPIRED_CERT, INVALID_CERT, PRIVATE_KEY_PEM } from './fixtures/cert.js'
import type { ComponentLogger, Libp2pEvents, Peer, PeerId, PrivateKey, RSAPrivateKey, TypedEventTarget } from '@libp2p/interface'
import type { AddressManager } from '@libp2p/interface-internal'
import type { AddressManager, NodeAddress } from '@libp2p/interface-internal'
import type { Keychain } from '@libp2p/keychain'
import type { StubbedInstance } from 'sinon-ts'

Expand Down Expand Up @@ -49,12 +49,26 @@ describe('auto-tls', () => {
datastore: new MemoryDatastore()
}

// mixture of LAN and public addresses
components.addressManager.getAddresses.returns([
multiaddr(`/ip4/127.0.0.1/tcp/1235/p2p/${components.peerId}`),
multiaddr(`/ip4/192.168.0.100/tcp/1235/p2p/${components.peerId}`),
multiaddr(`/ip4/82.32.57.46/tcp/2345/p2p/${components.peerId}`)
])
// a mixture of LAN and public addresses
const addresses: NodeAddress[] = [{
multiaddr: multiaddr(`/ip4/127.0.0.1/tcp/1235/p2p/${components.peerId}`),
verified: true,
expires: Infinity,
type: 'transport'
}, {
multiaddr: multiaddr(`/ip4/192.168.0.100/tcp/1235/p2p/${components.peerId}`),
verified: true,
expires: Infinity,
type: 'transport'
}, {
multiaddr: multiaddr(`/ip4/82.32.57.46/tcp/2345/p2p/${components.peerId}`),
verified: true,
expires: Infinity,
type: 'ip-mapping'
}]

components.addressManager.getAddressesWithMetadata.returns(addresses)
components.addressManager.getAddresses.returns(addresses.map(({ multiaddr }) => multiaddr))
})

afterEach(async () => {
Expand Down
159 changes: 0 additions & 159 deletions packages/integration-tests/test/addresses.spec.ts
View file
Open in desktop

This file was deleted.

Loading
Loading