reait 0.0.20__py3-none-any.whl → 1.0.1__py3-none-any.whl

reait/api.py

@@ -1,33 +1,48 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from __future__ import print_function, annotations
 
+import json
+import tomli
+import logging
+import requests
+
 from hashlib import sha256
+from datetime import datetime
 
 from sklearn.metrics.pairwise import cosine_similarity
-from os.path import basename, exists, expanduser
+from os import access, R_OK
+from os.path import basename, isfile, expanduser, getsize
 from requests import request, Response, HTTPError
-import requests
 from numpy import array, vstack, dot, arccos, pi
 from pandas import DataFrame
-import json
-import tomli
-import logging
-from lief import parse, ELF, PE, MachO
+from lief import parse, Binary, ELF, PE, MachO
 
+__version__ = "1.0.1"
 
 re_conf = {
     "apikey": "l1br3",
     "host": "https://api.reveng.ai",
-    "model": "binnet-0.2-x86"
+    "model": "binnet-0.3-x86",
 }
 
 
 logger = logging.getLogger("REAIT")
 
 
-def reveng_req(r: request, end_point: str, data=None, ex_headers: dict = None, params=None,
-               json_data: dict = None, timeout: int = 30) -> Response:
+class ReaitError(HTTPError):
+    def __init__(self, reason: str, end_point: str = None):
+        response = Response()
+
+        response.reason = reason
+        response.status_code = 404
+        response._content = b'{"success": false, "error": "' + reason.encode() + b'"}'
+        response.url = f"{re_conf['host']}/{end_point if end_point[0] != '/' else end_point[1:]}" if end_point else None
+
+        super().__init__(reason, response=response)
+
+
+def reveng_req(r: request, end_point: str, data: dict = None, ex_headers: dict = None,
+               params: dict = None, json_data: dict = None, timeout: int = 60, files: dict = None) -> Response:
     """
     Constructs and sends a Request
     :param r: Method for the new Request
@@ -37,98 +52,85 @@ def reveng_req(r: request, end_point: str, data=None, ex_headers: dict = None, p
     :param params: Dictionary, list of tuples or bytes to send in the query string for the query string
     :param json_data: A JSON serializable Python object to send in the body
     :param timeout: Number of seconds to stop waiting for a Response
+    :param files: Dictionary of files to send to the specified URL
     """
-    url = f"{re_conf['host']}/{end_point}"
+    url = f"{re_conf['host']}/{end_point if end_point[0] != '/' else end_point[1:]}"
     headers = {"Authorization": re_conf["apikey"]}
 
     if ex_headers:
         headers.update(ex_headers)
 
-    logger.debug("Making request %s:\n  - headers: %s\n  - data: %s\n  - json_data: %s\n  - params: %s",
-                 url, headers, data, json_data, params)
+    logger.debug("Making %s request %s:\n  - headers: %s\n  - data: %s\n  - json_data: %s\n  - params: %s\n  - files: %s",
+                 r.__name__.upper(), url, headers, data, json_data, params, files)
 
-    response: Response = r(url, headers=headers, json=json_data, data=data, params=params, timeout=timeout)
+    response: Response = r(url, headers=headers, json=json_data, data=data, params=params, timeout=timeout, files=files)
 
-    logger.debug("Making response %s:\n  - headers: %s\n  - status_code: %d\n  - content: %s",
-                 url, response.headers, response.status_code, response.text)
+    logger.debug("Making %s response %s:\n  - headers: %s\n  - status_code: %d\n  - content: %s",
+                 r.__name__.upper(), url, response.headers, response.status_code, response.text)
 
     return response
 
 
 def re_hash_check(bin_id: str) -> bool:
-    status = False
-    res = reveng_req(requests.get, f"search?search=sha_256_hash:{bin_id}&state=All&user_owned=true")
+    res: Response = reveng_req(requests.get, "v1/search", json_data={"sha_256_hash": bin_id})
 
-    if res.status_code == 200:
-        binaries_data = res.json()["binaries"]
-        status = len(binaries_data) > 0
-    elif res.status_code == 400:
-        logger.warning("Bad Request: %s", res.text)
+    if res.ok:
+        return any(binary["sha_256_hash"] == bin_id for binary in res.json()["query_results"])
     else:
-        logger.error("Internal Server Error.")
+        logger.warning("Bad Request: %s", res.text)
 
