aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/build.yml21
-rw-r--r--src/api/admin.rs16
-rw-r--r--src/api/core/accounts.rs17
-rw-r--r--src/api/core/ciphers.rs14
-rw-r--r--src/api/core/folders.rs6
-rw-r--r--src/api/core/mod.rs21
-rw-r--r--src/api/core/organizations.rs50
-rw-r--r--src/api/core/two_factor/mod.rs6
-rw-r--r--src/api/core/two_factor/u2f.rs10
-rw-r--r--src/api/icons.rs10
-rw-r--r--src/api/notifications.rs42
-rw-r--r--src/auth.rs66
-rw-r--r--src/db/models/cipher.rs2
-rw-r--r--src/db/models/device.rs6
-rw-r--r--src/db/models/organization.rs20
-rw-r--r--src/error.rs9
-rw-r--r--src/main.rs11
-rw-r--r--src/util.rs16
18 files changed, 176 insertions, 167 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d7ed5618..81151f17 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,15 @@ on:
- "docker/**"
- "hooks/**"
- "tools/**"
+ pull_request:
+ # Ignore when there are only changes done too one of these paths
+ paths-ignore:
+ - "**.md"
+ - "**.txt"
+ - "azure-pipelines.yml"
+ - "docker/**"
+ - "hooks/**"
+ - "tools/**"
jobs:
build:
@@ -82,10 +91,11 @@ jobs:
with:
profile: minimal
target: ${{ matrix.target-triple }}
+ components: clippy
# End Uses the rust-toolchain file to determine version
- # Run cargo tests (In release mode to speed up cargo build afterwards)
+ # Run cargo tests (In release mode to speed up future builds)
- name: '`cargo test --release --features ${{ matrix.features }} --target ${{ matrix.target-triple }}`'
uses: actions-rs/cargo@v1
with:
@@ -94,6 +104,15 @@ jobs:
# End Run cargo tests
+ # Run cargo clippy (In release mode to speed up future builds)
+ - name: '`cargo clippy --release --features ${{ matrix.features }} --target ${{ matrix.target-triple }}`'
+ uses: actions-rs/cargo@v1
+ with:
+ command: clippy
+ args: --release --features ${{ matrix.features }} --target ${{ matrix.target-triple }}
+ # End Run cargo clippy
+
+
# Build the binary
- name: '`cargo build --release --features ${{ matrix.features }} --target ${{ matrix.target-triple }}`'
uses: actions-rs/cargo@v1
diff --git a/src/api/admin.rs b/src/api/admin.rs
index f1ebc113..d484407a 100644
--- a/src/api/admin.rs
+++ b/src/api/admin.rs
@@ -13,7 +13,7 @@ use rocket::{
use rocket_contrib::json::Json;
use crate::{
- api::{ApiResult, EmptyResult, JsonResult, NumberOrString},
+ api::{ApiResult, EmptyResult, NumberOrString},
auth::{decode_admin, encode_jwt, generate_admin_claims, ClientIp},
config::ConfigBuilder,
db::{backup_database, get_sql_server_version, models::*, DbConn, DbConnType},
@@ -312,17 +312,17 @@ fn test_smtp(data: Json<InviteData>, _token: AdminToken) -> EmptyResult {
}
#[get("/logout")]
-fn logout(mut cookies: Cookies, referer: Referer) -> Result<Redirect, ()> {
+fn logout(mut cookies: Cookies, referer: Referer) -> Redirect {
cookies.remove(Cookie::named(COOKIE_NAME));
- Ok(Redirect::to(admin_url(referer)))
+ Redirect::to(admin_url(referer))
}
#[get("/users")]
-fn get_users_json(_token: AdminToken, conn: DbConn) -> JsonResult {
+fn get_users_json(_token: AdminToken, conn: DbConn) -> Json<Value> {
let users = User::get_all(&conn);
let users_json: Vec<Value> = users.iter().map(|u| u.to_json(&conn)).collect();
- Ok(Json(Value::Array(users_json)))
+ Json(Value::Array(users_json))
}
#[get("/users/overview")]
@@ -564,7 +564,7 @@ fn diagnostics(_token: AdminToken, ip_header: IpHeader, conn: DbConn) -> ApiResu
"running_within_docker": running_within_docker,
"has_http_access": has_http_access,
"ip_header_exists": &ip_header.0.is_some(),
- "ip_header_match": ip_header_name == &CONFIG.ip_header(),
+ "ip_header_match": ip_header_name == CONFIG.ip_header(),
"ip_header_name": ip_header_name,
"ip_header_config": &CONFIG.ip_header(),
"uses_proxy": uses_proxy,
@@ -579,9 +579,9 @@ fn diagnostics(_token: AdminToken, ip_header: IpHeader, conn: DbConn) -> ApiResu
}
#[get("/diagnostics/config")]
-fn get_diagnostics_config(_token: AdminToken) -> JsonResult {
+fn get_diagnostics_config(_token: AdminToken) -> Json<Value> {
let support_json = CONFIG.get_support_json();
- Ok(Json(support_json))
+ Json(support_json)
}
#[post("/config", data = "<data>")]
diff --git a/src/api/core/accounts.rs b/src/api/core/accounts.rs
index 9131575a..6e45a947 100644
--- a/src/api/core/accounts.rs
+++ b/src/api/core/accounts.rs
@@ -1,5 +1,6 @@
use chrono::Utc;
use rocket_contrib::json::Json;
+use serde_json::Value;
use crate::{
api::{EmptyResult, JsonResult, JsonUpcase, Notify, NumberOrString, PasswordData, UpdateType},
@@ -139,10 +140,8 @@ fn register(data: JsonUpcase<RegisterData>, conn: DbConn) -> EmptyResult {
}
user.last_verifying_at = Some(user.created_at);
- } else {
- if let Err(e) = mail::send_welcome(&user.email) {
- error!("Error sending welcome email: {:#?}", e);
- }
+ } else if let Err(e) = mail::send_welcome(&user.email) {
+ error!("Error sending welcome email: {:#?}", e);
}
}
@@ -150,8 +149,8 @@ fn register(data: JsonUpcase<RegisterData>, conn: DbConn) -> EmptyResult {
}
#[get("/accounts/profile")]
-fn profile(headers: Headers, conn: DbConn) -> JsonResult {
- Ok(Json(headers.user.to_json(&conn)))
+fn profile(headers: Headers, conn: DbConn) -> Json<Value> {
+ Json(headers.user.to_json(&conn))
}
#[derive(Deserialize, Debug)]
@@ -612,7 +611,7 @@ struct PreloginData {
}
#[post("/accounts/prelogin", data = "<data>")]
-fn prelogin(data: JsonUpcase<PreloginData>, conn: DbConn) -> JsonResult {
+fn prelogin(data: JsonUpcase<PreloginData>, conn: DbConn) -> Json<Value> {
let data: PreloginData = data.into_inner().data;
let (kdf_type, kdf_iter) = match User::find_by_mail(&data.Email, &conn) {
@@ -620,10 +619,10 @@ fn prelogin(data: JsonUpcase<PreloginData>, conn: DbConn) -> JsonResult {
None => (User::CLIENT_KDF_TYPE_DEFAULT, User::CLIENT_KDF_ITER_DEFAULT),
};
- Ok(Json(json!({
+ Json(json!({
"Kdf": kdf_type,
"KdfIterations": kdf_iter
- })))
+ }))
}
#[derive(Deserialize)]
#[allow(non_snake_case)]
diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs
index c9abb3d4..7b0de205 100644
--- a/src/api/core/ciphers.rs
+++ b/src/api/core/ciphers.rs
@@ -84,7 +84,7 @@ struct SyncData {
}
#[get("/sync?<data..>")]
-fn sync(data: Form<SyncData>, headers: Headers, conn: DbConn) -> JsonResult {
+fn sync(data: Form<SyncData>, headers: Headers, conn: DbConn) -> Json<Value> {
let user_json = headers.user.to_json(&conn);
let folders = Folder::find_by_user(&headers.user.uuid, &conn);
@@ -113,10 +113,10 @@ fn sync(data: Form<SyncData>, headers: Headers, conn: DbConn) -> JsonResult {
let domains_json = if data.exclude_domains {
Value::Null
} else {
- api::core::_get_eq_domains(headers, true).unwrap().into_inner()
+ api::core::_get_eq_domains(headers, true).into_inner()
};
- Ok(Json(json!({
+ Json(json!({
"Profile": user_json,
"Folders": folders_json,
"Collections": collections_json,
@@ -125,11 +125,11 @@ fn sync(data: Form<SyncData>, headers: Headers, conn: DbConn) -> JsonResult {
"Domains": domains_json,
"Sends": sends_json,
"Object": "sync"
- })))
+ }))
}
#[get("/ciphers")]
-fn get_ciphers(headers: Headers, conn: DbConn) -> JsonResult {
+fn get_ciphers(headers: Headers, conn: DbConn) -> Json<Value> {
let ciphers = Cipher::find_by_user_visible(&headers.user.uuid, &conn);
let ciphers_json: Vec<Value> = ciphers
@@ -137,11 +137,11 @@ fn get_ciphers(headers: Headers, conn: DbConn) -> JsonResult {
.map(|c| c.to_json(&headers.host, &headers.user.uuid, &conn))
.collect();
- Ok(Json(json!({
+ Json(json!({
"Data": ciphers_json,
"Object": "list",
"ContinuationToken": null
- })))
+ }))
}
#[get("/ciphers/<uuid>")]
diff --git a/src/api/core/folders.rs b/src/api/core/folders.rs
index 63bf40e2..2779fe61 100644
--- a/src/api/core/folders.rs
+++ b/src/api/core/folders.rs
@@ -20,16 +20,16 @@ pub fn routes() -> Vec<rocket::Route> {
}
#[get("/folders")]
-fn get_folders(headers: Headers, conn: DbConn) -> JsonResult {
+fn get_folders(headers: Headers, conn: DbConn) -> Json<Value> {
let folders = Folder::find_by_user(&headers.user.uuid, &conn);
let folders_json: Vec<Value> = folders.iter().map(Folder::to_json).collect();
- Ok(Json(json!({
+ Json(json!({
"Data": folders_json,
"Object": "list",
"ContinuationToken": null,
- })))
+ }))
}
#[get("/folders/<uuid>")]
diff --git a/src/api/core/mod.rs b/src/api/core/mod.rs
index f0b449c4..36e83f0e 100644
--- a/src/api/core/mod.rs
+++ b/src/api/core/mod.rs
@@ -34,17 +34,18 @@ pub fn routes() -> Vec<Route> {
//
use rocket::Route;
use rocket_contrib::json::Json;
+use rocket::response::Response;
use serde_json::Value;
use crate::{
- api::{EmptyResult, JsonResult, JsonUpcase},
+ api::{JsonResult, JsonUpcase},
auth::Headers,
db::DbConn,
error::Error,
};
#[put("/devices/identifier/<uuid>/clear-token")]
-fn clear_device_token(uuid: String) -> EmptyResult {
+fn clear_device_token<'a>(uuid: String) -> Response<'a> {
// This endpoint doesn't have auth header
let _ = uuid;
@@ -53,11 +54,11 @@ fn clear_device_token(uuid: String) -> EmptyResult {
// This only clears push token
// https://github.com/bitwarden/core/blob/master/src/Api/Controllers/DevicesController.cs#L109
// https://github.com/bitwarden/core/blob/master/src/Core/Services/Implementations/DeviceService.cs#L37
- Ok(())
+ Response::new()
}
#[put("/devices/identifier/<uuid>/token", data = "<data>")]
-fn put_device_token(uuid: String, data: JsonUpcase<Value>, headers: Headers) -> JsonResult {
+fn put_device_token(uuid: String, data: JsonUpcase<Value>, headers: Headers) -> Json<Value> {
let _data: Value = data.into_inner().data;
// Data has a single string value "PushToken"
let _ = uuid;
@@ -65,13 +66,13 @@ fn put_device_token(uuid: String, data: JsonUpcase<Value>, headers: Headers) ->
// TODO: This should save the push token, but we don't have push functionality
- Ok(Json(json!({
+ Json(json!({
"Id": headers.device.uuid,
"Name": headers.device.name,
"Type": headers.device.atype,
"Identifier": headers.device.uuid,
"CreationDate": crate::util::format_date(&headers.device.created_at),
- })))
+ }))
}
#[derive(Serialize, Deserialize, Debug)]
@@ -85,11 +86,11 @@ struct GlobalDomain {
const GLOBAL_DOMAINS: &str = include_str!("../../static/global_domains.json");
#[get("/settings/domains")]
-fn get_eq_domains(headers: Headers) -> JsonResult {
+fn get_eq_domains(headers: Headers) -> Json<Value> {
_get_eq_domains(headers, false)
}
-fn _get_eq_domains(headers: Headers, no_excluded: bool) -> JsonResult {
+fn _get_eq_domains(headers: Headers, no_excluded: bool) -> Json<Value> {
let user = headers.user;
use serde_json::from_str;
@@ -106,11 +107,11 @@ fn _get_eq_domains(headers: Headers, no_excluded: bool) -> JsonResult {
globals.retain(|g| !g.Excluded);
}
- Ok(Json(json!({
+ Json(json!({
"EquivalentDomains": equivalent_domains,
"GlobalEquivalentDomains": globals,
"Object": "domains",
- })))
+ }))
}
#[derive(Deserialize, Debug)]
diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs
index 34a0acdb..5698c187 100644
--- a/src/api/core/organizations.rs
+++ b/src/api/core/organizations.rs
@@ -192,8 +192,8 @@ fn post_organization(
// GET /api/collections?writeOnly=false
#[get("/collections")]
-fn get_user_collections(headers: Headers, conn: DbConn) -> JsonResult {
- Ok(Json(json!({
+fn get_user_collections(headers: Headers, conn: DbConn) -> Json<Value> {
+ Json(json!({
"Data":
Collection::find_by_user_uuid(&headers.user.uuid, &conn)
.iter()
@@ -201,12 +201,12 @@ fn get_user_collections(headers: Headers, conn: DbConn) -> JsonResult {
.collect::<Value>(),
"Object": "list",
"ContinuationToken": null,
- })))
+ }))
}
#[get("/organizations/<org_id>/collections")]
-fn get_org_collections(org_id: String, _headers: AdminHeaders, conn: DbConn) -> JsonResult {
- Ok(Json(json!({
+fn get_org_collections(org_id: String, _headers: AdminHeaders, conn: DbConn) -> Json<Value> {
+ Json(json!({
"Data":
Collection::find_by_organization(&org_id, &conn)
.iter()
@@ -214,7 +214,7 @@ fn get_org_collections(org_id: String, _headers: AdminHeaders, conn: DbConn) ->
.collect::<Value>(),
"Object": "list",
"ContinuationToken": null,
- })))
+ }))
}
#[post("/organizations/<org_id>/collections", data = "<data>")]
@@ -441,30 +441,30 @@ struct OrgIdData {
}
#[get("/ciphers/organization-details?<data..>")]
-fn get_org_details(data: Form<OrgIdData>, headers: Headers, conn: DbConn) -> JsonResult {
+fn get_org_details(data: Form<OrgIdData>, headers: Headers, conn: DbConn) -> Json<Value> {
let ciphers = Cipher::find_by_org(&data.organization_id, &conn);
let ciphers_json: Vec<Value> = ciphers
.iter()
.map(|c| c.to_json(&headers.host, &headers.user.uuid, &conn))
.collect();
- Ok(Json(json!({
+ Json(json!({
"Data": ciphers_json,
"Object": "list",
"ContinuationToken": null,
- })))
+ }))
}
#[get("/organizations/<org_id>/users")]
-fn get_org_users(org_id: String, _headers: ManagerHeadersLoose, conn: DbConn) -> JsonResult {
+fn get_org_users(org_id: String, _headers: ManagerHeadersLoose, conn: DbConn) -> Json<Value> {
let users = UserOrganization::find_by_org(&org_id, &conn);
let users_json: Vec<Value> = users.iter().map(|c| c.to_json_user_details(&conn)).collect();
- Ok(Json(json!({
+ Json(json!({
"Data": users_json,
"Object": "list",
"ContinuationToken": null,
- })))
+ }))
}
#[derive(Deserialize)]
@@ -930,15 +930,15 @@ fn post_org_import(
}
#[get("/organizations/<org_id>/policies")]
-fn list_policies(org_id: String, _headers: AdminHeaders, conn: DbConn) -> JsonResult {
+fn list_policies(org_id: String, _headers: AdminHeaders, conn: DbConn) -> Json<Value> {
let policies = OrgPolicy::find_by_org(&org_id, &conn);
let policies_json: Vec<Value> = policies.iter().map(OrgPolicy::to_json).collect();
- Ok(Json(json!({
+ Json(json!({
"Data": policies_json,
"Object": "list",
"ContinuationToken": null
- })))
+ }))
}
#[get("/organizations/<org_id>/policies/token?<token>")]
@@ -1017,8 +1017,8 @@ fn get_organization_tax(org_id: String, _headers: Headers, _conn: DbConn) -> Emp
}
#[get("/plans")]
-fn get_plans(_headers: Headers, _conn: DbConn) -> JsonResult {
- Ok(Json(json!({
+fn get_plans(_headers: Headers, _conn: DbConn) -> Json<Value> {
+ Json(json!({
"Object": "list",
"Data": [
{
@@ -1065,17 +1065,17 @@ fn get_plans(_headers: Headers, _conn: DbConn) -> JsonResult {
}
],
"ContinuationToken": null
- })))
+ }))
}
#[get("/plans/sales-tax-rates")]
-fn get_plans_tax_rates(_headers: Headers, _conn: DbConn) -> JsonResult {
+fn get_plans_tax_rates(_headers: Headers, _conn: DbConn) -> Json<Value> {
// Prevent a 404 error, which also causes Javascript errors.
- Ok(Json(json!({
+ Json(json!({
"Object": "list",
"Data": [],
"ContinuationToken": null
- })))
+ }))
}
#[derive(Deserialize, Debug)]
@@ -1128,7 +1128,7 @@ fn import(org_id: String, data: JsonUpcase<OrgImportData>, headers: Headers, con
// If user is not part of the organization, but it exists
} else if UserOrganization::find_by_email_and_org(&user_data.Email, &org_id, &conn).is_none() {
if let Some (user) = User::find_by_mail(&user_data.Email, &conn) {
-
+
let user_org_status = if CONFIG.mail_enabled() {
UserOrgStatus::Invited as i32
} else {
@@ -1157,18 +1157,18 @@ fn import(org_id: String, data: JsonUpcase<OrgImportData>, headers: Headers, con
Some(headers.user.email.clone()),
)?;
}
- }
+ }
}
}
// If this flag is enabled, any user that isn't provided in the Users list will be removed (by default they will be kept unless they have Deleted == true)
if data.OverwriteExisting {
- for user_org in UserOrganization::find_by_org_and_type(&org_id, UserOrgType::User as i32, &conn) {
+ for user_org in UserOrganization::find_by_org_and_type(&org_id, UserOrgType::User as i32, &conn) {
if let Some (user_email) = User::find_by_uuid(&user_org.user_uuid, &conn).map(|u| u.email) {
if !data.Users.iter().any(|u| u.Email == user_email) {
user_org.delete(&conn)?;
}
- }
+ }
}
}
diff --git a/src/api/core/two_factor/mod.rs b/src/api/core/two_factor/mod.rs
index 77e2cf2e..a3dfd319 100644
--- a/src/api/core/two_factor/mod.rs
+++ b/src/api/core/two_factor/mod.rs
@@ -38,15 +38,15 @@ pub fn routes() -> Vec<Route> {
}
#[get("/two-factor")]
-fn get_twofactor(headers: Headers, conn: DbConn) -> JsonResult {
+fn get_twofactor(headers: Headers, conn: DbConn) -> Json<Value> {
let twofactors = TwoFactor::find_by_user(&headers.user.uuid, &conn);
let twofactors_json: Vec<Value> = twofactors.iter().map(TwoFactor::to_json_provider).collect();
- Ok(Json(json!({
+ Json(json!({
"Data": twofactors_json,
"Object": "list",
"ContinuationToken": null,
- })))
+ }))
}
#[post("/two-factor/get-recover", data = "<data>")]
diff --git a/src/api/core/two_factor/u2f.rs b/src/api/core/two_factor/u2f.rs
index 7934ab63..f841240b 100644
--- a/src/api/core/two_factor/u2f.rs
+++ b/src/api/core/two_factor/u2f.rs
@@ -131,12 +131,12 @@ struct RegisterResponseCopy {
pub error_code: Option<NumberOrString>,
}
-impl Into<RegisterResponse> for RegisterResponseCopy {
- fn into(self) -> RegisterResponse {
+impl From<RegisterResponseCopy> for RegisterResponse {
+ fn from(r: RegisterResponseCopy) -> RegisterResponse {
RegisterResponse {
- registration_data: self.registration_data,
- version: self.version,
- client_data: self.client_data,
+ registration_data: r.registration_data,
+ version: r.version,
+ client_data: r.client_data,
}
}
}
diff --git a/src/api/icons.rs b/src/api/icons.rs
index 14cfa25f..747569c6 100644
--- a/src/api/icons.rs
+++ b/src/api/icons.rs
@@ -352,10 +352,12 @@ fn get_favicons_node(node: &std::rc::Rc<markup5ever_rcdom::Node>, icons: &mut Ve
}
}
- if has_rel && href.is_some() {
- if let Ok(full_href) = url.join(&href.unwrap()).map(|h| h.into_string()) {
- let priority = get_icon_priority(&full_href, sizes);
- icons.push(Icon::new(priority, full_href));
+ if has_rel {
+ if let Some(inner_href) = href {
+ if let Ok(full_href) = url.join(&inner_href).map(|h| h.into_string()) {
+ let priority = get_icon_priority(&full_href, sizes);
+ icons.push(Icon::new(priority, full_href));
+ }
}
}
}
diff --git a/src/api/notifications.rs b/src/api/notifications.rs
index 3a6423c1..8876937d 100644
--- a/src/api/notifications.rs
+++ b/src/api/notifications.rs
@@ -5,7 +5,7 @@ use rocket_contrib::json::Json;
use serde_json::Value as JsonValue;
use crate::{
- api::{EmptyResult, JsonResult},
+ api::EmptyResult,
auth::Headers,
db::DbConn,
Error, CONFIG,
@@ -31,7 +31,7 @@ fn websockets_err() -> EmptyResult {
}
#[post("/hub/negotiate")]
-fn negotiate(_headers: Headers, _conn: DbConn) -> JsonResult {
+fn negotiate(_headers: Headers, _conn: DbConn) -> Json<JsonValue> {
use crate::crypto;
use data_encoding::BASE64URL;
@@ -47,10 +47,10 @@ fn negotiate(_headers: Headers, _conn: DbConn) -> JsonResult {
// Rocket SSE support: https://github.com/SergioBenitez/Rocket/issues/33
// {"transport":"ServerSentEvents", "transferFormats":["Text"]},
// {"transport":"LongPolling", "transferFormats":["Text","Binary"]}
- Ok(Json(json!({
+ Json(json!({
"connectionId": conn_id,
"availableTransports": available_transports
- })))
+ }))
}
//
@@ -120,7 +120,7 @@ fn convert_option<T: Into<Value>>(option: Option<T>) -> Value {
}
// Server WebSocket handler
-pub struct WSHandler {
+pub struct WsHandler {
out: Sender,
user_uuid: Option<String>,
users: WebSocketUsers,
@@ -140,7 +140,7 @@ const PING: Token = Token(1);
const ACCESS_TOKEN_KEY: &str = "access_token=";
-impl WSHandler {
+impl WsHandler {
fn err(&self, msg: &'static str) -> ws::Result<()> {
self.out.close(ws::CloseCode::Invalid)?;
@@ -166,8 +166,8 @@ impl WSHandler {
if let Some(params) = path.split('?').nth(1) {
let params_iter = params.split('&').take(1);
for val in params_iter {
- if val.starts_with(ACCESS_TOKEN_KEY) {
- return Some(val[ACCESS_TOKEN_KEY.len()..].into());
+ if let Some(stripped) = val.strip_prefix(ACCESS_TOKEN_KEY) {
+ return Some(stripped.into());
}
}
};
@@ -176,7 +176,7 @@ impl WSHandler {
}
}
-impl Handler for WSHandler {
+impl Handler for WsHandler {
fn on_open(&mut self, hs: Handshake) -> ws::Result<()> {
// Path == "/notifications/hub?id=<id>==&access_token=<access_token>"
//
@@ -240,13 +240,13 @@ impl Handler for WSHandler {
}
}
-struct WSFactory {
+struct WsFactory {
pub users: WebSocketUsers,
}
-impl WSFactory {
+impl WsFactory {
pub fn init() -> Self {
- WSFactory {
+ WsFactory {
users: WebSocketUsers {
map: Arc::new(CHashMap::new()),
},
@@ -254,11 +254,11 @@ impl WSFactory {
}
}
-impl Factory for WSFactory {
- type Handler = WSHandler;
+impl Factory for WsFactory {
+ type Handler = WsHandler;
fn connection_made(&mut self, out: Sender) -> Self::Handler {
- WSHandler {
+ WsHandler {
out,
user_uuid: None,
users: self.users.clone(),
@@ -405,15 +405,17 @@ use rocket::State;
pub type Notify<'a> = State<'a, WebSocketUsers>;
pub fn start_notification_server() -> WebSocketUsers {
- let factory = WSFactory::init();
+ let factory = WsFactory::init();
let users = factory.users.clone();
if CONFIG.websocket_enabled() {
thread::spawn(move || {
- let mut settings = ws::Settings::default();
- settings.max_connections = 500;
- settings.queue_size = 2;
- settings.panic_on_internal = false;
+ let settings = ws::Settings {
+ max_connections: 500,
+ queue_size: 2,
+ panic_on_internal: false,
+ ..Default::default()
+ };
ws::Builder::new()
.with_settings(settings)
diff --git a/src/auth.rs b/src/auth.rs
index 4041cc6b..59d1370d 100644
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -58,28 +58,28 @@ fn decode_jwt<T: DeserializeOwned>(token: &str, issuer: String) -> Result<T, Err
.map_res("Error decoding JWT")
}
-pub fn decode_login(token: &str) -> Result<LoginJWTClaims, Error> {
+pub fn decode_login(token: &str) -> Result<LoginJwtClaims, Error> {
decode_jwt(token, JWT_LOGIN_ISSUER.to_string())
}
-pub fn decode_invite(token: &str) -> Result<InviteJWTClaims, Error> {
+pub fn decode_invite(token: &str) -> Result<InviteJwtClaims, Error> {
decode_jwt(token, JWT_INVITE_ISSUER.to_string())
}
-pub fn decode_delete(token: &str) -> Result<DeleteJWTClaims, Error> {
+pub fn decode_delete(token: &str) -> Result<DeleteJwtClaims, Error> {
decode_jwt(token, JWT_DELETE_ISSUER.to_string())
}
-pub fn decode_verify_email(token: &str) -> Result<VerifyEmailJWTClaims, Error> {
+pub fn decode_verify_email(token: &str) -> Result<VerifyEmailJwtClaims, Error> {
decode_jwt(token, JWT_VERIFYEMAIL_ISSUER.to_string())
}
-pub fn decode_admin(token: &str) -> Result<AdminJWTClaims, Error> {
+pub fn decode_admin(token: &str) -> Result<AdminJwtClaims, Error> {
decode_jwt(token, JWT_ADMIN_ISSUER.to_string())
}
#[derive(Debug, Serialize, Deserialize)]
-pub struct LoginJWTClaims {
+pub struct LoginJwtClaims {
// Not before
pub nbf: i64,
// Expiration time
@@ -110,7 +110,7 @@ pub struct LoginJWTClaims {
}
#[derive(Debug, Serialize, Deserialize)]
-pub struct InviteJWTClaims {
+pub struct InviteJwtClaims {
// Not before
pub nbf: i64,
// Expiration time
@@ -132,9 +132,9 @@ pub fn generate_invite_claims(
org_id: Option<String>,
user_org_id: Option<String>,
invited_by_email: Option<String>,
-) -> InviteJWTClaims {
+) -> InviteJwtClaims {
let time_now = Utc::now().naive_utc();
- InviteJWTClaims {
+ InviteJwtClaims {
nbf: time_now.timestamp(),
exp: (time_now + Duration::days(5)).timestamp(),
iss: JWT_INVITE_ISSUER.to_string(),
@@ -147,7 +147,7 @@ pub fn generate_invite_claims(
}
#[derive(Debug, Serialize, Deserialize)]
-pub struct DeleteJWTClaims {
+pub struct DeleteJwtClaims {
// Not before
pub nbf: i64,
// Expiration time
@@ -158,9 +158,9 @@ pub struct DeleteJWTClaims {
pub sub: String,
}
-pub fn generate_delete_claims(uuid: String) -> DeleteJWTClaims {
+pub fn generate_delete_claims(uuid: String) -> DeleteJwtClaims {
let time_now = Utc::now().naive_utc();
- DeleteJWTClaims {
+ DeleteJwtClaims {
nbf: time_now.timestamp(),
exp: (time_now + Duration::days(5)).timestamp(),
iss: JWT_DELETE_ISSUER.to_string(),
@@ -169,7 +169,7 @@ pub fn generate_delete_claims(uuid: String) -> DeleteJWTClaims {
}
#[derive(Debug, Serialize, Deserialize)]
-pub struct VerifyEmailJWTClaims {
+pub struct VerifyEmailJwtClaims {
// Not before
pub nbf: i64,
// Expiration time
@@ -180,9 +180,9 @@ pub struct VerifyEmailJWTClaims {
pub sub: String,
}
-pub fn generate_verify_email_claims(uuid: String) -> DeleteJWTClaims {
+pub fn generate_verify_email_claims(uuid: String) -> DeleteJwtClaims {
let time_now = Utc::now().naive_utc();
- DeleteJWTClaims {
+ DeleteJwtClaims {
nbf: time_now.timestamp(),
exp: (time_now + Duration::days(5)).timestamp(),
iss: JWT_VERIFYEMAIL_ISSUER.to_string(),
@@ -191,7 +191,7 @@ pub fn generate_verify_email_claims(uuid: String) -> DeleteJWTClaims {
}
#[derive(Debug, Serialize, Deserialize)]
-pub struct AdminJWTClaims {
+pub struct AdminJwtClaims {
// Not before
pub nbf: i64,
// Expiration time
@@ -202,9 +202,9 @@ pub struct AdminJWTClaims {
pub sub: String,
}
-pub fn generate_admin_claims() -> AdminJWTClaims {
+pub fn generate_admin_claims() -> AdminJwtClaims {
let time_now = Utc::now().naive_utc();
- AdminJWTClaims {
+ AdminJwtClaims {
nbf: time_now.timestamp(),
exp: (time_now + Duration::minutes(20)).timestamp(),
iss: JWT_ADMIN_ISSUER.to_string(),
@@ -450,12 +450,12 @@ impl<'a, 'r> FromRequest<'a, 'r> for AdminHeaders {
}
}
-impl Into<Headers> for AdminHeaders {
- fn into(self) -> Headers {
+impl From<AdminHeaders> for Headers {
+ fn from(h: AdminHeaders) -> Headers {
Headers {
- host: self.host,
- device: self.device,
- user: self.user,
+ host: h.host,
+ device: h.device,
+ user: h.user,
}
}
}
@@ -529,12 +529,12 @@ impl<'a, 'r> FromRequest<'a, 'r> for ManagerHeaders {
}
}
-impl Into<Headers> for ManagerHeaders {
- fn into(self) -> Headers {
+impl From<ManagerHeaders> for Headers {
+ fn from(h: ManagerHeaders) -> Headers {
Headers {
- host: self.host,
- device: self.device,
- user: self.user,
+ host: h.host,
+ device: h.device,
+ user: h.user,
}
}
}
@@ -571,12 +571,12 @@ impl<'a, 'r> FromRequest<'a, 'r> for ManagerHeadersLoose {
}
}
-impl Into<Headers> for ManagerHeadersLoose {
- fn into(self) -> Headers {
+impl From<ManagerHeadersLoose> for Headers {
+ fn from(h: ManagerHeadersLoose) -> Headers {
Headers {
- host: self.host,
- device: self.device,
- user: self.user,
+ host: h.host,
+ device: h.device,
+ user: h.user,
}
}
}
diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs
index da3eabab..365865f8 100644
--- a/src/db/models/cipher.rs
+++ b/src/db/models/cipher.rs
@@ -104,7 +104,7 @@ impl Cipher {
// Get the type_data or a default to an empty json object '{}'.
// If not passing an empty object, mobile clients will crash.
- let mut type_data_json: Value = serde_json::from_str(&self.data).unwrap_or(json!({}));
+ let mut type_data_json: Value = serde_json::from_str(&self.data).unwrap_or_else(|_| json!({}));
// NOTE: This was marked as *Backwards Compatibilty Code*, but as of January 2021 this is still being used by upstream
// Set the first element of the Uris array as Uri, this is needed several (mobile) clients.
diff --git a/src/db/models/device.rs b/src/db/models/device.rs
index b3413ada..77837fca 100644
--- a/src/db/models/device.rs
+++ b/src/db/models/device.rs
@@ -80,8 +80,8 @@ impl Device {
let orgmanager: Vec<_> = orgs.iter().filter(|o| o.atype == 3).map(|o| o.org_uuid.clone()).collect();
// Create the JWT claims struct, to send to the client
- use crate::auth::{encode_jwt, LoginJWTClaims, DEFAULT_VALIDITY, JWT_LOGIN_ISSUER};
- let claims = LoginJWTClaims {
+ use crate::auth::{encode_jwt, LoginJwtClaims, DEFAULT_VALIDITY, JWT_LOGIN_ISSUER};
+ let claims = LoginJwtClaims {
nbf: time_now.timestamp(),
exp: (time_now + *DEFAULT_VALIDITY).timestamp(),
iss: JWT_LOGIN_ISSUER.to_string(),
@@ -117,7 +117,7 @@ impl Device {
pub fn save(&mut self, conn: &DbConn) -> EmptyResult {
self.updated_at = Utc::now().naive_utc();
- db_run! { conn:
+ db_run! { conn:
sqlite, mysql {
crate::util::retry(
|| diesel::replace_into(devices::table).values(DeviceDb::to_db(self)).execute(conn),
diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs
index 2e93426d..1eeb04d2 100644
--- a/src/db/models/organization.rs
+++ b/src/db/models/organization.rs
@@ -90,17 +90,11 @@ impl PartialOrd<i32> for UserOrgType {
}
fn gt(&self, other: &i32) -> bool {
- match self.partial_cmp(other) {
- Some(Ordering::Less) | Some(Ordering::Equal) => false,
- _ => true,
- }
+ matches!(self.partial_cmp(other), Some(Ordering::Greater))
}
fn ge(&self, other: &i32) -> bool {
- match self.partial_cmp(other) {
- Some(Ordering::Less) => false,
- _ => true,
- }
+ matches!(self.partial_cmp(other), Some(Ordering::Greater) | Some(Ordering::Equal))
}
}
@@ -119,17 +113,11 @@ impl PartialOrd<UserOrgType> for i32 {
}
fn lt(&self, other: &UserOrgType) -> bool {
- match self.partial_cmp(other) {
- Some(Ordering::Less) | None => true,
- _ => false,
- }
+ matches!(self.partial_cmp(other), Some(Ordering::Less) | None)
}
fn le(&self, other: &UserOrgType) -> bool {
- match self.partial_cmp(other) {
- Some(Ordering::Less) | Some(Ordering::Equal) | None => true,
- _ => false,
- }
+ matches!(self.partial_cmp(other), Some(Ordering::Less) | Some(Ordering::Equal) | None)
}
}
diff --git a/src/error.rs b/src/error.rs
index fa90f1d3..a0b28a4b 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -38,11 +38,11 @@ use diesel::ConnectionError as DieselConErr;
use diesel_migrations::RunMigrationsError as DieselMigErr;
use diesel::r2d2::PoolError as R2d2Err;
use handlebars::RenderError as HbErr;
-use jsonwebtoken::errors::Error as JWTErr;
+use jsonwebtoken::errors::Error as JwtErr;
use regex::Error as RegexErr;
use reqwest::Error as ReqErr;
use serde_json::{Error as SerdeErr, Value};
-use std::io::Error as IOErr;
+use std::io::Error as IoErr;
use std::time::SystemTimeError as TimeErr;
use u2f::u2ferror::U2fError as U2fErr;
@@ -72,10 +72,10 @@ make_error! {
R2d2Error(R2d2Err): _has_source, _api_error,
U2fError(U2fErr): _has_source, _api_error,
SerdeError(SerdeErr): _has_source, _api_error,
- JWTError(JWTErr): _has_source, _api_error,
+ JWtError(JwtErr): _has_source, _api_error,
TemplError(HbErr): _has_source, _api_error,
//WsError(ws::Error): _has_source, _api_error,
- IOError(IOErr): _has_source, _api_error,
+ IoError(IoErr): _has_source, _api_error,
TimeError(TimeErr): _has_source, _api_error,
ReqError(ReqErr): _has_source, _api_error,
RegexError(RegexErr): _has_source, _api_error,
@@ -152,6 +152,7 @@ impl<S> MapResult<S> for Option<S> {
}
}
+#[allow(clippy::unnecessary_wraps)]
const fn _has_source<T>(e: T) -> Option<T> {
Some(e)
}
diff --git a/src/main.rs b/src/main.rs
index 15b18b3c..50975c66 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -48,10 +48,7 @@ fn main() {
let level = LF::from_str(&CONFIG.log_level()).expect("Valid log level");
init_logging(level).ok();
- let extra_debug = match level {
- LF::Trace | LF::Debug => true,
- _ => false,
- };
+ let extra_debug = matches!(level, LF::Trace | LF::Debug);
check_data_folder();
check_rsa_keys();
@@ -64,10 +61,10 @@ fn main() {
const HELP: &str = "\
A Bitwarden API server written in Rust
-
+
USAGE:
bitwarden_rs
-
+
FLAGS:
-h, --help Prints help information
-v, --version Prints the app version
@@ -329,7 +326,7 @@ fn launch_rocket(extra_debug: bool) {
.manage(pool)
.manage(api::start_notification_server())
.attach(util::AppHeaders())
- .attach(util::CORS())
+ .attach(util::Cors())
.attach(util::BetterLogging(extra_debug))
.launch();
diff --git a/src/util.rs b/src/util.rs
index 40256eb7..feafa467 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -38,9 +38,9 @@ impl Fairing for AppHeaders {
}
}
-pub struct CORS();
+pub struct Cors();
-impl CORS {
+impl Cors {
fn get_header(headers: &HeaderMap, name: &str) -> String {
match headers.get_one(name) {
Some(h) => h.to_string(),
@@ -51,7 +51,7 @@ impl CORS {
// Check a request's `Origin` header against the list of allowed origins.
// If a match exists, return it. Otherwise, return None.
fn get_allowed_origin(headers: &HeaderMap) -> Option<String> {
- let origin = CORS::get_header(headers, "Origin");
+ let origin = Cors::get_header(headers, "Origin");
let domain_origin = CONFIG.domain_origin();
let safari_extension_origin = "file://";
if origin == domain_origin || origin == safari_extension_origin {
@@ -62,10 +62,10 @@ impl CORS {
}
}
-impl Fairing for CORS {
+impl Fairing for Cors {
fn info(&self) -> Info {
Info {
- name: "CORS",
+ name: "Cors",
kind: Kind::Response,
}
}
@@ -73,14 +73,14 @@ impl Fairing for CORS {
fn on_response(&self, request: &Request, response: &mut Response) {
let req_headers = request.headers();
- if let Some(origin) = CORS::get_allowed_origin(req_headers) {
+ if let Some(origin) = Cors::get_allowed_origin(req_headers) {
response.set_header(Header::new("Access-Control-Allow-Origin", origin));
}
// Preflight request
if request.method() == Method::Options {
- let req_allow_headers = CORS::get_header(req_headers, "Access-Control-Request-Headers");
- let req_allow_method = CORS::get_header(req_headers, "Access-Control-Request-Method");
+ let req_allow_headers = Cors::get_header(req_headers, "Access-Control-Request-Headers");
+ let req_allow_method = Cors::get_header(req_headers, "Access-Control-Request-Method");
response.set_header(Header::new("Access-Control-Allow-Methods", req_allow_method));
response.set_header(Header::new("Access-Control-Allow-Headers", req_allow_headers));
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 01:06:22 +0000