feat: sync main branch updates

Author: WorldObservationLog

cmdline.c

@@ -1,7 +1,7 @@
 /*
   File autogenerated by gengetopt version 2.23
   generated with the following command:
-  gengetopt -i wrapper.ggo 
+  gengetopt 
 
   The developers of gengetopt consider the fixed text that goes in all
   gengetopt output files to be in the public domain:
@@ -42,6 +42,7 @@ const char *gengetopt_args_info_help[] = {
   "  -P, --proxy=STRING        (default=`')",
   "  -L, --login=STRING      username:password",
   "  -F, --code-from-file      (default=off)",
+  "  -B, --base-dir=STRING   \n                            (default=`/data/data/com.apple.android.music/files')",
     0
 };
 
@@ -75,6 +76,7 @@ void clear_given (struct gengetopt_args_info *args_info)
   args_info->proxy_given = 0 ;
   args_info->login_given = 0 ;
   args_info->code_from_file_given = 0 ;
+  args_info->base_dir_given = 0 ;
 }
 
 static
@@ -92,6 +94,8 @@ void clear_args (struct gengetopt_args_info *args_info)
   args_info->login_arg = NULL;
   args_info->login_orig = NULL;
   args_info->code_from_file_flag = 0;
+  args_info->base_dir_arg = gengetopt_strdup ("/data/data/com.apple.android.music/files");
+  args_info->base_dir_orig = NULL;
 
 }
 
@@ -108,6 +112,7 @@ void init_args_info(struct gengetopt_args_info *args_info)
   args_info->proxy_help = gengetopt_args_info_help[5] ;
   args_info->login_help = gengetopt_args_info_help[6] ;
   args_info->code_from_file_help = gengetopt_args_info_help[7] ;
+  args_info->base_dir_help = gengetopt_args_info_help[8] ;
 
 }
 
@@ -205,6 +210,8 @@ cmdline_parser_release (struct gengetopt_args_info *args_info)
   free_string_field (&(args_info->proxy_orig));
   free_string_field (&(args_info->login_arg));
   free_string_field (&(args_info->login_orig));
+  free_string_field (&(args_info->base_dir_arg));
+  free_string_field (&(args_info->base_dir_orig));
 
 
 
@@ -251,6 +258,8 @@ cmdline_parser_dump(FILE *outfile, struct gengetopt_args_info *args_info)
     write_into_file(outfile, "login", args_info->login_orig, 0);
   if (args_info->code_from_file_given)
     write_into_file(outfile, "code-from-file", 0, 0 );
+  if (args_info->base_dir_given)
+    write_into_file(outfile, "base-dir", args_info->base_dir_orig, 0);
 
 
   i = EXIT_SUCCESS;
@@ -519,10 +528,11 @@ cmdline_parser_internal (
         { "proxy",	1, NULL, 'P' },
         { "login",	1, NULL, 'L' },
         { "code-from-file",	0, NULL, 'F' },
+        { "base-dir",	1, NULL, 'B' },
         { 0,  0, 0, 0 }
       };
 
-      c = getopt_long (argc, argv, "hVH:D:M:P:L:F", long_options, &option_index);
+      c = getopt_long (argc, argv, "hVH:D:M:P:L:FB:", long_options, &option_index);
 
       if (c == -1) break;	/* Exit from `while (1)' loop.  */
 
@@ -608,6 +618,18 @@ cmdline_parser_internal (
             goto failure;
 
           break;
+        case 'B':	/* .  */
+        
+        
+          if (update_arg( (void *)&(args_info->base_dir_arg), 
+               &(args_info->base_dir_orig), &(args_info->base_dir_given),
+              &(local_args_info.base_dir_given), optarg, 0, "/data/data/com.apple.android.music/files", ARG_STRING,
+              check_ambiguity, override, 0, 0,
+              "base-dir", 'B',
+              additional_error))
+            goto failure;
+        
+          break;
 
         case 0:	/* Long option with no short option */
         case '?':	/* Invalid option.  */

cmdline.h

@@ -56,6 +56,9 @@ struct gengetopt_args_info
   const char *login_help; /**< @brief username:password help description.  */
   int code_from_file_flag;	/**< @brief  (default=off).  */
   const char *code_from_file_help; /**< @brief  help description.  */
+  char * base_dir_arg;	/**< @brief  (default='/data/data/com.apple.android.music/files').  */
+  char * base_dir_orig;	/**< @brief  original value given at command line.  */
+  const char *base_dir_help; /**< @brief  help description.  */
 
   unsigned int help_given ;	/**< @brief Whether help was given.  */
   unsigned int version_given ;	/**< @brief Whether version was given.  */
@@ -65,6 +68,7 @@ struct gengetopt_args_info
   unsigned int proxy_given ;	/**< @brief Whether proxy was given.  */
   unsigned int login_given ;	/**< @brief Whether login was given.  */
   unsigned int code_from_file_given ;	/**< @brief Whether code-from-file was given.  */
+  unsigned int base_dir_given ;	/**< @brief Whether base-dir was given.  */
 
 } ;
 

main.c

@@ -28,6 +28,19 @@ int file_exists(char *filename) {
   return (stat (filename, &buffer) == 0);
 }
 
