commit 8bbbff7567e611e1366e981de988f5249c6a8a0d
parent 6c5e35ce5c549b82629350dfe9f56f21dc2bc27e
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date: Fri, 8 May 2020 01:04:10 +0200
Merge pull request #987 from theycallmesteve/global_domains
GlobalEquivalentDomains updates from upstream bitwarden
Diffstat:
6 files changed, 73 insertions(+), 78 deletions(-)
diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.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,
diff --git a/src/api/core/two_factor/authenticator.rs b/src/api/core/two_factor/authenticator.rs
@@ -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;
diff --git a/src/config.rs b/src/config.rs
@@ -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",
diff --git a/src/db/models/device.rs b/src/db/models/device.rs
@@ -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 {
diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs
@@ -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,
diff --git a/src/static/global_domains.json b/src/static/global_domains.json
@@ -108,7 +108,9 @@
"microsoftonline.com",
"office365.com",
"microsoftstore.com",
- "xbox.com"
+ "xbox.com",
+ "azure.com",
+ "windowsazure.com"
],
"Excluded": false
},
@@ -126,8 +128,7 @@
"Type": 12,
"Domains": [
"overture.com",
- "yahoo.com",
- "flickr.com"
+ "yahoo.com"
],
"Excluded": false
},
@@ -192,7 +193,6 @@
"amazon.it",
"amazon.com.au",
"amazon.co.nz",
- "amazon.co.jp",
"amazon.in"
],
"Excluded": false
@@ -777,69 +777,69 @@
"Excluded": false
},
{
- "Type": 76,
- "Domains": [
- "docusign.com",
- "docusign.net"
- ],
- "Excluded": false
- },
- {
- "Type": 77,
- "Domains": [
- "envato.com",
- "themeforest.net",
- "codecanyon.net",
- "videohive.net",
- "audiojungle.net",
- "graphicriver.net",
- "photodune.net",
- "3docean.net"
- ],
- "Excluded": false
- },
- {
- "Type": 78,
- "Domains": [
- "x10hosting.com",
- "x10premium.com"
- ],
- "Excluded": false
- },
- {
- "Type": 79,
- "Domains": [
- "dnsomatic.com",
- "opendns.com",
- "umbrella.com"
- ],
- "Excluded": false
- },
- {
- "Type": 80,
- "Domains": [
- "cagreatamerica.com",
- "canadaswonderland.com",
- "carowinds.com",
- "cedarfair.com",
- "cedarpoint.com",
- "dorneypark.com",
- "kingsdominion.com",
- "knotts.com",
- "miadventure.com",
- "schlitterbahn.com",
- "valleyfair.com",
- "visitkingsisland.com",
- "worldsoffun.com"
- ],
- "Excluded": false
- },
- {
- "Type": 81,
- "Domains": [
- "ubnt.com",
- "ui.com"
- ],
- "Excluded": false
+ "Type": 76,
+ "Domains": [
+ "docusign.com",
+ "docusign.net"
+ ],
+ "Excluded": false
+ },
+ {
+ "Type": 77,
+ "Domains": [
+ "envato.com",
+ "themeforest.net",
+ "codecanyon.net",
+ "videohive.net",
+ "audiojungle.net",
+ "graphicriver.net",
+ "photodune.net",
+ "3docean.net"
+ ],
+ "Excluded": false
+ },
+ {
+ "Type": 78,
+ "Domains": [
+ "x10hosting.com",
+ "x10premium.com"
+ ],
+ "Excluded": false
+ },
+ {
+ "Type": 79,
+ "Domains": [
+ "dnsomatic.com",
+ "opendns.com",
+ "umbrella.com"
+ ],
+ "Excluded": false
+ },
+ {
+ "Type": 80,
+ "Domains": [
+ "cagreatamerica.com",
+ "canadaswonderland.com",
+ "carowinds.com",
+ "cedarfair.com",
+ "cedarpoint.com",
+ "dorneypark.com",
+ "kingsdominion.com",
+ "knotts.com",
+ "miadventure.com",
+ "schlitterbahn.com",
+ "valleyfair.com",
+ "visitkingsisland.com",
+ "worldsoffun.com"
+ ],
+ "Excluded": false
+ },
+ {
+ "Type": 81,
+ "Domains": [
+ "ubnt.com",
+ "ui.com"
+ ],
+ "Excluded": false
}
]
