Skip to content

Commit

Permalink
Only allow requests through proxy
Browse files Browse the repository at this point in the history
Previously, while requests would default to using the proxy due to the
`https_proxy` environment variables set, it would be possible for
applications to bypass this.

By creating an additional `internal` network, and only allowing the
updater containers to connect to that, we ensure that it can not make
requests to the outside network.

The proxy is connected to both the internal and external networks, so it
can make outbound requests.
  • Loading branch information
Jurre Stender committed Oct 22, 2021
1 parent 7f41a6d commit 8f46f3b
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 27 deletions.
9 changes: 3 additions & 6 deletions __tests__/proxy-integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,20 @@ describe('ProxyBuilder', () => {
const proxy = await builder.run(jobId, credentials)
await proxy.container.start()

expect(proxy.networkName).toBe('dependabot-job-1-network')
expect(proxy.networkName).toBe('dependabot-job-1-internal-network')
expect(proxy.url).toMatch(/^http:\/\/1:.+job-1-proxy:1080$/)

const containerInfo = await proxy.container.inspect()
expect(containerInfo.Name).toBe('/dependabot-job-1-proxy')
expect(containerInfo.HostConfig.NetworkMode).toBe(
'dependabot-job-1-network'
)
expect(containerInfo.Config.Entrypoint).toEqual([
'sh',
'-c',
'/usr/sbin/update-ca-certificates && /update-job-proxy'
])

const networkInfo = await proxy.network.inspect()
expect(networkInfo.Name).toBe('dependabot-job-1-network')
expect(networkInfo.Internal).toBe(false)
expect(networkInfo.Name).toBe('dependabot-job-1-internal-network')
expect(networkInfo.Internal).toBe(true)

// run a bash command that executes docker and returns contents of /config.json
const id = proxy.container.id
Expand Down
25 changes: 15 additions & 10 deletions dist/main/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/main/index.js.map

Large diffs are not rendered by default.

33 changes: 23 additions & 10 deletions src/proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,18 @@ export class ProxyBuilder {
const config = this.buildProxyConfig(credentials, jobId)
const cert = config.ca.cert

const networkName = `dependabot-job-${jobId}-network`
const network = await this.ensureNetwork(networkName)
const externalNetworkName = `dependabot-job-${jobId}-external-network`
const externalNetwork = await this.ensureNetwork(externalNetworkName, false)

const container = await this.createContainer(jobId, name, networkName)
const internalNetworkName = `dependabot-job-${jobId}-internal-network`
const internalNetwork = await this.ensureNetwork(internalNetworkName, true)

const container = await this.createContainer(
jobId,
name,
externalNetwork,
internalNetwork
)

await ContainerService.storeInput(
CONFIG_FILE_NAME,
Expand Down Expand Up @@ -105,26 +113,27 @@ export class ProxyBuilder {
const url = `http://${config.proxy_auth.username}:${config.proxy_auth.password}@${name}:1080`
return {
container,
network,
networkName,
network: internalNetwork,
networkName: internalNetworkName,
url,
cert,
shutdown: async () => {
await container.stop()
await container.remove()
await network.remove()
await externalNetwork.remove()
await internalNetwork.remove()
}
}
}

private async ensureNetwork(name: string): Promise<Network> {
private async ensureNetwork(name: string, internal = true): Promise<Network> {
const networks = await this.docker.listNetworks({
filters: JSON.stringify({name: [name]})
})
if (networks.length > 0) {
return this.docker.getNetwork(networks[0].Id)
} else {
return await this.docker.createNetwork({Name: name})
return await this.docker.createNetwork({Name: name, Internal: internal})
}
}

Expand Down Expand Up @@ -169,7 +178,8 @@ export class ProxyBuilder {
private async createContainer(
jobId: number,
containerName: string,
networkName: string
externalNetwork: Network,
internalNetwork: Network
): Promise<Container> {
const container = await this.docker.createContainer({
Image: this.proxyImage,
Expand All @@ -184,10 +194,13 @@ export class ProxyBuilder {
],

HostConfig: {
NetworkMode: networkName
NetworkMode: 'bridge'
}
})

await externalNetwork.connect({Container: container.id})
await internalNetwork.connect({Container: container.id})

core.info(`Created proxy container: ${container.id}`)
return container
}
Expand Down

0 comments on commit 8f46f3b

Please sign in to comment.