Merge branch 'qa'

Dockerfile

@@ -72,6 +72,7 @@ WORKDIR /root/Mobile-Security-Framework-MobSF/MobSF
 RUN sed -i 's/USE_HOME = False/USE_HOME = True/g' settings.py
 
 #Kali fix to support 32 bit execution
+WORKDIR /root/Mobile-Security-Framework-MobSF/scripts
 RUN ./kali_fix.sh
 
 #Install Dependencies

MobSF/settings.py

@@ -21,7 +21,7 @@
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 #==============================================
 
-MOBSF_VER = "v1.0 Beta"
+MOBSF_VER = "v1.0.1 Beta"
 BANNER = """
   __  __       _    ____  _____         _   ___  
  |  \/  | ___ | |__/ ___||  ___| __   _/ | / _ \ 
@@ -195,7 +195,7 @@
 )
 
 MIDDLEWARE = (
-    'MobSF.rest_api_middleware.RestApiAuthMiddleware',
+    'MobSF.views.api.rest_api_middleware.RestApiAuthMiddleware',
 )
 ROOT_URLCONF = 'MobSF.urls'
 WSGI_APPLICATION = 'MobSF.wsgi.application'

MobSF/urls.py

@@ -1,6 +1,6 @@
 from django.conf.urls import url
-import MobSF.views
-import MobSF.rest_api
+import MobSF.views.home
+import MobSF.views.api.rest_api
 import DynamicAnalyzer.views.android.dynamic
 import StaticAnalyzer.views.android.static_analyzer
 import StaticAnalyzer.views.android.java
@@ -17,18 +17,18 @@
 
 urlpatterns = [
     # Examples:
-    url(r'^$', MobSF.views.index),
-    url(r'^upload/$', MobSF.views.Upload.as_view),
-    url(r'^download/', MobSF.views.download),
-    url(r'^about$', MobSF.views.about),
-    url(r'^api_docs$', MobSF.views.api_docs),
-    url(r'^recent_scans/$', MobSF.views.recent_scans),
-    url(r'^delete_scan/$', MobSF.views.delete_scan),
-    url(r'^search$', MobSF.views.search),
-    url(r'^error/$', MobSF.views.error),
-    url(r'^not_found/$', MobSF.views.not_found),
-    url(r'^zip_format/$', MobSF.views.zip_format),
-    url(r'^mac_only/$', MobSF.views.mac_only),
+    url(r'^$', MobSF.views.home.index),
+    url(r'^upload/$', MobSF.views.home.Upload.as_view),
+    url(r'^download/', MobSF.views.home.download),
+    url(r'^about$', MobSF.views.home.about),
+    url(r'^api_docs$', MobSF.views.home.api_docs),
+    url(r'^recent_scans/$', MobSF.views.home.recent_scans),
+    url(r'^delete_scan/$', MobSF.views.home.delete_scan),
+    url(r'^search$', MobSF.views.home.search),
+    url(r'^error/$', MobSF.views.home.error),
+    url(r'^not_found/$', MobSF.views.home.not_found),
+    url(r'^zip_format/$', MobSF.views.home.zip_format),
+    url(r'^mac_only/$', MobSF.views.home.mac_only),
 
     # Android Static Analysis
     url(r'^StaticAnalyzer/$',
@@ -68,11 +68,11 @@
     url(r'^capfuzz$', DynamicAnalyzer.views.android.dynamic.capfuzz_start),
 
     # REST API
-    url(r'^api/v1/upload$', MobSF.rest_api.api_upload),
-    url(r'^api/v1/scan$', MobSF.rest_api.api_scan),
-    url(r'^api/v1/delete_scan$', MobSF.rest_api.api_delete_scan),
-    url(r'^api/v1/download_pdf$', MobSF.rest_api.api_pdf_report),
-    url(r'^api/v1/report_json$', MobSF.rest_api.api_json_report),
+    url(r'^api/v1/upload$', MobSF.views.api.rest_api.api_upload),
+    url(r'^api/v1/scan$', MobSF.views.api.rest_api.api_scan),
+    url(r'^api/v1/delete_scan$', MobSF.views.api.rest_api.api_delete_scan),
+    url(r'^api/v1/download_pdf$', MobSF.views.api.rest_api.api_pdf_report),
+    url(r'^api/v1/report_json$', MobSF.views.api.rest_api.api_json_report),
 
     # Test
     url(r'^runtest/$', StaticAnalyzer.tests.start_test),

MobSF/utils.py

@@ -213,7 +213,7 @@ def migrate(BASE_DIR):
 def kali_fix(BASE_DIR):
     try:
         if platform.system() == "Linux" and platform.dist()[0] == "Kali":
-            fix_path = os.path.join(BASE_DIR, "MobSF/kali_fix.sh")
+            fix_path = os.path.join(BASE_DIR, "scripts/kali_fix.sh")
             subprocess.call(["chmod", "a+x", fix_path])
             subprocess.call([fix_path], shell=True)
     except: