firebase · jonsimantov · Feb 8, 2021 · Jul 8, 2020 · Jul 8, 2020 · Jul 9, 2020
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -141,6 +141,8 @@ jobs:
             startsWith(matrix.os, 'macos')
         run: |
           brew install openssl
+          # brew won't overwrite MacOS system default OpenSSL, so force it here.
+          echo "OPENSSL_ROOT_DIR=/usr/local/opt/[email protected]" >> $GITHUB_ENV
 
       - name: Install OpenSSL (Linux)
         if: matrix.target_platform == 'Desktop' &&

diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle
@@ -16,29 +16,30 @@ import org.gradle.util.ConfigureUtil;
 
 // A map of library to the dependencies that need to be added for it.
 def firebaseDependenciesMap = [
-  'app' : ['com.google.firebase:firebase-analytics:18.0.0'],
-  'admob' : ['com.google.firebase:firebase-ads:19.5.0',
-             'com.google.android.gms:play-services-measurement-sdk-api:18.0.0',
-             'com.google.android.gms:play-services-base:17.5.0'],
-  'analytics' : ['com.google.firebase:firebase-analytics:18.0.0',
-                 'com.google.android.gms:play-services-base:17.5.0'],
-  'auth' : ['com.google.firebase:firebase-auth:20.0.0'],
-  'database' : ['com.google.firebase:firebase-database:19.5.1'],
+  'app' : ['com.google.firebase:firebase-analytics:18.0.2'],
+  'admob' : ['com.google.firebase:firebase-ads:19.7.0',
+             'com.google.android.gms:play-services-measurement-sdk-api:18.0.2',
+             'com.google.android.gms:play-services-base:17.6.0'],
+  'analytics' : ['com.google.firebase:firebase-analytics:18.0.2',
+                 'com.google.android.gms:play-services-base:17.6.0'],
+  'auth' : ['com.google.firebase:firebase-auth:20.0.2'],
+  'database' : ['com.google.firebase:firebase-database:19.6.0'],
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.1.1'],
-  'firestore' : ['com.google.firebase:firebase-firestore:22.0.0'],
-  'functions' : ['com.google.firebase:firebase-functions:19.1.0'],
-  'installations' : ['com.google.firebase:firebase-installations:16.3.3',
-                     'com.google.android.gms:play-services-base:17.4.0'],
-  'instance_id' : ['com.google.firebase:firebase-iid:21.0.0'],
+  'firestore' : ['com.google.firebase:firebase-firestore:22.0.2'],
+  'functions' : ['com.google.firebase:firebase-functions:19.2.0'],
+  'installations' : ['com.google.firebase:firebase-installations:16.3.5',
+                     'com.google.android.gms:play-services-base:17.6.0'],
+  'instance_id' : ['com.google.firebase:firebase-iid:21.0.1'],
   'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
   // Messaging has an additional local dependency to include.
-  'messaging' : ['com.google.firebase:firebase-messaging:21.0.0',
+  'messaging' : ['com.google.firebase:firebase-messaging:21.0.1',
                  'firebase_cpp_sdk.messaging:messaging_java',
-                 'androidx.core:core:1.0.1'],
-  'performance' : ['com.google.firebase:firebase-perf:19.0.9'],
-  'remote_config' : ['com.google.firebase:firebase-config:20.0.0',
-                     'com.google.android.gms:play-services-base:17.5.0'],
-  'storage' : ['com.google.firebase:firebase-storage:19.2.0']
+                 'androidx.core:core:1.0.1',
+                 'com.google.flatbuffers:flatbuffers-java:1.9.0'],
+  'performance' : ['com.google.firebase:firebase-perf:19.1.0'],
+  'remote_config' : ['com.google.firebase:firebase-config:20.0.3',
+                     'com.google.android.gms:play-services-base:17.6.0'],
+  'storage' : ['com.google.firebase:firebase-storage:19.2.1']
 ]
 
 // A map of library to the gradle resources that they depend upon.

diff --git a/admob/admob_resources/build.gradle b/admob/admob_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -45,13 +45,13 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:18.0.0'
-  implementation 'com.google.firebase:firebase-ads:19.5.0'
+  implementation 'com.google.firebase:firebase-analytics:18.0.2'
+  implementation 'com.google.firebase:firebase-ads:19.7.0'
 }
 
 afterEvaluate {
   generateReleaseBuildConfig.enabled = false
 }
 
 apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
-extractAndDexAarFile('admob_resources')
+extractAndDexAarFile('admob_resources')
diff --git a/admob/build.gradle b/admob/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
   }
 }
 allprojects {

diff --git a/admob/integration_test/Podfile b/admob/integration_test/Podfile
@@ -4,7 +4,7 @@ platform :ios, '10.0'
 # Firebase AdMob test application.
 
 target 'integration_test' do
-  pod 'Firebase/AdMob', '7.0.0'
+  pod 'Firebase/AdMob', '7.5.0'
 end
 
 post_install do |installer|

diff --git a/admob/integration_test/build.gradle b/admob/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }

diff --git a/admob/integration_test/gradle/wrapper/gradle-wrapper.properties b/admob/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/analytics/build.gradle b/analytics/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
   }
 }
 allprojects {

diff --git a/analytics/integration_test/Podfile b/analytics/integration_test/Podfile
@@ -4,7 +4,7 @@ platform :ios, '10.0'
 # Firebase Analytics test application.
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '7.0.0'
+  pod 'Firebase/Analytics', '7.5.0'
 end
 
 post_install do |installer|

diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }

diff --git a/analytics/integration_test/gradle/wrapper/gradle-wrapper.properties b/analytics/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -46,12 +46,12 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:18.0.0'
+  implementation 'com.google.firebase:firebase-analytics:18.0.2'
 }
 
 afterEvaluate {
   generateReleaseBuildConfig.enabled = false
 }
 
 apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
-extractAndDexAarFile('app_resources')
+extractAndDexAarFile('app_resources')
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
   }
 }
 allprojects {

diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -49,8 +49,8 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:18.0.0'
-  implementation 'com.google.android.gms:play-services-base:17.5.0'
+  implementation 'com.google.firebase:firebase-analytics:18.0.2'
+  implementation 'com.google.android.gms:play-services-base:17.6.0'
   implementation project(':app:app_resources')
 }
 
@@ -59,4 +59,4 @@ afterEvaluate {
 }
 
 apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
-extractAndDexAarFile('google_api_resources')
+extractAndDexAarFile('google_api_resources')
diff --git a/app/integration_test/Podfile b/app/integration_test/Podfile
@@ -4,7 +4,7 @@ platform :ios, '10.0'
 # Firebase App test application.
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '7.0.0'
+  pod 'Firebase/Analytics', '7.5.0'
 end
 
 post_install do |installer|

diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
     classpath 'com.google.gms:google-services:4.0.1'
   }
 }

diff --git a/app/integration_test/gradle/wrapper/gradle-wrapper.properties b/app/integration_test/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.1'
+    classpath 'com.android.tools.build:gradle:3.3.3'
     classpath 'com.google.gms:google-services:4.2.0'
   }
 }
@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.google.firebase:firebase-analytics:18.0.0'
+  implementation 'com.google.firebase:firebase-analytics:18.0.2'
   implementation 'com.google.firebase:firebase-dynamic-links:19.1.1'
   implementation project(':app:app_resources')
 }
@@ -55,4 +55,4 @@ afterEvaluate {
 }
 
 apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
-extractAndDexAarFile('invites_resources')
+extractAndDexAarFile('invites_resources')
diff --git a/app/src/function_registry.h b/app/src/function_registry.h
@@ -34,7 +34,10 @@ enum FunctionId {
   FnAuthGetCurrentToken,
   FnAuthStartTokenListener,
   FnAuthStopTokenListener,
-  FnAuthGetTokenAsync
+  FnAuthGetTokenAsync,
+  FnAuthGetCurrentUserUid,
+  FnAuthAddAuthStateListener,
+  FnAuthRemoveAuthStateListener,
 };
 
 // Class for providing a generic way for firebase libraries to expose their

