TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-03 12:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update snet extension

Browse Source
This commit is contained in:
topjohnwu
2019-08-08 04:18:32 -07:00
parent f2494374f8
commit a797d5d396
11 changed files with 74 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
snet/src/main/java/com/topjohnwu/snet/SafetyNetHelper.java
View File

@@ -1,18 +1,14 @@
package com.topjohnwu.snet;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.util.Base64;
import android.util.Log;
import androidx.annotation.NonNull;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import com.google.android.gms.common.api.ApiException;
import com.google.android.gms.common.internal.ConnectionErrorMessages;
import com.google.android.gms.common.internal.DialogRedirect;
import com.google.android.gms.safetynet.SafetyNet;
import com.google.android.gms.safetynet.SafetyNetApi;
import com.google.android.gms.safetynet.SafetyNetClient;
@@ -24,10 +20,9 @@ import org.json.JSONObject;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.security.SecureRandom;
import androidx.annotation.NonNull;
public class SafetyNetHelper implements InvocationHandler,
OnSuccessListener<SafetyNetApi.AttestationResponse>, OnFailureListener {
@@ -40,11 +35,16 @@ public class SafetyNetHelper implements InvocationHandler,
private static final SecureRandom RANDOM = new SecureRandom();
private static final String TAG = "SNET";
private final Activity mActivity;
private final Context context;
private final Object callback;
SafetyNetHelper(Activity activity, Object cb) {
mActivity = activity;
public static Object get(Class<?> interfaceClass, Context context, Object cb) {
return Proxy.newProxyInstance(SafetyNetHelper.class.getClassLoader(),
new Class[]{interfaceClass}, new SafetyNetHelper(context, cb));
}
private SafetyNetHelper(Context c, Object cb) {
context = c;
callback = cb;
}
@@ -52,7 +52,8 @@ public class SafetyNetHelper implements InvocationHandler,
Class<?> clazz = callback.getClass();
try {
clazz.getMethod("onResponse", int.class).invoke(callback, code);
} catch (Exception ignored) {}
} catch (Exception ignored) {
}
}
/* Return magic API key here :) */
@@ -60,17 +61,14 @@ public class SafetyNetHelper implements InvocationHandler,
return "";
}
/* Override ISafetyNetHelper.getVersion */
private int getVersion() {
return BuildConfig.VERSION_CODE;
}
/* Override ISafetyNetHelper.attest */
private void attest() {
int code = API_AVAIL.isGooglePlayServicesAvailable(mActivity);
int code = API_AVAIL.isGooglePlayServicesAvailable(context);
if (code != ConnectionResult.SUCCESS) {
if (API_AVAIL.isUserResolvableError(code))
getErrorDialog(code, 0).show();
Log.e(TAG, API_AVAIL.getErrorString(code));
invokeCallback(CONNECTION_FAIL);
return;
}
@@ -78,28 +76,10 @@ public class SafetyNetHelper implements InvocationHandler,
byte[] nonce = new byte[24];
RANDOM.nextBytes(nonce);
SafetyNetClient client = SafetyNet.getClient(mActivity.getBaseContext());
SafetyNetClient client = SafetyNet.getClient(context);
client.attest(nonce, getApiKey()).addOnSuccessListener(this).addOnFailureListener(this);
}
private Dialog getErrorDialog(int errorCode, int requestCode) {
AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
Context swapCtx = new SwapResContext(mActivity, Snet.dexPath);
Intent intent = API_AVAIL.getErrorResolutionIntent(swapCtx, errorCode, "d");
builder.setMessage(ConnectionErrorMessages.getErrorMessage(swapCtx, errorCode));
builder.setPositiveButton(
ConnectionErrorMessages.getErrorDialogButtonMessage(swapCtx, errorCode),
DialogRedirect.getInstance(mActivity, intent, requestCode));
String title;
if ((title = ConnectionErrorMessages.getErrorTitle(swapCtx, errorCode)) != null) {
builder.setTitle(title);
}
return builder.create();
}
@Override
public void onSuccess(SafetyNetApi.AttestationResponse result) {
int code = 0;
@@ -121,12 +101,9 @@ public class SafetyNetHelper implements InvocationHandler,
public void onFailure(@NonNull Exception e) {
if (e instanceof ApiException) {
int errCode = ((ApiException) e).getStatusCode();
if (API_AVAIL.isUserResolvableError(errCode))
getErrorDialog(errCode, 0).show();
else
Log.e(TAG, "Cannot resolve: " + e.getMessage());
Log.e(TAG, API_AVAIL.getErrorString(errCode));
} else {
Log.e(TAG, "Unknown: " + e.getMessage());
Log.e(TAG, "Unknown: " + e);
}
invokeCallback(CONNECTION_FAIL);
}
@@ -136,11 +113,10 @@ public class SafetyNetHelper implements InvocationHandler,
switch (method.getName()) {
case "attest":
attest();
return null;
break;
case "getVersion":
return getVersion();
default:
return null;
}
return null;
}
}

15
snet/src/main/java/com/topjohnwu/snet/Snet.java
View File

@@ -1,15 +0,0 @@
package com.topjohnwu.snet;
import android.app.Activity;
import java.lang.reflect.Proxy;
public class Snet {
static String dexPath;
public static Object newHelper(Class<?> interfaceClass, String dexPath, Activity activity, Object cb) {
Snet.dexPath = dexPath;
return Proxy.newProxyInstance(SafetyNetHelper.class.getClassLoader(),
new Class[] { interfaceClass }, new SafetyNetHelper(activity, cb));
}
}

34
snet/src/main/java/com/topjohnwu/snet/SwapResContext.java
View File

@@ -1,34 +0,0 @@
package com.topjohnwu.snet;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.res.AssetManager;
import android.content.res.Resources;
public class SwapResContext extends ContextWrapper {
private AssetManager asset;
private Resources resources;
public SwapResContext(Context base, String apk) {
super(base);
try {
asset = AssetManager.class.newInstance();
AssetManager.class.getMethod("addAssetPath", String.class).invoke(asset, apk);
} catch (Exception e) {
e.printStackTrace();
}
Resources res = base.getResources();
resources = new Resources(asset, res.getDisplayMetrics(), res.getConfiguration());
}
@Override
public Resources getResources() {
return resources;
}
@Override
public AssetManager getAssets() {
return asset;
}
}