Use secure coding methods when available. (#145)

* Use secure coding methods when available. * Have pod lib lint fail on warnings. * Check availability for all platforms. * Fix indentation. * Ignore deprecation warnings for (un)achiver methods.
google · Sep 12, 2022 · 9ec2a9c · 9ec2a9c
1 parent f2de574
commit 9ec2a9c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Install Ruby gems with Bundler
       run: bundle install
     - name: Lint podspec using local source
-      run: pod lib lint --verbose --allow-warnings
+      run: pod lib lint --verbose
 
   spm-build-test:
     runs-on: macOS-latest

diff --git a/GTMAppAuth/Sources/GTMAppAuthFetcherAuthorization+Keychain.m b/GTMAppAuth/Sources/GTMAppAuthFetcherAuthorization+Keychain.m
@@ -37,8 +37,19 @@ + (GTMAppAuthFetcherAuthorization *)authorizationFromKeychainForName:(NSString *
   if (!passwordData) {
     return nil;
   }
-  GTMAppAuthFetcherAuthorization *authorization = (GTMAppAuthFetcherAuthorization *)
-      [NSKeyedUnarchiver unarchiveObjectWithData:passwordData];
+  GTMAppAuthFetcherAuthorization *authorization;
+  if (@available(iOS 11.0, macOS 10.13, tvOS 11.0, watchOS 4.0, *)) {
+    authorization = (GTMAppAuthFetcherAuthorization *)
+        [NSKeyedUnarchiver unarchivedObjectOfClass:[GTMAppAuthFetcherAuthorization class]
+                                          fromData:passwordData
+                                             error:nil];
+  } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    authorization = (GTMAppAuthFetcherAuthorization *)
+        [NSKeyedUnarchiver unarchiveObjectWithData:passwordData];
+#pragma clang diagnostic pop
+  }
   return authorization;
 }
 
@@ -69,7 +80,17 @@ + (BOOL)saveAuthorization:(GTMAppAuthFetcherAuthorization *)auth
 + (BOOL)saveAuthorization:(GTMAppAuthFetcherAuthorization *)auth
              toKeychainForName:(NSString *)keychainItemName
      useDataProtectionKeychain:(BOOL)useDataProtectionKeychain {
-  NSData *authorizationData = [NSKeyedArchiver archivedDataWithRootObject:auth];
+  NSData *authorizationData;
+  if (@available(iOS 11.0, macOS 10.13, tvOS 11.0, watchOS 4.0, *)) {
+    authorizationData = [NSKeyedArchiver archivedDataWithRootObject:auth
+                                              requiringSecureCoding:YES
+                                                              error:nil];
+  } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    authorizationData = [NSKeyedArchiver archivedDataWithRootObject:auth];
+#pragma clang diagnostic pop
+  }
   return [GTMKeychain savePasswordDataToKeychainForName:keychainItemName
                                            passwordData:authorizationData
                               useDataProtectionKeychain:useDataProtectionKeychain];