Bug 1859874: Add basic engine URL validation #3948

gekorob · 2020-07-23T14:55:11Z

Add a basic URL validator to avoid adding urls with no
scheme or scheme different from https.

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1859874

Signed-off-by: Roberto Ciatti rciatti@redhat.com

openshift-ci-robot · 2020-07-23T14:55:15Z

@gekorob: This pull request references Bugzilla bug 1859874, which is invalid:

expected the bug to target the "4.5.z" release, but it targets "---" instead
expected Bugzilla bug 1859874 to depend on a bug targeting a release in 4.6.0, 4.6.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1859874: Add basic engine URL validation

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.

gekorob · 2020-07-23T14:56:17Z

/bugzilla refresh

openshift-ci-robot · 2020-07-23T14:56:19Z

@gekorob: This pull request references Bugzilla bug 1859874, which is invalid:

expected Bugzilla bug 1859874 to depend on a bug targeting a release in 4.6.0, 4.6.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/bugzilla refresh

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.

pkg/asset/installconfig/ovirt/validaton_test.go

pkg/asset/installconfig/ovirt/validaton.go

dougsland

Just small comments. LGTM

pkg/asset/installconfig/ovirt/validaton.go

Gal-Zaidman · 2020-07-26T08:08:15Z

/retest

gekorob · 2020-07-28T07:18:01Z

/bugzilla refresh

openshift-ci-robot · 2020-07-28T07:18:05Z

@gekorob: This pull request references Bugzilla bug 1859874, which is invalid:

expected dependent Bugzilla bug 1861251 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is NEW instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/bugzilla refresh

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.

dougsland · 2020-07-28T13:41:32Z

/lgtm

dougsland · 2020-07-29T00:49:25Z

Tested locally the change and it works. Waiting the bugzilla label ack to add the approve

openshift-bot · 2020-07-29T01:00:50Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2020-07-29T01:00:53Z

@openshift-bot: This pull request references Bugzilla bug 1859874, which is invalid:

expected dependent Bugzilla bug 1861251 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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.

gekorob · 2020-07-29T12:44:07Z

/bugzilla refresh

openshift-ci-robot · 2020-07-29T12:44:14Z

