Skip to content

Commit 5701817

Browse files
committed
Replace 2.TODO placeholders after core PR merge
1 parent 5f6c712 commit 5701817

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

content/doc/book/security/csp.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ifdef::backend-html5[]
66
:toc: left
77
endif::[]
88

9-
This page describes the restrictions that can be applied to the general Jenkins UI since Jenkins 2.TODO.
9+
This page describes the restrictions that can be applied to the general Jenkins UI since Jenkins 2.539.
1010

1111
== Motivation
1212

@@ -17,7 +17,7 @@ Using CSP, the impact of web vulnerabilities like link:/security/vulnerabilities
1717
NOTE: This page discusses configuration and customization of Content Security Policy for the general Jenkins UI.
1818
See link:/doc/book/security/configuring-content-security-policy/[Content Security Policy] for documentation on Content Security Policy for user generated files, like files in workspaces, archived artifacts, or file parameters, on controllers not using the link:/redirect/resource-root-url[Resource Root URL] feature.
1919

20-
NOTE: Using Jenkins older than 2.TODO?
20+
NOTE: Using Jenkins older than 2.539?
2121
plugin:csp[Content Security Policy Plugin] 1.x provides similar functionality.
2222

2323
// TODO Remove this once LTS with this is in common use.
@@ -34,7 +34,7 @@ See the section link:#identifying[Identifying incompatibilities in your setup] b
3434
Among the more than 2000 Jenkins plugins distributed by the Jenkins project, many use features that are prohibited by the default CSP rule set.
3535
As a result, the UI provided by these plugins would break.
3636

37-
To give plugin maintainers time to adapt their plugins, and Jenkins administrators time to migrate away from unmaintained, incompatible plugins, CSP protection is disabled by default as of Jenkins 2.TODO.
37+
To give plugin maintainers time to adapt their plugins, and Jenkins administrators time to migrate away from unmaintained, incompatible plugins, CSP protection is disabled by default as of Jenkins 2.539.
3838

3939
=== Using the UI
4040

content/doc/book/security/index.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ _This is set up securely by default._
6060
// TODO Confirm that skipping the setup wizard in 2.222 does no longer disable CSRF protection
6161

6262
link:csp[Content Security Policy]::
63-
Jenkins 2.TODO and newer allows administrators to set up Content Security Policy protection.
63+
Jenkins 2.539 and newer allows administrators to set up Content Security Policy protection.
6464
This chapter explains how to set it up, how to customize it, and how to identify potential problems. +
6565
*This must be configured according to the needs of your environment.*
6666
// TODO Remove version number once it's been in 1-2 LTS lines

content/doc/developer/security/csp.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ Resources should be hosted by Jenkins.
4545

4646
When running Jenkins, you can use the following techniques to identify broken features and the component that defines them:
4747

48-
=== Built-in CSP protection in Jenkins 2.TODO+
48+
=== Built-in CSP protection in Jenkins 2.539+
4949

50-
Running Jenkins 2.TODO or newer in development mode (e.g., `mvn hpi:run`) will have Content Security Policy protections enabled by default.
50+
Running Jenkins 2.539 or newer in development mode (e.g., `mvn hpi:run`) will have Content Security Policy protections enabled by default.
5151
link:/doc/book/security/csp/[Learn more.]
5252

5353
=== Content Security Policy Plugin 1.x
5454

55-
In Jenkins before version 2.TODO, link:https://plugins.jenkins.io/csp/[Content Security Policy Plugin] (1.x) lets you define a Content-Security-Policy that gets applied to the Jenkins web UI.
55+
In Jenkins before version 2.539, link:https://plugins.jenkins.io/csp/[Content Security Policy Plugin] (1.x) lets you define a Content-Security-Policy that gets applied to the Jenkins web UI.
5656
It can operate both as enforcing and to only gather reports.
5757
Both modes can be useful with identifying broken functionality.
5858

@@ -199,16 +199,16 @@ Any dynamically determined images (e.g., "avatar" images based on user configura
199199

200200
* Have Jenkins request (and possibly cache) these images, serving them through a local URL.
201201
Be careful to not allow parameterization of the URL serving this image such that it accepts arbitrary parameter values, resulting in arbitrary URLs being proxied.
202-
* For compatibility with Content Security Policy in Jenkins 2.TODO and newer, implement `jenkins.security.csp.Contributor` (or `jenkins.security.csp.SimpleContributor` in simple cases).
202+
* For compatibility with Content Security Policy in Jenkins 2.539 and newer, implement `jenkins.security.csp.Contributor` (or `jenkins.security.csp.SimpleContributor` in simple cases).
203203
This will allow Jenkins users' browsers to load images from a known safe domain.
204204
In this case, make sure that only administrators can ultimately configure the domains that images can be loaded from.
205205
For example, regular Jenkins users should not be able to, e.g., edit their user profile or configure a job in a certain way to allow a domain of their choice.
206206

207207
== Testing
208208

209-
=== In Jenkins 2.TODO and newer
209+
=== In Jenkins 2.539 and newer
210210

211-
Jenkins 2.TODO and newer supports Content Security Policy out of the box.
211+
Jenkins 2.539 and newer supports Content Security Policy out of the box.
212212
See the link:/doc/book/security/csp/[documentation] for information how to set it up.
213213

214214
NOTE: Running Jenkins in development mode will by default enforce Content Security Policy, so plugin maintainers will likely encounter incompatibilities in their own testing.

0 commit comments

Comments
 (0)