+char *strcat_b(char *dest, char* src) {
+    size_t len1 = strlen(dest);
+    size_t len2 = strlen(src);
+
+    char *result = malloc(len1 + len2 + 1);
+    if (!result) return NULL; 
+
+    strcpy(result, dest);
+    strcat(result, src);
+
+    return result;
+}
+
 static void dialogHandler(long j, struct shared_ptr *protoDialogPtr,
                           struct shared_ptr *respHandler) {
     const char *const title = std_string_data(
@@ -147,12 +160,11 @@ static inline void init() {
     fprintf(stderr, "[+] starting...\n");
     setenv("ANDROID_DNS_MODE", "local", 1);
     if (args_info.proxy_given) {
-        fprintf(stderr, "[+] Using proxy %s", args_info.proxy_arg);
-        setenv("http_proxy", args_info.proxy_arg, 1);
-        setenv("https_proxy", args_info.proxy_arg, 1);
+        fprintf(stderr, "[+] Using proxy %s\n", args_info.proxy_arg);
+        setenv("all_proxy", args_info.proxy_arg, 1);
     }
 
-    static const char *resolvers[2] = {"1.1.1.1", "1.0.0.1"};
+    static const char *resolvers[2] = {"223.5.5.5", "223.6.6.6"};
     _resolv_set_nameservers_for_net(0, resolvers, 2, ".");
 #ifndef MyRelease
     subhook_install(subhook_new(
@@ -189,15 +201,15 @@ static inline void init() {
 static inline struct shared_ptr init_ctx() {
     fprintf(stderr, "[+] initializing ctx...\n");
 
-    struct shared_ptr *reqCtx = newRequestContext("/data/data/com.apple.android.music/files/mpl_db");
+    struct shared_ptr *reqCtx = newRequestContext(strcat_b(args_info.base_dir_arg, "/mpl_db"));
     struct shared_ptr *reqCtxCfg = getRequestContextConfig();
 
     prepareRequestContextConfig(reqCtxCfg);
     configureRequestContext(reqCtx);
 
     static uint8_t buf[88];
     initRequestContext(buf, reqCtx, reqCtxCfg);
-    setFairPlayDirectoryPath(reqCtx, "/data/data/com.apple.android.music/files");
+    setFairPlayDirectoryPath(reqCtx, args_info.base_dir_arg);
     initPresentationInterface(&apInf, &dialogHandler, &credentialHandler);
     setPresentationInterface(reqCtx, &apInf);
 
@@ -209,6 +221,12 @@ extern void *pbErrCallback;
 
 inline static uint8_t login(struct shared_ptr reqCtx) {
     fprintf(stderr, "[+] logging in...\n");
+    if (file_exists(strcat_b(args_info.base_dir_arg, "/STOREFRONT_ID"))) {
+        remove(strcat_b(args_info.base_dir_arg, "/STOREFRONT_ID"));
+    }
+    if (file_exists(strcat_b(args_info.base_dir_arg, "/MUSIC_TOKEN"))) {
+        remove(strcat_b(args_info.base_dir_arg, "/MUSIC_TOKEN"));
+    }
     struct shared_ptr flow;
     _ZNSt6__ndk110shared_ptrIN17storeservicescore16AuthenticateFlowEE11make_sharedIJRNS0_INS1_14RequestContextEEEEEES3_DpOT_ASM(
         &flow, &reqCtx);
@@ -421,13 +439,38 @@ const char* get_m3u8_method_play(uint8_t leaseMgr[16], unsigned long adam) {
     _ZN22SVPlaybackLeaseManager12requestAssetERKmRKNSt6__ndk16vectorINS2_12basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEENS7_IS9_EEEERKbASM(
         &ptr_result, leaseMgr, &adam, &HLSParam, &z0
     );
+    
+    if (ptr_result.obj == NULL) {
+        return NULL;
+    }
+
     if (_ZNK23SVPlaybackAssetResponse13hasValidAssetEv(ptr_result.obj)) {
         struct shared_ptr *playbackAsset = _ZNK23SVPlaybackAssetResponse13playbackAssetEv(ptr_result.obj);
-        union std_string *m3u8 = malloc(24);
+        if (playbackAsset == NULL || playbackAsset->obj == NULL) {
+            return NULL;
+        }
+
+        union std_string *m3u8 = malloc(sizeof(union std_string));
+        if (m3u8 == NULL) {
+            return NULL;
+        }
+
         void *playbackObj = playbackAsset->obj;
         _ZNK17storeservicescore13PlaybackAsset9URLStringEvASM(m3u8, playbackObj);
+
+        if (m3u8 == NULL || std_string_data(m3u8) == NULL) {
+            free(m3u8);
+            return NULL;
+        }
+        
         const char *m3u8_str = std_string_data(m3u8);
-        return m3u8_str;
+        if (m3u8_str) {
+            char *result = strdup(m3u8_str);  // Make a copy
+            free(m3u8);
+            return result;
+        } else {
+            return NULL;
+        }
     } else {
         return NULL;
     }

wrapper.ggo

@@ -6,4 +6,5 @@ option "decrypt-port" D "" int optional default="10020"
 option "m3u8-port" M "" int optional default="20020"
 option "proxy" P "" string optional default=""
 option "login" L "username:password" string optional
-option "code-from-file" F "" flag off
+option "code-from-file" F "" flag off
+option "base-dir" B "" string optional default="/data/data/com.apple.android.music/files"