Skip to content

Commit d4a279d

Browse files
SailRealSailReal
committed
Merge branch 'develop' into feature/migrate-to-gcm
2 parents 89b8aa6 + e6e8d61 commit d4a279d

File tree

6 files changed

+175
-0
lines changed

6 files changed

+175
-0
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,7 @@ local.properties
5151
**/fastlane/izzyscript/iod-scan-apk.php
5252
**/fastlane/izzyscript/current_iod-scan-apk.php
5353
**/fastlane/izzyscript/current_result_*.json
54+
55+
# Fluid Attacks
56+
**/fastlane/fluidattacks/results.csv
57+
**/fastlane/fluidattacks/apks/**

‎buildsystem/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,9 @@ RUN yes | sdkmanager --licenses --sdk_root="${ANDROID_HOME}"
3838
RUN update-java-alternatives -s java-1.17.0-openjdk-amd64
3939

4040
RUN rm -rf ${ANDROID_HOME}/tools
41+
42+
# Create a non-root user and group
43+
RUN groupadd -r appuser && useradd --no-log-init -r -g appuser appuser
44+
45+
# Switch to the non-root user
46+
USER appuser

‎buildsystem/docker/dependencies.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
apt-utils=2.9.3
2+
wget=1.24.5-1
3+
git=1:2.45.1-1
4+
unzip=6.0-28
15
openjdk-17-jdk=17.0.11+9-1

‎fastlane/Fastfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,24 @@ platform :android do |options|
364364
FileUtils.rm_r("exodus-test")
365365
end
366366

367+
desc "Run fluidattacks"
368+
lane :runFluidattacks do |options|
369+
# if you want to run it for a specific version just set e.g. version = "1.10.0"
370+
fluidattacks_apks_path = "fluidattacks/apks"
371+
apk_types = %w[signed fdroid_signed lite_signed playstore_signed]
372+
373+
FileUtils.mkdir("#{fluidattacks_apks_path}")
374+
apk_types.each do |type|
375+
FileUtils.mkdir("#{fluidattacks_apks_path}/Cryptomator-#{version}_#{type}/")
376+
FileUtils.cp("release/Cryptomator-#{version}_#{type}.apk", "#{fluidattacks_apks_path}/Cryptomator-#{version}_#{type}/")
377+
end
378+
379+
puts "Run Fluidattacks. Results are in /src/fastlane/fluidattacks/results.csv"
380+
sh("docker run -v $(cd .. && pwd):/src -w /src fluidattacks/cli:amd64 skims scan /src/fastlane/fluidattacks/config.yaml")
381+
382+
FileUtils.rm_r("#{fluidattacks_apks_path}")
383+
end
384+
367385
desc "Create GitHub draft release"
368386
lane :createGitHubDraftRelease do |options|
369387
target_branch = "main"

‎fastlane/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,14 @@ Check if tracking added in some dependency using Izzy's script
7979

8080
Check if tracking added in some dependency using exodus
8181

82+
### android runFluidattacks
83+
84+
```sh
85+
[bundle exec] fastlane android runFluidattacks
86+
```
87+
88+
Run fluidattacks
89+
8290
### android createGitHubDraftRelease
8391

8492
```sh

‎fastlane/fluidattacks/config.yaml

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
# docker run --mount type=bind,source=<Root of repo>,target=/src fluidattacks/cli:<Tag> skims scan /src/fastlane/fluidattacks/config.yaml
2+
# <Root of repo>: Path to the root of the repository.
3+
# <Tag>: Tag of the tool image; usually "amd64" or "arm64".
4+
# Also see: https://hub.docker.com/r/fluidattacks/cli
5+
# Also see: https://web.archive.org/web/20240301173651/https://docs.fluidattacks.com/tech/scanner/standalone/casa/
6+
#
7+
# NOTE: Prefer using absolute paths over relative paths;
8+
# the tool doesn't seem to handle relative paths too well in some places.
9+
namespace: CryptomatorAndroid
10+
output:
11+
file_path: /src/fastlane/fluidattacks/results.csv
12+
format: CSV
13+
14+
# The working directory should resolve to the root of the repository.
15+
# This should stay "/src" because the tool doesn't seem to handle anything but the default too well.
16+
working_dir: /src
17+
language: EN
18+
file_size_limit: false
19+
20+
# The "/src/apk_files" folder is deleted once the tool is done.
21+
# The folders named after the apks (e.g. "presentation-playstore-debug" for
22+
# "presentation-playstore-debug.apk") in "/src" seem to always stay empty.
23+
# If this behavior changes, it might be necessary to exclude those from "sast" to keep iterative scans possible.
24+
apk:
25+
include:
26+
- glob(/src/fastlane/fluidattacks/apks/**/*.apk)
27+
sast: # Used to be "path" (e.g. in the docs of the ADA)
28+
include:
29+
- .
30+
checks:
31+
- F001
32+
- F004
33+
- F008
34+
- F009
35+
- F010
36+
- F011
37+
- F012
38+
- F015
39+
- F016
40+
- F017
41+
- F020
42+
- F021
43+
- F022
44+
- F023
45+
- F031
46+
- F034
47+
- F035
48+
- F037
49+
- F042
50+
- F043
51+
- F052
52+
- F055
53+
- F056
54+
- F058
55+
- F073
56+
- F075
57+
- F079
58+
- F080
59+
- F082
60+
- F085
61+
- F086
62+
- F089
63+
- F091
64+
- F092
65+
- F094
66+
- F096
67+
- F098
68+
- F099
69+
- F100
70+
- F103
71+
- F107
72+
- F112
73+
- F120
74+
- F127
75+
- F128
76+
- F129
77+
- F130
78+
- F131
79+
- F132
80+
- F133
81+
- F134
82+
- F143
83+
- F160
84+
- F176
85+
- F177
86+
- F182
87+
- F200
88+
- F203
89+
- F206
90+
- F207
91+
- F211
92+
- F234
93+
- F239
94+
- F246
95+
- F247
96+
- F250
97+
- F252
98+
- F256
99+
- F257
100+
- F258
101+
- F259
102+
- F266
103+
- F267
104+
- F268
105+
- F277
106+
- F281
107+
- F300
108+
- F313
109+
- F320
110+
- F325
111+
- F333
112+
- F335
113+
- F338
114+
- F346
115+
- F363
116+
- F372
117+
- F380
118+
- F381
119+
- F393
120+
- F394
121+
- F396
122+
- F398
123+
- F400
124+
- F401
125+
- F402
126+
- F406
127+
- F407
128+
- F408
129+
- F409
130+
- F411
131+
- F412
132+
- F413
133+
- F414
134+
- F416
135+
- F418

0 commit comments

Comments
 (0)