Skip to content

Commit eadea1d

Browse files
GermanCodingGermanCoding
committed
Use consistent env name for nextcloud hostname
1 parent 5df188b commit eadea1d

5 files changed

Lines changed: 37 additions & 37 deletions

File tree

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2026 G DATA CyberDefense AG
1+
# SPDX-FileCopyrightText: 2026 G DATA CyberDefense AG <vaas@gdata.de>
22
# SPDX-License-Identifier: AGPL-3.0-or-later
33

44
FROM mcr.microsoft.com/devcontainers/base:trixie

‎.devcontainer/devcontainer-lock.json.license‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
SPDX-FileCopyrightText: 2026 G DATA CyberDefense AG
1+
SPDX-FileCopyrightText: 2026 G DATA CyberDefense AG <vaas@gdata.de>
22

33
SPDX-License-Identifier: AGPL-3.0-or-later

‎tests/bats/.env-test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77

88
if [[ "$IS_CI" == 1 ]]; then
9-
export HOSTNAME=nextcloud-container
9+
export NEXTCLOUD_HOSTNAME=nextcloud-container
1010
else
11-
export HOSTNAME=127.0.0.1:8080
11+
export NEXTCLOUD_HOSTNAME=127.0.0.1:8080
1212
fi
1313

1414
if [[ "$IS_CI" == 1 ]]; then