-    res.raise_for_status()
-    return status
+    return False
 
 
 # Bin_id is referred to as hash in this program - to maintain usage BID = id of a binary bin_id = hash
 # Assumes a file has been passed, correct hash only
 # Returns the BID of the binary_id (hash)
 def re_bid_search(bin_id: str) -> int:
-    res = reveng_req(requests.get, f"search?search=sha_256_hash:{bin_id}&state=All")
+    res: Response = reveng_req(requests.get, "v1/search", json_data={"sha_256_hash": bin_id})
 
     bid = -1
 
-    # Valid request
-    if res.status_code == 200:
+    if res.ok:
+        # Filter the result who matches the SHA-256
+        binaries = list(filter(lambda binary: binary["sha_256_hash"] == bin_id, res.json()["query_results"]))
+
         # Check only one record is returned
-        binaries_data = res.json()["binaries"]
+        if len(binaries) == 1:
+            binary = binaries[0]
+            bid = binary["binary_id"]
 
-        if len(binaries_data) > 1:
-            logger.info("%d matches found for hash: %s.", len(binaries_data), bin_id)
+            logger.info("Only one record exists, selecting - ID: %d, Name: %s, Creation: %s, Model: %s, Status: %s",
+                        bid, binary["binary_name"], binary["creation"], binary["model_name"], binary["status"])
+        elif len(binaries) > 1:
+            binaries.sort(key=lambda binary: datetime.fromisoformat(binary["creation"]).timestamp(), reverse=True)
 
-            if len(binaries_data) > 1:
-                options_dict = {}
+            logger.info("%d matches found for hash: %s", len(binaries), bin_id)
 
-                for idx, binary in enumerate(binaries_data):
-                    logger.info("[%d] - ID: {}, Name: %s, Creation: %s, Model: %s, Owner: %s, Status: %s",
-                                idx, binary["binary_id"], binary["binary_name"], binary["creation"],
-                                binary["model_name"], binary["owner"], binary["status"])
+            options_dict = {}
 
-                    options_dict[idx] = binary["binary_id"]
+            for idx, binary in enumerate(binaries):
+                logger.info("[%d] - ID: %d, Name: %s, Creation: %s, Model: %s, Status: %s",
+                            idx, binary["binary_id"], binary["binary_name"], binary["creation"],
+                            binary["model_name"], binary["status"])
 
+                options_dict[idx] = binary["binary_id"]
+
+            try:
                 user_input = input("[+] Please enter the option you want to use for this operation:")
 
-                try:
-                    option_number = int(user_input)
+                option_number = int(user_input)
 
-                    bid = options_dict.get(option_number, -1)
+                bid = options_dict.get(option_number, -1)
 
-                    if bid == -1:
-                        logger.warning("Invalid option.")
-                except Exception:
-                    bid = -1
+                if bid == -1:
                     logger.warning("Invalid option.")
-            # Only 1 match found
-            elif len(binaries_data) == 1:
-                binary = binaries_data[0]
-                bid = binary["binary_id"]
-            else:
-                logger.warning("No matches found for hash: %s.", bin_id)
-        elif len(binaries_data) == 1:
-            binary = binaries_data[0]
-            bid = binary["binary_id"]
-
-            logger.info("Only one record exists, selecting - ID: %d, Name: %s, "
-                        "Creation: %s, Model: %s, Owner: %s, Status: %s",
-                        bid, binary["binary_name"], binary["creation"],
-                        binary["model_name"], binary["owner"], binary["status"])
+            except Exception:
+                bid = options_dict[0]
+                logger.warning("Select the most recent analysis - ID: %d", bid)
         else:
-            logger.warning("No matches found for hash: %s.", bin_id)
-    elif res.status_code == 400:
-        logger.warning("Bad Request: %s", res.text)
+            logger.warning("No matches found for hash: %s", bin_id)
     else:
-        logger.error("Internal Server Error.")
+        logger.warning("Bad Request: %s", res.text)
 
     res.raise_for_status()
     return bid
@@ -143,15 +145,17 @@ def RE_delete(fpath: str, binary_id: int = 0) -> Response:
     bin_id = re_binary_id(fpath)
     bid = re_bid_search(bin_id) if binary_id == 0 else binary_id
 
+    end_point = f"v1/analyse/{bid}"
+
     if bid == -1:
