Merge pull request #987 from theycallmesteve/global_domains

GlobalEquivalentDomains updates from upstream bitwarden

src/api/core/ciphers.rs

@@ -767,11 +767,7 @@ fn post_attachment_admin(
     post_attachment(uuid, data, content_type, headers, conn, nt)
 }
 
-#[post(
+#[post("/ciphers/<uuid>/attachment/<attachment_id>/share", format = "multipart/form-data", data = "<data>")]
-    "/ciphers/<uuid>/attachment/<attachment_id>/share",
-    format = "multipart/form-data",
-    data = "<data>"
-)]
 fn post_attachment_share(
     uuid: String,
     attachment_id: String,

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;

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",

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 {

src/db/models/organization.rs

@@ -165,9 +165,9 @@ impl Organization {
             "UsePolicies": true,
 
             "BusinessName": null,
-            "BusinessAddress1":	null,
+            "BusinessAddress1": null,
-            "BusinessAddress2":	null,
+            "BusinessAddress2": null,
-            "BusinessAddress3":	null,
+            "BusinessAddress3": null,
             "BusinessCountry": null,
             "BusinessTaxNumber": null,
 

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",
+      "yahoo.com"
-      "flickr.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,
+    "Type": 76,
-  	"Domains": [
+    "Domains": [
-  		"docusign.com",
+      "docusign.com",
-  		"docusign.net"
+      "docusign.net"
-  	],
+    ],
-  	"Excluded": false
+    "Excluded": false
-  },
+  },
-  {
+  {
-  	"Type": 77,
+    "Type": 77,
-  	"Domains": [
+    "Domains": [
-  		"envato.com",
+      "envato.com",
-  		"themeforest.net",
+      "themeforest.net",
-  		"codecanyon.net",
+      "codecanyon.net",
-  		"videohive.net",
+      "videohive.net",
-  		"audiojungle.net",
+      "audiojungle.net",
-  		"graphicriver.net",
+      "graphicriver.net",
-  		"photodune.net",
+      "photodune.net",
-  		"3docean.net"
+      "3docean.net"
-  	],
+    ],
-  	"Excluded": false
+    "Excluded": false
-  },
+  },
-  {
+  {
-  	"Type": 78,
+    "Type": 78,
-  	"Domains": [
+    "Domains": [
-  		"x10hosting.com",
+      "x10hosting.com",
-  		"x10premium.com"
+      "x10premium.com"
-  	],
+    ],
-  	"Excluded": false
+    "Excluded": false
-  },
+  },
-  {
+  {
-  	"Type": 79,
+    "Type": 79,
-  	"Domains": [
+    "Domains": [
-  		"dnsomatic.com",
+      "dnsomatic.com",
-  		"opendns.com",
+      "opendns.com",
-  		"umbrella.com"
+      "umbrella.com"
-  	],
+    ],
-  	"Excluded": false
+    "Excluded": false
-  },
+  },
-  {
+  {
-  	"Type": 80,
+    "Type": 80,
-  	"Domains": [
+    "Domains": [
-  		"cagreatamerica.com",
+      "cagreatamerica.com",
-  		"canadaswonderland.com",
+      "canadaswonderland.com",
-  		"carowinds.com",
+      "carowinds.com",
-  		"cedarfair.com",
+      "cedarfair.com",
-  		"cedarpoint.com",
+      "cedarpoint.com",
-  		"dorneypark.com",
+      "dorneypark.com",
-  		"kingsdominion.com",
+      "kingsdominion.com",
-  		"knotts.com",
+      "knotts.com",
-  		"miadventure.com",
+      "miadventure.com",
-  		"schlitterbahn.com",
+      "schlitterbahn.com",
-  		"valleyfair.com",
+      "valleyfair.com",
-  		"visitkingsisland.com",
+      "visitkingsisland.com",
-  		"worldsoffun.com"
+      "worldsoffun.com"
-  	],
+    ],
-  	"Excluded": false
+    "Excluded": false
-  },
+  },
-  {
+  {
-  	"Type": 81,
+    "Type": 81,
-  	"Domains": [
+    "Domains": [
-  		"ubnt.com",
+      "ubnt.com",
-  		"ui.com"
+      "ui.com"
-  	],
+    ],
-  	"Excluded": false
+    "Excluded": false
   }
 ]