fix(#1375): clean up pedantic warnings and re-enable -D warnings without pedantic bypass
This commit is contained in:
parent
da7f1d6c45
commit
fb726197ea
28 changed files with 109 additions and 90 deletions
|
|
@ -60,7 +60,7 @@ enum Cmd {
|
|||
/// Gateway htpasswd user management. Add, remove, or list users in
|
||||
/// an htpasswd file used by the gateway's HTTP Basic auth
|
||||
/// (`services.hyperhive.gateway.auth`). Credentials are stored as
|
||||
/// BCrypt hashes — no extra service or PAM required.
|
||||
/// `BCrypt` hashes — no extra service or PAM required.
|
||||
Gateway {
|
||||
#[command(subcommand)]
|
||||
cmd: GatewayCmd,
|
||||
|
|
@ -179,7 +179,7 @@ enum MatrixCmd {
|
|||
SyncAdmin,
|
||||
/// Promote a matrix user to homeserver admin via the admin API.
|
||||
/// Uses the hive system admin token at
|
||||
/// `/var/lib/hyperhive/matrix-admin-token`. The server_name is
|
||||
/// `/var/lib/hyperhive/matrix-admin-token`. The `server_name` is
|
||||
/// discovered automatically from the running homeserver.
|
||||
PromoteUser {
|
||||
/// Matrix localpart of the user to promote (e.g. `argus`).
|
||||
|
|
@ -205,7 +205,7 @@ const DEFAULT_HTPASSWD_FILE: &str = "/var/lib/hyperhive/gateway/gateway.htpasswd
|
|||
#[derive(Subcommand)]
|
||||
enum GatewayCmd {
|
||||
/// Add a new user or update the password of an existing user in the
|
||||
/// gateway htpasswd file. The password is hashed with BCrypt (cost 12).
|
||||
/// gateway htpasswd file. The password is hashed with `BCrypt` (cost 12).
|
||||
///
|
||||
/// Pass `--password-stdin` when scripting or when you don't want the
|
||||
/// password visible in shell history. The file is created if it does
|
||||
|
|
@ -581,7 +581,7 @@ fn htpasswd_write(path: &Path, lines: &[String]) -> Result<()> {
|
|||
}
|
||||
|
||||
/// Add or update `username` in the htpasswd file at `file`, hashing
|
||||
/// `password` with BCrypt (cost 12). Creates the file when absent.
|
||||
/// `password` with `BCrypt` (cost 12). Creates the file when absent.
|
||||
fn gateway_create_user(
|
||||
file: &Path,
|
||||
username: &str,
|
||||
|
|
@ -698,7 +698,7 @@ fn validate_htpasswd_username(username: &str) -> Result<()> {
|
|||
if username.contains(':') {
|
||||
bail!("username must not contain ':' (htpasswd field separator)");
|
||||
}
|
||||
if username.chars().any(|c| c.is_control()) {
|
||||
if username.chars().any(char::is_control) {
|
||||
bail!("username must not contain control characters");
|
||||
}
|
||||
Ok(())
|
||||
|
|
|
|||
Loading…
Reference in a new issue