[PR #2976] hostname: normalize before validation #2975

Open
opened 2025-12-29 04:19:53 +01:00 by adam · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/juanfont/headscale/pull/2976
Author: @griffer
Created: 12/19/2025
Status: 🔄 Open

Base: mainHead: fix/hostname-normalization


📝 Commits (1)

  • 91711ec hostname: normalize before validation

📊 Changes

2 files changed (+16 additions, -8 deletions)

View changed files

📝 hscontrol/types/node.go (+12 -4)
📝 hscontrol/util/util.go (+4 -4)

📄 Description

Apply NormaliseHostname() before ValidateHostname() in ApplyHostnameFromHostInfo() and EnsureHostname() to sanitize hostnames with minor invalid characters instead of replacing them with generic identifiers like "invalid-abc123".

This allows hostnames like "My-PC!" to become "my-pc" rather than being rejected.

Fixes #2926

  • have read the CONTRIBUTING.md file
  • raised a GitHub issue or discussed it on the projects chat beforehand
  • added unit tests
  • added integration tests
  • updated documentation if needed
  • updated CHANGELOG.md

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/juanfont/headscale/pull/2976 **Author:** [@griffer](https://github.com/griffer) **Created:** 12/19/2025 **Status:** 🔄 Open **Base:** `main` ← **Head:** `fix/hostname-normalization` --- ### 📝 Commits (1) - [`91711ec`](https://github.com/juanfont/headscale/commit/91711ec23402cbc8049dad743094379f2de1d454) hostname: normalize before validation ### 📊 Changes **2 files changed** (+16 additions, -8 deletions) <details> <summary>View changed files</summary> 📝 `hscontrol/types/node.go` (+12 -4) 📝 `hscontrol/util/util.go` (+4 -4) </details> ### 📄 Description Apply NormaliseHostname() before ValidateHostname() in ApplyHostnameFromHostInfo() and EnsureHostname() to sanitize hostnames with minor invalid characters instead of replacing them with generic identifiers like "invalid-abc123". This allows hostnames like "My-PC!" to become "my-pc" rather than being rejected. Fixes #2926 <!-- Headscale is "Open Source, acknowledged contribution", this means that any contribution will have to be discussed with the Maintainers before being submitted. This model has been chosen to reduce the risk of burnout by limiting the maintenance overhead of reviewing and validating third-party code. Headscale is open to code contributions for bug fixes without discussion. If you find mistakes in the documentation, please submit a fix to the documentation. --> <!-- Please tick if the following things apply. You… --> - [x] have read the [CONTRIBUTING.md](./CONTRIBUTING.md) file - [x] raised a GitHub issue or discussed it on the projects chat beforehand - [ ] added unit tests - [ ] added integration tests - [ ] updated documentation if needed - [ ] updated CHANGELOG.md <!-- If applicable, please reference the issue using `Fixes #XXX` and add tests to cover your new code. --> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-29 04:19:53 +01:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/headscale#2975