-        raise HTTPError(f"No matches found for hash: {bin_id}")
+        raise ReaitError(f"No matches found for hash: {bin_id}", end_point)
 
-    res = reveng_req(requests.delete, f"analyse/{bid}")
+    res: Response = reveng_req(requests.delete, end_point)
 
-    if res.status_code == 200:
-        logger.info("Securely deleted %s analysis.", bin_id)
+    if res.ok:
+        logger.info("Securely deleted analysis ID %s - %s.", bid, bin_id)
     elif res.status_code == 404:
-        logger.warning("Error analysis not found for %s.", bin_id)
+        logger.warning("Error analysis not found for ID %s - %s.", bid, bin_id)
     else:
         logger.error("Error deleting binary %s under. Server returned %d.", bin_id, res.status_code)
 
@@ -159,10 +163,10 @@ def RE_delete(fpath: str, binary_id: int = 0) -> Response:
     return res
 
 
-def RE_analyse(fpath: str, model_name: str = None, isa_options: str = None, platform_options: str = None,
-               file_options: str = None, dynamic_execution: bool = False, command_line_args: str = None,
-               scope: str = None, tags: list = None, priority: int = 0,
-               duplicate: bool = False, symbols: dict = None) -> Response:
+def RE_analyse(fpath: str, model_name: str = None, isa_options: str = None,
+               platform_options: str = None, file_options: str = None, dynamic_execution: bool = False,
+               command_line_args: str = None, binary_scope: str = None, tags: list = None, priority: int = 0,
+               duplicate: bool = False, symbols: dict = None, debug_fpath: str = None) -> Response:
     """
     Start analysis job for binary file
     :param fpath: File path for binary to analyse
@@ -172,46 +176,56 @@ def RE_analyse(fpath: str, model_name: str = None, isa_options: str = None, plat
     :param platform_options: OS platform
     :param dynamic_execution: Enable dynamic execution in sandbox during analysis
     :param command_line_args: Command line arguments to pass when running binary sample in the sandbox
-    :param scope: Analysis visibility
+    :param binary_scope: Analysis visibility
     :param tags: Assign tags to an analysis
     :param priority: Priority to processing queue
     :param duplicate: Duplicate an existing binary
-    :param symbols: List of functions
+    :param symbols: JSON object containing the base address and the list of functions
+    :param debug_fpath: File path for debug file
     """
     bin_id = re_binary_id(fpath)
     result = re_hash_check(bin_id)
 
+    end_point = "v1/analyse/"
+
     if result and duplicate is False:
         logger.error("Error, duplicate analysis for %s. To upload again, use the --duplicate flag.",
                      bin_id)
-        raise HTTPError(f"Duplicate analysis for hash: {bin_id}")
+        raise ReaitError(f"Duplicate analysis for hash: {bin_id}", end_point)
 
     filename = basename(fpath)
 
-    params = {"file_name": filename, "sha_256_hash": bin_id}
+    params = {"file_name": filename, "size_in_bytes": getsize(fpath), "sha_256_hash": bin_id,}
 
+    if debug_fpath and isfile(debug_fpath) and access(debug_fpath, R_OK):
+        try:
+            debug = RE_upload(debug_fpath).json()
+
+            if debug["success"]:
+                params["debug_hash"] = debug["sha_256_hash"]
+        except HTTPError:
+            pass
+    
     for p_name in ("model_name", "isa_options", "platform_options", "file_options",
-                   "dynamic_execution", "command_line_args", "scope", "tags", "priority", "symbols"):
+                   "dynamic_execution", "command_line_args", "binary_scope", "tags", "priority", "symbols",):
         p_value = locals()[p_name]
 
         if p_value:
             params[p_name] = p_value
 
-    res = reveng_req(requests.post, f"analyse", json_data=params)
+    res: Response = reveng_req(requests.post, end_point, json_data=params)
 
-    if res.status_code == 200:
-        logger.info("Successfully submitted binary for analysis. %s - %s", fpath, re_binary_id(fpath))
+    if res.ok:
+        logger.info("Successfully submitted binary for analysis. %s - %s", fpath, bin_id)
     elif res.status_code == 400:
-        response = res.json()
-
-        if "error" in response.keys():
-            logger.warning("Error analysing %s - %s", fpath, response["error"])
+        if "error" in res.json().keys():
+            logger.warning("Error analysing %s - %s", fpath, res.json()["error"])
 
     res.raise_for_status()
     return res
 
 
