Add Apple authentication to Sideloader.

Rajoute l'authentification à Sideloader - on avance, bientôt Sideloader fonctionnera !

Author: Dadoum

.github/workflows/cmake.yml

@@ -24,7 +24,7 @@ jobs:
         compiler: ldc-latest
 
     - name: Install dependencies
-      run: sudo apt-get install -y build-essential gcc g++ ninja-build libgtk-3-dev libimobiledevice-dev
+      run: sudo apt-get install -y build-essential gcc g++ ninja-build libgtk-3-dev libplist-dev libimobiledevice-dev
 
     - name: Configure CMake
       run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_D_COMPILER=ldc2
@@ -55,7 +55,7 @@ jobs:
           compiler: ldc-latest
 
       - name: Install dependencies
-        run: sudo apt-get install -y build-essential gcc g++ ninja-build
+        run: sudo apt-get install -y build-essential gcc g++ ninja-build libplist-dev
 
       - name: Configure CMake
         run: cmake -G Ninja -Dbuild_sideloadipa=OFF -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_D_COMPILER=ldc2

CMakeLists.txt

@@ -10,6 +10,9 @@ include(cmake/dependencies.cmake)
 set(PROVISION_SOURCE_DIR "lib/")
 file(GLOB_RECURSE PROVISION_D_SOURCES "${PROVISION_SOURCE_DIR}*.d")
 
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(plist REQUIRED IMPORTED_TARGET libplist-2.0)
+
 add_library(provision STATIC ${PROVISION_D_SOURCES})
 target_include_directories(provision PUBLIC ${PROVISION_SOURCE_DIR})
 
@@ -18,7 +21,7 @@ target_include_directories(provision PUBLIC ${PROVISION_SOURCE_DIR})
 # set_source_files_properties(lib/provision/c.d PROPERTIES COMPILE_FLAGS "-HC -HCf=${CMAKE_BINARY_DIR}/include-provision/provision.h")
 # target_include_directories(provision PUBLIC ${CMAKE_BINARY_DIR}/include-provision)
 
-target_link_libraries(provision PUBLIC plist hybris stdc++)
+target_link_libraries(provision PUBLIC PkgConfig::plist hybris stdc++)
 
 set(RETRIEVE_HEADERS_SOURCE_DIR "retrieve_headers/")
 file(GLOB_RECURSE RETRIEVE_HEADERS_D_SOURCES "${RETRIEVE_HEADERS_SOURCE_DIR}*.d")
@@ -34,10 +37,9 @@ if(build_sideloadipa)
     add_executable(sideload_ipa ${SIDELOAD_IPA_D_SOURCES})
     target_include_directories(sideload_ipa PUBLIC ${SIDELOAD_IPA_SOURCE_DIR})
 
-    find_package(PkgConfig REQUIRED)
     pkg_check_modules(imobiledevice REQUIRED IMPORTED_TARGET libimobiledevice-1.0)
 
-    target_link_libraries(sideload_ipa provision gtk-d PkgConfig::imobiledevice secured)
+    target_link_libraries(sideload_ipa provision gtk-d gmp-d PkgConfig::imobiledevice PkgConfig::plist pbkdf2 crypto)
 endif()
 
 if(build_anisetteserver)

LISEZMOI.md

@@ -24,8 +24,8 @@ Music. Vous pouvez ne télécharger que la tranche de votre architecture. Placez
 à côté des exécutables. Dans le dossier avec toutes les bibliothèques (fichiers en .so), vous pouvez 
 ne garder que libstoreservicescore.so et libCoreADI.so. Ce sont les seuls nécessaire. 
 
-Pour compiler n'importe lequel des projets, vous devez avoir CMake et le kit de développement 
-pour le D (le compilateur + dub).
+Pour compiler n'importe lequel des projets, vous devez avoir CMake, le kit de développement 
+pour le D (le compilateur + dub), un compilateur C et C++, et le paquet de dev de libplist.
 
 Pour compiler *sideload_ipa*, il est nécessaire en plus d'avoir ce qu'il faut pour développer avec 
 GTK+ et libimobiledevice.

README.md

@@ -24,8 +24,8 @@ the lib/ folder next to the executables. If you want to reduce further the size,
 folder all the libraries except libstoreservicescore.so and libCoreADI.so, since they are the only one
 needed to run the app.
 
-To build any of these projects, you need CMake, a C and C++ compiler, and the D SDK, with the compiler
-and dub.
+To build any of these projects, you need CMake, a C and C++ compiler, the D SDK, with the compiler
+and dub and libplist development packages.
 
 To build *sideload_ipa*, you also need GTK+ and libimobiledevice development packages. 
 

cmake/dependencies.cmake

@@ -11,27 +11,19 @@ FetchContent_Declare(
 FetchContent_MakeAvailable(libhybris)
 target_compile_definitions(hybris PUBLIC BROKEN_MODE)
 
-include(UseDub)
+if(build_sideloadipa OR build_anisetteserver)
+    include(UseDub)
 
-FetchContent_Declare(
-        plist_proj
-        GIT_REPOSITORY https://github.com/hatf0/plist
-        PATCH_COMMAND ${DUB_DIRECTORY}/CMakeTmp/DubToCMake -s plist
-)
-FetchContent_MakeAvailable(plist_proj)
-
-if(build_sideloadipa)
-    DubProject_Add(gtk-d ~3.10.0)
-    # DubProject_Add(mofile ~0.2.1)
+    if(build_sideloadipa)
+        DubProject_Add(gtk-d ~3.10.0)
+        DubProject_Add(gmp-d ~0.2.11)
+        # DubProject_Add(mofile ~0.2.1)
 
-    FetchContent_Declare(
-            secured_proj
-            GIT_REPOSITORY https://github.com/LightBender/SecureD
-            PATCH_COMMAND ${DUB_DIRECTORY}/CMakeTmp/DubToCMake -s secured
-    )
-    FetchContent_MakeAvailable(secured_proj)
-endif()
+        DubProject_Add(pbkdf2 ~0.1.3)
+        DubProject_Add(crypto ~0.2.17)
+    endif()
 
-if(build_anisetteserver)
-    DubProject_Add(archttp ~1.1.0)
-endif()
+    if(build_anisetteserver)
+        DubProject_Add(archttp ~1.1.0)
+    endif()
+endif()

lib/provision/adi.d

@@ -2,8 +2,6 @@ module provision.adi;
 
 import provision.android.id;
 import provision.androidlibrary;
-import plist;
-import plist.types;
 import std.base64;
 import std.conv;
 import std.digest.sha;
@@ -13,6 +11,8 @@ import std.net.curl;
 import std.stdio;
 import std.string;
 
+import provision.plist;
+
 @nogc:
 
 alias ADILoadLibraryWithPath_t = extern(C) int function(immutable char*);
@@ -178,14 +178,15 @@ alias ADIGetIDMSRouting_t = extern(C) int function(ulong*, ulong);
     }
 
     private void populateUrlBag(HTTP client) {
-        auto content = std.net.curl.get("https://gsa.apple.com/grandslam/GsService2/lookup", client);
-
-        Plist plist = new Plist();
-        plist.read(cast(string) content);
-        auto response = (cast(PlistElementDict) (cast(PlistElementDict) (plist[0]))["urls"]);
-
-        foreach (key; response.keys()) {
-            urlBag[key] = (cast(PlistElementString) response[key]).value;
+        auto content = cast(string) std.net.curl.get("https://gsa.apple.com/grandslam/GsService2/lookup", client);
+
+        PlistDict plist = cast(PlistDict) Plist.fromXml(content);
+        auto response = cast(PlistDict) plist["urls"];
+        auto responseIter = response.iter();
+        Plist val;
+        string key;
+        while (responseIter.next(val, key)) {
+            urlBag[key] = cast(string) cast(PlistString) val;
         }
     }
 
@@ -209,10 +210,9 @@ alias ADIGetIDMSRouting_t = extern(C) int function(ulong*, ulong);
 </plist>
 ", client);
 
-        Plist spimPlist = new Plist();
-        spimPlist.read(content);
-        PlistElementDict spimResponse = cast(PlistElementDict) (cast(PlistElementDict) (spimPlist[0]))["Response"];
-        string spimStr = (cast(PlistElementString) spimResponse["spim"]).value;
+        auto spimPlist = cast(PlistDict) Plist.fromXml(content);
+        auto spimResponse = cast(PlistDict) spimPlist["Response"];
+        string spimStr = cast(string) cast(PlistString) spimResponse["spim"];
 
         return Base64.decode(spimStr);
     }
@@ -242,9 +242,8 @@ alias ADIGetIDMSRouting_t = extern(C) int function(ulong*, ulong);
         string content = cast(string) post(urlBag["midFinishProvisioning"],
         body_, client);
 
-        Plist plist = new Plist();
-        plist.read(content);
-        PlistElementDict spimResponse = cast(PlistElementDict) (cast(PlistElementDict) (plist[0]))["Response"];
+        PlistDict plist = cast(PlistDict) Plist.fromXml(content);
+        PlistDict spimResponse = cast(PlistDict) plist["Response"];
 
         struct SecondStepAnswers {
             string rinfo;
@@ -253,9 +252,9 @@ alias ADIGetIDMSRouting_t = extern(C) int function(ulong*, ulong);
         }
 
         SecondStepAnswers secondStepAnswers = SecondStepAnswers();
-        secondStepAnswers.rinfo = (cast(PlistElementString) spimResponse["X-Apple-I-MD-RINFO"]).value;
-        secondStepAnswers.tk = Base64.decode((cast(PlistElementString) spimResponse["tk"]).value);
-        secondStepAnswers.ptm = Base64.decode((cast(PlistElementString) spimResponse["ptm"]).value);
+        secondStepAnswers.rinfo = cast(string) cast(PlistString) spimResponse["X-Apple-I-MD-RINFO"];
+        secondStepAnswers.tk = Base64.decode(cast(string) cast(PlistString) spimResponse["tk"]);
+        secondStepAnswers.ptm = Base64.decode(cast(string) cast(PlistString) spimResponse["ptm"]);
 
         return secondStepAnswers;
     }

sideload_ipa/sideloadipa/plist/c.d lib/provision/plist/c.d

@@ -1,4 +1,4 @@
-module sideloadipa.plist.c;
+module provision.plist.c;
 
 /**
  * @file plist/plist.h