Skip to content

check domain configuration before starting Invidious #5352

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

Open
Fijxu wants to merge 4 commits into
base: master
Choose a base branch
from
Open

check domain configuration before starting Invidious #5352

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
143d92a
check domain configuration before starting Invidious
Fijxu Jun 15, 2025
a3363fa
Update src/invidious/config.cr
Fijxu Sep 2, 2025
a48e6ca
better domain missconfiguration checking
Fijxu Dec 6, 2025
2304b5a
improve
Fijxu Dec 6, 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
17 changes: 17 additions & 0 deletions src/invidious/config.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,23 @@
end
end

# Check if the domain configuration is valid
if (domain = config.domain).nil? || domain.empty?
Copy link
Member

@SamantazFox SamantazFox Sep 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By the way you can use String.presence instead of a separate nil/empty check

Suggested change
if (domain = config.domain).nil? || domain.empty?
if !config.domain.presence

puts "Config: 'domain' is required/can't be empty"
Copy link
Member

@SamantazFox SamantazFox Jun 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

domain can be empty on local instances.

exit(1)
elsif parsed_domain = URI.parse(domain)
if domain != parsed_domain.domain
puts "Config: 'domain' is invalid.
Copy link
Member

@SamantazFox SamantazFox Sep 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
puts "Config: 'domain' is invalid.
puts "Config: 'domain' is invalid."

if parsed_domain.host.presence
puts "Config: (Hint) Did you mean #{parsed_domain.host} ?"

Check failure on line 331 in src/invidious/config.cr

View workflow job for this annotation

GitHub Actions / build - crystal: 1.13.3, stable: true 

unexpected token: "Config"

Check failure on line 331 in src/invidious/config.cr

View workflow job for this annotation

GitHub Actions / build - crystal: 1.12.2, stable: true 

unexpected token: "Config"

Check failure on line 331 in src/invidious/config.cr

View workflow job for this annotation

GitHub Actions / build - crystal: 1.15.1, stable: true 

unexpected token: "Config"

Check failure on line 331 in src/invidious/config.cr

View workflow job for this annotation

GitHub Actions / build - crystal: 1.14.1, stable: true 

unexpected token: "Config"

Check failure on line 331 in src/invidious/config.cr

View workflow job for this annotation

GitHub Actions / build - crystal: 1.16.3, stable: true 

unexpected token: "Config"
else
puts "Config: (Hint) 'domain' should look like this: invidious.example.com"
end
exit(1)
end
end

return config
end
end
Loading