noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable root authentication when no password is set

Browse source 
Closes #10
This commit is contained in:
Tobie Morgan Hitchcock 2022-07-24 01:11:32 +01:00
parent 92fe3da531
commit 960a5a768b
3 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cli/config.rs
View file

@ -8,7 +8,7 @@ pub struct Config {
pub bind: SocketAddr, pub bind: SocketAddr,
pub path: String, pub path: String,
pub user: String, pub user: String,
pub pass: String, pub pass: Option<String>,
pub crt: Option<String>, pub crt: Option<String>,
pub key: Option<String>, pub key: Option<String>,
} }
@ -25,7 +25,7 @@ pub fn init(matches: &clap::ArgMatches) {
// Parse the root username for authentication // Parse the root username for authentication
let user = matches.value_of("user").unwrap().to_owned(); let user = matches.value_of("user").unwrap().to_owned();
// Parse the root password for authentication // Parse the root password for authentication
let pass = matches.value_of("pass").unwrap().to_owned(); let pass = matches.value_of("pass").map(|v| v.to_owned());
// Parse any TLS server security options // Parse any TLS server security options
let crt = matches.value_of("web-crt").map(|v| v.to_owned()); let crt = matches.value_of("web-crt").map(|v| v.to_owned());
let key = matches.value_of("web-key").map(|v| v.to_owned()); let key = matches.value_of("web-key").map(|v| v.to_owned());

10
src/cli/mod.rs
View file

@ -10,9 +10,6 @@ pub use config::CF;
use crate::cnf::LOGO; use crate::cnf::LOGO;
use clap::{Arg, Command}; use clap::{Arg, Command};
use once_cell::sync::Lazy;
use rand::distributions::Alphanumeric;
use rand::Rng;
pub const LOG: &str = "surrealdb::cli"; pub const LOG: &str = "surrealdb::cli";
@ -29,10 +26,6 @@ We would love it if you could star the repository (https://github.com/surrealdb/
---------- ----------
"; ";
static PASS: Lazy<String> = Lazy::new(|| {
rand::thread_rng().sample_iter(&Alphanumeric).take(16).map(char::from).collect::<String>()
});
fn file_valid(v: &str) -> Result<(), String> { fn file_valid(v: &str) -> Result<(), String> {
if !v.is_empty() { if !v.is_empty() {
return Ok(()); return Ok(());
@ -157,9 +150,8 @@ pub fn init() {
Arg::new("pass") Arg::new("pass")
.short('p') .short('p')
.long("pass") .long("pass")
.hide_default_value(true) .takes_value(true)
.forbid_empty_values(true) .forbid_empty_values(true)
.default_value(PASS.as_str())
.help("The master password for the database"), .help("The master password for the database"),
) )
.arg( .arg(

4
src/iam/verify.rs
View file

@ -97,10 +97,12 @@ pub async fn basic(session: &mut Session, auth: String) -> Result<(), Error> {
return Err(Error::InvalidAuth); return Err(Error::InvalidAuth);
} }
// Check if this is root authentication // Check if this is root authentication
if user == opts.user && pass == opts.pass { if let Some(root) = &opts.pass {
if user == opts.user && pass == root {
session.au = Arc::new(Auth::Kv); session.au = Arc::new(Auth::Kv);
return Ok(()); return Ok(());
} }
}
// Check if this is NS authentication // Check if this is NS authentication
if let Some(ns) = &session.ns { if let Some(ns) = &session.ns {
// Create a new readonly transaction // Create a new readonly transaction