-def RE_upload(fpath: str) -> Response | bool:
+def RE_upload(fpath: str) -> Response:
     """
     Upload binary to Server
     :param fpath: File path for binary to analyse
@@ -220,22 +234,27 @@ def RE_upload(fpath: str) -> Response | bool:
     result = re_hash_check(bin_id)
 
     if result:
-        logger.info("File %s - %s already exists. Skipping upload...", basename(fpath), re_binary_id(fpath))
-        return True
-
-    res = reveng_req(requests.post, f"upload", data=open(fpath, "rb").read())
-
-    if res.status_code == 200:
-        logger.info("Successfully uploaded binary to your account. %s - %s", fpath, re_binary_id(fpath))
-    elif res.status_code == 400:
-        response = res.json()
-
-        if "error" in response.keys():
-            logger.warning("Error uploading %s - %s", fpath, response["error"])
-    elif res.status_code == 413:
-        logger.warning("File too large. Please upload files under 100MB.")
-    elif res.status_code == 500:
-        logger.error("Internal Server Error. Please contact support. Skipping upload...")
+        logger.info("File %s - %s already uploaded. Skipping upload...", fpath, bin_id)
+
+        res = Response()
+        res.status_code = 200
+        res.url = f"{re_conf['host']}/v1/upload"
+        res._content = ('{0}"success": true,'
+                        '"message": "File already uploaded!",'
+                        '"sha_256_hash": "{1}"{2}').format("{", bin_id, "}").encode()
+    else:
+        with open(fpath, "rb") as fd:
+            res: Response = reveng_req(requests.post, "v1/upload", files={"file": fd})
+
+        if res.ok:
+            logger.info("Successfully uploaded binary to your account. %s - %s", fpath, bin_id)
+        elif res.status_code == 400:
+            if "error" in res.json().keys():
+                logger.warning("Error uploading %s - %s", fpath, res.json()["error"])
+        elif res.status_code == 413:
+            logger.warning("File too large. Please upload files under 10MB.")
+        elif res.status_code == 500:
+            logger.error("Internal Server Error. Please contact support. Skipping upload...")
 
     res.raise_for_status()
     return res
@@ -250,65 +269,14 @@ def RE_embeddings(fpath: str, binary_id: int = 0) -> Response:
     bin_id = re_binary_id(fpath)
     bid = re_bid_search(bin_id) if binary_id == 0 else binary_id
 
-    if bid == -1:
-        raise HTTPError(f"No matches found for hash: {bin_id}")
-
-    res = reveng_req(requests.get, f"embeddings/{bid}")
-
-    if res.status_code == 400:
-        logger.warning("Analysis for %s still in progress. Please check the logs (-l) and try again later.",
-                       bin_id)
-
-    res.raise_for_status()
-    return res
-
-
-def RE_signature(fpath: str, binary_id: int = 0) -> Response:
-    """
-    Fetch binary BinNet signature
-    :param fpath: File path for binary to analyse
-    :param binary_id: ID of binary
-    """
-    bin_id = re_binary_id(fpath)
-    bid = re_bid_search(bin_id) if binary_id == 0 else binary_id
+    end_point = f"v1/embeddings/binary/{bid}"
 
     if bid == -1:
-        raise HTTPError(f"No matches found for hash: {bin_id}")
-
-    res = reveng_req(requests.get, f"signature/{bid}")
-
-    if res.status_code == 425:
-        logger.warning("Analysis for %s still in progress. Please check the logs (-l) and try again later.",
-                       bin_id)
-
-    res.raise_for_status()
-    return res
-
-
-def RE_embedding(fpath: str, start_vaddr: int, end_vaddr: int = None, base_vaddr: int = None,
-                 model: str = None) -> Response:
-    """
-    Fetch embedding for custom symbol range
-    :param fpath: File path for binary to analyse
-    :param start_vaddr: Start virtual address of the function to extract embeddings
-    :param end_vaddr: End virtual address of the function to extract embeddings
-    :param base_vaddr: Base address of the binary
-    :param model: Binary model name
-    """
-    params = {}
-
-    if end_vaddr:
-        params["end_vaddr"] = end_vaddr
-    if base_vaddr:
-        params["base_vaddr"] = base_vaddr
-    if model:
-        params["models"] = model
-
-    bin_id = re_binary_id(fpath)
+        raise ReaitError(f"No matches found for hash: {bin_id}", end_point)
 
-    res = reveng_req(requests.get, f"embedding/{bin_id}/{start_vaddr}", params=params)
+    res: Response = reveng_req(requests.get, end_point)
 
-    if res.status_code == 425:
+    if res.status_code == 400:
         logger.warning("Analysis for %s still in progress. Please check the logs (-l) and try again later.",
                        bin_id)
 
@@ -326,13 +294,15 @@ def RE_logs(fpath: str, binary_id: int = 0, console: bool = True) -> Response:
     bin_id = re_binary_id(fpath)
     bid = re_bid_search(bin_id) if binary_id == 0 else binary_id
 
+    end_point = f"v1/logs/{bid}"
+
     if bid == -1:
-        raise HTTPError(f"No matches found for hash: {bin_id}")
+        raise ReaitError(f"No matches found for hash: {bin_id}", end_point)
 
-    res = reveng_req(requests.get, f"logs/{bid}")
+    res: Response = reveng_req(requests.get, end_point)
 
-    if res.status_code == 200 and console:
-        logger.info("Logs found for %s:\n%s", bin_id, res.text)
+    if res.ok and console:
+        logger.info("Logs found for %s:\n%s", bin_id, res.json()["logs"])
     elif res.status_code == 404:
         logger.warning("Error, logs not found for %s.", bin_id)
 
@@ -349,12 +319,14 @@ def RE_cves(fpath: str, binary_id: int = 0) -> Response:
     bin_id = re_binary_id(fpath)
     bid = re_bid_search(bin_id) if binary_id == 0 else binary_id
 
+    end_point = f"cves/{bid}"
+
     if bid == -1:
-        raise HTTPError(f"No matches found for hash: {bin_id}")
+        raise ReaitError(f"No matches found for hash: {bin_id}", end_point)
 
-    res = reveng_req(requests.get, f"cves/{bid}")
+    res: Response = reveng_req(requests.get, end_point)
 
-    if res.status_code == 200:
+    if res.ok:
         cves = json.loads(res.text)
         logger.info("Checking for known CVEs embedded inside %s", fpath)
 
@@ -369,7 +341,7 @@ def RE_cves(fpath: str, binary_id: int = 0) -> Response:
     return res
 
 
-def RE_status(fpath: str, binary_id: int = 0) -> Response:
+def RE_status(fpath: str, binary_id: int = 0, console: bool = False) -> Response:
     """
     Get the status of an ongoing binary analysis
     :param fpath: File path for binary to analyse
