Skip to content
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.

Sign up for GitHub

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

Allow underscores in kerberos principal names #563

Merged
merged 3 commits into from
Feb 12, 2025
Merged

Allow underscores in kerberos principal names #563

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
376f45d
Allow underscores in kerberos principal names
nightkr Feb 12, 2025
b5300d8
Changelog
nightkr Feb 12, 2025
17e0e65
Merge branch 'main' into bugfix/kerbeos-principal-underscore
nightkr Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ All notable changes to this project will be documented in this file.
- Helm chart: The tag of the tools image used for the secret migration job can
be changed in the Helm values and defaults now to 1.0.0-stackable24.11.0
rather than being hard-coded to 1.0.0-stackable24.7.0 ([#536]).
- Underscores are now allowed in Kerberos principal names ([#563]).

[#528]: https://github.com/stackabletech/secret-operator/pull/528
[#536]: https://github.com/stackabletech/secret-operator/pull/536
[#548]: https://github.com/stackabletech/secret-operator/pull/548
[#552]: https://github.com/stackabletech/secret-operator/pull/552
[#563]: https://github.com/stackabletech/secret-operator/pull/563

## [24.11.0] - 2024-11-18

Expand Down
9 changes: 7 additions & 2 deletions rust/operator-binary/src/crd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ pub struct KerberosPrincipal(String);
#[snafu(module)]
pub enum InvalidKerberosPrincipal {
#[snafu(display(
"principal contains illegal characters (allowed: alphanumeric, /, @, -, and .)"
"principal contains illegal characters (allowed: alphanumeric, /, @, -, _, and .)"
))]
IllegalCharacter,

Expand All @@ -342,7 +342,12 @@ impl TryFrom<String> for KerberosPrincipal {
if value.starts_with('-') {
invalid_kerberos_principal::StartWithDashSnafu.fail()
} else if value.contains(|chr: char| {
!chr.is_alphanumeric() && chr != '/' && chr != '@' && chr != '.' && chr != '-'
!chr.is_alphanumeric()
&& chr != '/'
&& chr != '@'
&& chr != '.'
&& chr != '-'
&& chr != '_'
}) {
invalid_kerberos_principal::IllegalCharacterSnafu.fail()
} else {
Expand Down