Merge remote-tracking branch 'origin/release-0.50.x' into merge-v0.50.0

.buildconfig-android.yml

@@ -1,4 +1,4 @@
-libraryVersion: 0.50.0
+libraryVersion: 0.50.2
 groupId: org.mozilla.appservices
 projects:
   fxaclient:

CHANGELOG.md

@@ -1,3 +1,24 @@
+# v0.50.2 (_2020-02-06_)
+
+[Full Changelog](https://github.com/mozilla/application-services/compare/v0.50.1...v0.50.2)
+
+### What's changed
+
+- Re-releasing to fix misconfigured build options in v0.50.1.
+
+
+# v0.50.1 (_2020-02-06_)
+
+[Full Changelog](https://github.com/mozilla/application-services/compare/v0.50.0...v0.50.1)
+
+## FxA Client
+
+### What's changed
+
+- Fixed a potentially-unsafe use of a boolean in the FFI interface for `migrateFromSessionToken`.
+  ([#2592](https://github.com/mozilla/application-services/pull/2592)).
+
+
 # v0.50.0 (_2020-02-05_)
 
 [Full Changelog](https://github.com/mozilla/application-services/compare/v0.49.0...v0.50.0)

CHANGES_UNRELEASED.md

@@ -2,7 +2,7 @@
 
 # Unreleased Changes
 
-[Full Changelog](https://github.com/mozilla/application-services/compare/v0.50.0...master)
+[Full Changelog](https://github.com/mozilla/application-services/compare/v0.50.2...master)
 
 ## FxA Client
 

components/fxa-client/android/src/main/java/mozilla/appservices/fxaclient/FirefoxAccount.kt

@@ -329,7 +329,7 @@ class FirefoxAccount(handle: FxaHandle, persistCallback: PersistCallback?) : Aut
                     sessionToken,
                     kSync,
                     kXCS,
-                    false,
+                    0,
                     e
                 )
             }.getAndConsumeRustString()
@@ -366,7 +366,7 @@ class FirefoxAccount(handle: FxaHandle, persistCallback: PersistCallback?) : Aut
     fun copyFromSessionToken(sessionToken: String, kSync: String, kXCS: String): JSONObject {
         try {
             val json = rustCallWithLock { e ->
-                LibFxAFFI.INSTANCE.fxa_migrate_from_session_token(this.handle.get(), sessionToken, kSync, kXCS, true, e)
+                LibFxAFFI.INSTANCE.fxa_migrate_from_session_token(this.handle.get(), sessionToken, kSync, kXCS, 1, e)
             }.getAndConsumeRustString()
             return JSONObject(json)
         } finally {

components/fxa-client/android/src/main/java/mozilla/appservices/fxaclient/rust/LibFxAFFI.kt

@@ -90,7 +90,7 @@ internal interface LibFxAFFI : Library {
         sessionToken: String,
         kSync: String,
         kXCS: String,
-        copySessionToken: Boolean,
+        copySessionToken: Byte,
         e: RustError.ByReference
     ): Pointer?
 

components/fxa-client/ffi/src/lib.rs

@@ -238,7 +238,7 @@ pub extern "C" fn fxa_migrate_from_session_token(
     session_token: FfiStr<'_>,
     k_sync: FfiStr<'_>,
     k_xcs: FfiStr<'_>,
-    copy_session_token: bool,
+    copy_session_token: u8,
     error: &mut ExternError,
 ) -> *mut c_char {
     log::debug!("fxa_migrate_from_session_token");
@@ -247,7 +247,7 @@ pub extern "C" fn fxa_migrate_from_session_token(
         let k_sync = k_sync.as_str();
         let k_xcs = k_xcs.as_str();
         let migration_metrics =
-            fxa.migrate_from_session_token(session_token, k_sync, k_xcs, copy_session_token)?;
+            fxa.migrate_from_session_token(session_token, k_sync, k_xcs, copy_session_token != 0)?;
         let result = serde_json::to_string(&migration_metrics)?;
         Ok(result)
     })

components/fxa-client/ios/FxAClient/RustFxAFFI.h

@@ -127,7 +127,7 @@ void fxa_migrate_from_session_token(FirefoxAccountHandle handle,
                                     const char *_Nonnull sessionToken,
                                     const char *_Nonnull kSync,
                                     const char *_Nonnull kXCS,
-                                    bool copySessionToken,
+                                    uint8_t copySessionToken,
                                     FxAError *_Nonnull out);
 
 char *_Nullable fxa_get_token_server_endpoint_url(FirefoxAccountHandle handle,