treewide: complete book management interface
Signed-off-by: NotAShelf <raf@notashelf.dev> Change-Id: If5a21f16221f3c56a8008e139f93edc46a6a6964
This commit is contained in:
parent
bda36ac152
commit
2f31242442
23 changed files with 1693 additions and 126 deletions
|
|
@ -633,18 +633,18 @@ impl TlsConfig {
|
|||
if self.key_path.is_none() {
|
||||
return Err("TLS enabled but key_path not specified".into());
|
||||
}
|
||||
if let Some(ref cert_path) = self.cert_path {
|
||||
if !cert_path.exists() {
|
||||
return Err(format!(
|
||||
"TLS certificate file not found: {}",
|
||||
cert_path.display()
|
||||
));
|
||||
}
|
||||
if let Some(ref cert_path) = self.cert_path
|
||||
&& !cert_path.exists()
|
||||
{
|
||||
return Err(format!(
|
||||
"TLS certificate file not found: {}",
|
||||
cert_path.display()
|
||||
));
|
||||
}
|
||||
if let Some(ref key_path) = self.key_path {
|
||||
if !key_path.exists() {
|
||||
return Err(format!("TLS key file not found: {}", key_path.display()));
|
||||
}
|
||||
if let Some(ref key_path) = self.key_path
|
||||
&& !key_path.exists()
|
||||
{
|
||||
return Err(format!("TLS key file not found: {}", key_path.display()));
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
|
|
@ -768,11 +768,7 @@ impl Config {
|
|||
}
|
||||
|
||||
// Validate authentication configuration
|
||||
let has_api_key = self
|
||||
.server
|
||||
.api_key
|
||||
.as_ref()
|
||||
.map_or(false, |k| !k.is_empty());
|
||||
let has_api_key = self.server.api_key.as_ref().is_some_and(|k| !k.is_empty());
|
||||
let has_accounts = !self.accounts.users.is_empty();
|
||||
let auth_disabled = self.server.authentication_disabled;
|
||||
|
||||
|
|
@ -785,12 +781,12 @@ impl Config {
|
|||
}
|
||||
|
||||
// Empty API key is not allowed (must use authentication_disabled flag)
|
||||
if let Some(ref api_key) = self.server.api_key {
|
||||
if api_key.is_empty() {
|
||||
return Err("empty api_key is not allowed. To disable authentication, \
|
||||
set authentication_disabled = true instead"
|
||||
.into());
|
||||
}
|
||||
if let Some(ref api_key) = self.server.api_key
|
||||
&& api_key.is_empty()
|
||||
{
|
||||
return Err("empty api_key is not allowed. To disable authentication, \
|
||||
set authentication_disabled = true instead"
|
||||
.into());
|
||||
}
|
||||
|
||||
// Require TLS when authentication is enabled on non-localhost
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue