tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avoid some clippy warnings

Browse Source
This commit is contained in:
Dietmar Maurer
2019-10-26 11:36:01 +02:00
parent 834a2f95a0
commit 62ee2eb405
50 changed files with 179 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/api2/access.rs
View File

@ -52,23 +52,22 @@ fn create_ticket(
log::info!("successful auth for user '{}'", username);
return Ok(json!({
Ok(json!({
"username": username,
"ticket": ticket,
"CSRFPreventionToken": token,
}));
}))
}
Err(err) => {
let client_ip = "unknown"; // $rpcenv->get_client_ip() || '';
log::error!("authentication failure; rhost={} user={} msg={}", client_ip, username, err.to_string());
return Err(http_err!(UNAUTHORIZED, "permission check failed.".into()));
Err(http_err!(UNAUTHORIZED, "permission check failed.".into()))
}
}
}
pub fn router() -> Router {
let route = Router::new()
Router::new()
.subdir(
"ticket",
Router::new()
@ -93,7 +92,5 @@ pub fn router() -> Router {
).protected(true)
)
)
.list_subdirs();
route
.list_subdirs()
}

7
src/api2/admin.rs
View File

@ -3,10 +3,7 @@ use crate::api_schema::router::*;
pub mod datastore;
pub fn router() -> Router {
let route = Router::new()
Router::new()
.subdir("datastore", datastore::router())
.list_subdirs();
route
.list_subdirs()
}

10
src/api2/admin/datastore.rs
View File

@ -654,15 +654,9 @@ pub fn router() -> Router {
)
.list_subdirs();
let route = Router::new()
Router::new()
.get(ApiMethod::new(
get_datastore_list,
ObjectSchema::new("Directory index.")))
.match_all("store", datastore_info);
route
.match_all("store", datastore_info)
}

7
src/api2/backup.rs
View File

@ -167,8 +167,7 @@ lazy_static!{
}
pub fn backup_api() -> Router {
let router = Router::new()
Router::new()
.subdir(
"blob", Router::new()
.upload(api_method_upload_blob())
@ -214,9 +213,7 @@ pub fn backup_api() -> Router {
"speedtest", Router::new()
.upload(api_method_upload_speedtest())
)
.list_subdirs();
router
.list_subdirs()
}
pub fn api_method_create_dynamic_index() -> ApiMethod {

8
src/api2/config.rs
View File

@ -7,11 +7,7 @@ use crate::api_schema::router::*;
pub mod datastore;
pub fn router() -> Router {
let route = Router::new()
Router::new()
.subdir("datastore", datastore::router())
.list_subdirs();
route
.list_subdirs()
}

8
src/api2/config/datastore.rs
View File

@ -97,12 +97,8 @@ fn delete_datastore(
}
pub fn router() -> Router {
let route = Router::new()
Router::new()
.get(get())
.post(post())
.delete(delete());
route
.delete(delete())
}

7
src/api2/node.rs
View File

@ -8,15 +8,12 @@ mod syslog;
mod services;
pub fn router() -> Router {
let route = Router::new()
Router::new()
.subdir("dns", dns::router())
.subdir("network", network::router())
.subdir("services", services::router())
.subdir("syslog", syslog::router())
.subdir("tasks", tasks::router())
.subdir("time", time::router())
.list_subdirs();
route
.list_subdirs()
}

7
src/api2/node/dns.rs
View File

@ -108,8 +108,7 @@ fn get_dns(
}
pub fn router() -> Router {
let route = Router::new()
Router::new()
.get(
ApiMethod::new(
get_dns,
@ -135,7 +134,5 @@ pub fn router() -> Router {
.optional("dns3", THIRD_DNS_SERVER_SCHEMA.clone())
.optional("digest", PVE_CONFIG_DIGEST_SCHEMA.clone())
).protected(true)
);
route
)
}

7
src/api2/node/network.rs
View File

@ -17,13 +17,10 @@ fn get_network_config(
}
pub fn router() -> Router {
let route = Router::new()
Router::new()
.get(ApiMethod::new(
get_network_config,
ObjectSchema::new("Read network configuration.")
.required("node", NODE_SCHEMA.clone())
));
route
))
}

12
src/api2/node/services.rs
View File

@ -140,10 +140,8 @@ fn run_service_command(service: &str, cmd: &str) -> Result<Value, Error> {
_ => bail!("unknown service command '{}'", cmd),
}
if service == "proxmox-backup" {
if cmd != "restart" {
bail!("invalid service cmd '{} {}'", service, cmd);
}
if service == "proxmox-backup" && cmd != "restart" {
bail!("invalid service cmd '{} {}'", service, cmd);
}
let real_service_name = real_service_name(service);
@ -285,7 +283,7 @@ pub fn router() -> Router {
)
.list_subdirs();
let route = Router::new()
Router::new()
.get(
ApiMethod::new(
list_services,
@ -303,7 +301,5 @@ pub fn router() -> Router {
)
)
)
.match_all("service", service_api);
route
.match_all("service", service_api)
}

7
src/api2/node/syslog.rs
View File

@ -97,8 +97,7 @@ lazy_static! {
}
pub fn router() -> Router {
let route = Router::new()
Router::new()
.get(
ApiMethod::new(
get_syslog,
@ -134,7 +133,5 @@ pub fn router() -> Router {
.required("n", IntegerSchema::new("Line number."))
.required("t", StringSchema::new("Line text."))
).protected(true)
);
route
)
}

6
src/api2/node/tasks.rs
View File

@ -218,7 +218,7 @@ pub fn router() -> Router {
.list_subdirs();
let route = Router::new()
Router::new()
.get(ApiMethod::new(
list_tasks,
ObjectSchema::new("List tasks.")
@ -245,7 +245,5 @@ pub fn router() -> Router {
)
)
)
.match_all("upid", upid_api);
route
.match_all("upid", upid_api)
}

10
src/api2/node/time.rs
View File

@ -81,7 +81,7 @@ fn set_timezone(
}
pub fn router() -> Router {
let route = Router::new()
Router::new()
.get(
ApiMethod::new(
get_time,
@ -91,9 +91,9 @@ pub fn router() -> Router {
ObjectSchema::new("Returns server time and timezone.")
.required("timezone", StringSchema::new("Time zone"))
.required("time", IntegerSchema::new("Seconds since 1970-01-01 00:00:00 UTC.")
.minimum(1297163644))
.minimum(1_297_163_644))
.required("localtime", IntegerSchema::new("Seconds since 1970-01-01 00:00:00 UTC. (local time)")
.minimum(1297163644))
.minimum(1_297_163_644))
)
)
.put(
@ -104,7 +104,5 @@ pub fn router() -> Router {
.required("timezone", StringSchema::new(
"Time zone. The file '/usr/share/zoneinfo/zone.tab' contains the list of valid names."))
).protected(true).reload_timezone(true)
);
route
)
}

9
src/api2/reader.rs
View File

@ -35,7 +35,7 @@ pub fn api_method_upgrade_backup() -> ApiAsyncMethod {
.format(Arc::new(ApiStringFormat::Enum(&["vm", "ct", "host"]))))
.required("backup-id", StringSchema::new("Backup ID."))
.required("backup-time", IntegerSchema::new("Backup time (Unix epoch.)")
.minimum(1547797308))
.minimum(1_547_797_308))
.optional("debug", BooleanSchema::new("Enable verbose debug logging."))
)
}
@ -139,8 +139,7 @@ lazy_static!{
}
pub fn reader_api() -> Router {
let router = Router::new()
Router::new()
.subdir(
"chunk", Router::new()
.download(api_method_download_chunk())
@ -152,9 +151,7 @@ pub fn reader_api() -> Router {
.subdir(
"speedtest", Router::new()
.download(api_method_speedtest())
);
router
)
}
pub fn api_method_download_file() -> ApiAsyncMethod {

7
src/api2/subscription.rs
View File

@ -22,11 +22,8 @@ fn get_subscription(
}
pub fn router() -> Router {
let route = Router::new()
Router::new()
.get(ApiMethod::new(
get_subscription,
ObjectSchema::new("Read subscription info.")));
route
ObjectSchema::new("Read subscription info.")))
}

2
src/api2/types.rs
View File

@ -79,7 +79,7 @@ lazy_static!{
pub static ref BACKUP_TIME_SCHEMA: Arc<Schema> =
IntegerSchema::new("Backup time (Unix epoch.)")
.minimum(1547797308)
.minimum(1_547_797_308)
.into();
}

13
src/api2/version.rs
View File

@ -4,14 +4,14 @@ use crate::api_schema::*;
use crate::api_schema::router::*;
use serde_json::{json, Value};
pub const PROXMOX_PKG_VERSION: &'static str =
pub const PROXMOX_PKG_VERSION: &str =
concat!(
env!("CARGO_PKG_VERSION_MAJOR"),
".",
env!("CARGO_PKG_VERSION_MINOR"),
);
pub const PROXMOX_PKG_RELEASE: &'static str = env!("CARGO_PKG_VERSION_PATCH");
pub const PROXMOX_PKG_REPOID: &'static str = env!("CARGO_PKG_REPOSITORY");
pub const PROXMOX_PKG_RELEASE: &str = env!("CARGO_PKG_VERSION_PATCH");
pub const PROXMOX_PKG_REPOID: &str = env!("CARGO_PKG_REPOSITORY");
fn get_version(
_param: Value,
@ -27,11 +27,8 @@ fn get_version(
}
pub fn router() -> Router {
let route = Router::new()
Router::new()
.get(ApiMethod::new(
get_version,
ObjectSchema::new("Proxmox Backup Server API version.")));
route
ObjectSchema::new("Proxmox Backup Server API version.")))
}