mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-04 23:37:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ocis-1132

Browse Source
This commit is contained in:
A.Unger
2020-12-03 13:36:27 +01:00
parent be46bacc5b a2cba4631f
commit 2731dbd7b2
9 changed files with 53 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.star
View File

@@ -17,7 +17,7 @@ config = {
},
'apiTests': {
'coreBranch': 'master',
'coreCommit': 'b1e3888c39de7f450ce782f598d97867f4f50120',
'coreCommit': 'ed326fd54c7f9142389e49aad87653a905c6ddb7',
'numberOfParts': 10
},
'uiTests': {

12
ocis/docker-compose-eos-test.yml
View File

@@ -61,7 +61,7 @@ services:
mgm-master:
container_name: mgm-master
image: owncloud/eos-mgm:4.6.5
image: owncloud/eos-mgm:4.8.26
tty: true
privileged: true
stdin_open: true
@@ -81,7 +81,7 @@ services:
mq-master:
container_name: mq-master
image: owncloud/eos-mq:4.6.5
image: owncloud/eos-mq:4.8.26
tty: true
privileged: true
stdin_open: true
@@ -99,7 +99,7 @@ services:
fst:
container_name: fst
image: owncloud/eos-fst:4.6.5
image: owncloud/eos-fst:4.8.26
tty: true
privileged: true
stdin_open: true
@@ -116,7 +116,7 @@ services:
quark-1:
container_name: quark-1
image: owncloud/eos-qdb:4.6.5
image: owncloud/eos-qdb:4.8.26
tty: true
privileged: true
stdin_open: true
@@ -136,7 +136,7 @@ services:
quark-2:
container_name: quark-2
image: owncloud/eos-qdb:4.6.5
image: owncloud/eos-qdb:4.8.26
tty: true
privileged: true
stdin_open: true
@@ -156,7 +156,7 @@ services:
quark-3:
container_name: quark-3
image: owncloud/eos-qdb:4.6.5
image: owncloud/eos-qdb:4.8.26
tty: true
privileged: true
stdin_open: true

12
ocis/docker-compose.yml
View File

@@ -59,7 +59,7 @@ services:
mgm-master:
container_name: mgm-master
image: owncloud/eos-mgm:4.6.5
image: owncloud/eos-mgm:4.8.26
tty: true
privileged: true
stdin_open: true
@@ -79,7 +79,7 @@ services:
mq-master:
container_name: mq-master
image: owncloud/eos-mq:4.6.5
image: owncloud/eos-mq:4.8.26
tty: true
privileged: true
stdin_open: true
@@ -97,7 +97,7 @@ services:
fst:
container_name: fst
image: owncloud/eos-fst:4.6.5
image: owncloud/eos-fst:4.8.26
tty: true
privileged: true
stdin_open: true
@@ -114,7 +114,7 @@ services:
quark-1:
container_name: quark-1
image: owncloud/eos-qdb:4.6.5
image: owncloud/eos-qdb:4.8.26
tty: true
privileged: true
stdin_open: true
@@ -134,7 +134,7 @@ services:
quark-2:
container_name: quark-2
image: owncloud/eos-qdb:4.6.5
image: owncloud/eos-qdb:4.8.26
tty: true
privileged: true
stdin_open: true
@@ -154,7 +154,7 @@ services:
quark-3:
container_name: quark-3
image: owncloud/eos-qdb:4.6.5
image: owncloud/eos-qdb:4.8.26
tty: true
privileged: true
stdin_open: true

2
ocis/docker/eos-ocis-dev/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM owncloud/eos-base:4.6.5
FROM owncloud/eos-base:4.8.26
ENV CGO_ENABLED=1
ENV GOOS=linux

2
ocis/docker/eos-ocis/Dockerfile
View File

@@ -25,7 +25,7 @@ COPY user.go /build/user.go
RUN cd /build && go build -o user user.go
FROM owncloud/eos-base:4.6.5
FROM owncloud/eos-base:4.8.26
RUN mkdir -p /usr/local/bin
COPY --from=build ocis/bin/ocis /usr/local/bin/
RUN chmod +x /usr/local/bin/ocis

1
tests/acceptance/config/behat.yml
View File

@@ -44,6 +44,7 @@ default:
- PublicWebDavContext:
- TrashbinContext:
- WebDavPropertiesContext:
- TUSContext:
extensions:
jarnaiz\JUnitFormatter\JUnitFormatterExtension:

4
tests/acceptance/expected-failures-on-OCIS-storage.txt
View File

@@ -2502,3 +2502,7 @@ apiWebdavUploadTUS/uploadToShare.feature:67
# https://github.com/owncloud/product/issues/293 sharing with group not available
apiWebdavUploadTUS/uploadToShare.feature:52
apiWebdavUploadTUS/uploadToShare.feature:53
# https://github.com/owncloud/ocis/issues/1012 TUS OPTIONS requests does not reply with TUS headers when invalid password
apiWebdavUploadTUS/optionsRequest.feature:29
apiWebdavUploadTUS/optionsRequest.feature:40

4
tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
View File

@@ -2410,3 +2410,7 @@ apiVersions/fileVersionsSharingToShares.feature:279
# https://github.com/owncloud/ocis/issues/719 when a share exists its impossible to share a renamed folder
apiShareManagementBasicToShares/createShareToSharesFolder.feature:611
apiShareManagementBasicToShares/createShareToSharesFolder.feature:612
# https://github.com/owncloud/ocis/issues/1012 TUS OPTIONS requests does not reply with TUS headers when invalid password
apiWebdavUploadTUS/optionsRequest.feature:29
apiWebdavUploadTUS/optionsRequest.feature:40

29
tests/acceptance/features/apiOcisSpecific/apiWebdavUploadTUS-optionsRequest.feature Normal file
View File

@@ -0,0 +1,29 @@
@api @issue-ocis-1012
# after fixing all issues delete these Scenarios and use the one from oC10 core
Feature: OPTIONS request
Background:
Given user "Alice" has been created with default attributes and without skeleton files
Scenario: send OPTIONS request to webDav endpoints using the TUS protocol with valid username and wrong password
When user "Alice" requests these endpoints with "OPTIONS" including body "doesnotmatter" using password "invalid" about user "Alice"
| endpoint |
| /remote.php/webdav/ |
| /remote.php/dav/files/%username%/ |
Then the following headers should not be set
| header |
| Tus-Resumable |
| Tus-Version |
| Tus-Extension |
Scenario: send OPTIONS requests to webDav endpoints using valid password and username of different user
Given user "Brian" has been created with default attributes and without skeleton files
When user "Brian" requests these endpoints with "OPTIONS" including body "doesnotmatter" using the password of user "Alice"
| endpoint |
| /remote.php/webdav/ |
| /remote.php/dav/files/%username%/ |
Then the following headers should not be set
| header |
| Tus-Resumable |
| Tus-Version |
| Tus-Extension |