diff --git a/app/src/future_manager.cc b/app/src/future_manager.cc
@@ -31,7 +31,7 @@ FutureManager::~FutureManager() {
     orphaned_future_apis_.insert(i->second);
   }
   future_apis_.clear();
-  CleanupOrphanedFutureApis(true);  // force delete all
+  CleanupOrphanedFutureApis(/*force_delete_all=*/true);
 }
 
 void FutureManager::AllocFutureApi(void* owner, int num_fns) {
@@ -95,8 +95,18 @@ void FutureManager::CleanupOrphanedFutureApis(bool force_delete_all) {
   std::vector<ReferenceCountedFutureImpl*> to_delete;
   for (auto api = orphaned_future_apis_.begin();
        api != orphaned_future_apis_.end(); ++api) {
-    if (force_delete_all || IsSafeToDeleteFutureApi(*api)) {
+    if (IsSafeToDeleteFutureApi(*api)) {
       to_delete.push_back(*api);
+    } else if (force_delete_all) {
+      // Deleting an API while it's running a callback (which could have
+      // triggered the current call to `CleanupOrphanedFutureApis`) will lead to
+      // a use-after-free. Instead, mark the API to be deleted once the callback
+      // finishes.
+      if ((*api)->IsRunningCallback()) {
+        (*api)->MarkOrphaned();
+      } else {
+        to_delete.push_back(*api);
+      }
     }
   }
 

diff --git a/app/src/heartbeat_date_storage_desktop.cc b/app/src/heartbeat_date_storage_desktop.cc
@@ -19,9 +19,8 @@
 #include <fstream>
 #include <utility>
 
-#include <app/src/mutex.h>
-
 #include "app/src/filesystem.h"
+#include "app/src/mutex.h"
 
 namespace FIREBASE_NAMESPACE {
 
@@ -32,7 +31,7 @@ const char kHeartbeatFilename[] = "HEARTBEAT_INFO_STORAGE";
 
 // Returns the mutex that protects accesses to the storage file.
 Mutex& FileMutex() {
-  static Mutex* mutex_ =  new Mutex(Mutex::kModeNonRecursive);
+  static Mutex* mutex_ = new Mutex(Mutex::kModeNonRecursive);
   return *mutex_;
 }
 

diff --git a/app/src/reference_counted_future_impl.cc b/app/src/reference_counted_future_impl.cc
@@ -466,6 +466,11 @@ void ReferenceCountedFutureImpl::RunCallback(
   is_running_callback_ = false;
 }
 
+bool ReferenceCountedFutureImpl::is_orphaned() const {
+  MutexLock lock(mutex_);
+  return is_orphaned_;
+}
+
 static void CleanupFuture(FutureBase* future) { future->Release(); }
 
 void ReferenceCountedFutureImpl::RegisterFutureForCleanup(FutureBase* future) {
@@ -715,6 +720,11 @@ bool ReferenceCountedFutureImpl::IsSafeToDelete() const {
   return true;
 }
 
+bool ReferenceCountedFutureImpl::IsRunningCallback() const {
+  MutexLock lock(mutex_);
+  return is_running_callback_;
+}
+
 bool ReferenceCountedFutureImpl::IsReferencedExternally() const {
   MutexLock lock(mutex_);
 
@@ -803,6 +813,11 @@ void ReferenceCountedFutureImpl::ForceReleaseFuture(
   FIREBASE_FUTURE_TRACE("API: ForceReleaseFuture handle %d", handle.id());
 }
 
+void ReferenceCountedFutureImpl::MarkOrphaned() {
+  MutexLock lock(mutex_);
+  is_orphaned_ = true;
+}
+
 // Implementation of FutureHandle from future.h
 FutureHandle::FutureHandle() : id_(0), api_(nullptr) {}