-
-
Notifications
You must be signed in to change notification settings - Fork 9.8k
[JENKINS-41891] Resource domain support #4239
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
Merged
oleg-nenashev
merged 34 commits into
jenkinsci:master
from
daniel-beck:JENKINS-41891-resource-domain
Oct 11, 2019
Merged
Changes from 30 commits
Commits
Show all changes
34 commits
Select commit
Hold shift + click to select a range
41919ee
[JENKINS-41891] Resorce domain support
daniel-beck 6a630fa
Rename a few things
daniel-beck c980615
Encapsulate token
daniel-beck 6d049b4
Update documentation based on review feedback
daniel-beck 9806520
Rename field and change symbol for friendlier JCasC format
daniel-beck f5e17cf
Be more explicit about expiration and URL sharing
daniel-beck 2e894c9
Allow favicon.ico, robots.txt; better logging
daniel-beck 830b29a
Remove TODO from comment
daniel-beck b60c89f
Consider resource root URL only set if the Jenkins root URL is set
daniel-beck 4f70ab7
Improve form validation
daniel-beck bc9ac84
Clean up form validation warnings a bit
daniel-beck 16b0081
Fix null handling (even though it'll never be called that way)
daniel-beck 736f8d3
Simpler logging statement after code review
daniel-beck e97c65a
It's nicer to read this way
daniel-beck e8f7251
Use the proper API for this with less string magic
daniel-beck 5e1c37c
Update TODO comments
daniel-beck 8eecaa1
Simplify log statement
daniel-beck 8eccb67
Use base64 instead of hexadecimal for shorter URLs
daniel-beck 2715d09
Open link to Wikipedia in new tab/window
daniel-beck 119a272
Serve directory indexes
daniel-beck 2c4ae8e
Fix target of redirect in admin monitor
daniel-beck d5b00ec
Update TODO comments in test to current implementation
daniel-beck f4def8a
Include link to parent directory unless in top level directory
daniel-beck 9d8f194
Update validation message when we cannot determine instance identity
daniel-beck c33fe8a
Improve tests
daniel-beck bdc0acf
Fix permission exception, further improve tests
daniel-beck b7b3f5a
Annotation was redundant
daniel-beck 93f0c2a
Add test for resource domain monitor activation
daniel-beck e2c9881
Do not go through hex encoding/decoding
daniel-beck 3c6aeb9
Address review comments
daniel-beck 2b923df
Address further review feedback
daniel-beck d81caa5
Better logging, handle exception when the user is gone
daniel-beck 9a25de1
Only get the bytes once
daniel-beck 791e2ab
Inline help improvements
daniel-beck File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
258 changes: 258 additions & 0 deletions
258
core/src/main/java/jenkins/security/ResourceDomainConfiguration.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,258 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright 2019 CloudBees, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
| package jenkins.security; | ||
|
|
||
| import hudson.Extension; | ||
| import hudson.ExtensionList; | ||
| import hudson.Util; | ||
| import hudson.util.FormValidation; | ||
| import jenkins.diagnostics.RootUrlNotSetMonitor; | ||
| import jenkins.model.GlobalConfiguration; | ||
| import jenkins.model.Jenkins; | ||
| import jenkins.model.JenkinsLocationConfiguration; | ||
| import jenkins.model.identity.InstanceIdentityProvider; | ||
| import jenkins.util.UrlHelper; | ||
| import net.sf.json.JSONObject; | ||
| import org.apache.commons.codec.binary.Base64; | ||
| import org.jenkinsci.Symbol; | ||
| import org.kohsuke.accmod.Restricted; | ||
| import org.kohsuke.accmod.restrictions.NoExternalUse; | ||
| import org.kohsuke.stapler.QueryParameter; | ||
| import org.kohsuke.stapler.Stapler; | ||
| import org.kohsuke.stapler.StaplerRequest; | ||
| import org.kohsuke.stapler.verb.POST; | ||
|
|
||
| import javax.servlet.http.HttpServletRequest; | ||
| import java.io.IOException; | ||
| import java.net.HttpURLConnection; | ||
| import java.net.MalformedURLException; | ||
| import java.net.URL; | ||
| import java.net.URLConnection; | ||
| import java.security.interfaces.RSAPublicKey; | ||
| import java.util.logging.Level; | ||
| import java.util.logging.Logger; | ||
|
|
||
| import static jenkins.security.ResourceDomainFilter.ERROR_RESPONSE; | ||
|
|
||
| /** | ||
| * Configure the resource root URL, an alternative root URL to serve resources from | ||
| * to not need Content-Security-Policy headers, which mess with desired complex output. | ||
| * | ||
| * @see ResourceDomainFilter | ||
| * @see ResourceDomainRootAction | ||
| * | ||
| * @since TODO | ||
| */ | ||
| @Extension(ordinal = JenkinsLocationConfiguration.ORDINAL-1) // sort just below the regular location config | ||
| @Restricted(NoExternalUse.class) | ||
| @Symbol("resourceRoot") | ||
| public class ResourceDomainConfiguration extends GlobalConfiguration { | ||
|
|
||
| private static final Logger LOGGER = Logger.getLogger(ResourceDomainConfiguration.class.getName()); | ||
|
|
||
| private String url; | ||
|
|
||
| public ResourceDomainConfiguration() { | ||
| load(); | ||
| } | ||
|
|
||
| @POST | ||
| public FormValidation doCheckUrl(@QueryParameter("url") String resourceRootUrlString) { | ||
| Jenkins.get().checkPermission(Jenkins.ADMINISTER); | ||
|
|
||
| return checkUrl(resourceRootUrlString, true); | ||
| } | ||
|
|
||
| private FormValidation checkUrl(String resourceRootUrlString, boolean allowOnlineIdentityCheck) { | ||
| if (ExtensionList.lookupSingleton(RootUrlNotSetMonitor.class).isActivated()) { | ||
| // This is needed to round-trip expired resource URLs through regular URLs to refresh them, | ||
| // so while it's not required in the strictest sense, it is required. | ||
| return FormValidation.warning(Messages.ResourceDomainConfiguration_NeedsRootURL()); | ||
| } | ||
|
|
||
| resourceRootUrlString = Util.fixEmptyAndTrim(resourceRootUrlString); | ||
| if (resourceRootUrlString == null) { | ||
| return FormValidation.ok(Messages.ResourceDomainConfiguration_Empty()); | ||
| } | ||
|
|
||
| if (!UrlHelper.isValidRootUrl(resourceRootUrlString)) { | ||
| return FormValidation.error(Messages.ResourceDomainConfiguration_Invalid()); | ||
| } | ||
|
|
||
| if (!resourceRootUrlString.endsWith("/")) { | ||
| resourceRootUrlString += '/'; | ||
| } | ||
|
|
||
| URL resourceRootUrl; | ||
| try { | ||
| resourceRootUrl = new URL(resourceRootUrlString); | ||
| } catch (MalformedURLException ex) { | ||
| return FormValidation.error(Messages.ResourceDomainConfiguration_Invalid()); | ||
| } | ||
|
|
||
| String resourceRootUrlHost = resourceRootUrl.getHost(); | ||
| try { | ||
| String jenkinsRootUrlHost = new URL(JenkinsLocationConfiguration.get().getUrl()).getHost(); | ||
| if (jenkinsRootUrlHost.equals(resourceRootUrlHost)) { // TODO this only checks the host, do we care about port differences? | ||
|
daniel-beck marked this conversation as resolved.
Outdated
|
||
| return FormValidation.error(Messages.ResourceDomainConfiguration_SameAsJenkinsRoot()); | ||
| } | ||
| } catch (Exception ex) { | ||
| LOGGER.log(Level.CONFIG, "Failed to create URL from the existing Jenkins root URL", ex); | ||
| return FormValidation.error(Messages.ResourceDomainConfiguration_InvalidRootURL(ex.getMessage())); | ||
| } | ||
|
|
||
| StaplerRequest currentRequest = Stapler.getCurrentRequest(); | ||
| if (currentRequest != null) { | ||
| String currentRequestHost = currentRequest.getHeader("Host"); | ||
|
|
||
| if (currentRequestHost.equals(resourceRootUrlHost)) { | ||
| return FormValidation.error(Messages.ResourceDomainConfiguration_SameAsCurrent()); | ||
| } | ||
| } | ||
|
|
||
| // TODO We could perform more elaborate permission checks to prevent users from setting a subdomain (not great wrt cookies?) | ||
|
jeffret-b marked this conversation as resolved.
Outdated
daniel-beck marked this conversation as resolved.
Outdated
|
||
|
|
||
| if (!allowOnlineIdentityCheck) { | ||
| return FormValidation.ok(); | ||
| } | ||
|
|
||
| // Send a request to /instance-identity/ at the resource root URL and check whether it is this Jenkins | ||
| try { | ||
| URLConnection urlConnection = new URL(resourceRootUrlString + "instance-identity/").openConnection(); | ||
| if (urlConnection instanceof HttpURLConnection) { | ||
| HttpURLConnection httpURLConnection = (HttpURLConnection) urlConnection; | ||
| int responseCode = httpURLConnection.getResponseCode(); | ||
|
|
||
| if (responseCode == 200) { | ||
| String identityHeader = urlConnection.getHeaderField("X-Instance-Identity"); | ||
| if (identityHeader == null) { | ||
| return FormValidation.warning(Messages.ResourceDomainConfiguration_NotJenkins()); | ||
| } | ||
| // URL points to a Jenkins instance | ||
| RSAPublicKey publicKey = InstanceIdentityProvider.RSA.getPublicKey(); | ||
| if (publicKey != null) { | ||
| String identity = Base64.encodeBase64String(publicKey.getEncoded()); | ||
| if (identity.equals(identityHeader)) { | ||
| return FormValidation.ok(Messages.ResourceDomainConfiguration_ThisJenkins()); | ||
| } | ||
| return FormValidation.warning(Messages.ResourceDomainConfiguration_OtherJenkins()); | ||
| } // the current instance has no public key | ||
| return FormValidation.warning(Messages.ResourceDomainConfiguration_SomeJenkins()); | ||
| } | ||
| // response is error | ||
| String responseMessage = httpURLConnection.getResponseMessage(); | ||
| if (responseCode == 404 && responseMessage.equals(ERROR_RESPONSE)) { | ||
| return FormValidation.ok(Messages.ResourceDomainConfiguration_ResourceResponse()); | ||
| } | ||
| return FormValidation.error(Messages.ResourceDomainConfiguration_FailedIdentityCheck(responseCode, responseMessage)); | ||
| } | ||
| return FormValidation.error(Messages.ResourceDomainConfiguration_Invalid()); // unlikely to ever be hit | ||
| } catch (MalformedURLException ex) { | ||
| // Not expected to be hit | ||
| LOGGER.log(Level.FINE, "MalformedURLException occurred during instance identity check for " + resourceRootUrlString, ex); | ||
| return FormValidation.error(Messages.ResourceDomainConfiguration_Exception(ex.getMessage())); | ||
| } catch (IOException ex) { | ||
| LOGGER.log(Level.FINE, "IOException occurred during instance identity check for " + resourceRootUrlString, ex); | ||
| return FormValidation.warning(Messages.ResourceDomainConfiguration_IOException(ex.getMessage())); | ||
|
daniel-beck marked this conversation as resolved.
|
||
| } | ||
| } | ||
|
|
||
| public String getUrl() { | ||
| return url; | ||
| } | ||
|
|
||
| public void setUrl(String url) { | ||
| if (checkUrl(url, false).kind == FormValidation.Kind.OK) { | ||
| // only accept valid configurations, both with and without URL, but allow for networking issues | ||
| url = Util.fixEmpty(url); | ||
| if (url != null && !url.endsWith("/")) { | ||
| url += "/"; | ||
| } | ||
| this.url = url; | ||
| save(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if and only if this is a request to URLs under the resource root URL. | ||
| * | ||
| * For this to be the case, the requested host and port (from the Host HTTP request header) must match what is | ||
| * configured for the resource root URL. | ||
| * | ||
| * @param req the request to check | ||
| * @return whether the request is a resource URL request | ||
| */ | ||
| public static boolean isResourceRequest(HttpServletRequest req) { | ||
| if (!isResourceDomainConfigured()) { | ||
| return false; | ||
| } | ||
| String resourceRootUrl = get().getUrl(); | ||
| try { | ||
| URL url = new URL(resourceRootUrl); | ||
|
|
||
| String resourceRootHost = url.getHost(); | ||
| if (!resourceRootHost.equalsIgnoreCase(req.getServerName())) { | ||
| return false; | ||
| } | ||
|
|
||
| int resourceRootPort = url.getPort(); | ||
| if (resourceRootPort == -1) { | ||
| resourceRootPort = url.getDefaultPort(); | ||
| } | ||
|
|
||
| // let's hope this gives the default port if the Host header exists but doesn't specify a port | ||
| int requestedPort = req.getServerPort(); | ||
|
|
||
| if (requestedPort != resourceRootPort) { | ||
| return false; | ||
| } | ||
| } catch (MalformedURLException ex) { | ||
| // the URL here cannot be so broken that we cannot call `new URL(String)` on it... | ||
|
Wadeck marked this conversation as resolved.
|
||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if and only if a domain has been configured to serve resource URLs from | ||
| * | ||
| * @return whether a domain has been configured | ||
| */ | ||
| public static boolean isResourceDomainConfigured() { | ||
| String resourceRootUrl = get().getUrl(); | ||
| if (resourceRootUrl == null || resourceRootUrl.isEmpty()) { | ||
| return false; | ||
| } | ||
|
|
||
| // effectively not configured when the location configuration is empty | ||
| if (Util.nullify(JenkinsLocationConfiguration.get().getUrl()) == null) { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| public static ResourceDomainConfiguration get() { | ||
| return ExtensionList.lookupSingleton(ResourceDomainConfiguration.class); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.