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

[JENKINS-70240] fix for non http based URLs in PluginManager.doCheckUpdateSiteUrl #7524

Merged
merged 7 commits into from
Dec 17, 2022

Conversation

jtnord
Copy link
Member

@jtnord jtnord commented Dec 15, 2022

update sites are not restricted to just http/https file based ones are also common.
Add support for file based url schemes in the doCheck to avoid an angry jenkins.

code will return a FormValidation error in the case an unsupported scheme is now used rather than an angry jenkins.
Update the help and translations.

subsumes #7520

See JENKINS-70240.

TODO: fix up stupid code charset mangling, and Manual dev testing still to be performed. (by the author)

Testing done

Proposed changelog entries

  • Prevent Angry Jenkins when checking a non http(s) based update center URL.

Proposed upgrade guidelines

N/A

Submitter checklist

  • The Jira issue, if it exists, is well-described.
  • The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples).
    • Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • New or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

@mention

Maintainer checklist

Before the changes are marked as ready-for-merge:

  • There are at least two (2) approvals for the pull request and no outstanding requests for change.
  • Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
  • Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
  • Proper changelog labels are set so that the changelog can be generated automatically.
  • If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).
  • If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

julieheard and others added 4 commits December 14, 2022 11:02
- Local update centers use local json files which are valid
- I have added the value.replace("file:/", ""); as when using a war, it adds 'file:/' to the path
- This checks if the file is a valid file and if true returns FormValidation.ok
Update error message for when invalid URL message appears.
Updated wording on invalidURL
@jtnord jtnord requested review from basil and a team December 15, 2022 17:10
@jtnord jtnord marked this pull request as draft December 15, 2022 17:13
@jtnord jtnord removed request for a team and basil December 15, 2022 17:14
@basil basil changed the title [JENKINS-70240] fix for non http based URLs in PLuginManager.doCheckUpdateSiteUrl [JENKINS-70240] fix for non http based URLs in PluginManager.doCheckUpdateSiteUrl Dec 15, 2022
Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

Code looks good to me; I fixed up the localizations and verified the new automated test passes.

@jtnord jtnord marked this pull request as ready for review December 16, 2022 11:19
@jtnord jtnord requested a review from a team December 16, 2022 12:26
@jtnord jtnord added ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback bug For changelog: Minor bug. Will be listed after features labels Dec 16, 2022
Copy link
Member

@NotMyFault NotMyFault left a comment

Choose a reason for hiding this comment

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

/label ready-for-merge


This PR is now ready for merge. We will merge it after ~24 hours if there is no negative feedback.
Please see the merge process documentation for more information about the merge process.
Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug For changelog: Minor bug. Will be listed after features ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback
Projects
None yet
5 participants