Skip to content

fix(firebase_app_check): Add play integrity check to app_check activation #9450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
the-recondite wants to merge 5 commits into from
Closed

fix(firebase_app_check): Add play integrity check to app_check activation #9450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5866cfb
Added play integrity check to added safety net check for appcheck act…
the-recondite Aug 31, 2022
5af6e76
Merge pull request #1 from flooz-link/chore/use-play-integrity-for-ap…
the-recondite Aug 31, 2022
926267f
added play integrity dependency
the-recondite Aug 31, 2022
cd13b0d
Merge pull request #2 from flooz-link/chore/use-play-integrity-for-ap…
the-recondite Aug 31, 2022
bd88ded
Merge branch 'master' of github.com:firebase/flutterfire
the-recondite Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cloud_firestore/cloud_firestore/lib/cloud_firestore.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

library cloud_firestore;


// TODO(Lyokone): remove once we bump Flutter SDK min version to 3.3
// ignore: unnecessary_import
import 'dart:typed_data';

import 'package:cloud_firestore_platform_interface/cloud_firestore_platform_interface.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart'
Expand Down
1 change: 1 addition & 0 deletions ...ud_firestore_platform_interface/lib/src/method_channel/utils/firestore_message_codec.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.


// TODO(Lyokone): remove once we bump Flutter SDK min version to 3.3
// ignore: unnecessary_import
import 'dart:typed_data';
Expand Down
1 change: 1 addition & 0 deletions packages/firebase_app_check/firebase_app_check/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ android {
// TODO: Since App Check is a beta SDK it's not available in the Firebase Android BoM so we need to specify an exact version here.
implementation 'com.google.firebase:firebase-appcheck-safetynet:16.0.0-beta04'
implementation 'com.google.firebase:firebase-appcheck-debug:16.0.0-beta04'
implementation 'com.google.firebase:firebase-appcheck-playintegrity:16.0.0-beta04'
implementation 'androidx.annotation:annotation:1.1.0'
}
}
Expand Down
3 changes: 3 additions & 0 deletions ...oid/src/main/java/io/flutter/plugins/firebase/appcheck/FlutterFirebaseAppCheckPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.google.firebase.FirebaseApp;
import com.google.firebase.appcheck.AppCheckTokenResult;
import com.google.firebase.appcheck.FirebaseAppCheck;
import com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderFactory;
import com.google.firebase.appcheck.safetynet.SafetyNetAppCheckProviderFactory;
import io.flutter.embedding.engine.plugins.FlutterPlugin;
import io.flutter.plugin.common.BinaryMessenger;
Expand Down Expand Up @@ -80,6 +81,8 @@ private Task<Void> activate(Map<String, Object> arguments) {
FirebaseAppCheck firebaseAppCheck = getAppCheck(arguments);
firebaseAppCheck.installAppCheckProviderFactory(
SafetyNetAppCheckProviderFactory.getInstance());
Copy link
Contributor

@nohe427 nohe427 Sep 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like SafetyNet should be behind a flag. SafetyNet is eventually being deprecated and the Play Console is warning folks about SafetyNet being present in their APKs and AABs. I think PlayIntegrityAPI should be the default choice and then optionally have a flag that can switch over to safetyNet, but not have both appcheck providers active at the same time since both provide attestation.

firebaseAppCheck.installAppCheckProviderFactory(
PlayIntegrityAppCheckProviderFactory.getInstance());
taskCompletionSource.setResult(null);
} catch (Exception e) {
taskCompletionSource.setException(e);
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ - (void)messaging:(nonnull FIRMessaging *)messaging
if ([[GULAppDelegateSwizzler sharedApplication].delegate
respondsToSelector:messaging_didReceiveRegistrationTokenSelector]) {
void (*usersDidReceiveRegistrationTokenIMP)(id, SEL, FIRMessaging *, NSString *) =
(typeof(usersDidReceiveRegistrationTokenIMP)) & objc_msgSend;
(typeof(usersDidReceiveRegistrationTokenIMP))&objc_msgSend;
usersDidReceiveRegistrationTokenIMP([GULAppDelegateSwizzler sharedApplication].delegate,
messaging_didReceiveRegistrationTokenSelector, messaging,
fcmToken);
Expand Down