From 8cb6a2f393ae5072fc8fb0f70d52185c040e7c57 Mon Sep 17 00:00:00 2001
From: JoYo <>
Date: Mon, 24 Jan 2022 13:27:11 -0500
Subject: [PATCH] refactor submodule to include additional disassemblers

---
 Dockerfile                                    |  8 ++--
 .../{disassemble.py => capstone_wrapper.py}   |  0
 subdisassem/scripts.py                        | 43 ++++++-------------
 3 files changed, 17 insertions(+), 34 deletions(-)
 rename subdisassem/{disassemble.py => capstone_wrapper.py} (100%)

diff --git a/Dockerfile b/Dockerfile
index e7c394c..40f4962 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:22.04
-ENV DEBIAN_FRONTEND noninteractive
+FROM rizin/rizin:latest
 
+USER root
 RUN apt-get update && apt-get install --yes \
     build-essential \
     git \
@@ -18,6 +18,4 @@ COPY subdisassem /app/subdisassem/
 WORKDIR /app/
 RUN python3 setup.py install
 
-RUN useradd -m subdisassem
-WORKDIR /home/subdisassem
-ENV HOME /home/subdisassem
+USER rizin
diff --git a/subdisassem/disassemble.py b/subdisassem/capstone_wrapper.py
similarity index 100%
rename from subdisassem/disassemble.py
rename to subdisassem/capstone_wrapper.py
diff --git a/subdisassem/scripts.py b/subdisassem/scripts.py
index be704f3..f08f782 100644
--- a/subdisassem/scripts.py
+++ b/subdisassem/scripts.py
@@ -4,22 +4,7 @@ from pathlib import Path
 from sqlalchemy import desc
 import logging
 
-from .disassemble import (
-    x86_16,
-    x86_32,
-    x86_64,
-    armv7,
-    thumb2,
-    aarch64,
-    mips32,
-    mips64_el,
-    ppc64,
-    sparc,
-    sparcv9,
-    systemz,
-    xcore,
-)
-
+from . import capstone_wrapper
 from .schema import db_config, Disassembly
 
 
@@ -74,19 +59,19 @@ def subdisassem_script():
     logging.info(f"sha1sum: {checksum}")
 
     archs = [
-        x86_16,
-        x86_32,
-        x86_64,
-        armv7,
-        thumb2,
-        aarch64,
-        mips32,
-        mips64_el,
-        ppc64,
-        sparc,
-        sparcv9,
-        systemz,
-        xcore,
+        capstone_wrapper.x86_16,
+        capstone_wrapper.x86_32,
+        capstone_wrapper.x86_64,
+        capstone_wrapper.armv7,
+        capstone_wrapper.thumb2,
+        capstone_wrapper.aarch64,
+        capstone_wrapper.mips32,
+        capstone_wrapper.mips64_el,
+        capstone_wrapper.ppc64,
+        capstone_wrapper.sparc,
+        capstone_wrapper.sparcv9,
+        capstone_wrapper.systemz,
+        capstone_wrapper.xcore,
     ]
 
     for arch in archs: