theycallmesteve
5 years ago
No known key found for this signature in database
GPG Key ID: 6240923F65CC698D
5 changed files with
5 additions and
10 deletions
-
src/api/core/ciphers.rs
-
src/api/core/two_factor/authenticator.rs
-
src/config.rs
-
src/db/models/device.rs
-
src/db/models/organization.rs
|
|
@ -767,11 +767,7 @@ fn post_attachment_admin( |
|
|
|
post_attachment(uuid, data, content_type, headers, conn, nt) |
|
|
|
} |
|
|
|
|
|
|
|
#[post(
|
|
|
|
"/ciphers/<uuid>/attachment/<attachment_id>/share", |
|
|
|
format = "multipart/form-data", |
|
|
|
data = "<data>" |
|
|
|
)] |
|
|
|
#[post("/ciphers/<uuid>/attachment/<attachment_id>/share", format = "multipart/form-data", data = "<data>")] |
|
|
|
fn post_attachment_share( |
|
|
|
uuid: String, |
|
|
|
attachment_id: String, |
|
|
|
|
|
@ -20,6 +20,7 @@ pub fn routes() -> Vec<Route> { |
|
|
|
activate_authenticator_put, |
|
|
|
] |
|
|
|
} |
|
|
|
|
|
|
|
#[post("/two-factor/get-authenticator", data = "<data>")] |
|
|
|
fn generate_authenticator(data: JsonUpcase<PasswordData>, headers: Headers, conn: DbConn) -> JsonResult { |
|
|
|
let data: PasswordData = data.into_inner().data; |
|
|
|
|
|
@ -135,7 +135,6 @@ macro_rules! make_config { |
|
|
|
(inner._env.build(), inner.config.clone()) |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
fn _get_form_type(rust_type: &str) -> &'static str { |
|
|
|
match rust_type { |
|
|
|
"Pass" => "password", |
|
|
|
|
|
@ -77,7 +77,6 @@ impl Device { |
|
|
|
let orguser: Vec<_> = orgs.iter().filter(|o| o.atype == 2).map(|o| o.org_uuid.clone()).collect(); |
|
|
|
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 { |
|
|
|
|
|
@ -165,9 +165,9 @@ impl Organization { |
|
|
|
"UsePolicies": true, |
|
|
|
|
|
|
|
"BusinessName": null, |
|
|
|
"BusinessAddress1": null, |
|
|
|
"BusinessAddress2": null, |
|
|
|
"BusinessAddress3": null, |
|
|
|
"BusinessAddress1": null, |
|
|
|
"BusinessAddress2": null, |
|
|
|
"BusinessAddress3": null, |
|
|
|
"BusinessCountry": null, |
|
|
|
"BusinessTaxNumber": null, |
|
|
|
|
|
|
|