Skip to content

Commit

Permalink
Only update v24.3 security-reference/authentication.md
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeCRL committed Nov 6, 2024
1 parent 0b6e8ed commit 8259120
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 0 additions & 3 deletions src/current/v24.2/security-reference/authentication.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ Each rule definition contains up to 6 values.
- `cert-password`: user may authenticate with either a certificate or a password. Additionally, the server may use a [SCRAM]({% link {{ page.version.version }}/security-reference/scram-authentication.md %}) exchange, if the cluster setting `server.user_login.cert_password_method.auto_scram_promotion.enabled` is set to `true`.
- `cert-scram-sha-25`: user may authenticate with either a certificate or a [SCRAM]({% link {{ page.version.version }}/security-reference/scram-authentication.md %}) exchange.
- `gss`: user may authenticate with a GSSAPI token.
- `ldap`: user may authetnciate using [LDAP](ldap.html) or Active Directory servers.
- `reject`: server unconditionally rejects connection without performing authentication.
- `trust`: server unconditionally allows connection without performing authentication.

Expand Down Expand Up @@ -121,5 +120,3 @@ CockroachDB {{ site.data.products.core }} deploys with the following default HBA
host all all all cert-password
local all all password
```

TODO: Add coverage for https://github.com/cockroachdb/cockroach/pull/131625 & https://github.com/cockroachdb/cockroach/pull/131578 here?
3 changes: 3 additions & 0 deletions src/current/v24.3/security-reference/authentication.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ Each rule definition contains up to 6 values.
- `cert-password`: user may authenticate with either a certificate or a password. Additionally, the server may use a [SCRAM]({% link {{ page.version.version }}/security-reference/scram-authentication.md %}) exchange, if the cluster setting `server.user_login.cert_password_method.auto_scram_promotion.enabled` is set to `true`.
- `cert-scram-sha-25`: user may authenticate with either a certificate or a [SCRAM]({% link {{ page.version.version }}/security-reference/scram-authentication.md %}) exchange.
- `gss`: user may authenticate with a GSSAPI token.
- `ldap`: user may authenticate using [LDAP](ldap.html) or Active Directory servers.
- `reject`: server unconditionally rejects connection without performing authentication.
- `trust`: server unconditionally allows connection without performing authentication.

Expand Down Expand Up @@ -120,3 +121,5 @@ CockroachDB {{ site.data.products.core }} deploys with the following default HBA
host all all all cert-password
local all all password
```

TODO: Add coverage for https://github.com/cockroachdb/cockroach/pull/131625 & https://github.com/cockroachdb/cockroach/pull/131578 here?

0 comments on commit 8259120

Please sign in to comment.