@gekorob: This pull request references Bugzilla bug 1859874, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.5.z) matches configured target release for branch (4.5.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1861251 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
dependent Bugzilla bug 1861251 targets the "4.6.0" release, which is one of the valid target releases: 4.6.0, 4.6.z
bug has dependents

In response to this:

/bugzilla refresh

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.

dougsland · 2020-07-29T13:04:45Z

ci/prow/e2e-ovirt — Job succeeded.

dougsland · 2020-07-29T13:04:56Z

/approve

dougsland · 2020-07-29T13:07:13Z

/assign @rgolangh

abhinavdahiya · 2020-07-30T18:02:21Z

pkg/asset/installconfig/ovirt/validaton.go

+		url, err := url.ParseRequestURI(urlStr)
+		if err != nil {
+			return errors.Errorf("The specified URL is invalid, got %s", urlStr)
+		}
+
+		if url.Scheme != "https" {
+			return errors.Errorf("The only URL scheme accepted is https, but got %s", url.Scheme)
+		}


I think we can replace this with https://godoc.org/github.com/openshift/installer/pkg/validate#URIWithProtocol

also this entire function can be made a little easier to read by early error return.

uri, ok := val.(string) if !ok { return invalid expected string } return validate.URIWithProtocol(uri, "https")

Hi @abhinavdahiya I didn't know about URIWithProtocol, great suggestion. I've replaced the code.

abhinavdahiya · 2020-07-30T18:04:22Z

pkg/asset/installconfig/ovirt/validaton_test.go

+	}{
+		{
+			url:           "engine.example.com",
+			expectSuccess: false,


test for actual errors and not just error yes/no

Changed expectations using the Error returned by URIWithProtocol, hope I understood correctly your point.

gekorob · 2020-07-31T13:24:42Z

/retest

dougsland · 2020-07-31T13:45:41Z

LGTM. Waiting feedback from @abhinavdahiya

abhinavdahiya

/approve

abhinavdahiya · 2020-07-31T14:30:17Z

pkg/asset/installconfig/ovirt/validaton.go

+func validURL(val interface{}) error {
+	uri, ok := val.(string)
+	if !ok {
+		return fmt.Errorf("cannot check url validity on type %v", reflect.TypeOf(val).Name())


Suggested change

return fmt.Errorf("cannot check url validity on type %v", reflect.TypeOf(val).Name())

return fmt.Errorf("cannot check url validity on type %T", val)

https://golang.org/pkg/fmt/

Thx for the suggestion.

openshift-ci-robot · 2020-07-31T14:31:42Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, dougsland

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:

~~pkg/asset/installconfig/ovirt/OWNERS~~ [abhinavdahiya]

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

dougsland · 2020-07-31T15:18:17Z

/lgtm

dougsland · 2020-08-09T11:48:22Z

My only comment: If possible, please squash the patches. Otherwise, looks good to me.

Add a basic URL validator to avoid adding urls with no scheme or scheme different from https Signed-off-by: Roberto Ciatti <rciatti@redhat.com>

Gal-Zaidman · 2020-08-10T06:59:05Z

/test e2e-ovirt

Gal-Zaidman · 2020-08-10T07:46:17Z

/test e2e-ovirt

dougsland · 2020-08-10T16:27:31Z

/test e2e-ovirt

dougsland · 2020-08-10T21:22:07Z

/lgtm

openshift-ci-robot · 2020-08-20T05:13:43Z

@gekorob: All pull requests linked via external trackers have merged: openshift/installer#3948. Bugzilla bug 1859874 has been moved to the MODIFIED state.

In response to this:

Bug 1859874: Add basic engine URL validation

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 added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jul 23, 2020

openshift-ci-robot requested review from dougsland and Gal-Zaidman July 23, 2020 14:56

dougsland reviewed Jul 23, 2020

View reviewed changes

pkg/asset/installconfig/ovirt/validaton_test.go Outdated Show resolved Hide resolved

dougsland reviewed Jul 23, 2020

View reviewed changes

pkg/asset/installconfig/ovirt/validaton.go Outdated Show resolved Hide resolved

dougsland reviewed Jul 23, 2020

View reviewed changes

pkg/asset/installconfig/ovirt/validaton.go Show resolved Hide resolved

gekorob force-pushed the ovirt-installer-basic-url-validations branch 2 times, most recently from e24af44 to 982f9d4 Compare July 23, 2020 15:23

dougsland reviewed Jul 23, 2020

View reviewed changes

pkg/asset/installconfig/ovirt/validaton.go Outdated Show resolved Hide resolved

pkg/asset/installconfig/ovirt/validaton.go Outdated Show resolved Hide resolved

gekorob force-pushed the ovirt-installer-basic-url-validations branch from 982f9d4 to 34c5161 Compare July 28, 2020 13:36

openshift-ci-robot assigned dougsland Jul 28, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 28, 2020

openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jul 29, 2020

openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jul 29, 2020

openshift-ci-robot assigned rgolangh Jul 29, 2020

abhinavdahiya reviewed Jul 30, 2020

View reviewed changes

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 31, 2020

abhinavdahiya reviewed Jul 31, 2020

View reviewed changes

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 31, 2020

openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. and removed lgtm Indicates that a PR is ready to be merged. labels Jul 31, 2020

ovirt: Add basic engine URL validation

3f71c8b

Add a basic URL validator to avoid adding urls with no scheme or scheme different from https Signed-off-by: Roberto Ciatti <rciatti@redhat.com>

gekorob force-pushed the ovirt-installer-basic-url-validations branch from c4a16e9 to 3f71c8b Compare August 10, 2020 06:40

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 10, 2020

jwforres added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Aug 20, 2020

openshift-merge-robot merged commit d104265 into openshift:release-4.5 Aug 20, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1859874: Add basic engine URL validation #3948

Bug 1859874: Add basic engine URL validation #3948

gekorob commented Jul 23, 2020

openshift-ci-robot commented Jul 23, 2020

gekorob commented Jul 23, 2020

openshift-ci-robot commented Jul 23, 2020

dougsland left a comment

Gal-Zaidman commented Jul 26, 2020

gekorob commented Jul 28, 2020

openshift-ci-robot commented Jul 28, 2020

dougsland commented Jul 28, 2020

dougsland commented Jul 29, 2020

openshift-bot commented Jul 29, 2020

openshift-ci-robot commented Jul 29, 2020

gekorob commented Jul 29, 2020

openshift-ci-robot commented Jul 29, 2020

dougsland commented Jul 29, 2020

dougsland commented Jul 29, 2020

dougsland commented Jul 29, 2020

abhinavdahiya Jul 30, 2020

abhinavdahiya Jul 30, 2020

gekorob Jul 31, 2020

abhinavdahiya Jul 30, 2020

gekorob Jul 31, 2020

gekorob commented Jul 31, 2020

dougsland commented Jul 31, 2020

abhinavdahiya left a comment

abhinavdahiya Jul 31, 2020

gekorob Jul 31, 2020

openshift-ci-robot commented Jul 31, 2020

dougsland commented Jul 31, 2020

dougsland commented Aug 9, 2020

Gal-Zaidman commented Aug 10, 2020

Gal-Zaidman commented Aug 10, 2020

dougsland commented Aug 10, 2020

dougsland commented Aug 10, 2020

openshift-ci-robot commented Aug 20, 2020

	return fmt.Errorf("cannot check url validity on type %v", reflect.TypeOf(val).Name())
	return fmt.Errorf("cannot check url validity on type %T", val)

Bug 1859874: Add basic engine URL validation #3948

Bug 1859874: Add basic engine URL validation #3948

Conversation

gekorob commented Jul 23, 2020

openshift-ci-robot commented Jul 23, 2020

gekorob commented Jul 23, 2020

openshift-ci-robot commented Jul 23, 2020

dougsland left a comment

Choose a reason for hiding this comment

Gal-Zaidman commented Jul 26, 2020

gekorob commented Jul 28, 2020

openshift-ci-robot commented Jul 28, 2020

dougsland commented Jul 28, 2020

dougsland commented Jul 29, 2020

openshift-bot commented Jul 29, 2020

openshift-ci-robot commented Jul 29, 2020

gekorob commented Jul 29, 2020

openshift-ci-robot commented Jul 29, 2020

dougsland commented Jul 29, 2020

dougsland commented Jul 29, 2020

dougsland commented Jul 29, 2020

abhinavdahiya Jul 30, 2020

Choose a reason for hiding this comment

abhinavdahiya Jul 30, 2020

Choose a reason for hiding this comment

gekorob Jul 31, 2020

Choose a reason for hiding this comment

abhinavdahiya Jul 30, 2020

Choose a reason for hiding this comment

gekorob Jul 31, 2020

Choose a reason for hiding this comment

gekorob commented Jul 31, 2020

dougsland commented Jul 31, 2020

abhinavdahiya left a comment

Choose a reason for hiding this comment

abhinavdahiya Jul 31, 2020

Choose a reason for hiding this comment

gekorob Jul 31, 2020

Choose a reason for hiding this comment

openshift-ci-robot commented Jul 31, 2020

dougsland commented Jul 31, 2020

dougsland commented Aug 9, 2020

Gal-Zaidman commented Aug 10, 2020

Gal-Zaidman commented Aug 10, 2020

dougsland commented Aug 10, 2020

dougsland commented Aug 10, 2020

openshift-ci-robot commented Aug 20, 2020