show more details in InvalidOrigin error message (#7110)

Author: jo

components/logins/src/error.rs

@@ -131,8 +131,8 @@ pub enum InvalidLogin {
     NoTarget,
     // Login has an illegal origin field, split off from IllegalFieldValue since this is a known
     // issue with the Desktop logins and we don't want to report it to Sentry (see #5233).
-    #[error("Login has illegal origin")]
-    IllegalOrigin,
+    #[error("Login has illegal origin: {reason}")]
+    IllegalOrigin { reason: String },
     #[error("Login has illegal field: {field_info}")]
     IllegalFieldValue { field_info: String },
 }

components/logins/src/login.rs

@@ -435,7 +435,10 @@ impl LoginEntry {
                     error_support::redact_url(origin)
                 );
                 // We can't fixup completely invalid records, so always throw.
-                Err(InvalidLogin::IllegalOrigin.into())
+                Err(InvalidLogin::IllegalOrigin {
+                    reason: e.to_string(),
+                }
+                .into())
             }
         }
     }
@@ -1129,7 +1132,8 @@ mod tests {
             TestCase {
                 login: login_with_malformed_origin_parens,
                 should_err: true,
-                expected_err: "Invalid login: Login has illegal origin",
+                expected_err:
+                    "Invalid login: Login has illegal origin: relative URL without a base",
             },
             TestCase {
                 login: login_with_host_unicode,

components/logins/src/sync/engine.rs

@@ -144,7 +144,7 @@ impl LoginsSyncEngine {
                         match e {
                             // This is a known error with Desktop logins (see #5233), just log it
                             // rather than reporting to sentry
-                            Error::InvalidLogin(InvalidLogin::IllegalOrigin) => {
+                            Error::InvalidLogin(InvalidLogin::IllegalOrigin { reason: _ }) => {
                                 warn!("logins-deserialize-error: {e}");
                             }
                             // For all other errors, report them to Sentry