hotfix apkid, strings, gunicorn threads and issue template

.github/ISSUE_TEMPLATE/bug.md

@@ -1,10 +1,23 @@
 <!-- ## IMPORTANT -->
-<!-- Issues are ONLY for reporting bugs and feature requests. For support, questions, queries and discussions use our slack channel. Slack Channel: https://mobsf.slack.com/ , Get Invitation: https://goo.gl/6cYU5a
+<!-- Issues are ONLY for reporting BUGS. For support, feature requests, questions, queries, and discussions use our slack channel. Slack Channel: https://mobsf.slack.com/, Get Invitation: https://goo.gl/6cYU5a
 -->
+## IMPORTANT READ THIS !!
+
+<!-- Reports without enough information will be closed without any response. -->
+
 ## EXPLANATION OF THE ISSUE
 
 <!-- What happens, under which versions, under what conditions, when, and what were you expecting instead. -->
 
+## ENVIRONMENT
+
+```
+OS and Version:
+Python Version:
+MobSF Version:
+```
+
+
 ## STEPS TO REPRODUCE THE ISSUE
 
 ```
@@ -13,29 +26,19 @@
 3. Further steps, etc.
 ```
 
-## CONSOLE OUTPUT
+
+## LOG FILE
 
 ```
-Paste the output generated at your console/terminal while scanning the mobile app.
-The console log should contain the error or bug you are seeing
-(NOT REQUIRED FOR FEATURE REQUEST/ENHANCEMENT)
-```
-
-## CONTENTS OF LOG FILES
-
-```
-Paste the contents of logs/MobSF.log here
-(NOT REQUIRED FOR FEATURE REQUEST/ENHANCEMENT)
+Paste the contents of logs/debug.log here or attach the log file.
 ```
 
 <!--
 BEFORE POSTING YOUR ISSUE/BUG
 - These comments won't show up when you submit the issue.
-- GitHub issues ARE NOT FOR SUPPORT, DISCUSSIONS AND QUESTIONS! 
+- GitHub issues ARE NOT FOR FEATURE REQUESTS, SUPPORT, DISCUSSIONS AND QUESTIONS! 
 - If you have questions, use our slack channel. Request invitation here https://goo.gl/6cYU5a.
-- Installation problems with regards to requirements.txt or VirtualBox in not considered as a MobSF issue.
 - Reproduce issue in the latest master and try to add as much detail as possible.
-- If you're requesting a new feature/enhancement, explain why you'd like it to be added and it's importance.
 - Search this repository (top of the page) for the issue and it has not been fixed or reported already.
 - Once you open a bug, you should also provide additional information if requested. 
 - Failure to do so in 25 days will result in closure of the bug without further communication.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,13 @@
+- If you're requesting a new feature/enhancement, explain why you'd like it to be added and it's importance.
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

MalwareAnalyzer/views/apkid.py

@@ -36,6 +36,6 @@ def apkid_analysis(app_dir, apk_file, apk_name):
     findings = output._build_json_output(res)['files']
     sanitized = {}
     for item in findings:
-        filename = item['filename'].split('!')[1]
+        filename = item['filename']
         sanitized[filename] = item['matches']
     return sanitized

StaticAnalyzer/views/android/strings.py

@@ -30,11 +30,10 @@ def strings_jar(app_file, app_dir):
         pkg = rsrc.get_packages_names()[0]
         rsrc.get_strings_resources()
         for i in rsrc.values[pkg].keys():
-            string = rsrc.values[pkg][i].get('string')
-            if string is None:
-                return dat
-            for duo in string:
-                dat.append('"' + duo[0] + '" : "' + duo[1] + '"')
+            res_string = rsrc.values[pkg][i].get('string')
+            if res_string:
+                for duo in res_string:
+                    dat.append('"' + duo[0] + '" : "' + duo[1] + '"')
         data_string = "".join(dat)
         urls, urls_nf, emails_nf = url_n_email_extract(
             data_string, "Android String Resource")

run.sh

@@ -2,4 +2,4 @@
 # Dev Server
 #. venv/bin/activate && python manage.py runserver
 # Prod Server
-. venv/bin/activate && gunicorn -b 0.0.0.0:8000 MobSF.wsgi:application --workers=1 --timeout=1800
+. venv/bin/activate && gunicorn -b 0.0.0.0:8000 MobSF.wsgi:application --workers=1 --threads=4 --timeout=1800