@@ -378,11 +350,15 @@ def RE_status(fpath: str, binary_id: int = 0) -> Response:
     bin_id = re_binary_id(fpath)
     bid = re_bid_search(bin_id) if binary_id == 0 else binary_id
 
+    end_point = f"v1/analyse/status/{bid}"
+
     if bid == -1:
-        raise HTTPError(f"No matches found for hash: {bin_id}")
+        raise ReaitError(f"No matches found for hash: {bin_id}", end_point)
 
-    res = reveng_req(requests.get, f"analyse/status/{bid}")
+    res: Response = reveng_req(requests.get, end_point)
 
+    if res.ok and console:
+        logger.info("Binary analysis status: %s", res.json()["status"])
     if res.status_code == 400:
         logger.warning(" Error, status not found for %s.", bin_id)
 
@@ -408,62 +384,79 @@ def RE_compute_distance(embedding: list, embeddings: list, nns: int = 5) -> list
 
     # create json similarity object
     similarities = list(zip(distances, closest_df.index.tolist()))
-    json_sims = [{"similaritiy": float(d[0]), "vaddr": int(df.iloc[v]["vaddr"]), "name": str(df.iloc[v]["name"]),
-                  "size": int(df.iloc[v]["size"])} for d, v in similarities]
+    json_sims = [{"similaritiy": float(d[0]),
+                  "vaddr": int(df.iloc[v]["vaddr"]),
+                  "name": str(df.iloc[v]["name"]),
+                  "size": int(df.iloc[v]["size"]),
+                 } for d, v in similarities]
     return json_sims
 
 
