Skip to content

Commit 80b8865

Browse files
committed
Merge branch 'production' into ranbel/warp-release
2 parents da93f02 + c2d0a83 commit 80b8865

File tree

12 files changed

+75
-23
lines changed

12 files changed

+75
-23
lines changed

public/__redirects

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
/bots/concepts/ja3-fingerprint/ /bots/concepts/ja3-ja4-fingerprint/ 301
188188
/bots/reference/verified-bot-categories/ /bots/concepts/bot/verified-bots/categories/ 301
189189
/bots/reference/verified-bot-policy/ /bots/concepts/bot/verified-bots/policy/ 301
190+
/bots/concepts/challenge-solve-rate/ /fundamentals/security/cloudflare-challenges/challenge-solve-rate/ 301
190191

191192
#browser-rendering
192193
/browser-rendering/get-started/browser-rendering-with-do/ /browser-rendering/workers-binding-api/browser-rendering-with-do/ 301

src/content/docs/api-shield/management-and-monitoring/endpoint-labels.mdx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,13 @@ Use managed labels to identify endpoints by use case. Cloudflare may automatical
4343

4444
`cf-account-update`: Add this label to endpoints that participate in user account or profile updates.
4545

46+
`cf-llm`: Services that are (partially) powered by Large Language Model (LLM).
47+
4648
`cf-rss-feed`: Add this label to endpoints that expect traffic from RSS clients.
4749

48-
`cf-llm`: Services that are (partially) powered by Large Language Model (LLM).
50+
:::note
51+
<Render file="rss-labels" product="bots" />
52+
:::
4953

5054
### Risk labels
5155

@@ -109,4 +113,4 @@ Alternatively, you can create a user-defined label via Endpoint Management in AP
109113

110114
## Availability
111115

112-
Endpoint Management's labeling service is available to all customers.
116+
Endpoint Management's labeling service is available to all customers.

src/content/docs/cloudflare-one/connections/connect-devices/warp/configure-warp/warp-settings/index.mdx

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ WARP settings define the WARP client modes and permissions available to end user
2626
<Render file="warp/all-systems-modes-plans" />
2727

2828
:::note
29-
30-
To use **Admin override**, you must first have enabled the [**Lock WARP switch**](#lock-warp-switch). **Admin override** is only needed and used when the WARP lock switch is turned on.
31-
29+
To use **Admin override**, you must first have enabled [**Lock WARP switch**](#lock-warp-switch).
3230
:::
3331

34-
When the [**Lock WARP switch**](#lock-warp-switch) is enabled, users cannot toggle the WARP client on and off on their device. Enabling **Admin override** gives users the ability to temporarily turn off the WARP client using an override code provided by an admin. **Admin override** is only needed in a configuration where the **lock WARP switch** is enabled.
32+
When [**Lock WARP switch**](#lock-warp-switch) is enabled, users cannot toggle the WARP client on and off on their device. Enabling **Admin override** gives users the ability to temporarily turn on or off the WARP client using an override code provided by an admin. **Admin override** is only needed in a configuration where **Lock WARP switch** is enabled.
3533

36-
**Admin override** allows end users to momentarily turn off WARP with an override code to work around a temporary network issue (for example, an incompatible public Wi-Fi, or a firewall at a customer site blocking the connection).
34+
Example use cases for **Admin override** include:
35+
- Allowing users to momentarily turn off WARP to work around a temporary network issue such as an incompatible public Wi-Fi, or a firewall at a customer site blocking the connection.
36+
- Allowing test users to turn on WARP when [Global WARP override](#global-warp-override) is in effect.
3737

3838
As admin, you can set a **Timeout** to define how long a user can toggle the WARP switch on or off after entering the override code. Cloudflare generates a new override code every hour that an admin can send to end users. The override code's validity adheres to fixed-hour time blocks and aims to be generous to the end user.
3939

@@ -53,20 +53,19 @@ To retrieve the one-time code for a user:
5353
2. Go to **My Team** > **Devices**.
5454
3. Select **View** for a connected device.
5555
4. Scroll down to **User details** and copy the 7-digit **Override code**.
56-
5. Share this code with the end user for them to enter on their device.
56+
5. Share this code with the user for them to enter on their device.
5757

5858
The user will have an unlimited amount of time to activate their code.
5959

6060
#### Enter the override code
6161

62-
To turn off the WARP client on a user device:
62+
To activate the override code on a user device:
6363

6464
1. In the WARP client, go to **Settings** > **Preferences** > **Advanced**.
6565
2. Select **Enter code**.
66-
3. Enter the override code. The WARP client will display a pop-up window showing when the override expires.
67-
4. Turn off the WARP switch.
66+
3. Enter the override code.
6867

69-
The client will automatically reconnect after the [Auto connect period](#auto-connect), but the user can continue to turn off WARP until the override expires.
68+
The user can now toggle the WARP switch or use the `warp-cli connect` command. The client will automatically reconnect after the [Auto connect period](#auto-connect), but the user can continue to turn on or off WARP until the override expires.
7069

7170
### Install CA to system certificate store
7271

@@ -111,6 +110,35 @@ This setting is primarily used as a prerequisite for [WARP Connector](/cloudflar
111110

112111
The CGNAT IP assigned to a WARP device is permanent until the device unregisters from your Zero Trust organization. Disconnects and reconnects do not change the IP address assignment.
113112

113+
### Global WARP override
114+
115+
<Details header="Feature availability">
116+
117+
| [WARP modes](/cloudflare-one/connections/connect-devices/warp/configure-warp/warp-modes/) | [Zero Trust plans](https://www.cloudflare.com/teams-pricing/) |
118+
| ----------------------------------------------------------------------------------------- | ------------------------------------------------------------- |
119+
| All modes | All plans |
120+
121+
| System | Availability | Minimum WARP version |
122+
| -------- | ------------ | -------------------- |
123+
| Windows || 2025.2.600.0 |
124+
| macOS || 2025.2.600.0 |
125+
| Linux || 2025.2.600.0 |
126+
| iOS || |
127+
| Android || |
128+
| ChromeOS || |
129+
130+
</Details>
131+
132+
:::note
133+
Requires the [Super Administrator](/cloudflare-one/roles-permissions/) role.
134+
:::
135+
136+
Global WARP override allows administrators to fail open WARP in case of an incident or outage. When you turn on **Global WARP override**, Cloudflare will disconnect all Windows, macOS, and Linux WARP clients that are connected to your Zero Trust organization. This includes end user devices, [WARP Connector](/cloudflare-one/connections/connect-networks/private-net/warp-connector/) hosts, and [WARP-to-WARP](/cloudflare-one/connections/connect-networks/private-net/warp-to-warp/) devices. End users will receive a notification on their device and the WARP client will display `The administrator for your account has disconnected WARP`.
137+
138+
[Auto connect](#auto-connect) and [Lock WARP switch](#lock-warp-switch) will not apply while the global override is on. Additionally, the global override will clear any existing [Admin override](#admin-override) codes. The only way for users to reconnect during a global override is by using a new [Admin override](#admin-override) code. For example, you may want to provide IT staff with a code so that they can test resolution of the incident that led to the global disconnect.
139+
140+
To resume normal operations, turn off **Global WARP override**. If you configured an [Auto connect](#auto-connect) value, the WARP client will automatically reconnect. Otherwise WARP will remain disconnected until the user manually reconnects.
141+
114142
## Device settings
115143

116144
### Captive portal detection

src/content/docs/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-multiuser.mdx

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ To request participation in this beta, contact your account team.
2222

2323
| System | Availability | Minimum WARP version |
2424
| -------- | ------------ | -------------------- |
25-
| Windows || 2025.1.447.1 |
25+
| Windows || 2025.2.460.1 |
2626
| macOS || |
2727
| Linux || |
2828
| iOS || |
@@ -33,8 +33,8 @@ To request participation in this beta, contact your account team.
3333

3434
Cloudflare WARP supports multiple user registrations on a single Windows device. When deployed in multi-user mode, the WARP client will automatically switch user registrations after a user logs in to their Windows account. All traffic to Cloudflare will be attributed to the currently active Windows user. This allows administrators to apply identity-based policies and device settings, audit user activity, and remove individual users from a shared workstation.
3535

36-
:::note
37-
A user must log out of their Windows account before switching to another account. A user cannot lock the screen and log in to another account, use the **Switch users** option in Windows, or have any other type of concurrent sessions.
36+
:::caution[DNS logging]
37+
If a user enables **Log DNS queries** in the WARP GUI (or runs `warp-cli dns log enable`), WARP will store all DNS queries on the device onto disk. Any user on the device will be able to examine the DNS queries of another user.
3838
:::
3939

4040
## Enable multi-user mode
@@ -100,6 +100,7 @@ The following flowchart shows how WARP registration settings take effect as user
100100
flowchart TB
101101
start(["Enable multi-user mode"])-->reg["Active Windows user is prompted to register WARP"]
102102
reg--"Log out of Windows"-->prelogin
103+
reg--"Switch user"-->regexists
103104
104105
subgraph preloginbehavior["Windows login screen"]
105106
prelogin{{"Is there a pre-login <br />registration?"}}
@@ -114,3 +115,13 @@ flowchart TB
114115
regexists-. "No" .->reg
115116
```
116117

118+
### Fast user switching
119+
120+
:::note
121+
Requires [multi-user mode](#enable-multi-user-mode).
122+
:::
123+
124+
[Fast user switching](https://learn.microsoft.com/windows/win32/shell/fast-user-switching) is a Windows feature that allows users to switch accounts without logging out. With fast user switching, multiple users may be logged in to the device and generating network traffic. The WARP client will attribute all traffic to the user who has the [interactive windows station](http://techcommunity.microsoft.com/blog/askperf/sessions-desktops-and-windows-stations/372473). For example, if user A is logged in and fast user switches to user B, traffic from both accounts will appear to come from user B. This is because user B is now actively using the Windows desktop GUI. Now assume that user B logs out and there is no [pre-login registration](/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-prelogin/); WARP will continue to attribute traffic to user B until user A logs back in to the Windows desktop.
125+
126+
To accurately attribute network traffic to specific users, Cloudflare recommends disabling fast user switching or at the very least configuring a [pre-login registration](/cloudflare-one/connections/connect-devices/warp/deployment/mdm-deployment/windows-prelogin/).
127+

src/content/docs/fundamentals/security/cloudflare-challenges/challenge-passage.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
pcx_content_type: reference
33
title: Challenge Passage
4-
4+
sidebar:
5+
order: 2
56
---
67

78
When a visitor solves a [Cloudflare challenge](/fundamentals/security/cloudflare-challenges/) - as part of a [WAF custom rule](/waf/custom-rules/) or [IP Access rule](/waf/tools/ip-access-rules/) - you can set the **Challenge Passage** to prevent them from having to solve future challenges for a specified period of time.

src/content/docs/bots/concepts/challenge-solve-rate.mdx renamed to src/content/docs/fundamentals/security/cloudflare-challenges/challenge-solve-rate.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
pcx_content_type: concept
3-
title: Challenge Solve Rate (CSR)
3+
title: Challenge solve rate (CSR)
44
sidebar:
5-
order: 2
5+
order: 3
66

77
---
88

src/content/docs/turnstile/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Refer to [Cloudflare Turnstile's product page](https://www.cloudflare.com/produc
7777
## Features
7878

7979
<Feature header="Turnstile Analytics" href="/turnstile/turnstile-analytics/">
80-
Assess the number of challenges issued, evaluate the challenge solve rate, and
80+
Assess the number of challenges issued, evaluate the [challenge solve rate](/fundamentals/security/cloudflare-challenges/challenge-solve-rate/), and
8181
view the metrics of issued challenges.
8282
</Feature>
8383

src/content/docs/turnstile/tutorials/implicit-vs-explicit-rendering.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,5 +264,5 @@ Remember to perform server-side validation of the response token to complete the
264264
## Additional resources
265265
266266
- [Server-side validation](/turnstile/get-started/server-side-validation/): A guide on how to implement server-side validation to ensure that only valid, human-generated responses are accepted by your application.
267-
- [Turnstile Analytics](/turnstile/turnstile-analytics/): A guide on how to access and interpret Turnstile Analytics data, allowing you to monitor key metrics, access the number of challenges issued, and evaluate the challenge solve rate (CSR).
267+
- [Turnstile Analytics](/turnstile/turnstile-analytics/): A guide on how to access and interpret Turnstile Analytics data, allowing you to monitor key metrics, access the number of challenges issued, and evaluate the [challenge solve rate (CSR)](/fundamentals/security/cloudflare-challenges/challenge-solve-rate/).
268268
- [Turnstile API Reference](/api/resources/turnstile/subresources/widgets/methods/list/): Comprehensive documentation for the Turnstile API, providing detailed information on API operations for managing Turnstile widgets, including how to list, create, and update widgets via API calls.

src/content/docs/turnstile/tutorials/integrating-turnstile-waf-and-bot-management.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,4 +180,4 @@ If you are interested in customizing Turnstile, refer to the resources below for
180180

181181
- [Client-side rendering](/turnstile/get-started/client-side-rendering/). Learn how to customize how and when Turnstile renders in your user interface, to better fit your application's needs and user experience.
182182
- [Server-side validation](/turnstile/get-started/server-side-validation/). Learn how Turnstile's API works, including request parameters, as well as how to handle different types of responses, including error codes.
183-
- [Turnstile Analytics](/turnstile/turnstile-analytics/). Learn how to view Turnstile's analytics in the Cloudflare dashboard. This includes metrics on the number of challenges issued, as well as the CSR (Challenge Solve Rate).
183+
- [Turnstile Analytics](/turnstile/turnstile-analytics/). Learn how to view Turnstile's analytics in the Cloudflare dashboard. This includes metrics on the number of challenges issued, as well as the [challenge solve rate (CSR)](/fundamentals/security/cloudflare-challenges/challenge-solve-rate/).

src/content/glossary/bots.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ entries:
1313
general_definition: |-
1414
Additional information about a bot request, such as why Cloudflare has given it a bot score and whether the request came from a verified bot or a category of verified bots.
1515
16-
- term: Challenge Solve Rate (CSR)
16+
- term: Challenge solve rate (CSR)
1717
general_definition: |-
1818
The percentage of issued challenges that were solved.
1919

0 commit comments

Comments
 (0)