Skip to content

Commit af8187d

Browse files
authored
Merge pull request #1905 from Altinity/remove_clickhouse_references_25_8
Backport of #1851 to 25.8: Removed references to clickhouse.cloud
2 parents b2b04e1 + 6afa40f commit af8187d

4 files changed

Lines changed: 3 additions & 7 deletions

File tree

src/Access/AccessControl.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -629,9 +629,6 @@ AuthResult AccessControl::authenticate(const Credentials & credentials, const Po
629629

630630
message << R"(
631631
632-
If you use ClickHouse Cloud, the password can be reset at https://clickhouse.cloud/
633-
on the settings page for the corresponding service.
634-
635632
If you have installed ClickHouse and forgot password you can reset it in the configuration file.
636633
The password for default user is typically located at /etc/clickhouse-server/users.d/default-password.xml
637634
and deleting this file will reset the password.

src/Core/Settings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5895,7 +5895,7 @@ This setting takes a ClickHouse version number as a string, like `22.3`, `22.8`.
58955895
Disabled by default.
58965896
58975897
:::note
5898-
In ClickHouse Cloud the compatibility setting must be set by ClickHouse Cloud support. Please [open a case](https://clickhouse.cloud/support) to have it set.
5898+
The compatibility setting can be overridden at the user, role, profile, query, or session level using standard ClickHouse setting mechanisms such as `SET compatibility = '22.3'` in a session or `SETTINGS compatibility = '22.3'` in a query.
58995899
:::
59005900
)", 0) \
59015901
\
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
1
2-
< HTTP/1.1 403 Forbidden
3-
If you use ClickHouse Cloud, the password can be reset at https://clickhouse.cloud/
2+
< HTTP/1.1 403 Forbidden

tests/queries/0_stateless/03362_basic_auth_interactive_not_with_authorization_never.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ ${CLICKHOUSE_CURL} -H 'Authorization: never' "$URL?query=SELECT%201"
1111
# If the Authorization is set to "never", and the credentials are provided in URL parameters,
1212
# the server will return 403 instead of 401 Unauthorized, so there will be no prompt in the browser.
1313
URL="${CLICKHOUSE_PORT_HTTP_PROTO}://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_HTTP}/?user=default&password=invalid_password"
14-
${CLICKHOUSE_CURL} -H 'Authorization: never' -v "$URL?query=SELECT%201" 2>&1 | grep -P '403 Forbidden|ClickHouse Cloud'
14+
${CLICKHOUSE_CURL} -H 'Authorization: never' -v "$URL&query=SELECT%201" 2>&1 | grep -P '403 Forbidden' | tr -d '\r'

0 commit comments

Comments
 (0)