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

feat(pdns): add validation for MX and SRV records #4871

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

julillae
Copy link
Contributor

Description
Adds a check to validate the format of MX and SRV records. In addition, implements AdjustEndpoints to filter incorrectly formatted records which we know will fail to be created by PowerDNS. This change improves error handling for MX and SRV records and provides a base to validate other record types in the future.

Fixes #ISSUE

Checklist

  • Unit tests updated
  • End user documentation updated

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 13, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @julillae. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 13, 2024
@mloiseleur
Copy link
Contributor

Thanks for this PR, which is tested.
I'm wondering: the format check based on RFC may be used by other providers.
Wdyt of moving the checkEndpoint part in endpoint/endpoint.go ?

@mloiseleur
Copy link
Contributor

/retitle feat(pdns): add validation for MX and SRV records

@k8s-ci-robot k8s-ci-robot changed the title Add validation for MX and SRV records in pdns feat(pdns): add validation for MX and SRV records Nov 14, 2024
@julillae
Copy link
Contributor Author

@mloiseleur That is a great point! I moved the checkEndpoint function to endpoint/endpoint.go.

@mloiseleur
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 21, 2025
@mloiseleur
Copy link
Contributor

/assign @ivankatliarchuk for a first review

@ivankatliarchuk
Copy link
Contributor

/assign

@ivankatliarchuk
Copy link
Contributor

Hi @julillae was it tested on real cluster? Could you also provide a set of manual test steps using manifests and kubectl commands? This will help in understanding and verifying the implementation.

@@ -396,3 +397,41 @@ func RemoveDuplicates(endpoints []*Endpoint) []*Endpoint {

return result
}

// Check endpoint if is it properly formatted according to RFC standards
func CheckEndpoint(endpoint Endpoint) bool {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we convert this to a method of the Endpoint type?

func (e *Endpoint) CheckEndpointTargets() bool {
// function body
}

}

preferenceRaw := targetParts[0]
_, err := strconv.ParseInt(preferenceRaw, 10, 32)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what this numbers are e.g. 10 and 32?

for _, part := range targetParts[:3] {
_, err := strconv.ParseInt(part, 10, 32)
if err != nil {
return false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shell we add debug logging here, so it's clear why record is rejected?

pseudo code

debug("Invalid %s record target: %s and reason %s", type, target, reason))

return false
}
}
case "SRV":
Copy link
Contributor

@ivankatliarchuk ivankatliarchuk Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we use constants instead?

case RecordTypeSRV:

}
}
case "SRV":
for _, target := range endpoint.Targets {
Copy link
Contributor

@ivankatliarchuk ivankatliarchuk Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An optional, nice to have solution, is to move actual validation from this block to a Target

func (t Target) ValidateSRVRecord() {
	...body...
}
func (t Target) ValidateMXRecord() {
	...body...
}

Isolating the validation logic into separate functions makes it easier to update or modify the validation rules for each record type without affecting the main function. And should simplify testing as well

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign raffo for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

// AdjustEndpoints performs checks on the provided endpoints and will skip any potentially failing changes.
func (p *PDNSProvider) AdjustEndpoints(endpoints []*endpoint.Endpoint) ([]*endpoint.Endpoint, error) {
var validEndpoints []*endpoint.Endpoint
for i := 0; i < len(endpoints); i++ {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this require a null check guard?

the *endpoints could be nill or value of *endpoints[i] could be nil

@@ -433,6 +433,19 @@ func (p *PDNSProvider) Records(ctx context.Context) (endpoints []*endpoint.Endpo
return endpoints, nil
}

// AdjustEndpoints performs checks on the provided endpoints and will skip any potentially failing changes.
func (p *PDNSProvider) AdjustEndpoints(endpoints []*endpoint.Endpoint) ([]*endpoint.Endpoint, error) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this method need to be public?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants