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.

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

Bug 1882485: Prevent dig errors from corrupting host's /etc/hosts #223

Merged
merged 2 commits into from Dec 15, 2020

Conversation

rfredette
Copy link
Contributor

It's possible for dig to print error messages and still succeed, such as
if retries are attempted. If that happens, each word of the error
message is treated as a separate IP for the service that's being
resolved, causing /etc/hosts to be updated with garbage data.

This PR does 2 things:

  • filters out error messages from dig, which always begin the line
    with ';' (usually with ';;', but some messages only have one
    semicolon)
  • sets maximum retries to 0 when using tcp for dns, so that the behavior
    matches that of udp

It's possible for `dig` to print error messages and still succeed, such as
if retries are attempted. If that happens, each word of the error
message is treated as a separate IP for the service that's being
resolved, causing /etc/hosts to be updated with garbage data.

This PR does 2 things:
- filters out error messages from `dig`, which always begin the line
  with ';' (usually with ';;', but some messages only have one
  semicolon)
- sets maximum retries to 0 when using tcp for dns, so that the behavior
  matches that of udp
@openshift-ci-robot
Copy link
Contributor

@rfredette: This pull request references Bugzilla bug 1882485, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1882485: Prevent dig errors from corrupting host's /etc/hosts

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Dec 11, 2020
@Miciah
Copy link
Contributor

Miciah commented Dec 14, 2020

Thanks!
/lgtm

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Miciah, rfredette

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 14, 2020
@Miciah
Copy link
Contributor

Miciah commented Dec 15, 2020

Looks like we're seeing BZ#1886922.
/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 1a3c3b8 into openshift:master Dec 15, 2020
@openshift-ci-robot
Copy link
Contributor

@rfredette: All pull requests linked via external trackers have merged:

Bugzilla bug 1882485 has been moved to the MODIFIED state.

In response to this:

Bug 1882485: Prevent dig errors from corrupting host's /etc/hosts

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@rfredette
Copy link
Contributor Author

/cherry-pick release-4.6

@openshift-cherrypick-robot

@rfredette: #223 failed to apply on top of branch "release-4.6":

Applying: Prevent dig errors from corrupting host's /etc/hosts
Applying: Updated bindata.go with the new change
Using index info to reconstruct a base tree...
M	pkg/manifests/bindata.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/manifests/bindata.go
CONFLICT (content): Merge conflict in pkg/manifests/bindata.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Updated bindata.go with the new change
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants