Skip to content

Ensure checking RoomIDs works for room version 12 #467

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

Merged
kegsay merged 4 commits into from
Jul 16, 2026
+6 −4
Merged

Ensure checking RoomIDs works for room version 12 #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2605408
Remove check on Room IDs having a domain component as Room IDs should…
jason-famedly Jun 30, 2026
b97d4a0
Ensure this check still exists for other kinds of ID, like "user"
jason-famedly Jun 30, 2026
7e16985
Use ParseAndValidateRoomID() after exposing as public function to par…
jason-famedly Jul 16, 2026
b674263
remove comment
jason-famedly Jul 16, 2026
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
6 changes: 4 additions & 2 deletions event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ const (
)

func checkID(id, kind string, sigil byte) (err error) {
if _, err = domainFromID(id); err != nil {
return
if kind == "room" {
if _, err = spec.ParseAndValidateRoomID(id); err != nil {
return
}
}
if id[0] != sigil {
err = fmt.Errorf(
Expand Down
4 changes: 2 additions & 2 deletions spec/roomid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type RoomID struct {
}

func NewRoomID(id string) (*RoomID, error) {
return parseAndValidateRoomID(id)
return ParseAndValidateRoomID(id)
}

// Returns the full roomID string including leading sigil
Expand All @@ -41,7 +41,7 @@ func (room RoomID) Domain() ServerName {
return ServerName(room.domain)
}

func parseAndValidateRoomID(id string) (*RoomID, error) {
func ParseAndValidateRoomID(id string) (*RoomID, error) {
idLength := len(id)
if idLength < 4 { // 4 since minimum roomID includes an !, :, non-empty opaque ID, non-empty domain
return nil, fmt.Errorf("length %d is too short to be valid", idLength)
Expand Down
Loading