‎tests/bats/functionality-parallel.bats‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,47 +21,47 @@ setup_file() {
2121

2222
@test "test admin eicar Upload" {
2323
EICAR_LENGTH=$(echo $EICAR_STRING | wc -c)
24-
RESULT=$(echo $EICAR_STRING | curl -v -X PUT -w "%{http_code}" -u admin:admin -T - http://$HOSTNAME/remote.php/dav/files/admin/functionality-parallel.eicar.com.txt || echo "curl failed")
24+
RESULT=$(echo $EICAR_STRING | curl -v -X PUT -w "%{http_code}" -u admin:admin -T - http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/functionality-parallel.eicar.com.txt || echo "curl failed")
2525

2626
echo "Actual: $RESULT"
27-
curl --silent -q -u admin:admin -X DELETE http://$HOSTNAME/remote.php/dav/files/admin/functionality-parallel.eicar.com.txt || echo "file not found"
27+
curl --silent -q -u admin:admin -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/functionality-parallel.eicar.com.txt || echo "file not found"
2828
[[ "$RESULT" =~ "Virus found" ]]
2929
}
3030

3131
@test "test admin clean upload" {
32-
RESULT=$(echo $CLEAN_STRING | curl -w "%{http_code}" -u admin:admin -T - http://$HOSTNAME/remote.php/dav/files/admin/functionality-parallel.clean.txt || echo "curl failed")
32+
RESULT=$(echo $CLEAN_STRING | curl -w "%{http_code}" -u admin:admin -T - http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/functionality-parallel.clean.txt || echo "curl failed")
3333

3434
echo "Actual: $RESULT"
35-
curl --silent -q -u admin:admin -X DELETE http://$HOSTNAME/remote.php/dav/files/admin/functionality-parallel.clean.txt || echo "file not found"
35+
curl --silent -q -u admin:admin -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/functionality-parallel.clean.txt || echo "file not found"
3636
[[ $RESULT -ge 200 && $RESULT -lt 300 ]]
3737
}
3838

3939
@test "test admin pup Upload" {
40-
RESULT=$(curl --silent -w "%{http_code}" -u admin:admin -T $FOLDER_PREFIX/pup.exe http://$HOSTNAME/remote.php/dav/files/admin/functionality-parallel.pup.exe)
40+
RESULT=$(curl --silent -w "%{http_code}" -u admin:admin -T $FOLDER_PREFIX/pup.exe http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/functionality-parallel.pup.exe)
4141
echo "Actual: $RESULT"
42-
curl --silent -q -u admin:admin -X DELETE http://$HOSTNAME/remote.php/dav/files/admin/functionality-parallel.pup.exe || echo "file not found"
42+
curl --silent -q -u admin:admin -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/functionality-parallel.pup.exe || echo "file not found"
4343
[[ $RESULT -ge 200 && $RESULT -lt 300 ]]
4444
}
4545

4646
@test "test testuser eicar Upload" {
47-
RESULT=$(echo $EICAR_STRING | curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T - http://$HOSTNAME/remote.php/dav/files/$TESTUSER/functionality-parallel.eicar.com.txt)
47+
RESULT=$(echo $EICAR_STRING | curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T - http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/functionality-parallel.eicar.com.txt)
4848
echo "Actual: $RESULT"
4949
$DOCKER_EXEC_WITH_USER -i nextcloud-container php occ config:app:get gdatavaas clientSecret
50-
curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$HOSTNAME/remote.php/dav/files/$TESTUSER/functionality-parallel.eicar.com.txt || echo "file not found"
50+
curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/functionality-parallel.eicar.com.txt || echo "file not found"
5151
[[ "$RESULT" =~ "Virus found" ]]
5252
}
5353

5454
@test "test testuser clean Upload" {
55-
STATUS_CODE=$(echo $CLEAN_STRING | curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T - http://$HOSTNAME/remote.php/dav/files/$TESTUSER/functionality-parallel.clean.txt)
55+
STATUS_CODE=$(echo $CLEAN_STRING | curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T - http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/functionality-parallel.clean.txt)
5656
echo "Actual: $RESULT"
57-
curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$HOSTNAME/remote.php/dav/files/$TESTUSER/functionality-parallel.clean.txt || echo "file not found"
57+
curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/functionality-parallel.clean.txt || echo "file not found"
5858
[[ $STATUS_CODE -ge 200 && $STATUS_CODE -lt 300 ]] || exit 1
5959
}
6060

6161
@test "test testuser pup Upload" {
62-
RESULT=$(curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T $FOLDER_PREFIX/pup.exe http://$HOSTNAME/remote.php/dav/files/$TESTUSER/functionality-parallel.pup.exe)
62+
RESULT=$(curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T $FOLDER_PREFIX/pup.exe http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/functionality-parallel.pup.exe)
6363
echo "Actual: $RESULT"
64-
curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$HOSTNAME/remote.php/dav/files/$TESTUSER/functionality-parallel.pup.exe || echo "file not found"
64+
curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/functionality-parallel.pup.exe || echo "file not found"
6565
[[ $RESULT -ge 200 && $RESULT -lt 300 ]] || exit 1
6666
}
6767

‎tests/bats/functionality-sequential.bats‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ setup_file() {
2121

2222
@test "test upload when vaas does not function" {
2323
$DOCKER_EXEC_WITH_USER nextcloud-container php occ config:app:set gdatavaas clientSecret --value="WRONG_PASSWORD"
24-
RESULT=$(echo $EICAR_STRING | curl --silent -w "%{http_code}" -u admin:admin -T - http://$HOSTNAME/remote.php/dav/files/admin/functionality-sequential.eicar.com.txt)
24+
RESULT=$(echo $EICAR_STRING | curl --silent -w "%{http_code}" -u admin:admin -T - http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/functionality-sequential.eicar.com.txt)
2525
$DOCKER_EXEC_WITH_USER nextcloud-container php occ config:app:set gdatavaas clientSecret --value="$CLIENT_SECRET"
26-
curl --silent -q -u admin:admin -X DELETE http://$HOSTNAME/remote.php/dav/files/admin/functionality-sequential.eicar.com.txt
26+
curl --silent -q -u admin:admin -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/functionality-sequential.eicar.com.txt
2727

2828
echo "Actual: $RESULT"
2929
[[ $RESULT -ge 200 && $RESULT -lt 300 ]]
3030
}
3131

3232
@test "test croned scan for admin files" {
3333
$DOCKER_EXEC_WITH_USER nextcloud-container php occ config:app:set gdatavaas clientSecret --value="WRONG_PASSWORD"
34-
echo $EICAR_STRING | curl --silent -w "%{http_code}" -u admin:admin -T - http://$HOSTNAME/remote.php/dav/files/admin/admin.functionality-sequential.eicar.com.txt
35-
curl --silent -w "%{http_code}" -u admin:admin -T $FOLDER_PREFIX/pup.exe http://$HOSTNAME/remote.php/dav/files/admin/admin.pup.exe
36-
echo $CLEAN_STRING | curl --silent -w "%{http_code}" -u admin:admin -T - http://$HOSTNAME/remote.php/dav/files/admin/admin.functionality-sequential.clean.txt
34+
echo $EICAR_STRING | curl --silent -w "%{http_code}" -u admin:admin -T - http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/admin.functionality-sequential.eicar.com.txt
35+
curl --silent -w "%{http_code}" -u admin:admin -T $FOLDER_PREFIX/pup.exe http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/admin.pup.exe
36+
echo $CLEAN_STRING | curl --silent -w "%{http_code}" -u admin:admin -T - http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/admin.functionality-sequential.clean.txt
3737

3838
$DOCKER_EXEC_WITH_USER nextcloud-container php occ config:app:set gdatavaas clientSecret --value="$CLIENT_SECRET"
3939

@@ -59,17 +59,17 @@ setup_file() {
5959
[[ $($DOCKER_EXEC_WITH_USER nextcloud-container php occ gdatavaas:get-tags-for-file admin/files/admin.functionality-sequential.clean.txt | grep "Clean" ) ]]
6060
[[ $($DOCKER_EXEC_WITH_USER nextcloud-container php occ gdatavaas:get-tags-for-file admin/files/admin.functionality-sequential.clean.txt | wc -l ) -eq "1" ]]
6161

62-
curl --silent -q -u admin:admin -X DELETE http://$HOSTNAME/remote.php/dav/files/admin/admin.functionality-sequential.eicar.com.txt
63-
curl --silent -q -u admin:admin -X DELETE http://$HOSTNAME/remote.php/dav/files/admin/admin.pup.exe
64-
curl --silent -q -u admin:admin -X DELETE http://$HOSTNAME/remote.php/dav/files/admin/admin.functionality-sequential.clean.txt
62+
curl --silent -q -u admin:admin -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/admin.functionality-sequential.eicar.com.txt
63+
curl --silent -q -u admin:admin -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/admin.pup.exe
64+
curl --silent -q -u admin:admin -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/admin.functionality-sequential.clean.txt
6565
}
6666

6767
#@test "test croned scan for testuser files" {
6868
# $DOCKER_EXEC_WITH_USER -i nextcloud-container php occ config:app:set gdatavaas clientSecret --value="WRONG_PASSWORD"
6969
#
70-
# echo $EICAR_STRING |curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T - http://$HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.eicar.com.txt
71-
# curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T $FOLDER_PREFIX/pup.exe http://$HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.pup.exe
72-
# echo $CLEAN_STRING |curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T - http://$HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.clean.txt
70+
# echo $EICAR_STRING |curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T - http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.eicar.com.txt
71+
# curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T $FOLDER_PREFIX/pup.exe http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.pup.exe
72+
# echo $CLEAN_STRING |curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T - http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.clean.txt
7373
#
7474
# $DOCKER_EXEC_WITH_USER -i nextcloud-container php occ config:app:set gdatavaas clientSecret --value="$CLIENT_SECRET"
7575
#
@@ -95,17 +95,17 @@ setup_file() {
9595
# [[ $($DOCKER_EXEC_WITH_USER nextcloud-container php occ gdatavaas:get-tags-for-file $TESTUSER/files/$TESTUSER.functionality-sequential.clean.txt | grep "Clean" ) ]]
9696
# [[ $($DOCKER_EXEC_WITH_USER nextcloud-container php occ gdatavaas:get-tags-for-file $TESTUSER/files/$TESTUSER.functionality-sequential.clean.txt | wc -l ) -eq "1" ]]
9797
#
98-
# curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.eicar.com.txt
99-
# curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.pup.exe
100-
# curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.clean.txt
98+
# curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.eicar.com.txt
99+
# curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.pup.exe
100+
# curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.clean.txt
101101
#}
102102

103103
#@test "test when unscanned tag is deactivated" {
104104
# $DOCKER_EXEC_WITH_USER -i nextcloud-container php occ config:app:set gdatavaas clientSecret --value="WRONG_PASSWORD"
105105
# $DOCKER_EXEC_WITH_USER -i nextcloud-container php occ config:app:set gdatavaas disableUnscannedTag --value="true"
106106
#
107-
# echo $EICAR_STRING |curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T - http://$HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.eicar.com.txt
108-
# echo $CLEAN_STRING |curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T - http://$HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.clean.txt
107+
# echo $EICAR_STRING |curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T - http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.eicar.com.txt
108+
# echo $CLEAN_STRING |curl --silent -w "%{http_code}" -u $TESTUSER:$TESTUSER_PASSWORD -T - http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.clean.txt
109109
#
110110
# $DOCKER_EXEC_WITH_USER -i nextcloud-container php occ config:app:set gdatavaas clientSecret --value="$CLIENT_SECRET"
111111
#
@@ -115,20 +115,20 @@ setup_file() {
115115
#
116116
# $DOCKER_EXEC_WITH_USER -i nextcloud-container php occ config:app:set gdatavaas disableUnscannedTag --value="false"
117117
#
118-
# curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.eicar.com.txt
119-
# curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.clean.txt
118+
# curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.eicar.com.txt
119+
# curl --silent -q -u $TESTUSER:$TESTUSER_PASSWORD -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/$TESTUSER/$TESTUSER.functionality-sequential.clean.txt
120120
#}
121121

122122
@test "test mailing on eicar upload" {
123-
echo $EICAR_STRING | curl --silent -w "%{http_code}" -u admin:admin -T - http://$HOSTNAME/remote.php/dav/files/admin/functionality-sequential.eicar.com.txt
123+
echo $EICAR_STRING | curl --silent -w "%{http_code}" -u admin:admin -T - http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/functionality-sequential.eicar.com.txt
124124
sleep 1
125125

126-
RESULT=$(curl -X 'GET' "http://$MAIL_HOSTNAME/api/Messages/new?mailboxName=Default&pageSize=1" -H 'accept: application/json')
126+
RESULT=$(curl -X 'GET' "http://$MAIL_NEXTCLOUD_HOSTNAME/api/Messages/new?mailboxName=Default&pageSize=1" -H 'accept: application/json')
127127

128128
echo $RESULT
129129
[[ $RESULT =~ "Infected file upload" ]]
130130

131-
curl --silent -q -u admin:admin -X DELETE http://$HOSTNAME/remote.php/dav/files/admin/functionality-sequential.eicar.com.txt
131+
curl --silent -q -u admin:admin -X DELETE http://$NEXTCLOUD_HOSTNAME/remote.php/dav/files/admin/functionality-sequential.eicar.com.txt
132132
}
133133

134134
tearddown_file() {

0 commit comments

Comments
 (0)