Skip to content

[MSAL] Update proguard rules, Fixes AB#3340920 #2372

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

Merged
mohitc1 merged 9 commits into from
Sep 16, 2025
Merged

[MSAL] Update proguard rules, Fixes AB#3340920 #2372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3f934b7
update rules
mohitc1 Aug 20, 2025
240a1c5
changelog
mohitc1 Sep 8, 2025
5bd1bdd
merge dev
mohitc1 Sep 10, 2025
6be40f6
merge dev
mohitc1 Sep 11, 2025
2732fe6
type adapter rules
mohitc1 Sep 13, 2025
9fb6181
merge common
mohitc1 Sep 13, 2025
1f542a0
reformat
mohitc1 Sep 13, 2025
20d0572
commengs
mohitc1 Sep 16, 2025
6264524
merge common
mohitc1 Sep 16, 2025
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
1 change: 1 addition & 0 deletions changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr

vNext
----------
- [MAJOR] Update proguard rules (#2372)

Version 7.1.0
----------
Expand Down
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 19 files
+6 −0 changelog.txt
+1 −0 common/build.gradle
+38 −11 common/consumer-rules.pro
+3 −1 common/src/main/java/com/microsoft/identity/common/base64/AndroidBase64.kt
+6 −1 common/src/main/java/com/microsoft/identity/common/internal/platform/AndroidDeviceMetadata.java
+69 −3 common/src/main/java/com/microsoft/identity/common/internal/util/AndroidKeyStoreUtil.java
+41 −1 ...src/main/com/microsoft/identity/common/java/commands/parameters/BrokerResourceAccountCommandParameters.java
+1 −0 common4j/src/main/com/microsoft/identity/common/java/jwt/AbstractJwtRequest.java
+3 −0 common4j/src/main/com/microsoft/identity/common/java/jwt/JwtRequestBody.java
+10 −0 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/AttributeName.java
+3 −1 common4j/src/main/com/microsoft/identity/common/java/opentelemetry/SpanName.java
+19 −0 common4j/src/main/com/microsoft/identity/common/java/platform/Device.java
+8 −0 common4j/src/main/com/microsoft/identity/common/java/platform/IDeviceMetadata.java
+8 −0 common4j/src/main/com/microsoft/identity/common/java/providers/microsoft/MicrosoftAuthorizationRequest.java
+6 −0 common4j/src/test/com/microsoft/identity/common/java/platform/MockDeviceMetadata.java
+2 −0 ...on4j/src/test/com/microsoft/identity/common/java/providers/microsoft/MicrosoftAuthorizationRequestTest.java
+2 −0 .../microsoft/identity/common/java/providers/microsoft/microsoftsts/MicrosoftStsAuthorizationRequestTests.java
+1 −1 common4j/versioning/version.properties
+1 −1 versioning/version.properties
13 changes: 8 additions & 5 deletions msal/consumer-rules.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,13 @@
#}

##---------------Begin: proguard configuration for MSAL --------
-keep class !com.microsoft.identity.common.java.nativeauth.**, !com.microsoft.identity.common.nativeauth.**, !com.microsoft.identity.nativeauth.**, com.microsoft.identity.** { *; }
-keep class com.microsoft.device.display.** { *; }

# Keep things as they are used in TypeAdapter for deserialization/serialization
-keep class com.microsoft.identity.client.Logger { *; }
-keep class com.microsoft.identity.client.claims.ClaimsRequest { *; }
-keep class com.microsoft.identity.client.claims.RequestedClaimAdditionalInformation { *; }

##---------------Begin: proguard configuration for Nimbus ----------
-keep class com.nimbusds.** { *; }

Expand All @@ -35,17 +39,16 @@
-dontwarn sun.misc.**
#-keep class com.google.gson.stream.** { *; }

# Application classes that will be serialized/deserialized over Gson
-keep class com.google.gson.examples.android.model.** { <fields>; }

# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
-keep class * extends com.google.gson.TypeAdapter
-keep class * implements com.google.gson.TypeAdapterFactory
-keep class * implements com.google.gson.JsonSerializer
-keep class * implements com.google.gson.JsonDeserializer
-keep class com.google.gson.reflect.TypeToken { *; }
-keep class * extends com.google.gson.reflect.TypeToken { *; }

# Prevent R8 from leaving Data object members always null
-keepclassmembers,allowobfuscation class * {
-keepclassmembers class * {
@com.google.gson.annotations.SerializedName <fields>;
}
15 changes: 15 additions & 0 deletions testapps/testapp/proguard-rules.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,18 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
-dontwarn com.google.crypto.tink.subtle.Ed25519Sign$KeyPair
-dontwarn com.google.crypto.tink.subtle.Ed25519Sign
-dontwarn com.google.crypto.tink.subtle.Ed25519Verify
-dontwarn com.google.crypto.tink.subtle.X25519
-dontwarn com.google.crypto.tink.subtle.XChaCha20Poly1305
-dontwarn org.bouncycastle.asn1.ASN1Encodable
-dontwarn org.bouncycastle.asn1.pkcs.PrivateKeyInfo
-dontwarn org.bouncycastle.asn1.x509.AlgorithmIdentifier
-dontwarn org.bouncycastle.asn1.x509.SubjectPublicKeyInfo
-dontwarn org.bouncycastle.cert.X509CertificateHolder
-dontwarn org.bouncycastle.cert.jcajce.JcaX509CertificateHolder
-dontwarn org.bouncycastle.jce.provider.BouncyCastleProvider
-dontwarn org.bouncycastle.openssl.PEMKeyPair
-dontwarn org.bouncycastle.openssl.PEMParser
-dontwarn org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter