Remove flags

Author: haeter525

docs/source/install.rst

@@ -29,6 +29,7 @@ Once you see the following msg, then you're all set::
       -d, --detail TEXT               Show detail report. Optionally specify the
                                       name of a rule/label
       -o, --output FILE               Output report in JSON
+      -w, --webreport FILE            Generate web report
       -a, --apk FILE                  APK file  [required]
       -r, --rule PATH                 Rules directory  [default:
                                       /home/$USER/.quark-engine/quark-rules]
@@ -49,12 +50,7 @@ Once you see the following msg, then you're all set::
       --multi-process INTEGER RANGE   Allow analyzing APK with N processes, where
                                       N doesn't exceeds the number of usable CPUs
                                       - 1 to avoid memory exhaustion.  [x>=1]
-      --rizin-path FILE               Specify a Rizin executable for Quark to
-                                      perform analyses.
-      --disable-rizin-installation    Don't install Rizin automatically when no
-                                      Rizin instance with a compatible version is
-                                      found.
-      --version                       Show the version and exit.
+     --version                       Show the version and exit.
       --help                          Show this message and exit.
 
 To learn how to scan multiple samples in a directory, please have a look at :ref:`Directory Scanning <dir_scan>`

docs/source/testing.rst

@@ -50,11 +50,3 @@ Now Quark also supports `Rizin`_ as one of our Android analysis frameworks. You
 For now, Quark is compatible with Rizin v0.3.4. But, users don't have to installed a Rizin with that version. Quark provides a feature to automatically setup a independent Rizin. In this way, the dependency will not conflict with your environment. Type in the above command and let Quark handle everything else for you.
 
 If there is a working installation of Rizin installed in the system, Quark will check its version to determine if it is compatible. If true, Quark automatically uses it for the analysis. Otherwise, Quark uses the independent Rizin installed in the Quark directory (``~/.quark-engine``).
-
-You can use option ``--rizin-path`` to specify the path of the Rizin executable.
-
-.. code-block:: bash
-
-    quark -a Ahmyth.apk -s --core-library rizin --rizin-path path_to_a_rizin_executable
-
-Moreover, if you don't want Quark to install an independent Rizin, you can use the flag ``--disable-rizin-installation`` to disable this feature.

quark/cli.py

@@ -17,14 +17,9 @@
 from quark.rulegeneration import RuleGeneration
 from quark.utils.colors import yellow
 from quark.utils.graph import select_label_menu, show_comparison_graph
-from quark.utils.pprint import (
-    print_error,
-    print_info,
-    print_success,
-    print_warning,
-)
+from quark.utils.pprint import print_info, print_success, print_warning
+from quark.utils.tools import find_rizin
 from quark.utils.weight import Weight
-from quark.utils.tools import find_rizin_instance, _get_rizin_version
 from quark.webreport.generate import ReportGenerator
 
 logo()
@@ -152,20 +147,6 @@
     required=False,
     default=1,
 )
-@click.option(
-    "--rizin-path",
-    "rizin_path",
-    type=click.Path(exists=True, file_okay=True, dir_okay=False),
-    help="Specify a Rizin executable for Quark to perform analyses.",
-)
-@click.option(
-    "--disable-rizin-installation",
-    "disable_rizin_installation",
-    default=False,
-    is_flag=True,
-    help="Don't install Rizin automatically when no Rizin instance with"
-    + " a compatible version is found.",
-)
 def entry_point(
     summary,
     detail,
@@ -183,45 +164,16 @@ def entry_point(
     comparison,
     core_library,
     num_of_process,
-    rizin_path,
-    disable_rizin_installation,
 ):
     """Quark is an Obfuscation-Neglect Android Malware Scoring System"""
     # Load rules
     rule_buffer_list = []
     rule_filter = summary or detail
 
-    # Check Rizin version
     if core_library.lower() == "rizin":
-        if not rizin_path:
-            if disable_rizin_installation:
-                print_info("Disable automatic Rizin installation.")
-
-            rizin_path = find_rizin_instance(
-                disable_rizin_installation=disable_rizin_installation
-            )
-
-            if not rizin_path:
-                print_error(
-                    "No valid Rizin executable found. Please specify the path"
-                    + "to the Rizin executable by using option --rizin-path."
-                )
-                return
-            else:
-                version = _get_rizin_version(rizin_path)
-                if rizin_path.startswith(config.HOME_DIR):
-                    print_info(
-                        f"Use the Rizin executable (version {version})"
-                        + " installed in the Quark directory."
-                    )
-                else:
-                    print_info(
-                        f"Use the Rizin executable (version {version})"
-                        + " installed in the system PATH."
-                    )
-
-        else:
-            print_info(f"Use the user-specified Rizin executable.")
+        rizin_path = find_rizin()
+    else:
+        rizin_path = ""
 
     # Determine the location of rules
     if rule_filter and rule_filter.endswith("json"):
@@ -469,7 +421,8 @@ def entry_point(
 
             json_report = data.get_json_report()
             report_html = ReportGenerator(
-                json_report).get_analysis_report_html()
+                json_report
+            ).get_analysis_report_html()
 
             if ".html" not in webreport:
                 webreport = f"{webreport}.html"

quark/config.py

@@ -9,9 +9,8 @@
 DIR_PATH = f"{HOME_DIR}quark-rules"
 
 DEBUG = False
-COMPATIBLE_RAZIN_VERSIONS = ["0.3.4"]
+COMPATIBLE_RAZIN_VERSIONS = ["v0.3.4"]
 
 RIZIN_DIR = f"{HOME_DIR}rizin/"
-RIZIN_COMMIT = "2373c53880e017be86afed5454bca5b5017b920e"
 
 Path(HOME_DIR).mkdir(parents=True, exist_ok=True)

quark/report.py

@@ -6,7 +6,7 @@
 
 from quark.core.quark import Quark
 from quark.core.struct.ruleobject import RuleObject
-from quark.utils.tools import find_rizin_instance
+from quark.utils.tools import find_rizin
 
 
 class Report:
@@ -46,7 +46,7 @@ def analysis(self, apk, rule, core_library="androguard", rizin_path=None):
             if rizin_path:
                 self.rizin_path = rizin_path
             elif not self.rizin_path:
-                self.rizin_path = find_rizin_instance(
+                self.rizin_path = find_rizin(
                     disable_rizin_installation=self.disable_rizin_installation
                 )