-def RE_nearest_symbols(embedding: list, model_name: str, nns: int = 5,
-                       collections: list = None, ignore_hashes: list = None,
-                       distance: float = 0.0, debug_enabled: bool = False) -> Response:
+def RE_nearest_symbols_batch(function_ids: list[int], nns: int = 5, collections: list[str] = None,
+                             distance: float = 0.1, debug_enabled: bool = False) -> Response:
     """
-    Get function name suggestions for an embedding
-    :param embedding: Embedding vector as python list
-    :param model_name: Binary model name
+    Get nearest functions to a passed function ids
+    :param function_ids: List of function ids
     :param nns: Number of nearest neighbors
     :param collections: List of collections RevEng.AI collection names to search through
-    :param ignore_hashes: List[str] SHA-256 hash of binary file to ignore symbols from (usually the current binary)
     :param distance: How close we want the ANN search to filter for
     :param debug_enabled: ANN Symbol Search, only perform ANN on debug symbols if set
     """
-    params = {"nns": nns, "model_name": model_name, "debug_enabled": debug_enabled}
+    params = {"function_id_list": function_ids,
+              "result_per_function": nns,
+              "debug_mode": debug_enabled,
+              "distance": distance,
+              }
 
-    if collections and len(collections) > 0:
+    if collections:
         # api param is collection, not collections
-        params["collection"] = "|".join(collections)
-
-    if ignore_hashes and len(ignore_hashes) > 0:
-        params["ignore_hashes"] = ignore_hashes
+        params["collection"] = collections
 
-    if distance > 0.0:
-        params["distance"] = distance
-
-    res = reveng_req(requests.post, "ann/symbol", data=json.dumps(embedding), params=params)
+    res: Response = reveng_req(requests.post, "v1/ann/symbol/batch", json_data=params)
 
     res.raise_for_status()
     return res
 
 
-def RE_nearest_binaries(embedding: list, model_name: str, nns: int = 5,
-                        collections: list = None, ignore_hashes: list = None) -> Response:
+def RE_nearest_functions(fpath: str, binary_id: int = 0, nns: int = 5,
+                         distance: float = 0.1, debug_enabled: bool = False) -> Response:
     """
-    Get executable suggestions for a binary embedding
-    :param embedding: Embedding vector as python list
-    :param model_name: Binary model name
+    Get the nearest functions
+    :param fpath: File path for binary to analyse
+    :param binary_id: ID of binary
     :param nns: Number of nearest neighbors
-    :param collections: List of collections RevEng.AI collection names to search through
-    :param ignore_hashes: List[str] SHA-256 hash of binary files to ignore symbols from (usually the current binary)
+    :param distance: How close we want the ANN search to filter for
+    :param debug_enabled: ANN Symbol Search, only perform ANN on debug symbols if set
     """
-    params = {"nns": nns, "model_name": model_name}
+    bin_id = re_binary_id(fpath)
+    bid = re_bid_search(bin_id) if binary_id == 0 else binary_id
 
-    if collections and len(collections) > 0:
-        # api param is collection, not collections
-        params["collection"] = "|".join(collections)
+    end_point = f"v1/ann/symbol/{bid}"
+
+    if bid == -1:
+        raise ReaitError(f"No matches found for hash: {bin_id}", end_point)
+
+    params = {"result_per_function": nns,
+              "debug_mode": debug_enabled,
+              "distance": distance,
+              }
+
+    res: Response = reveng_req(requests.post, end_point, json_data=params)
+
+    res.raise_for_status()
+    return res
 
-    if ignore_hashes and len(ignore_hashes) > 0:
-        params["ignore_hashes"] = ignore_hashes
 
-    res = reveng_req(requests.post, "ann/binary", data=json.dumps(embedding), params=params)
+def RE_analyze_functions(fpath: str, binary_id: int = 0) -> Response:
+    bin_id = re_binary_id(fpath)
+    bid = re_bid_search(bin_id) if binary_id == 0 else binary_id
+
+    end_point = f"v1/analyse/functions/{bid}"
+
+    if bid == -1:
+        raise ReaitError(f"No matches found for hash: {bin_id}", end_point)
+
+    res: Response = reveng_req(requests.get, end_point)
 
     res.raise_for_status()
     return res
@@ -478,10 +471,12 @@ def RE_SBOM(fpath: str, binary_id: int = 0) -> Response:
     bin_id = re_binary_id(fpath)
     bid = re_bid_search(bin_id) if binary_id == 0 else binary_id
 
