update

Author: 王俊杰

src/main/java/com/baidu/disk/algorithm/Sign.java

@@ -3,8 +3,12 @@
 
 import lombok.SneakyThrows;
 
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
 import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
 import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.Base64;
 
 /**
@@ -26,6 +30,23 @@ public static String getBdstoken(String bduss) {
         return shaHex(md5(bduss.getBytes(StandardCharsets.UTF_8)));
     }
 
+    public static byte[] hmacSHA1Encrypt(byte[] arg3, byte[] arg4) throws NoSuchAlgorithmException, InvalidKeyException {
+        byte[] res;
+        Mac mac;
+        if (arg3 != null && arg4 != null) {
+            try {
+                mac = Mac.getInstance("HmacSHA1");
+            } catch (NoSuchAlgorithmException v0) {
+                mac = Mac.getInstance("HMAC-SHA-1");
+            }
+            mac.init(new SecretKeySpec(arg3, "RAW"));
+            res = mac.doFinal(arg4);
+        } else {
+            res = null;
+        }
+        return res;
+    }
+
     @SneakyThrows
     public static byte[] md5(byte[] bduss) {
         MessageDigest digest;
@@ -61,8 +82,9 @@ public static String shaHex(byte[] digest) {
 
     /**
      * RC4
+     *
      * @param content content
-     * @param key key
+     * @param key     key
      * @return encrypt code
      */
     @SuppressWarnings("unused")
@@ -105,12 +127,31 @@ public static byte[] encrypt(byte[] content, String key) {
         return iOutput;
     }
 
+    public static String customEncode(byte[] bArr, String str, boolean z) {
+        if (bArr == null) {
+            return "";
+        }
+        StringBuilder sb = new StringBuilder();
+        for (byte b : bArr) {
+            String hexString = Integer.toHexString(b & 255);
+            if (z) {
+                hexString = hexString.toUpperCase();
+            }
+            if (hexString.length() == 1) {
+                sb.append("0");
+            }
+            sb.append(hexString).append(str);
+        }
+        return sb.toString();
+    }
+
     public static String encode(byte[] val) {
         return Base64.getEncoder().encodeToString(val);
     }
 
     /**
      * Base64 decode
+     *
      * @param val val
      * @return decode val
      */

src/main/java/com/baidu/disk/algorithm/SoSign.java

@@ -6,6 +6,7 @@
 import com.github.unidbg.linux.android.AndroidResolver;
 import com.github.unidbg.linux.android.dvm.*;
 import com.github.unidbg.memory.Memory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PreDestroy;
@@ -21,6 +22,7 @@
  * @author JackJun
  * @date 2020/11/14 11:08 下午
  */
+@Slf4j
 @Component
 public class SoSign extends AbstractJni {
 
@@ -41,11 +43,15 @@ public SoSign(BaiduYunProperties baiduYunProperties) {
         vm.setJni(this);
         vm.setVerbose(false);
         //加载so，使用armv8-64速度会快很多
-        DalvikModule dm = vm.loadLibrary(new File(baiduYunProperties.getSoPath()), false);
+        DalvikModule urlDm = vm.loadLibrary(new File(baiduYunProperties.getUrlSo()), false);
+        DalvikModule keyMakerDm = vm.loadLibrary(new File(baiduYunProperties.getKeySo()), false);
         //调用jni
-        dm.callJNI_OnLoad(emulator);
+        urlDm.callJNI_OnLoad(emulator);
+        keyMakerDm.callJNI_OnLoad(emulator);
+
         //Jni调用的类，加载so
-        dvmClass = vm.resolveClass("com/baidu/netdisk/security/URLHandler");
+        urlHandler = vm.resolveClass("com/baidu/netdisk/security/URLHandler");
+        keyMaker = vm.resolveClass("com/baidu/netdisk/kernel/encode/KeyMaker");
     }
 
     //ARM模拟器
@@ -54,19 +60,38 @@ public SoSign(BaiduYunProperties baiduYunProperties) {
     //vm
     private final VM vm;
 
-    private final DvmClass dvmClass;
+    private final DvmClass urlHandler;
+
+    private final DvmClass keyMaker;
 
     private String sk;
 
+    //B8ec24caf34ef7227c66767d29ffd3fb
+    private String generate = "B8ec24caf34ef7227c66767d29ffd3fb";
+
+    public String generate() {
+        if (generate == null) {
+            long time = System.currentTimeMillis();
+            StringObject resObj = keyMaker.callStaticJniMethodObject(emulator, "converToSha1Key(J;I;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
+                    time,
+                    12306,
+                    vm.addLocalObject(new StringObject(vm, "FF214M12NDS90SFAG")),
+                    vm.addLocalObject(new StringObject(vm, "LKM3636U098T")));
+            generate = resObj.getValue();
+            log.info("EncryptFactor, Param: {}, 12306, FF214M12NDS90SFAG, LKM3636U098T, Result: {}", time, generate);
+        }
+        return generate;
+    }
+
     public String handlerUrl(String url, String sk) {
         return handlerUrl(url, sk, baiduYunProperties.getBduss(), baiduYunProperties.getUid());
     }
 
     public String handlerUrl(String url, String sk, String bduss, String uid) {
+        this.sk = sk;
         //获取encodeByte地址
         DvmObject<?> context = vm.resolveClass("android/content/Context").newObject(null);
-        this.sk = sk;
-        StringObject fullUrl = dvmClass.callStaticJniMethodObject(emulator, "handlerURL(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
+        StringObject fullUrl = urlHandler.callStaticJniMethodObject(emulator, "handlerURL(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
                 vm.addLocalObject(context),
                 vm.addLocalObject(new StringObject(vm, url)),
                 vm.addLocalObject(new StringObject(vm, bduss)),
@@ -82,7 +107,11 @@ public DvmObject<?> callStaticObjectMethodV(BaseVM vm, DvmClass dvmObject, Strin
             case "com/baidu/netdisk/security/URLHandler->getDeviceID()Ljava/lang/String;":
                 return new StringObject(vm, baiduYunProperties.getDevUid());
             case "android/content/Context->getPackageName()Ljava/lang/String;": {
-                return new StringObject(vm, "com.baidu.netdisk");
+                String packageName = vm.getPackageName();
+                if (packageName != null) {
+                    return new StringObject(vm, packageName);
+                }
+                break;
             }
         }
 

src/main/java/com/baidu/disk/config/BaiduYunProperties.java

@@ -1,6 +1,9 @@
 package com.baidu.disk.config;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
@@ -11,13 +14,16 @@
 @Data
 @Component
 @ConfigurationProperties("baidu")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class BaiduYunProperties {
     private String uid;
     private String bduss;
     private String stoken;
-    private String bdstoken;
-    private String soPath;
+    private String urlSo;
     private String apkPath;
     private String devUid;
     private String cuid;
+    private String keySo;
 }