Skip to content

fix: allow multistage Dockerfiles by removing AS <stage name> in validation #112

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
arnaugiralt merged 4 commits into from
Feb 28, 2026
Merged

fix: allow multistage Dockerfiles by removing AS <stage name> in validation #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0d66c6
fix: allow multistage Dockerfiles by removing AS <stage name> in vali…
Sainomori May 28, 2024
0887be3
fix: use context manager for Dockerfile open in validation
arnaugiralt Feb 11, 2026
d76d583
fix: replace regex with str.split to avoid ReDoS in Dockerfile valida…
arnaugiralt Feb 11, 2026
c1f7aa5
fix: use case-insensitive comparison for Docker image validation
arnaugiralt Feb 27, 2026
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
9 changes: 5 additions & 4 deletions connect/eaas/core/validation/validators/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,9 @@ def validate_docker_compose_yml(context): # noqa: CCR001
),
)
continue
content = open(dockerfile, 'r').read().splitlines()
from_cmd = next(filter(lambda x: x.startswith('FROM'), content), None)
with open(dockerfile, 'r') as f:
content = f.read().splitlines()
from_cmd = next(filter(lambda x: x.startswith('FROM'), reversed(content)), None)
if not from_cmd:
messages.append(
ValidationItem(
Expand All @@ -224,8 +225,8 @@ def validate_docker_compose_yml(context): # noqa: CCR001
),
)
continue
image = from_cmd[4:].strip()
if image != runner_image:
image = from_cmd[4:].split()[0]
if image.lower() != runner_image.lower():
messages.append(
ValidationItem(
level='ERROR',
Expand Down
151 changes: 151 additions & 0 deletions tests/connect/eaas/core/validation/validators/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,8 @@ def test_validate_docker_compose_yml_invalid_image_dockerfile(mocker):
return_value=True,
)
mocked_open = mocker.MagicMock()
mocked_open.__enter__ = mocker.MagicMock(return_value=mocked_open)
mocked_open.__exit__ = mocker.MagicMock(return_value=False)
mocked_open.read.return_value = 'FROM cloudblueconnect/connect-extension-runner:0.3\n'
mocker.patch(
'connect.eaas.core.validation.validators.base.open',
Expand Down Expand Up @@ -566,6 +568,155 @@ def test_validate_docker_compose_yml_invalid_image_dockerfile(mocker):
assert item.file == 'fake_dir/Dockerfile'


def test_validate_docker_compose_yml_multistage_image_dockerfile(mocker):
mocker.patch(
'connect.eaas.core.validation.validators.base.os.path.isfile',
return_value=True,
)
mocked_open = mocker.MagicMock()
mocked_open.__enter__ = mocker.MagicMock(return_value=mocked_open)
mocked_open.__exit__ = mocker.MagicMock(return_value=False)
mocked_open.read.return_value = (
'FROM cloudblueconnect/connect-extension-runner:0.3 as a-stage-name\n'
)
mocker.patch(
'connect.eaas.core.validation.validators.base.open',
side_effect=[None, mocked_open],
)
mocker.patch(
'connect.eaas.core.validation.validators.base.yaml.safe_load',
return_value={
'services': {
'dev': {
'build': {'dockerfile': 'Dockerfile'},
},
},
},
)

result = validate_docker_compose_yml({'project_dir': 'fake_dir', 'runner_version': '0.3'})

assert isinstance(result, ValidationResult)
assert result.must_exit is False
assert len(result.items) == 0


def test_validate_docker_compose_yml_dockerfile_case_insensitive(mocker):
mocker.patch(
'connect.eaas.core.validation.validators.base.os.path.isfile',
return_value=True,
)
mocked_open = mocker.MagicMock()
mocked_open.__enter__ = mocker.MagicMock(return_value=mocked_open)
mocked_open.__exit__ = mocker.MagicMock(return_value=False)
mocked_open.read.return_value = (
'FROM CloudBlueConnect/Connect-Extension-Runner:1.0\n'
)
mocker.patch(
'connect.eaas.core.validation.validators.base.open',
side_effect=[None, mocked_open],
)
mocker.patch(
'connect.eaas.core.validation.validators.base.yaml.safe_load',
return_value={
'services': {
'dev': {
'build': {'dockerfile': 'Dockerfile'},
},
},
},
)

result = validate_docker_compose_yml({'project_dir': 'fake_dir', 'runner_version': '1.0'})

assert isinstance(result, ValidationResult)
assert result.must_exit is False
assert len(result.items) == 0


def test_validate_docker_compose_yml_multistage_runner_in_last_stage(mocker):
mocker.patch(
'connect.eaas.core.validation.validators.base.os.path.isfile',
return_value=True,
)
mocked_open = mocker.MagicMock()
mocked_open.__enter__ = mocker.MagicMock(return_value=mocked_open)
mocked_open.__exit__ = mocker.MagicMock(return_value=False)
mocked_open.read.return_value = (
'FROM python:3.10 AS builder\n'
'RUN pip install stuff\n'
'\n'
'FROM cloudblueconnect/connect-extension-runner:0.3\n'
'COPY --from=builder /app /app\n'
)
mocker.patch(
'connect.eaas.core.validation.validators.base.open',
side_effect=[None, mocked_open],
)
mocker.patch(
'connect.eaas.core.validation.validators.base.yaml.safe_load',
return_value={
'services': {
'dev': {
'build': {'dockerfile': 'Dockerfile'},
},
},
},
)

result = validate_docker_compose_yml({'project_dir': 'fake_dir', 'runner_version': '0.3'})

assert isinstance(result, ValidationResult)
assert result.must_exit is False
assert len(result.items) == 0


def test_validate_docker_compose_yml_multistage_wrong_last_stage(mocker):
mocker.patch(
'connect.eaas.core.validation.validators.base.os.path.isfile',
return_value=True,
)
mocked_open = mocker.MagicMock()
mocked_open.__enter__ = mocker.MagicMock(return_value=mocked_open)
mocked_open.__exit__ = mocker.MagicMock(return_value=False)
mocked_open.read.return_value = (
'FROM cloudblueconnect/connect-extension-runner:0.3 AS base\n'
'RUN pip install stuff\n'
'\n'
'FROM python:3.10\n'
'COPY --from=base /app /app\n'
)
mocker.patch(
'connect.eaas.core.validation.validators.base.open',
side_effect=[None, mocked_open],
)
mocker.patch(
'connect.eaas.core.validation.validators.base.yaml.safe_load',
return_value={
'services': {
'dev': {
'build': {'dockerfile': 'Dockerfile'},
},
},
},
)

result = validate_docker_compose_yml({'project_dir': 'fake_dir', 'runner_version': '0.3'})

assert isinstance(result, ValidationResult)
assert result.must_exit is False
assert len(result.items) == 1
item = result.items[0]
assert isinstance(item, ValidationItem)
assert item.level == 'ERROR'
assert (
'Invalid base image in Dockerfile of service *dev*: expected '
'*cloudblueconnect/connect-extension-runner:0.3* '
'got *python:3.10*.'
) in item.message
assert item.file == 'fake_dir/Dockerfile'


def test_validate_docker_compose_yml_invalid_image_no_dockerfile(mocker):
mocker.patch(
'connect.eaas.core.validation.validators.base.os.path.isfile',
Expand Down