Skip to content

Commit cf59941

Browse files
ajinabrahamajinabraham
authored
HOTFIX: setup.py and directory refactoring
Python setup.py #1585 directory refactoring
1 parent 68bdcd1 commit cf59941

File tree

335 files changed

+2642
-1559
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

335 files changed

+2642
-1559
lines changed

‎.dockerignore

+12-7
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,21 @@
66
.sonarcloud.properties
77
.pyup.yml
88
tox.ini
9-
db.sqlite3
9+
mobsf/db.sqlite3
1010
Dockerfile
11+
dist
12+
*.egg-info
1113
docker-compose.yml
14+
*.md
15+
venv
16+
setup.py
17+
MANIFEST.in
1218
setup.bat
1319
run.bat
14-
*.md
1520
setup.sh
1621
run.sh
17-
downloads
18-
uploads
19-
logs
20-
venv
21-
secret
22+
mobsf/downloads
23+
mobsf/uploads
24+
mobsf/debug.log
25+
mobsf/secret
26+
mobsf/StaticAnalyzer/test_files/

‎.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DynamicAnalyzer/tools/onDevice/frida/ filter=lfs diff=lfs merge=lfs -text
1+
mobsf/DynamicAnalyzer/tools/onDevice/frida/ filter=lfs diff=lfs merge=lfs -text

‎.github/CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Guidelines for bug reports:
3939
3. **Isolate the problem** — create a [reduced test
4040
case](http://css-tricks.com/reduced-test-cases/) and a live example.
4141

42-
4. **Add Log file** — Please add the log file `logs/debug.log` while opening bugs.
42+
4. **Add Log file** — Please add the log file `mobsf/debug.log` while opening bugs.
4343

4444
5. **Timely Response** — Once you open a bug, you should also provide additional information if requested. Failure to do so in 10 days will result in closure of the bug without further communication.
4545

@@ -60,7 +60,7 @@ Example:
6060
> 1. This is the first step
6161
> 2. This is the second step
6262
> 3. Further steps, etc.
63-
> 4. Log information from `logs/debug.log`
63+
> 4. Log information from `mobsf/debug.log`
6464
>
6565
> `<url>` - a link to the reduced test case
6666
>

‎.github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ What happens, under which versions, under what conditions, when, and what were y
3939
## LOG FILE
4040

4141
```
42-
Paste the contents of logs/debug.log here or attach the log file.
42+
Paste the contents of mobsf/debug.log here or attach the log file.
4343
```
4444

4545
<!--

‎SECURITY.md ‎.github/SECURITY.md

File renamed without changes.

‎.github/workflows/mobsf_test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ jobs:
5555
- name: Unit Tests
5656
run: |
5757
git submodule update --init --recursive
58-
python manage.py test
58+
python manage.py test mobsf

‎.gitignore

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Byte-compiled / optimized / DLL files
22
__pycache__/
33
*.py[cod]
4-
MobSF/windows_vm_priv_key.asc
54

65
# C extensions
76
*.so
@@ -20,6 +19,7 @@ lib/
2019
lib64/
2120
parts/
2221
sdist/
22+
dist
2323
var/
2424
*.egg-info/
2525
.installed.cfg
@@ -63,14 +63,16 @@ target/
6363
#D2J Error file
6464
classes-error.zip
6565

66-
#MobSF Files
67-
logs/
68-
uploads/
69-
db.sqlite3
70-
secret
71-
7266
#IntelliJ IDE
7367
.idea
7468
*/migrations/*
7569
.fuse_hidden*
76-
/MalwareAnalyzer/malwaredb/*
70+
.tox
71+
72+
#MobSF Files
73+
mobsf/debug.log
74+
mobsf/uploads/
75+
mobsf/db.sqlite3
76+
mobsf/secret
77+
mobsf/StaticAnalyzer/migrations
78+
mobsf/MobSF/windows_vm_priv_key.asc

‎.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[submodule "StaticAnalyzer/test_files"]
2-
path = StaticAnalyzer/test_files
1+
[submodule "mobsf/StaticAnalyzer/test_files"]
2+
path = mobsf/StaticAnalyzer/test_files
33
url = https://github.com/MobSF/test_files.git

‎.sonarcloud.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
sonar.sources=.
2-
sonar.exclusions=static/**/*,templates/**/*
2+
sonar.exclusions=mobsf/static/**/*,mobsf/templates/**/*
33
sonar.sourceEncoding=UTF-8

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ COPY . .
8787
RUN rm -rf /root/Mobile-Security-Framework-MobSF/scripts/wheels > /dev/null 2>&1
8888

8989
# Enable Use Home Directory and set adb path
90-
RUN sed -i 's/USE_HOME = False/USE_HOME = True/g' MobSF/settings.py && \
91-
sed -i "s#ADB_BINARY = ''#ADB_BINARY = '/usr/bin/adb'#" MobSF/settings.py
90+
RUN sed -i 's/USE_HOME = False/USE_HOME = True/g' mobsf/MobSF/settings.py && \
91+
sed -i "s#ADB_BINARY = ''#ADB_BINARY = '/usr/bin/adb'#" mobsf/MobSF/settings.py
9292

9393
# Postgres support is set to false by default
9494
ARG POSTGRES=False

‎MANIFEST.in

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
recursive-include mobsf/StaticAnalyzer/tools *
3+
recursive-include mobsf/DynamicAnalyzer/tools *
4+
recursive-include mobsf/StaticAnalyzer/views/android/rules *
5+
recursive-include mobsf/StaticAnalyzer/views/ios/rules *
6+
recursive-include mobsf/signatures *
7+
recursive-include mobsf/static *
8+
recursive-include mobsf/templates *
9+
recursive-include mobsf/install *
10+
recursive-exclude *.pyc

‎manage.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
warnings.filterwarnings('ignore', category=UserWarning, module='cffi')
88

99
if __name__ == '__main__':
10-
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'MobSF.settings')
10+
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mobsf.MobSF.settings')
1111

1212
from django.core.management import execute_from_command_line
1313
if 'runserver' in sys.argv:

0 commit comments

Comments
 (0)