+    end_point = f"sboms/{bid}"
+
     if bid == -1:
-        raise HTTPError(f"No matches found for hash: {bin_id}")
+        raise ReaitError(f"No matches found for hash: {bin_id}", end_point)
 
-    res = reveng_req(requests.get, f"sboms/{bid}")
+    res: Response = reveng_req(requests.get, end_point)
 
     logger.info("SBOM for %s:\n%s", fpath, res.text)
 
@@ -495,9 +490,10 @@ def RE_functions_rename(function_id: int, new_name: str) -> Response:
     :param function_id: ID of a function
     :param new_name: New function name
     """
-    res = reveng_req(requests.post, f"functions/rename/{function_id}", json_data={"new_name": new_name})
+    res: Response = reveng_req(requests.post, f"v1/functions/rename/{function_id}",
+                               json_data={"new_name": new_name})
 
-    if res.status_code == 200:
+    if res.ok:
         logger.info("FunctionId %d has been renamed with '%s'.", function_id, new_name)
     else:
         logger.warning("Error, cannot rename FunctionId %d. %s", function_id, res.text)
@@ -506,66 +502,131 @@ def RE_functions_rename(function_id: int, new_name: str) -> Response:
     return res
 
 
+def RE_functions_rename_batch(mapping: dict[int, str]) -> Response:
+    """
+    Send a list of dictionaries, with a corresponding key as function ID and the desired function_name
+    :param mapping: dictionary containing the function_id as key and function_name as value
+    """
+    params = {"new_name_mapping":
+                  [{"function_id": func_id,
+                    "function_name": func_name,
+                    } for func_id, func_name in mapping.items()]
+              }
+
+    res: Response = reveng_req(requests.post, "v1/functions/batch/rename", json_data=params)
+
+    res.raise_for_status()
+    return res
+
+def RE_settings() -> Response:
+    """
+    Get the configuration settings
+    """
+    res: Response = reveng_req(requests.get, "v1/config")
+
+    res.raise_for_status()
+    return res
+
+
+def RE_health() -> bool:
+    """
+    Health check & verify access to the API
+    """
+    res: Response = reveng_req(requests.get, "v1")
+
+    success = res.json()["success"]
+
+    if success:
+        logger.info(res.json()["message"])
+    else:
+        logger.warning(res.json()["error"])
+    return success
+
+
+def RE_authentication() -> Response:
+    """
+    Authentication Check
+    """
+    res: Response = reveng_req(requests.get, "v1/authenticate")
+
+    res.raise_for_status()
+    return res
+
+
 def re_binary_id(fpath: str) -> str:
     """
     Take the SHA-256 hash of binary file
     :param fpath: File path for binary to analyse
     """
-    if not fpath or not exists(fpath):
-        return "undefined"
+    if fpath and isfile(fpath) and access(fpath, R_OK):
+        hf = sha256()
 
-    hf = sha256()
+        with open(fpath, "rb") as fd:
+            c = fd.read()
+            hf.update(c)
 
-    with open(fpath, "rb") as f:
-        c = f.read()
-        hf.update(c)
+        return hf.hexdigest()
+    else:
+        logger.error("File '%s' doesn't exist or isn't readable", fpath)
 
-    return hf.hexdigest()
+    return "Undefined"
 
 
-def _binary_isa(lief_hdlr, exec_type: str) -> str:
+def _binary_isa(binary: Binary, exec_type: str) -> str:
     """
     Get ISA format
     """
-    if exec_type == "elf":
-        machine_type = lief_hdlr.header.machine_type
+    if exec_type == "ELF":
+        arch = binary.header.machine_type
 
-        if machine_type == ELF.ARCH.i386:
+        if arch == ELF.ARCH.i386:
             return "x86"
-        elif machine_type == ELF.ARCH.x86_64:
+        elif arch == ELF.ARCH.x86_64:
             return "x86_64"
-    elif exec_type == "pe":
-        machine_type = lief_hdlr.header.machine
-
-        if machine_type == PE.MACHINE_TYPES.I386:
+        elif arch == ELF.ARCH.ARM:
+            return "ARM32"
+        elif arch == ELF.ARCH.AARCH64:
+            return "ARM64"
+    elif exec_type == "PE":
+        machine_type = binary.header.machine
+
+        if machine_type == PE.Header.MACHINE_TYPES.I386:
             return "x86"
-        elif machine_type == PE.MACHINE_TYPES.AMD64:
+        elif machine_type == PE.Header.MACHINE_TYPES.AMD64:
             return "x86_64"
-    elif exec_type == "macho":
-        machine_type = lief_hdlr.header.cpu_type
-
-        if machine_type == MachO.CPU_TYPES.x86:
+        elif machine_type == PE.Header.MACHINE_TYPES.ARM:
+            return "ARM32"
+        elif machine_type == PE.Header.MACHINE_TYPES.ARM64:
+            return "ARM64"
+    elif exec_type == "Mach-O":
+        cpu_type = binary.header.cpu_type
+
+        if cpu_type == MachO.CPU_TYPES.x86:
             return "x86"
-        elif machine_type == MachO.CPU_TYPES.x86_64:
+        elif cpu_type == MachO.CPU_TYPES.x86_64:
             return "x86_64"
+        elif cpu_type == MachO.CPU_TYPES.ARM:
+            return "ARM32"
+        elif cpu_type == MachO.CPU_TYPES.ARM64:
+            return "ARM64"
 
-    logger.error("Error, failed to determine or unsupported ISA for exec_type: %s.", exec_type)
-    raise RuntimeError(f"Error, failed to determine or unsupported ISA for exec_type:{exec_type}.")
+    logger.error("Error, could not determine or unsupported ISA for binary format: %s.", exec_type)
+    raise RuntimeError(f"Error, could not determine or unsupported ISA for binary format: {exec_type}.")
 
 
-def _binary_format(lief_hdlr) -> str:
+def _binary_format(binary: Binary) -> str:
     """
     Get executable file format
     """
-    if lief_hdlr.format == lief_hdlr.format.PE:
-        return "pe"
-    if lief_hdlr.format == lief_hdlr.format.ELF:
-        return "elf"
-    if lief_hdlr.format == lief_hdlr.format.MACHO:
-        return "macho"
+    if binary.format == Binary.FORMATS.PE:
+        return "PE"
+    if binary.format == Binary.FORMATS.ELF:
+        return "ELF"
+    if binary.format == Binary.FORMATS.MACHO:
+        return "Mach-O"
 
-    logger.error("Error, could not determine binary format: %s.", lief_hdlr.format)
-    raise RuntimeError("Error, could not determine binary format.")
+    logger.error("Error, could not determine or unsupported binary format: %s.", binary.format)
+    raise RuntimeError(f"Error, could not determine or unsupported binary format: {binary.format}")
 
 
 def file_type(fpath: str) -> tuple[str, str]:
@@ -575,24 +636,31 @@ def file_type(fpath: str) -> tuple[str, str]:
     """
     binary = parse(fpath)
 
-    # handle PE and ELF files
-    file_format = _binary_format(binary)
-    isa = _binary_isa(binary, file_format)
+    if not binary:
+        file_format = isa_format = "Unknown format"
+    else:
+        # handle PE and ELF files
+        file_format = _binary_format(binary)
+        isa_format = _binary_isa(binary, file_format)
 
-    return file_format, isa
+    return file_format, isa_format
 
 
 def parse_config() -> None:
     """
     Parse ~/.reait.toml config file
     """
-    if exists(expanduser("~/.reait.toml")):
-        with open(expanduser("~/.reait.toml"), "r") as file:
-            config = tomli.loads(file.read())
+    fpath = expanduser("~/.reait.toml")
 
-            for key in ("apikey", "host", "model"):
+    if isfile(fpath) and access(fpath, R_OK):
+        with open(fpath) as fd:
+            config = tomli.loads(fd.read())
+
+            for key in ("apikey", "host", "model",):
                 if key in config:
                     re_conf[key] = config[key]
+    else:
+        logger.info("File %s doesn't exist or isn't readable", fpath)
 
 
 def angular_distance(x, y) -> float:
@@ -600,5 +668,5 @@ def angular_distance(x, y) -> float:
     Compute angular distance between two embedding vectors
     Normalised euclidian distance
     """
-    cos = dot(x, y) / ((dot(x, x) * dot(y, y)) ** 0.5)
+    cos = dot(x, y) / ((dot(x, x) * dot(y, y))**0.5)
     return 1.0 - arccos(cos) / pi