From d7b1ecb3dc40ca0f7661f2c58bf2603e93ab65d2 Mon Sep 17 00:00:00 2001 From: Pascal Wengerter Date: Thu, 28 Jan 2021 00:32:47 +0000 Subject: [PATCH 01/13] Change (ocis,OCIS) to oCIS, unify GitHub branding --- .github/pull_request_template.md | 2 +- accounts/pkg/proto/v0/accounts.pb.go | 10 +++--- accounts/pkg/proto/v0/accounts.proto | 10 +++--- accounts/pkg/proto/v0/accounts.swagger.json | 10 +++--- .../user-agent-challenge-lock-in.md | 4 +-- .../1.1.0_2021-01-22/add-ocis-url-env.md | 4 +-- changelog/1.1.0_2021-01-22/move-k6.md | 2 +- .../1.1.0_2021-01-22/update-reva-to-1.5.1.md | 2 +- .../cs3_users_ocis/docker-compose.yaml | 2 +- docs/_index.md | 6 ++-- docs/extensions/glauth/_index.md | 2 +- docs/extensions/settings/glossary.md | 2 +- docs/extensions/storage/_index.md | 4 +-- docs/extensions/storage/storages.md | 4 +-- docs/ocis/deployment/basic-remote-setup.md | 12 +++---- docs/ocis/deployment/ocis_keycloak.md | 2 +- docs/ocis/development/debugging.md | 2 +- docs/ocis/getting-started.md | 4 +-- ocis/pkg/runtime/README.md | 2 +- ocis/pkg/runtime/cmd/root.go | 4 +-- ocis/pkg/runtime/controller/controller.go | 6 ++-- ocis/pkg/runtime/runtime.go | 6 ++-- ocs/pkg/service/v0/users.go | 2 +- proxy/pkg/middleware/authentication.go | 2 +- .../expected-failures-API-on-EOS-storage.md | 2 +- .../expected-failures-API-on-OCIS-storage.md | 32 +++++++++---------- ...pected-failures-API-on-OWNCLOUD-storage.md | 18 +++++------ 27 files changed, 79 insertions(+), 79 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d83ea85582..85a7126224 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -7,7 +7,7 @@ For fixing potential security issues please see https://owncloud.org/security/ To make it possible for us to get your change reviewed and merged please carefully fill out the requested information below. -Please note that any kind of change needs first be submitted to the master branch which holds the next version of OCIS. +Please note that any kind of change needs first be submitted to the master branch which holds the next version of oCIS. Please set the following labels: diff --git a/accounts/pkg/proto/v0/accounts.pb.go b/accounts/pkg/proto/v0/accounts.pb.go index d265ca3131..028688ccfa 100644 --- a/accounts/pkg/proto/v0/accounts.pb.go +++ b/accounts/pkg/proto/v0/accounts.pb.go @@ -480,12 +480,12 @@ type Account struct { IsResourceAccount bool `protobuf:"varint,3,opt,name=is_resource_account,json=isResourceAccount,proto3" json:"is_resource_account,omitempty"` // Indicates whether the account was created as // - a regular school or work account ("" / emptystring), - // - a local account, fully managed by ocis (LocalAccount), includes synced accounts or + // - a local account, fully managed by oCIS (LocalAccount), includes synced accounts or // - an external account (Invitation), // - self-service sign-up using email verification (EmailVerified). Read-only. CreationType string `protobuf:"bytes,4,opt,name=creation_type,json=creationType,proto3" json:"creation_type,omitempty"` // Represents the identities that can be used to sign in to this account. - // An identity can be provided by OCIS (also known as a local account), by organizations, or by social identity providers such as Facebook, Google, and Microsoft, and is tied to an account. + // An identity can be provided by oCIS (also known as a local account), by organizations, or by social identity providers such as Facebook, Google, and Microsoft, and is tied to an account. // May contain multiple items with the same signInType value. Supports $filter. Identities []*Identities `protobuf:"bytes,5,rep,name=identities,proto3" json:"identities,omitempty"` // The name displayed in the address book for the account. @@ -527,7 +527,7 @@ type Account struct { // *false* if this object was originally synced from an on-premises directory but is no longer synced; // null if this object has never been synced from an on-premises directory (default). Read-only OnPremisesSyncEnabled bool `protobuf:"varint,20,opt,name=on_premises_sync_enabled,json=onPremisesSyncEnabled,proto3" json:"on_premises_sync_enabled,omitempty"` - // This property is used to associate an on-premises LDAP user to the ocis account object. + // This property is used to associate an on-premises LDAP user to the oCIS account object. // This property must be specified when creating a new user account in the Graph if you are using a federated domain for the user’s userPrincipalName (UPN) property. // Important: The $ and _ characters cannot be used when specifying this property. Supports $filter. OnPremisesImmutableId string `protobuf:"bytes,21,opt,name=on_premises_immutable_id,json=onPremisesImmutableId,proto3" json:"on_premises_immutable_id,omitempty"` @@ -796,7 +796,7 @@ func (x *Account) GetSignInSessionsValidFromDateTime() *timestamp.Timestamp { } // Identities Represents an identity used to sign in to a user account. -// An identity can be provided by ocis, by organizations, or by social identity providers such as Facebook, Google, or Microsoft, that are tied to a user account. +// An identity can be provided by oCIS, by organizations, or by social identity providers such as Facebook, Google, or Microsoft, that are tied to a user account. // This enables the user to sign in to the user account with any of those associated identities. // They are also used to keep a history of old usernames. type Identities struct { @@ -1643,7 +1643,7 @@ type Group struct { // null if this object has never been synced from an on-premises directory (default). // Returned by default. Read-only. Supports $filter. OnPremisesSyncEnabled bool `protobuf:"varint,20,opt,name=on_premises_sync_enabled,json=onPremisesSyncEnabled,proto3" json:"on_premises_sync_enabled,omitempty"` - // This property is used to associate an on-premises LDAP user to the ocis account object. + // This property is used to associate an on-premises LDAP user to the oCIS account object. // This property must be specified when creating a new user account in the Graph if you are using a federated domain for the user’s userPrincipalName (UPN) property. // Important: The $ and _ characters cannot be used when specifying this property. Supports $filter. OnPremisesImmutableId string `protobuf:"bytes,21,opt,name=on_premises_immutable_id,json=onPremisesImmutableId,proto3" json:"on_premises_immutable_id,omitempty"` diff --git a/accounts/pkg/proto/v0/accounts.proto b/accounts/pkg/proto/v0/accounts.proto index 9410491d29..cdc24882e7 100644 --- a/accounts/pkg/proto/v0/accounts.proto +++ b/accounts/pkg/proto/v0/accounts.proto @@ -242,13 +242,13 @@ message Account { // Indicates whether the account was created as // - a regular school or work account ("" / emptystring), - // - a local account, fully managed by ocis (LocalAccount), includes synced accounts or + // - a local account, fully managed by oCIS (LocalAccount), includes synced accounts or // - an external account (Invitation), // - self-service sign-up using email verification (EmailVerified). Read-only. string creation_type = 4; // Represents the identities that can be used to sign in to this account. - // An identity can be provided by OCIS (also known as a local account), by organizations, or by social identity providers such as Facebook, Google, and Microsoft, and is tied to an account. + // An identity can be provided by oCIS (also known as a local account), by organizations, or by social identity providers such as Facebook, Google, and Microsoft, and is tied to an account. // May contain multiple items with the same signInType value. Supports $filter. repeated Identities identities = 5; @@ -321,7 +321,7 @@ message Account { // null if this object has never been synced from an on-premises directory (default). Read-only bool on_premises_sync_enabled = 20; - // This property is used to associate an on-premises LDAP user to the ocis account object. + // This property is used to associate an on-premises LDAP user to the oCIS account object. // This property must be specified when creating a new user account in the Graph if you are using a federated domain for the user’s userPrincipalName (UPN) property. // Important: The $ and _ characters cannot be used when specifying this property. Supports $filter. string on_premises_immutable_id = 21; @@ -382,7 +382,7 @@ message Account { } // Identities Represents an identity used to sign in to a user account. -// An identity can be provided by ocis, by organizations, or by social identity providers such as Facebook, Google, or Microsoft, that are tied to a user account. +// An identity can be provided by oCIS, by organizations, or by social identity providers such as Facebook, Google, or Microsoft, that are tied to a user account. // This enables the user to sign in to the user account with any of those associated identities. // They are also used to keep a history of old usernames. message Identities { @@ -627,7 +627,7 @@ message Group { // Returned by default. Read-only. Supports $filter. bool on_premises_sync_enabled = 20; - // This property is used to associate an on-premises LDAP user to the ocis account object. + // This property is used to associate an on-premises LDAP user to the oCIS account object. // This property must be specified when creating a new user account in the Graph if you are using a federated domain for the user’s userPrincipalName (UPN) property. // Important: The $ and _ characters cannot be used when specifying this property. Supports $filter. string on_premises_immutable_id = 21; diff --git a/accounts/pkg/proto/v0/accounts.swagger.json b/accounts/pkg/proto/v0/accounts.swagger.json index 37f50807d9..084f43f4ea 100644 --- a/accounts/pkg/proto/v0/accounts.swagger.json +++ b/accounts/pkg/proto/v0/accounts.swagger.json @@ -568,14 +568,14 @@ }, "creation_type": { "type": "string", - "description": "Indicates whether the account was created as\n- a regular school or work account (\"\" / emptystring),\n- a local account, fully managed by ocis (LocalAccount), includes synced accounts or\n- an external account (Invitation),\n- self-service sign-up using email verification (EmailVerified). Read-only." + "description": "Indicates whether the account was created as\n- a regular school or work account (\"\" / emptystring),\n- a local account, fully managed by oCIS (LocalAccount), includes synced accounts or\n- an external account (Invitation),\n- self-service sign-up using email verification (EmailVerified). Read-only." }, "identities": { "type": "array", "items": { "$ref": "#/definitions/settingsIdentities" }, - "description": "Represents the identities that can be used to sign in to this account.\nAn identity can be provided by OCIS (also known as a local account), by organizations, or by social identity providers such as Facebook, Google, and Microsoft, and is tied to an account.\nMay contain multiple items with the same signInType value. Supports $filter." + "description": "Represents the identities that can be used to sign in to this account.\nAn identity can be provided by oCIS (also known as a local account), by organizations, or by social identity providers such as Facebook, Google, and Microsoft, and is tied to an account.\nMay contain multiple items with the same signInType value. Supports $filter." }, "display_name": { "type": "string", @@ -631,7 +631,7 @@ }, "on_premises_immutable_id": { "type": "string", - "description": "This property is used to associate an on-premises LDAP user to the ocis account object.\nThis property must be specified when creating a new user account in the Graph if you are using a federated domain for the user’s userPrincipalName (UPN) property.\nImportant: The $ and _ characters cannot be used when specifying this property. Supports $filter." + "description": "This property is used to associate an on-premises LDAP user to the oCIS account object.\nThis property must be specified when creating a new user account in the Graph if you are using a federated domain for the user’s userPrincipalName (UPN) property.\nImportant: The $ and _ characters cannot be used when specifying this property. Supports $filter." }, "on_premises_security_identifier": { "type": "string", @@ -815,7 +815,7 @@ }, "on_premises_immutable_id": { "type": "string", - "description": "This property is used to associate an on-premises LDAP user to the ocis account object.\nThis property must be specified when creating a new user account in the Graph if you are using a federated domain for the user’s userPrincipalName (UPN) property.\nImportant: The $ and _ characters cannot be used when specifying this property. Supports $filter." + "description": "This property is used to associate an on-premises LDAP user to the oCIS account object.\nThis property must be specified when creating a new user account in the Graph if you are using a federated domain for the user’s userPrincipalName (UPN) property.\nImportant: The $ and _ characters cannot be used when specifying this property. Supports $filter." }, "on_premises_security_identifier": { "type": "string", @@ -866,7 +866,7 @@ "description": "Specifies the unique identifier assigned to the user by the issuer. The combination of *issuer* and *issuerAssignedId* must be unique within the organization. Represents the sign-in name for the user, when signInType is set to emailAddress or userName (also known as local accounts).\nWhen *signInType* is set to:\n* `emailAddress`, (or starts with `emailAddress` like `emailAddress1`) *issuerAssignedId* must be a valid email address\n* `userName`, issuer_assigned_id must be a valid local part of an email address\nSupports $filter. 512 character limit." } }, - "description": "Identities Represents an identity used to sign in to a user account.\nAn identity can be provided by ocis, by organizations, or by social identity providers such as Facebook, Google, or Microsoft, that are tied to a user account.\nThis enables the user to sign in to the user account with any of those associated identities.\nThey are also used to keep a history of old usernames." + "description": "Identities Represents an identity used to sign in to a user account.\nAn identity can be provided by oCIS, by organizations, or by social identity providers such as Facebook, Google, or Microsoft, that are tied to a user account.\nThis enables the user to sign in to the user account with any of those associated identities.\nThey are also used to keep a history of old usernames." }, "settingsListAccountsRequest": { "type": "object", diff --git a/changelog/1.0.0_2020-12-17/user-agent-challenge-lock-in.md b/changelog/1.0.0_2020-12-17/user-agent-challenge-lock-in.md index f89ab4eb2a..74a1eca9ab 100644 --- a/changelog/1.0.0_2020-12-17/user-agent-challenge-lock-in.md +++ b/changelog/1.0.0_2020-12-17/user-agent-challenge-lock-in.md @@ -4,7 +4,7 @@ Tags: reva, proxy We now comply with HTTP spec by adding Www-Authenticate headers on every `401` request. Furthermore, we not only take care of such a thing at the Proxy but also Reva will take care of it. In addition, we now are able to lock-in a set of User-Agent to specific challenges. -Admins can use this feature by configuring OCIS + Reva following this approach: +Admins can use this feature by configuring oCIS + Reva following this approach: ``` STORAGE_FRONTEND_MIDDLEWARE_AUTH_CREDENTIALS_BY_USER_AGENT="mirall:basic, Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:83.0) Gecko/20100101 Firefox/83.0:bearer" \ @@ -15,6 +15,6 @@ go run cmd/ocis/main.go server We introduced two new environment variables: -`STORAGE_FRONTEND_MIDDLEWARE_AUTH_CREDENTIALS_BY_USER_AGENT` as well as `PROXY_MIDDLEWARE_AUTH_CREDENTIALS_BY_USER_AGENT`, The reason they have the same value is not to rely on the os env on a distributed environment, so in redundancy we trust. They both configure the same on the backend storage and OCIS Proxy. +`STORAGE_FRONTEND_MIDDLEWARE_AUTH_CREDENTIALS_BY_USER_AGENT` as well as `PROXY_MIDDLEWARE_AUTH_CREDENTIALS_BY_USER_AGENT`, The reason they have the same value is not to rely on the os env on a distributed environment, so in redundancy we trust. They both configure the same on the backend storage and oCIS Proxy. https://github.com/owncloud/ocis/pull/1009 diff --git a/changelog/1.1.0_2021-01-22/add-ocis-url-env.md b/changelog/1.1.0_2021-01-22/add-ocis-url-env.md index d8f349c0c5..0770b5e84e 100644 --- a/changelog/1.1.0_2021-01-22/add-ocis-url-env.md +++ b/changelog/1.1.0_2021-01-22/add-ocis-url-env.md @@ -10,8 +10,8 @@ Some environment variables are now built dynamically if they are not set: Furthermore, the built in konnectd will generate an `identifier-registration.yaml` that uses the `KONNECTD_ISS` in the allowed `redirect_uris` and `origins`. It simplifies the default `https://localhost:9200` and remote deployment with `OCIS_URL` which is evaluated as a fallback if `KONNECTD_ISS` is not set. -An OCIS server can now be started on a remote machine as easy as `OCIS_URL=https://cloud.ocis.test PROXY_HTTP_ADDR=0.0.0.0:443 ocis server`. +An oCIS server can now be started on a remote machine as easy as `OCIS_URL=https://cloud.ocis.test PROXY_HTTP_ADDR=0.0.0.0:443 ocis server`. -Note that the `OCIS_DOMAIN` environment variable is not used by ocis, but by the docker containers. +Note that the `OCIS_DOMAIN` environment variable is not used by oCIS, but by the docker containers. https://github.com/owncloud/ocis/pull/1148 diff --git a/changelog/1.1.0_2021-01-22/move-k6.md b/changelog/1.1.0_2021-01-22/move-k6.md index 55dba76491..c6fe2387f3 100644 --- a/changelog/1.1.0_2021-01-22/move-k6.md +++ b/changelog/1.1.0_2021-01-22/move-k6.md @@ -2,7 +2,7 @@ Change: Move k6 to cdperf Tags: performance, testing, k6 -The ownCloud performance tests can not only be used to test ocis. +The ownCloud performance tests can not only be used to test oCIS. This is why we have decided to move the k6 tests to https://github.com/owncloud/cdperf https://github.com/owncloud/ocis/pull/1358 diff --git a/changelog/1.1.0_2021-01-22/update-reva-to-1.5.1.md b/changelog/1.1.0_2021-01-22/update-reva-to-1.5.1.md index 4ea6f224a8..ded0a34767 100644 --- a/changelog/1.1.0_2021-01-22/update-reva-to-1.5.1.md +++ b/changelog/1.1.0_2021-01-22/update-reva-to-1.5.1.md @@ -58,7 +58,7 @@ Details * Enhancement #1393: Allow setting favorites, mtime and a temporary etag - We now let the ocis driver persist favorites, set temporary etags and the mtime as arbitrary + We now let the oCIS driver persist favorites, set temporary etags and the mtime as arbitrary metadata. https://github.com/owncloud/ocis/issues/567 diff --git a/deployments/examples/cs3_users_ocis/docker-compose.yaml b/deployments/examples/cs3_users_ocis/docker-compose.yaml index 7e62f6844a..ca2e188dcc 100644 --- a/deployments/examples/cs3_users_ocis/docker-compose.yaml +++ b/deployments/examples/cs3_users_ocis/docker-compose.yaml @@ -68,7 +68,7 @@ services: STORAGE_LDAP_ATTRIBUTEFILTER: '(&(objectclass=owncloud)({{attr}}={{value}}))' STORAGE_LDAP_FINDFILTER: '(&(objectclass=owncloud)(|(uid={{query}}*)(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)(description={{query}}*)))' STORAGE_LDAP_GROUPFILTER: '(&(objectclass=groupOfUniqueNames)(objectclass=owncloud)(ownclouduuid={{.OpaqueId}}*))' - # General ocis config + # General oCIS config OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose PROXY_OIDC_INSECURE: "${INSECURE:-false}" # needed if Traefik is using self generated certificates diff --git a/docs/_index.md b/docs/_index.md index e900969ba0..2b8c4c5728 100644 --- a/docs/_index.md +++ b/docs/_index.md @@ -22,14 +22,14 @@ Welcome to our developer documentation. Here you can find developer documentatio The oCIS server is Apache v2 licensed. The lower storage layer of oCIS is defined by the CS3 APIs and implemented in the REVA project. Our goal is to develop the CS3 APIs to an open standard and collaborate on the open source REVA reference implementation for CS3 APIs. -You can also find all client sources on github. +You can also find all client sources on GitHub. ## Join us -The oCIS server repository on github is a good entry point for you to join the project. But we also develop clients for iOS, Android, Desktop and Web. +The oCIS server repository on GitHub is a good entry point for you to join the project. But we also develop clients for iOS, Android, Desktop and Web. For communication on development you can join our public chat [talk.owncloud.com](https://talk.owncloud.com) -If you want to help and improve ownCloud or oCIS, start coding or open issues on github in the related repository. +If you want to help and improve ownCloud or oCIS, start coding or open issues on GitHub in the related repository. We are very happy to hear your feedback and ideas! diff --git a/docs/extensions/glauth/_index.md b/docs/extensions/glauth/_index.md index e65e2783bc..2359429dc0 100644 --- a/docs/extensions/glauth/_index.md +++ b/docs/extensions/glauth/_index.md @@ -8,6 +8,6 @@ geekdocFilePath: _index.md geekdocCollapseSection: true --- -This service provides a [glauth](https://github.com/glauth/glauth) based LDAP proxy for ocis which can be used by clients or other extensions. It allows applications relying on LDAP to access the accounts stored in the ocis accounts service. It can be used to make firewalls or identity providers aware of all users, including guest accounts. +This service provides a [glauth](https://github.com/glauth/glauth) based LDAP proxy for oCIS which can be used by clients or other extensions. It allows applications relying on LDAP to access the accounts stored in the oCIS accounts service. It can be used to make firewalls or identity providers aware of all users, including guest accounts. We are using it to make eos aware of all accounts so the native ACLs can be used to persist share information in the storage. diff --git a/docs/extensions/settings/glossary.md b/docs/extensions/settings/glossary.md index 4e7afb8386..bf8abe4402 100644 --- a/docs/extensions/settings/glossary.md +++ b/docs/extensions/settings/glossary.md @@ -39,4 +39,4 @@ In the context of this extension and oCIS in general, we are using the following - Manifestation of a setting for a specific user - E.g. used for customization (at runtime) in `ocis-web` - `ocis-web-settings` extension for modifying settings values is provided by this service -- Can be queried and modified by other ocis extensions +- Can be queried and modified by other oCIS extensions diff --git a/docs/extensions/storage/_index.md b/docs/extensions/storage/_index.md index 5f1ea9c76a..c76156a528 100644 --- a/docs/extensions/storage/_index.md +++ b/docs/extensions/storage/_index.md @@ -8,7 +8,7 @@ geekdocFilePath: _index.md geekdocCollapseSection: true --- -This service provides an ocis extension that wraps [reva](https://github.com/cs3org/reva/) and adds an opinionated configuration to it. +This service provides an oCIS extension that wraps [reva](https://github.com/cs3org/reva/) and adds an opinionated configuration to it. It uses the port range 9140-9179 to preconfigure several services. @@ -43,4 +43,4 @@ It uses the port range 9140-9179 to preconfigure several services. | 9165 | storage oc data debug | | 9166-9177 | reserved for s3, wnd, custom + data providers | | 9178 | storage public link | -| 9179 | storage public link data | \ No newline at end of file +| 9179 | storage public link data | diff --git a/docs/extensions/storage/storages.md b/docs/extensions/storage/storages.md index 0a3eec64c1..6172dc10ef 100644 --- a/docs/extensions/storage/storages.md +++ b/docs/extensions/storage/storages.md @@ -13,11 +13,11 @@ geekdocFilePath: storages.md ## Storage providers -To manage the file tree ocis uses storage *storage providers* that are accessing the underlying storage using a *storage driver*. The driver can be used to change the implementation of a storage aspect to better reflect the actual underlying storage capabilities. As an example a move operation on a POSIX filesystem ([theoretically](https://danluu.com/deconstruct-files/)) is an atomic operation. When trying to implement a file tree on top of S3 there is no native move operation that can be used. A naive implementation might fall back on a COPY and DELETE. Some S3 implementations provide a COPY operation that uses an existing key as the source, so the file at least does not need to be reuploaded. In the worst case scenario, which is renaming a folder with hundreds of thousands of objects, a reupload for every file has to be made. Instead of hiding this complexity a better choice might be to disable renaming of files or at least folders on S3. There are however implementations of filesystems on top of S3 that store the tree metadata in dedicated objects or use a completely different persistence mechanism like a distributed key value store to implement the file tree aspect of a storage. +To manage the file tree oCIS uses *storage providers* that are accessing the underlying storage using a *storage driver*. The driver can be used to change the implementation of a storage aspect to better reflect the actual underlying storage capabilities. As an example a move operation on a POSIX filesystem ([theoretically](https://danluu.com/deconstruct-files/)) is an atomic operation. When trying to implement a file tree on top of S3 there is no native move operation that can be used. A naive implementation might fall back on a COPY and DELETE. Some S3 implementations provide a COPY operation that uses an existing key as the source, so the file at least does not need to be reuploaded. In the worst case scenario, which is renaming a folder with hundreds of thousands of objects, a reupload for every file has to be made. Instead of hiding this complexity a better choice might be to disable renaming of files or at least folders on S3. There are however implementations of filesystems on top of S3 that store the tree metadata in dedicated objects or use a completely different persistence mechanism like a distributed key value store to implement the file tree aspect of a storage. {{< hint info >}} -While the *storage provider* is responsible for managing the tree, file up and download is delegated to a dedicated *data provider*. See below. +While the *storage provider* is responsible for managing the tree, file up- and downloads are delegated to a dedicated *data provider*. See below. {{< /hint >}} ## Storage aspects diff --git a/docs/ocis/deployment/basic-remote-setup.md b/docs/ocis/deployment/basic-remote-setup.md index a3fcac6a49..b022cf2c8f 100644 --- a/docs/ocis/deployment/basic-remote-setup.md +++ b/docs/ocis/deployment/basic-remote-setup.md @@ -9,13 +9,13 @@ geekdocFilePath: basic-remote-setup.md {{< toc >}} -Out of the box the ocis single binary and the `owncloud/ocis` docker image are configured to run on localhost for quick testing and development. +Out of the box the oCIS single binary and the `owncloud/ocis` docker image are configured to run on localhost for quick testing and development. -If you need to access ocis on a VM or a remote machine e.g. when testing a mobile client you need to configure ocis to run on a different host. +If you need to access oCIS on a VM or a remote machine e.g. when testing a mobile client you need to configure oCIS to run on a different host. ## Use the binary -If you start the ocis fullstack for the first time with `./bin/ocis server` it will generate a file `identifier-registration.yml` in the config folder relative to its location. This file is used to configure the clients for the built-in Identity Provider. +If you start the oCIS fullstack for the first time with `./bin/ocis server` it will generate a file `identifier-registration.yml` in the config folder relative to its location. This file is used to configure the clients for the built-in Identity Provider. {{< hint warning >}} **Outdated version**\ @@ -52,11 +52,11 @@ clients: In this example we do not change the default port (`9200`). But this could be changed to another port. -### Start the ocis fullstack server +### Start the oCIS fullstack server You need to configure `your-host` in some services to provide the needed public resources. -This snippet will start the ocis server with auto generated self signed certificates: +This snippet will start the oCIS server with auto generated self signed certificates: ```bash PROXY_HTTP_ADDR=0.0.0.0:9200 \ @@ -65,7 +65,7 @@ KONNECTD_TLS=0 \ ./bin/ocis server ``` -For more configuration options check the configuration section in [ocis](https://owncloud.github.io/ocis/configuration/) and every ocis extension. +For more configuration options check the configuration section in [ocis](https://owncloud.github.io/ocis/configuration/) and every oCIS extension. {{< hint info >}} **TLS Certificate**\ diff --git a/docs/ocis/deployment/ocis_keycloak.md b/docs/ocis/deployment/ocis_keycloak.md index 50ad39b46d..34452b7cac 100644 --- a/docs/ocis/deployment/ocis_keycloak.md +++ b/docs/ocis/deployment/ocis_keycloak.md @@ -91,7 +91,7 @@ See also [example server setup]({{< ref "preparing_server.md" >}}) Traefik will issue certificates with LetsEncrypt and therefore you must set an email address in `TRAEFIK_ACME_MAIL=`. - By default ocis will be started in the `latest` version. If you want to start a specific version of oCIS set the version to `OCIS_DOCKER_TAG=`. Available versions can be found on [Docker Hub](https://hub.docker.com/r/owncloud/ocis/tags?page=1&ordering=last_updated). + By default oCIS will be started in the `latest` version. If you want to start a specific version of oCIS set the version to `OCIS_DOCKER_TAG=`. Available versions can be found on [Docker Hub](https://hub.docker.com/r/owncloud/ocis/tags?page=1&ordering=last_updated). Set your domain for the oCIS frontend in `OCIS_DOMAIN=`, eg. `OCIS_DOMAIN=ocis.owncloud.test`. diff --git a/docs/ocis/development/debugging.md b/docs/ocis/development/debugging.md index a5465f9eb4..a76bb32761 100644 --- a/docs/ocis/development/debugging.md +++ b/docs/ocis/development/debugging.md @@ -139,7 +139,7 @@ bin/ocis --log-level=$LOG_LEVEL proxy & ### Gather error messages -We recommend you collect all related information in a single file or in a github issue. Let us start with an error that pops up in the Web UI: +We recommend you collect all related information in a single file or in a GitHub issue. Let us start with an error that pops up in the Web UI: > Error while sharing. > error sending a grpc stat request diff --git a/docs/ocis/getting-started.md b/docs/ocis/getting-started.md index 9b595053f7..dd54ba2ec2 100644 --- a/docs/ocis/getting-started.md +++ b/docs/ocis/getting-started.md @@ -19,8 +19,8 @@ You can find more deployments examples in the [deployment section](https://owncl You can find the latest official release of ocis at [our download mirror](https://download.owncloud.com/ocis/ocis/) or on [GitHub](https://github.com/owncloud/ocis/releases). The latest build from the master branch can be found at [our download mirrors testing section](https://download.owncloud.com/ocis/ocis/testing/). -To run ocis as binary you need to download it first and then run the following commands. -For this example, assuming version 1.1.0 of ocis running on a Linux AMD64 host: +To run oCIS as binary you need to download it first and then run the following commands. +For this example, assuming version 1.1.0 of oCIS running on a Linux AMD64 host: ```console # download diff --git a/ocis/pkg/runtime/README.md b/ocis/pkg/runtime/README.md index 8d8c7ce190..ae09ba6000 100644 --- a/ocis/pkg/runtime/README.md +++ b/ocis/pkg/runtime/README.md @@ -65,4 +65,4 @@ func main() { } ``` -Run the above example with `RUNTIME_KEEP_ALIVE=true` and with no `RUNTIME_KEEP_ALIVE` set to see its behavior. It requires an [OCIS binary](https://github.com/owncloud/ocis/releases) present in your `$PATH` for it to work. +Run the above example with `RUNTIME_KEEP_ALIVE=true` and with no `RUNTIME_KEEP_ALIVE` set to see its behavior. It requires an [oCIS binary](https://github.com/owncloud/ocis/releases) present in your `$PATH` for it to work. diff --git a/ocis/pkg/runtime/cmd/root.go b/ocis/pkg/runtime/cmd/root.go index 0c505b2ba6..c461bb3eb0 100644 --- a/ocis/pkg/runtime/cmd/root.go +++ b/ocis/pkg/runtime/cmd/root.go @@ -15,8 +15,8 @@ var ( // RootCmd returns a configured root command. func RootCmd(cfg *config.Config) *cobra.Command { - rootCmd.PersistentFlags().StringVarP(&cfg.Hostname, "hostname", "n", "localhost", "host with a running OCIS runtime.") - rootCmd.PersistentFlags().StringVarP(&cfg.Port, "port", "p", "10666", "port to send messages to the rpc OCIS runtime.") + rootCmd.PersistentFlags().StringVarP(&cfg.Hostname, "hostname", "n", "localhost", "host with a running oCIS runtime.") + rootCmd.PersistentFlags().StringVarP(&cfg.Port, "port", "p", "10666", "port to send messages to the rpc oCIS runtime.") rootCmd.PersistentFlags().BoolVarP(&cfg.KeepAlive, "keep-alive", "k", false, "restart supervised processes that abruptly die.") viper.BindPFlag("hostname", rootCmd.PersistentFlags().Lookup("hostname")) diff --git a/ocis/pkg/runtime/controller/controller.go b/ocis/pkg/runtime/controller/controller.go index 5c58c4e89c..3180e1a9b7 100644 --- a/ocis/pkg/runtime/controller/controller.go +++ b/ocis/pkg/runtime/controller/controller.go @@ -28,10 +28,10 @@ type Controller struct { Store storage.Storage - // Bin is the OCIS single binary name. + // Bin is the oCIS single binary name. Bin string - // BinPath is the OCIS single binary path withing the host machine. + // BinPath is the oCIS single binary path withing the host machine. // The Controller needs to know the binary location in order to spawn new extensions. BinPath string @@ -70,7 +70,7 @@ func NewController(o ...Option) Controller { // Get binary location from $PATH lookup. If not present, it uses arg[0] as entry point. path, err := exec.LookPath(c.Bin) if err != nil { - c.log.Debug().Msg("OCIS binary not present in PATH, using Args[0]") + c.log.Debug().Msg("oCIS binary not present in PATH, using Args[0]") path = os.Args[0] } c.BinPath = path diff --git a/ocis/pkg/runtime/runtime.go b/ocis/pkg/runtime/runtime.go index a2849809b8..8485ceef5a 100644 --- a/ocis/pkg/runtime/runtime.go +++ b/ocis/pkg/runtime/runtime.go @@ -30,7 +30,7 @@ var ( "registry", // :8000 } - // Extensions are ocis extension services + // Extensions are oCIS extension services Extensions = []string{ "glauth", "konnectd", @@ -70,7 +70,7 @@ type Runtime struct { c *config.Config } -// New creates a new ocis + micro runtime +// New creates a new oCIS + micro runtime func New(cfg *config.Config) Runtime { return Runtime{ c: cfg, @@ -85,7 +85,7 @@ func (r *Runtime) Start() error { ) } -// Launch ocis default ocis extensions. +// Launch oCIS default oCIS extensions. func (r *Runtime) Launch() { var client *rpc.Client var err error diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go index a9d3ca0f65..906a8ef09f 100644 --- a/ocs/pkg/service/v0/users.go +++ b/ocs/pkg/service/v0/users.go @@ -154,7 +154,7 @@ func (o Ocs) AddUser(w http.ResponseWriter, r *http.Request) { // fallbacks /* TODO decide if we want to make these fallbacks. Keep in mind: - - ocis requires a preferred_name and email + - oCIS requires a preferred_name and email */ if displayname == "" { displayname = userid diff --git a/proxy/pkg/middleware/authentication.go b/proxy/pkg/middleware/authentication.go index 9759a6a80b..1c98857275 100644 --- a/proxy/pkg/middleware/authentication.go +++ b/proxy/pkg/middleware/authentication.go @@ -13,7 +13,7 @@ var ( SupportedAuthStrategies []string // ProxyWwwAuthenticate is a list of endpoints that do not rely on reva underlying authentication, such as ocs. - // services that fallback to reva authentication are declared in the "frontend" command on OCIS. It is a list of strings + // services that fallback to reva authentication are declared in the "frontend" command on oCIS. It is a list of strings // to be regexp compiled. ProxyWwwAuthenticate = []string{"/ocs/v[12].php/cloud/"} diff --git a/tests/acceptance/expected-failures-API-on-EOS-storage.md b/tests/acceptance/expected-failures-API-on-EOS-storage.md index e81170cf93..7e30f2f97b 100644 --- a/tests/acceptance/expected-failures-API-on-EOS-storage.md +++ b/tests/acceptance/expected-failures-API-on-EOS-storage.md @@ -1053,7 +1053,7 @@ to be investigated and issues raised or comments added here - [apiWebdavUpload2/uploadFileUsingOldChunking.feature:100](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavUpload2/uploadFileUsingOldChunking.feature#L100) - [apiWebdavUpload2/uploadFileUsingOldChunking.feature:101](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavUpload2/uploadFileUsingOldChunking.feature#L101) -### [Previews via webDAV API tests fail on OCIS](https://github.com/owncloud/ocis/issues/187) +### [Previews via webDAV API tests fail on oCIS](https://github.com/owncloud/ocis/issues/187) - [apiWebdavPreviews/previews.feature:15](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavPreviews/previews.feature#L15) - [apiWebdavPreviews/previews.feature:16](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavPreviews/previews.feature#L16) - [apiWebdavPreviews/previews.feature:17](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavPreviews/previews.feature#L17) diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md index 9ed95ef244..bc5b1b601a 100644 --- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md @@ -1,6 +1,6 @@ -## Scenarios from ownCloud10 core API tests that are expected to fail with OCIS storage +## Scenarios from ownCloud10 core API tests that are expected to fail with oCIS storage -### Test scenarios that specifically fail with OCIS storage +### Test scenarios that specifically fail with oCIS storage - [apiWebdavProperties1/setFileProperties.feature:32](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavProperties1/setFileProperties.feature#L32) - [apiWebdavProperties1/setFileProperties.feature:33](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavProperties1/setFileProperties.feature#L33) @@ -453,7 +453,7 @@ ### [Split old public API webdav tests from new public webdav tests](https://github.com/owncloud/ocis-reva/issues/282) ### [Public link enforce permissions](https://github.com/owncloud/ocis/issues/1269) -### [Previews via webDAV API tests fail on OCIS](https://github.com/owncloud/ocis/issues/187) +### [Previews via webDAV API tests fail on oCIS](https://github.com/owncloud/ocis/issues/187) - [apiSharePublicLink1/accessToPublicLinkShare.feature:10](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink1/accessToPublicLinkShare.feature#L10) - [apiSharePublicLink1/accessToPublicLinkShare.feature:20](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink1/accessToPublicLinkShare.feature#L20) @@ -572,14 +572,14 @@ - [apiSharePublicLink2/updatePublicLinkShare.feature:321](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/updatePublicLinkShare.feature#L321) - [apiSharePublicLink2/updatePublicLinkShare.feature:322](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/updatePublicLinkShare.feature#L322) -### [OCIS share permissions not enforced](https://github.com/owncloud/product/issues/270) +### [oCIS share permissions not enforced](https://github.com/owncloud/product/issues/270) - [apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:157](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature#L157) - [apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:158](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature#L158) - [apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:179](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature#L179) - [apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:180](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature#L180) -### [OCIS old public webdav api doesnt works](https://github.com/owncloud/product/issues/272) +### [oCIS old public webdav api doesnt works](https://github.com/owncloud/product/issues/272) - [apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:30](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature#L30) - [apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:31](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature#L31) @@ -645,7 +645,7 @@ - [apiSharePublicLink2/uploadToPublicLinkShare.feature:238](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/uploadToPublicLinkShare.feature#L238) - [apiSharePublicLink2/uploadToPublicLinkShare.feature:255](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/uploadToPublicLinkShare.feature#L255) -### [Resharing does not work with ocis storage](https://github.com/owncloud/product/issues/265) +### [Resharing does not work with oCIS storage](https://github.com/owncloud/product/issues/265) - [apiShareReshareToShares1/reShare.feature:56](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareReshareToShares1/reShare.feature#L56) - [apiShareReshareToShares1/reShare.feature:57](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareReshareToShares1/reShare.feature#L57) @@ -1029,7 +1029,7 @@ - [apiWebdavMove1/moveFolderToExcludedDirectory.feature:70](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavMove1/moveFolderToExcludedDirectory.feature#L70) - [apiWebdavMove1/moveFolderToExcludedDirectory.feature:71](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavMove1/moveFolderToExcludedDirectory.feature#L71) -### [Review and fix the tests that have sharing step to work with ocis](https://github.com/owncloud/core/issues/38006) +### [Review and fix the tests that have sharing step to work with oCIS](https://github.com/owncloud/core/issues/38006) - [apiWebdavMove2/moveFile.feature:89](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavMove2/moveFile.feature#L89) - [apiWebdavMove2/moveFile.feature:90](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavMove2/moveFile.feature#L90) @@ -1072,7 +1072,7 @@ - [apiWebdavMove2/moveFileToExcludedDirectory.feature:63](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavMove2/moveFileToExcludedDirectory.feature#L63) - [apiWebdavMove2/moveFileToExcludedDirectory.feature:64](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavMove2/moveFileToExcludedDirectory.feature#L64) -### [Review and fix the tests that have sharing step to work with ocis](https://github.com/owncloud/core/issues/38006) +### [Review and fix the tests that have sharing step to work with oCIS](https://github.com/owncloud/core/issues/38006) - [apiWebdavOperations/deleteFolder.feature:67](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/deleteFolder.feature#L67) - [apiWebdavOperations/deleteFolder.feature:68](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/deleteFolder.feature#L68) @@ -1082,7 +1082,7 @@ - [apiWebdavOperations/deleteFolder.feature:92](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/deleteFolder.feature#L92) ### [Range Header is not obeyed when downloading a file](https://github.com/owncloud/ocis/issues/1346) -### [Review and fix the tests that have sharing step to work with ocis](https://github.com/owncloud/core/issues/38006) +### [Review and fix the tests that have sharing step to work with oCIS](https://github.com/owncloud/core/issues/38006) - [apiWebdavOperations/downloadFile.feature:60](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/downloadFile.feature#L60) - [apiWebdavOperations/downloadFile.feature:61](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/downloadFile.feature#L61) @@ -1093,7 +1093,7 @@ - [apiWebdavOperations/refuseAccess.feature:21](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/refuseAccess.feature#L21) - [apiWebdavOperations/refuseAccess.feature:22](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/refuseAccess.feature#L22) -### [Review and fix the tests that have sharing step to work with ocis](https://github.com/owncloud/core/issues/38006) +### [Review and fix the tests that have sharing step to work with oCIS](https://github.com/owncloud/core/issues/38006) - [apiWebdavProperties1/copyFile.feature:65](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavProperties1/copyFile.feature#L65) - [apiWebdavProperties1/copyFile.feature:66](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavProperties1/copyFile.feature#L66) @@ -1268,7 +1268,7 @@ - [apiWebdavUpload2/uploadFileUsingOldChunking.feature:99](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavUpload2/uploadFileUsingOldChunking.feature#L99) - [apiWebdavUpload2/uploadFileUsingOldChunking.feature:100](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavUpload2/uploadFileUsingOldChunking.feature#L100) -### [Previews via webDAV API tests fail on OCIS](https://github.com/owncloud/ocis/issues/187) +### [Previews via webDAV API tests fail on oCIS](https://github.com/owncloud/ocis/issues/187) - [apiWebdavPreviews/previews.feature:15](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavPreviews/previews.feature#L15) - [apiWebdavPreviews/previews.feature:16](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavPreviews/previews.feature#L16) @@ -1340,7 +1340,7 @@ - [apiWebdavEtagPropagation1/moveFileFolder.feature:314](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation1/moveFileFolder.feature#L314) - [apiWebdavEtagPropagation1/moveFileFolder.feature:315](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation1/moveFileFolder.feature#L315) -### [Implement Trashbin Feature for ocis storage](https://github.com/owncloud/product/issues/209) +### [Implement Trashbin Feature for oCIS storage](https://github.com/owncloud/product/issues/209) - [apiWebdavEtagPropagation2/restoreFromTrash.feature:26](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/restoreFromTrash.feature#L26) - [apiWebdavEtagPropagation2/restoreFromTrash.feature:27](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/restoreFromTrash.feature#L27) @@ -1351,7 +1351,7 @@ - [apiWebdavEtagPropagation2/restoreFromTrash.feature:90](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/restoreFromTrash.feature#L90) - [apiWebdavEtagPropagation2/restoreFromTrash.feature:91](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/restoreFromTrash.feature#L91) -### [Implement Versions Feature for ocis storage](https://github.com/owncloud/product/issues/210) +### [Implement Versions Feature for oCIS storage](https://github.com/owncloud/product/issues/210) - [apiWebdavEtagPropagation2/restoreVersion.feature:10](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavEtagPropagation2/restoreVersion.feature#L10) @@ -1393,7 +1393,7 @@ - [apiShareOperationsToShares/changingFilesShare.feature:59](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareOperationsToShares/changingFilesShare.feature#L59) - [apiShareOperationsToShares/changingFilesShare.feature:60](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareOperationsToShares/changingFilesShare.feature#L60) -### [OCIS-storage overwriting a file as share receiver, does not create a new file version for the sharer](https://github.com/owncloud/ocis/issues/766) +### [ocis-storage overwriting a file as share receiver, does not create a new file version for the sharer](https://github.com/owncloud/ocis/issues/766) - [apiVersions/fileVersionsSharingToShares.feature:33](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiVersions/fileVersionsSharingToShares.feature#L33) @@ -2310,7 +2310,7 @@ - [apiWebdavUploadTUS/uploadFileMtimeShares.feature:55](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavUploadTUS/uploadFileMtimeShares.feature#L55) - [apiWebdavUploadTUS/uploadFileMtimeShares.feature:56](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavUploadTUS/uploadFileMtimeShares.feature#L56) -### [OCIS-storage reading a file that a collaborator uploaded is impossible](https://github.com/owncloud/ocis/issues/763) +### [ocis-storage reading a file that a collaborator uploaded is impossible](https://github.com/owncloud/ocis/issues/763) - [apiWebdavUploadTUS/uploadFileMtimeShares.feature:70](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavUploadTUS/uploadFileMtimeShares.feature#L70) - [apiWebdavUploadTUS/uploadFileMtimeShares.feature:71](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavUploadTUS/uploadFileMtimeShares.feature#L71) @@ -2344,5 +2344,5 @@ - [apiTrashbin/trashbinFilesFolders.feature:284](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinFilesFolders.feature#L284) - [apiTrashbin/trashbinFilesFolders.feature:285](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinFilesFolders.feature#L285) -### [OCIS-storage overwriting a file as share receiver, does not create a new file version for the sharer](https://github.com/owncloud/ocis/issues/766) +### [ocis-storage overwriting a file as share receiver, does not create a new file version for the sharer](https://github.com/owncloud/ocis/issues/766) - [apiVersions/fileVersionsSharingToShares.feature:291](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiVersions/fileVersionsSharingToShares.feature#L291) diff --git a/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md b/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md index cec6e5d023..9d77a84692 100644 --- a/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md +++ b/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md @@ -471,7 +471,7 @@ User cannot create a folder named Share ### [Split old public API webdav tests from new public webdav tests](https://github.com/owncloud/ocis-reva/issues/282) ### [Public link enforce permissions](https://github.com/owncloud/ocis/issues/1269) -### [Previews via webDAV API tests fail on OCIS](https://github.com/owncloud/ocis/issues/187) +### [Previews via webDAV API tests fail on CISS](https://github.com/owncloud/ocis/issues/187) - [apiSharePublicLink1/accessToPublicLinkShare.feature:10](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink1/accessToPublicLinkShare.feature#L10) - [apiSharePublicLink1/accessToPublicLinkShare.feature:20](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink1/accessToPublicLinkShare.feature#L20) @@ -591,7 +591,7 @@ User cannot create a folder named Share - [apiSharePublicLink2/updatePublicLinkShare.feature:321](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/updatePublicLinkShare.feature#L321) - [apiSharePublicLink2/updatePublicLinkShare.feature:322](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/updatePublicLinkShare.feature#L322) -### [OCIS share permissions not enforced](https://github.com/owncloud/product/issues/270) +### [oCIS share permissions not enforced](https://github.com/owncloud/product/issues/270) - [apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:25](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature#L25) - [apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:26](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature#L26) @@ -606,7 +606,7 @@ User cannot create a folder named Share - [apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:179](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature#L179) - [apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:180](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature#L180) -### [OCIS old public webdav api doesnt works](https://github.com/owncloud/product/issues/272) +### [oCIS old public webdav api doesnt works](https://github.com/owncloud/product/issues/272) - [apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:30](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature#L30) - [apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:31](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature#L31) @@ -917,7 +917,7 @@ User cannot create a folder named Share - [apiTrashbin/trashbinFilesFolders.feature:60](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinFilesFolders.feature#L60) - [apiTrashbin/trashbinFilesFolders.feature:61](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinFilesFolders.feature#L61) -### [Review and fix the tests that### have sharing step to work with ocis](https://github.com/owncloud/core/issues/38006) +### [Review and fix the tests that### have sharing step to work with oCIS](https://github.com/owncloud/core/issues/38006) - [apiTrashbin/trashbinFilesFolders.feature:105](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinFilesFolders.feature#L105) - [apiTrashbin/trashbinFilesFolders.feature:106](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinFilesFolders.feature#L106) @@ -1100,7 +1100,7 @@ User cannot create a folder named Share - [apiWebdavMove1/moveFolderToExcludedDirectory.feature:70](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavMove1/moveFolderToExcludedDirectory.feature#L70) - [apiWebdavMove1/moveFolderToExcludedDirectory.feature:71](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavMove1/moveFolderToExcludedDirectory.feature#L71) -### [Review and fix the tests that### have sharing step to work with ocis](https://github.com/owncloud/core/issues/38006) +### [Review and fix the tests that### have sharing step to work with oCIS](https://github.com/owncloud/core/issues/38006) - [apiWebdavMove2/moveFile.feature:89](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavMove2/moveFile.feature#L89) - [apiWebdavMove2/moveFile.feature:90](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavMove2/moveFile.feature#L90) @@ -1143,7 +1143,7 @@ User cannot create a folder named Share - [apiWebdavMove2/moveFileToExcludedDirectory.feature:63](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavMove2/moveFileToExcludedDirectory.feature#L63) - [apiWebdavMove2/moveFileToExcludedDirectory.feature:64](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavMove2/moveFileToExcludedDirectory.feature#L64) -### [Review and fix the tests that### have sharing step to work with ocis](https://github.com/owncloud/core/issues/38006) +### [Review and fix the tests that### have sharing step to work with oCIS](https://github.com/owncloud/core/issues/38006) - [apiWebdavOperations/deleteFolder.feature:67](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/deleteFolder.feature#L67) - [apiWebdavOperations/deleteFolder.feature:68](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/deleteFolder.feature#L68) @@ -1153,7 +1153,7 @@ User cannot create a folder named Share - [apiWebdavOperations/deleteFolder.feature:92](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/deleteFolder.feature#L92) ### [Range Header is not obeyed when downloading a file](https://github.com/owncloud/ocis/issues/1346) -### [Review and fix the tests that### have sharing step to work with ocis](https://github.com/owncloud/core/issues/38006) +### [Review and fix the tests that### have sharing step to work with oCIS](https://github.com/owncloud/core/issues/38006) - [apiWebdavOperations/downloadFile.feature:60](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/downloadFile.feature#L60) - [apiWebdavOperations/downloadFile.feature:61](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/downloadFile.feature#L61) @@ -1164,7 +1164,7 @@ User cannot create a folder named Share - [apiWebdavOperations/refuseAccess.feature:21](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/refuseAccess.feature#L21) - [apiWebdavOperations/refuseAccess.feature:22](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavOperations/refuseAccess.feature#L22) -### [Review and fix the tests that### have sharing step to work with ocis](https://github.com/owncloud/core/issues/38006) +### [Review and fix the tests that### have sharing step to work with oCIS](https://github.com/owncloud/core/issues/38006) - [apiWebdavProperties1/copyFile.feature:65](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavProperties1/copyFile.feature#L65) - [apiWebdavProperties1/copyFile.feature:66](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavProperties1/copyFile.feature#L66) @@ -1423,7 +1423,7 @@ User cannot create a folder named Share - [apiSharePublicLink2/multilinkSharing.feature:181](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/multilinkSharing.feature#L181) -### [Previews via webDAV API tests fail on OCIS](https://github.com/owncloud/ocis/issues/187) +### [Previews via webDAV API tests fail on CISS](https://github.com/owncloud/ocis/issues/187) - [apiWebdavPreviews/previews.feature:15](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavPreviews/previews.feature#L15) - [apiWebdavPreviews/previews.feature:16](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavPreviews/previews.feature#L16) From ae07429eea2037a115ce6ba886a0002c34fe6271 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 28 Jan 2021 09:02:27 +0545 Subject: [PATCH 02/13] Apply suggestions from code review --- tests/acceptance/expected-failures-API-on-OCIS-storage.md | 6 +++--- .../acceptance/expected-failures-API-on-OWNCLOUD-storage.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md index bc5b1b601a..4f2daad39b 100644 --- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md @@ -1393,7 +1393,7 @@ - [apiShareOperationsToShares/changingFilesShare.feature:59](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareOperationsToShares/changingFilesShare.feature#L59) - [apiShareOperationsToShares/changingFilesShare.feature:60](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareOperationsToShares/changingFilesShare.feature#L60) -### [ocis-storage overwriting a file as share receiver, does not create a new file version for the sharer](https://github.com/owncloud/ocis/issues/766) +### [oCIS-storage overwriting a file as share receiver, does not create a new file version for the sharer](https://github.com/owncloud/ocis/issues/766) - [apiVersions/fileVersionsSharingToShares.feature:33](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiVersions/fileVersionsSharingToShares.feature#L33) @@ -2310,7 +2310,7 @@ - [apiWebdavUploadTUS/uploadFileMtimeShares.feature:55](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavUploadTUS/uploadFileMtimeShares.feature#L55) - [apiWebdavUploadTUS/uploadFileMtimeShares.feature:56](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavUploadTUS/uploadFileMtimeShares.feature#L56) -### [ocis-storage reading a file that a collaborator uploaded is impossible](https://github.com/owncloud/ocis/issues/763) +### [oCIS-storage reading a file that a collaborator uploaded is impossible](https://github.com/owncloud/ocis/issues/763) - [apiWebdavUploadTUS/uploadFileMtimeShares.feature:70](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavUploadTUS/uploadFileMtimeShares.feature#L70) - [apiWebdavUploadTUS/uploadFileMtimeShares.feature:71](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavUploadTUS/uploadFileMtimeShares.feature#L71) @@ -2344,5 +2344,5 @@ - [apiTrashbin/trashbinFilesFolders.feature:284](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinFilesFolders.feature#L284) - [apiTrashbin/trashbinFilesFolders.feature:285](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinFilesFolders.feature#L285) -### [ocis-storage overwriting a file as share receiver, does not create a new file version for the sharer](https://github.com/owncloud/ocis/issues/766) +### [oCIS-storage overwriting a file as share receiver, does not create a new file version for the sharer](https://github.com/owncloud/ocis/issues/766) - [apiVersions/fileVersionsSharingToShares.feature:291](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiVersions/fileVersionsSharingToShares.feature#L291) diff --git a/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md b/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md index 9d77a84692..18d5ad2ef2 100644 --- a/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md +++ b/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md @@ -471,7 +471,7 @@ User cannot create a folder named Share ### [Split old public API webdav tests from new public webdav tests](https://github.com/owncloud/ocis-reva/issues/282) ### [Public link enforce permissions](https://github.com/owncloud/ocis/issues/1269) -### [Previews via webDAV API tests fail on CISS](https://github.com/owncloud/ocis/issues/187) +### [Previews via webDAV API tests fail on oCIS](https://github.com/owncloud/ocis/issues/187) - [apiSharePublicLink1/accessToPublicLinkShare.feature:10](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink1/accessToPublicLinkShare.feature#L10) - [apiSharePublicLink1/accessToPublicLinkShare.feature:20](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink1/accessToPublicLinkShare.feature#L20) @@ -1423,7 +1423,7 @@ User cannot create a folder named Share - [apiSharePublicLink2/multilinkSharing.feature:181](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/multilinkSharing.feature#L181) -### [Previews via webDAV API tests fail on CISS](https://github.com/owncloud/ocis/issues/187) +### [Previews via webDAV API tests fail on oCIS](https://github.com/owncloud/ocis/issues/187) - [apiWebdavPreviews/previews.feature:15](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavPreviews/previews.feature#L15) - [apiWebdavPreviews/previews.feature:16](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavPreviews/previews.feature#L16) From 498a21cf0a0fee2a9f9d95f7bbaf9fd53bdc0061 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 28 Jan 2021 08:56:16 +0545 Subject: [PATCH 03/13] [tests-only] Bump behat/gherkin to 4.7.1 --- vendor-bin/behat/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor-bin/behat/composer.json b/vendor-bin/behat/composer.json index 5668e6dd07..43fcad9b69 100644 --- a/vendor-bin/behat/composer.json +++ b/vendor-bin/behat/composer.json @@ -6,7 +6,7 @@ }, "require": { "behat/behat": "^3.8", - "behat/gherkin": "4.6.2", + "behat/gherkin": "4.7.1", "behat/mink": "1.7.1", "behat/mink-extension": "^2.3", "behat/mink-selenium2-driver": "^1.4", From 5dac7ae5c457139c1b12629aff97f73cead5e6b5 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 28 Jan 2021 05:52:15 +0000 Subject: [PATCH 04/13] Automated changelog update [skip ci] --- CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22ee9bc6f0..2b3f3fba03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -95,7 +95,7 @@ The following sections list the changes for 1.1.0. Tags: performance, testing, k6 - The ownCloud performance tests can not only be used to test ocis. This is why we have decided to + The ownCloud performance tests can not only be used to test oCIS. This is why we have decided to move the k6 tests to https://github.com/owncloud/cdperf https://github.com/owncloud/ocis/pull/1358 @@ -140,10 +140,10 @@ The following sections list the changes for 1.1.0. default `https://localhost:9200` and remote deployment with `OCIS_URL` which is evaluated as a fallback if `KONNECTD_ISS` is not set. - An OCIS server can now be started on a remote machine as easy as + An oCIS server can now be started on a remote machine as easy as `OCIS_URL=https://cloud.ocis.test PROXY_HTTP_ADDR=0.0.0.0:443 ocis server`. - Note that the `OCIS_DOMAIN` environment variable is not used by ocis, but by the docker + Note that the `OCIS_DOMAIN` environment variable is not used by oCIS, but by the docker containers. https://github.com/owncloud/ocis/pull/1148 @@ -233,7 +233,7 @@ The following sections list the changes for 1.1.0. * Enhancement #1393: Allow setting favorites, mtime and a temporary etag - We now let the ocis driver persist favorites, set temporary etags and the mtime as arbitrary + We now let the oCIS driver persist favorites, set temporary etags and the mtime as arbitrary metadata. Https://github.com/owncloud/ocis/issues/567 @@ -2241,7 +2241,7 @@ The following sections list the changes for 1.0.0. Furthermore, we not only take care of such a thing at the Proxy but also Reva will take care of it. In addition, we now are able to lock-in a set of User-Agent to specific challenges. - Admins can use this feature by configuring OCIS + Reva following this approach: + Admins can use this feature by configuring oCIS + Reva following this approach: ``` STORAGE_FRONTEND_MIDDLEWARE_AUTH_CREDENTIALS_BY_USER_AGENT="mirall:basic, Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:83.0) Gecko/20100101 @@ -2255,6 +2255,6 @@ The following sections list the changes for 1.0.0. `STORAGE_FRONTEND_MIDDLEWARE_AUTH_CREDENTIALS_BY_USER_AGENT` as well as `PROXY_MIDDLEWARE_AUTH_CREDENTIALS_BY_USER_AGENT`, The reason they have the same value is not to rely on the os env on a distributed environment, so in redundancy we trust. They both - configure the same on the backend storage and OCIS Proxy. + configure the same on the backend storage and oCIS Proxy. https://github.com/owncloud/ocis/pull/1009 From 5a44f83bbf162d359f4a7201c27fff9cf11713f8 Mon Sep 17 00:00:00 2001 From: saw-jan Date: Thu, 28 Jan 2021 11:14:56 +0545 Subject: [PATCH 05/13] restore test files removed in PR #1488 --- .../features/apiBasic/addUser.feature | 18 +++++++++++++ .../features/apiBasic/uploadFile.feature | 18 +++++++++++++ .../apiBasic/webDavPUTAuthInvalid.feature | 26 +++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 tests/acceptance/features/apiBasic/addUser.feature create mode 100644 tests/acceptance/features/apiBasic/uploadFile.feature create mode 100644 tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature diff --git a/tests/acceptance/features/apiBasic/addUser.feature b/tests/acceptance/features/apiBasic/addUser.feature new file mode 100644 index 0000000000..935325269e --- /dev/null +++ b/tests/acceptance/features/apiBasic/addUser.feature @@ -0,0 +1,18 @@ +@api @provisioning_api-app-required @skipOnLDAP +Feature: add user + As an admin + I want to be able to add users + So that I can give people controlled individual access to resources on the ownCloud server + + Scenario Outline: admin creates a user + Given using OCS API version "" + And user "brand-new-user" has been deleted + When the administrator sends a user creation request for user "brand-new-user" password "%alt1%" using the provisioning API + Then the OCS status code should be "" + And the HTTP status code should be "200" + And user "brand-new-user" should exist + And user "brand-new-user" should be able to access a skeleton file + Examples: + | ocs_api_version | ocs_status_code | + | 1 | 100 | + | 2 | 200 | \ No newline at end of file diff --git a/tests/acceptance/features/apiBasic/uploadFile.feature b/tests/acceptance/features/apiBasic/uploadFile.feature new file mode 100644 index 0000000000..1cc63b89a1 --- /dev/null +++ b/tests/acceptance/features/apiBasic/uploadFile.feature @@ -0,0 +1,18 @@ +@api +Feature: upload file + As a user + I want to be able to upload files + So that I can store and share files between multiple client systems + + Scenario Outline: upload a file and check download content + Given using OCS API version "" + And user "Alice" has been created with default attributes and without skeleton files + And using DAV path + When user "Alice" uploads file with content "uploaded content" to "/upload.txt" using the WebDAV API + Then the content of file "/upload.txt" for user "Alice" should be "uploaded content" + Examples: + | ocs_api_version | dav_version | + | 1 | old | + | 1 | new | + | 2 | old | + | 2 | new | \ No newline at end of file diff --git a/tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature b/tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature new file mode 100644 index 0000000000..79f0b3adb5 --- /dev/null +++ b/tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature @@ -0,0 +1,26 @@ +@api +Feature: attempt to PUT files with invalid password + + Background: + Given user "Alice" has been created with default attributes and without skeleton files + And user "Alice" has created folder "/PARENT" + + Scenario: send PUT requests to webDav endpoints as normal user with wrong password + When user "Alice" requests these endpoints with "PUT" including body "doesnotmatter" using password "invalid" about user "Alice" + | endpoint | + | /remote.php/webdav/textfile0.txt | + | /remote.php/dav/files/%username%/textfile0.txt | + | /remote.php/webdav/PARENT | + | /remote.php/dav/files/%username%/PARENT | + | /remote.php/dav/files/%username%/PARENT/parent.txt | + Then the HTTP status code of responses on all endpoints should be "401" + + Scenario: send PUT requests to webDav endpoints as normal user with no password + When user "Alice" requests these endpoints with "PUT" including body "doesnotmatter" using password "" about user "Alice" + | endpoint | + | /remote.php/webdav/textfile0.txt | + | /remote.php/dav/files/%username%/textfile0.txt | + | /remote.php/webdav/PARENT | + | /remote.php/dav/files/%username%/PARENT | + | /remote.php/dav/files/%username%/PARENT/parent.txt | + Then the HTTP status code of responses on all endpoints should be "401" From 924246c0a65142c67a89b28ac162c0310fc6ee07 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 28 Jan 2021 11:56:07 +0545 Subject: [PATCH 06/13] Rename apiBasic to apiAccountsHashDifficulty --- .drone.star | 4 ++-- tests/acceptance/config/behat.yml | 4 ++-- tests/acceptance/docker/Makefile | 16 +++++++------- .../apiAccountsHashDifficulty/addUser.feature | 21 +++++++++++++++++++ .../createShareToSharesFolder.feature | 6 ++++++ .../uploadFile.feature | 9 +++++--- .../webDavPUTAuthInvalid.feature | 6 ++++++ .../features/apiBasic/addUser.feature | 18 ---------------- 8 files changed, 51 insertions(+), 33 deletions(-) create mode 100644 tests/acceptance/features/apiAccountsHashDifficulty/addUser.feature rename tests/acceptance/features/{apiBasic => apiAccountsHashDifficulty}/createShareToSharesFolder.feature (73%) rename tests/acceptance/features/{apiBasic => apiAccountsHashDifficulty}/uploadFile.feature (61%) rename tests/acceptance/features/{apiBasic => apiAccountsHashDifficulty}/webDavPUTAuthInvalid.feature (80%) delete mode 100644 tests/acceptance/features/apiBasic/addUser.feature diff --git a/.drone.star b/.drone.star index 76dcbeefc7..2e599403e9 100644 --- a/.drone.star +++ b/.drone.star @@ -239,8 +239,8 @@ def testPipelines(ctx): pipelines = [ localApiTests(ctx, 'owncloud', 'apiOcisSpecific'), localApiTests(ctx, 'ocis', 'apiOcisSpecific'), - localApiTests(ctx, 'owncloud', 'apiBasic', 'default'), - localApiTests(ctx, 'ocis', 'apiBasic', 'default') + localApiTests(ctx, 'owncloud', 'apiAccountsHashDifficulty', 'default'), + localApiTests(ctx, 'ocis', 'apiAccountsHashDifficulty', 'default') ] for runPart in range(1, config['apiTests']['numberOfParts'] + 1): diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml index bb33b728d7..e2480b6f2b 100644 --- a/tests/acceptance/config/behat.yml +++ b/tests/acceptance/config/behat.yml @@ -3,9 +3,9 @@ default: '': '%paths.base%/../features/bootstrap' suites: - apiBasic: + apiAccountsHashDifficulty: paths: - - '%paths.base%/../features/apiBasic' + - '%paths.base%/../features/apiAccountsHashDifficulty' context: &common_ldap_suite_context parameters: ldapAdminPassword: admin diff --git a/tests/acceptance/docker/Makefile b/tests/acceptance/docker/Makefile index dcec4ed638..554c8c37fc 100644 --- a/tests/acceptance/docker/Makefile +++ b/tests/acceptance/docker/Makefile @@ -51,11 +51,11 @@ help: @echo -e "https://hub.docker.com/r/owncloud/ocis." @echo @echo -e "${GREEN}Run full oCIS test suites against oCIS with oCIS storage:${RESET}\n" - @echo -e "\tmake localApiTests-apiBasic-ocis\t\t${BLUE}run apiBasic test suite${RESET}" + @echo -e "\tmake localApiTests-apiAccountsHashDifficulty-ocis\t\t${BLUE}run apiAccountsHashDifficulty test suite${RESET}" @echo -e "\tmake localApiTests-apiOcisSpecific-ocis\t\t${BLUE}run apiOcisSPecific test suite${RESET}" @echo @echo -e "${GREEN}Run full oCIS test suites against oCIS with ownCloud storage:${RESET}\n" - @echo -e "\tmake localApiTests-apiBasic-owncloud\t\t${BLUE}run apiBasic test suite${RESET}" + @echo -e "\tmake localApiTests-apiAccountsHashDifficulty-owncloud\t\t${BLUE}run apiAccountsHashDifficulty test suite${RESET}" @echo -e "\tmake localApiTests-apiOcisSpecific-owncloud\t${BLUE}run apiOcisSpecific test suite${RESET}" @echo @echo -e "${GREEN}Run full ownCloud test suites against oCIS with oCIS storage:${RESET}\n" @@ -133,11 +133,11 @@ localApiTests-apiOcisSpecific-owncloud: ## run apiOcisSpecific test suite with o BEHAT_SUITE=apiOcisSpecific \ $(MAKE) --no-print-directory testSuite -.PHONY: localApiTests-apiBasic-owncloud -localApiTests-apiBasic-owncloud: ## run apiBasic test suite with owncloud storage +.PHONY: localApiTests-apiAccountsHashDifficulty-owncloud +localApiTests-apiAccountsHashDifficulty-owncloud: ## run apiAccountsHashDifficulty test suite with owncloud storage @TEST_SOURCE=ocis \ STORAGE=owncloud \ - BEHAT_SUITE=apiBasic \ + BEHAT_SUITE=apiAccountsHashDifficulty \ $(MAKE) --no-print-directory testSuite .PHONY: localApiTests-apiOcisSpecific-ocis @@ -147,11 +147,11 @@ localApiTests-apiOcisSpecific-ocis: ## run apiOcisSPecific test suite with ocis BEHAT_SUITE=apiOcisSpecific \ $(MAKE) --no-print-directory testSuite -.PHONY: localApiTests-apiBasic-ocis -localApiTests-apiBasic-ocis: ## run apiBasic test suite with ocis storage +.PHONY: localApiTests-apiAccountsHashDifficulty-ocis +localApiTests-apiAccountsHashDifficulty-ocis: ## run apiAccountsHashDifficulty test suite with ocis storage @TEST_SOURCE=ocis \ STORAGE=ocis \ - BEHAT_SUITE=apiBasic \ + BEHAT_SUITE=apiAccountsHashDifficulty \ $(MAKE) --no-print-directory testSuite targets = $(addprefix Core-API-Tests-owncloud-storage-,$(PARTS)) diff --git a/tests/acceptance/features/apiAccountsHashDifficulty/addUser.feature b/tests/acceptance/features/apiAccountsHashDifficulty/addUser.feature new file mode 100644 index 0000000000..eb271388b9 --- /dev/null +++ b/tests/acceptance/features/apiAccountsHashDifficulty/addUser.feature @@ -0,0 +1,21 @@ +@api @provisioning_api-app-required @skipOnLDAP +Feature: add user + As an admin + I want to be able to add users and store their password with the full hash difficulty + So that I can give people controlled individual access to resources on the ownCloud server + + Note - this feature is run in CI with ACCOUNTS_HASH_DIFFICULTY set to the default for production + See https://github.com/owncloud/ocis/issues/1542 and https://github.com/owncloud/ocis/pull/839 + + Scenario Outline: admin creates a user + Given using OCS API version "" + And user "brand-new-user" has been deleted + When the administrator sends a user creation request for user "brand-new-user" password "%alt1%" using the provisioning API + Then the OCS status code should be "" + And the HTTP status code should be "200" + And user "brand-new-user" should exist + And user "brand-new-user" should be able to access a skeleton file + Examples: + | ocs_api_version | ocs_status_code | + | 1 | 100 | + | 2 | 200 | diff --git a/tests/acceptance/features/apiBasic/createShareToSharesFolder.feature b/tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature similarity index 73% rename from tests/acceptance/features/apiBasic/createShareToSharesFolder.feature rename to tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature index b2b1af193a..524e38b5ae 100644 --- a/tests/acceptance/features/apiBasic/createShareToSharesFolder.feature +++ b/tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature @@ -1,5 +1,11 @@ @api @files_sharing-app-required Feature: sharing + As a user + I want to be able to share files when passwords are stored with the full hash difficulty + So that I can give people secure controlled access to my data + + Note - this feature is run in CI with ACCOUNTS_HASH_DIFFICULTY set to the default for production + See https://github.com/owncloud/ocis/issues/1542 and https://github.com/owncloud/ocis/pull/839 Scenario Outline: Creating a share of a file with a user Given the administrator has set the default folder for received shares to "Shares" diff --git a/tests/acceptance/features/apiBasic/uploadFile.feature b/tests/acceptance/features/apiAccountsHashDifficulty/uploadFile.feature similarity index 61% rename from tests/acceptance/features/apiBasic/uploadFile.feature rename to tests/acceptance/features/apiAccountsHashDifficulty/uploadFile.feature index 1cc63b89a1..d0518fa92d 100644 --- a/tests/acceptance/features/apiBasic/uploadFile.feature +++ b/tests/acceptance/features/apiAccountsHashDifficulty/uploadFile.feature @@ -1,8 +1,11 @@ @api Feature: upload file As a user - I want to be able to upload files - So that I can store and share files between multiple client systems + I want to be able to upload files when passwords are stored with the full hash difficulty + So that I can store and share files securely between multiple client systems + + Note - this feature is run in CI with ACCOUNTS_HASH_DIFFICULTY set to the default for production + See https://github.com/owncloud/ocis/issues/1542 and https://github.com/owncloud/ocis/pull/839 Scenario Outline: upload a file and check download content Given using OCS API version "" @@ -15,4 +18,4 @@ Feature: upload file | 1 | old | | 1 | new | | 2 | old | - | 2 | new | \ No newline at end of file + | 2 | new | diff --git a/tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature b/tests/acceptance/features/apiAccountsHashDifficulty/webDavPUTAuthInvalid.feature similarity index 80% rename from tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature rename to tests/acceptance/features/apiAccountsHashDifficulty/webDavPUTAuthInvalid.feature index 79f0b3adb5..37ba017d39 100644 --- a/tests/acceptance/features/apiBasic/webDavPUTAuthInvalid.feature +++ b/tests/acceptance/features/apiAccountsHashDifficulty/webDavPUTAuthInvalid.feature @@ -1,5 +1,11 @@ @api Feature: attempt to PUT files with invalid password + As an admin + I want to the system to be secure when passwords are stored with the full hash difficulty + So that unauthorised users do not have access to data + + Note - this feature is run in CI with ACCOUNTS_HASH_DIFFICULTY set to the default for production + See https://github.com/owncloud/ocis/issues/1542 and https://github.com/owncloud/ocis/pull/839 Background: Given user "Alice" has been created with default attributes and without skeleton files diff --git a/tests/acceptance/features/apiBasic/addUser.feature b/tests/acceptance/features/apiBasic/addUser.feature deleted file mode 100644 index 935325269e..0000000000 --- a/tests/acceptance/features/apiBasic/addUser.feature +++ /dev/null @@ -1,18 +0,0 @@ -@api @provisioning_api-app-required @skipOnLDAP -Feature: add user - As an admin - I want to be able to add users - So that I can give people controlled individual access to resources on the ownCloud server - - Scenario Outline: admin creates a user - Given using OCS API version "" - And user "brand-new-user" has been deleted - When the administrator sends a user creation request for user "brand-new-user" password "%alt1%" using the provisioning API - Then the OCS status code should be "" - And the HTTP status code should be "200" - And user "brand-new-user" should exist - And user "brand-new-user" should be able to access a skeleton file - Examples: - | ocs_api_version | ocs_status_code | - | 1 | 100 | - | 2 | 200 | \ No newline at end of file From dfb4eb11cbc39526b086b6fb657135c388742474 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 28 Jan 2021 12:03:01 +0545 Subject: [PATCH 07/13] Rename apiOcisSpecific to apiBugDemonstration --- .drone.star | 6 ++--- docs/ocis/development/testing.md | 8 +++---- tests/acceptance/config/behat.yml | 4 ++-- tests/acceptance/docker/Makefile | 24 +++++++++---------- .../apiAuthOcs-ocsDELETEAuth.feature | 0 .../apiAuthOcs-ocsGETAuth.feature | 0 .../apiAuthOcs-ocsPOSTAuth.feature | 0 .../apiAuthOcs-ocsPUTAuth.feature | 0 .../apiAuthWebDav-webDavLOCKAuth.feature | 0 .../apiAuthWebDav-webDavMOVEAuth.feature | 0 ...ilities-capabilitiesWithNormalUser.feature | 0 .../apiMain-main.feature | 0 ...-createShareWithInvalidPermissions.feature | 0 ...piShareManagementBasic-createShare.feature | 0 .../apiShareOperations-gettingShares.feature | 0 ...harePublicLink2-copyFromPublicLink.feature | 0 .../apiShareUpdate-updateShare.feature | 0 .../apiTrashbin-trashbinDelete.feature | 0 .../apiVersions-fileVersions.feature | 0 .../apiWebdavMove1-moveFolder.feature | 0 ...vMove1-moveFolderToBlacklistedName.feature | 0 .../apiWebdavMove2-moveFile.feature | 0 ...davMove2-moveFileToBlacklistedName.feature | 0 .../apiWebdavOperations-refuseAccess.feature | 0 .../apiWebdavPreviews-previews.feature | 0 .../apiWebdavProperties1-createFolder.feature | 0 ...ebdavProperties2-getFileProperties.feature | 0 .../apiWebdavUpload1-uploadFile.feature | 0 .../apiWebdavUploadTUS-optionsRequest.feature | 0 .../apiWebdavUploadTUS-uploadFile.feature | 0 30 files changed, 21 insertions(+), 21 deletions(-) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiAuthOcs-ocsDELETEAuth.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiAuthOcs-ocsGETAuth.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiAuthOcs-ocsPOSTAuth.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiAuthOcs-ocsPUTAuth.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiAuthWebDav-webDavLOCKAuth.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiAuthWebDav-webDavMOVEAuth.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiCapabilities-capabilitiesWithNormalUser.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiMain-main.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiShareManagementBasic-createShare.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiShareOperations-gettingShares.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiSharePublicLink2-copyFromPublicLink.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiShareUpdate-updateShare.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiTrashbin-trashbinDelete.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiVersions-fileVersions.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiWebdavMove1-moveFolder.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiWebdavMove1-moveFolderToBlacklistedName.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiWebdavMove2-moveFile.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiWebdavMove2-moveFileToBlacklistedName.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiWebdavOperations-refuseAccess.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiWebdavPreviews-previews.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiWebdavProperties1-createFolder.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiWebdavProperties2-getFileProperties.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiWebdavUpload1-uploadFile.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiWebdavUploadTUS-optionsRequest.feature (100%) rename tests/acceptance/features/{apiOcisSpecific => apiBugDemonstration}/apiWebdavUploadTUS-uploadFile.feature (100%) diff --git a/.drone.star b/.drone.star index 2e599403e9..dac646de74 100644 --- a/.drone.star +++ b/.drone.star @@ -237,8 +237,8 @@ def testOcisModules(ctx): def testPipelines(ctx): pipelines = [ - localApiTests(ctx, 'owncloud', 'apiOcisSpecific'), - localApiTests(ctx, 'ocis', 'apiOcisSpecific'), + localApiTests(ctx, 'owncloud', 'apiBugDemonstration'), + localApiTests(ctx, 'ocis', 'apiBugDemonstration'), localApiTests(ctx, 'owncloud', 'apiAccountsHashDifficulty', 'default'), localApiTests(ctx, 'ocis', 'apiAccountsHashDifficulty', 'default') ] @@ -430,7 +430,7 @@ def uploadCoverage(ctx): }, } -def localApiTests(ctx, storage = 'owncloud', suite = 'apiOcisSpecific', accounts_hash_difficulty = 4): +def localApiTests(ctx, storage = 'owncloud', suite = 'apiBugDemonstration', accounts_hash_difficulty = 4): return { 'kind': 'pipeline', 'type': 'docker', diff --git a/docs/ocis/development/testing.md b/docs/ocis/development/testing.md index 318c0a6565..9e5b674c57 100644 --- a/docs/ocis/development/testing.md +++ b/docs/ocis/development/testing.md @@ -39,7 +39,7 @@ You can invoke two types of test suite runs: The names of the full test suite make targets have the same naming as in the CI pipeline. -For example `make -C tests/acceptance/docker localApiTests-apiOcisSpecific-ocis` runs the same tests as the `localApiTests-apiOcisSpecific-ocis` CI pipeline, which runs the oCIS test suite "apiOcisSpecific" against an oCIS with oCIS storage. +For example `make -C tests/acceptance/docker localApiTests-apiBugDemonstration-ocis` runs the same tests as the `localApiTests-apiBugDemonstration-ocis` CI pipeline, which runs the oCIS test suite "apiBugDemonstration" against an oCIS with oCIS storage. For example `make -C tests/acceptance/docker Core-API-Tests-owncloud-storage-3`runs the same tests as the `Core-API-Tests-owncloud-storage-3` CI pipeline, which runs the third (out of ten) ownCloud test suite against an oCIS with owncloud storage. @@ -48,7 +48,7 @@ For example `make -C tests/acceptance/docker Core-API-Tests-owncloud-storage-3`r The single feature tests can also be run against the different storage backends. Therefore multiple make targets with the schema test--feature- exists. For selecting a single feature test you have to add an additional `BEHAT_FEATURE=...` parameter when invoking the make command: ``` -make -C tests/acceptance/docker test-ocis-feature-ocis BEHAT_FEATURE='tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature' +make -C tests/acceptance/docker test-ocis-feature-ocis BEHAT_FEATURE='tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsDELETEAuth.feature' ``` This must be pointing to a valid feature definition. @@ -58,7 +58,7 @@ This must be pointing to a valid feature definition. By default the tests will be run against docker image built from your current working state of the oCIS repository. For some purposes it might also be handy to use a oCIS image from Docker Hub. Therefore you can provide the optional flag `OCIS_IMAGE_TAG=...` which must contain an available docker tag of the [owncloud/ocis registry on Docker Hub](https://hub.docker.com/r/owncloud/ocis) (eg. 'latest'). ``` -make -C tests/acceptance/docker localApiTests-apiOcisSpecific-ocis OCIS_IMAGE_TAG=latest +make -C tests/acceptance/docker localApiTests-apiBugDemonstration-ocis OCIS_IMAGE_TAG=latest ``` ### Test log output @@ -138,7 +138,7 @@ Those scenarios are run in the ordinary acceptance test pipeline in CI. The scen expected failures. If there are any differences then the CI pipeline fails. Similarly, scenarios that do not work in oCIS with EOS storage are listed in `tests/acceptance/expected-failures-on-EOS-storage.txt`. Additionally, some issues have scenarios that demonstrate the current buggy behaviour in ocis(reva). -Those scenarios are in this ocis repository in `tests/acceptance/features/apiOcisSpecific`. +Those scenarios are in this ocis repository in `tests/acceptance/features/apiBugDemonstration`. Have a look into the [documentation](https://doc.owncloud.com/server/developer_manual/testing/acceptance-tests.html#writing-scenarios-for-bugs) to understand why we are writing those tests. If you want to work on a specific issue diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml index e2480b6f2b..f785972736 100644 --- a/tests/acceptance/config/behat.yml +++ b/tests/acceptance/config/behat.yml @@ -29,9 +29,9 @@ default: - TrashbinContext: - WebDavPropertiesContext: - apiOcisSpecific: + apiBugDemonstration: paths: - - '%paths.base%/../features/apiOcisSpecific' + - '%paths.base%/../features/apiBugDemonstration' context: *common_ldap_suite_context contexts: - RevaContext: diff --git a/tests/acceptance/docker/Makefile b/tests/acceptance/docker/Makefile index 554c8c37fc..a1f0d4a262 100644 --- a/tests/acceptance/docker/Makefile +++ b/tests/acceptance/docker/Makefile @@ -52,11 +52,11 @@ help: @echo @echo -e "${GREEN}Run full oCIS test suites against oCIS with oCIS storage:${RESET}\n" @echo -e "\tmake localApiTests-apiAccountsHashDifficulty-ocis\t\t${BLUE}run apiAccountsHashDifficulty test suite${RESET}" - @echo -e "\tmake localApiTests-apiOcisSpecific-ocis\t\t${BLUE}run apiOcisSPecific test suite${RESET}" + @echo -e "\tmake localApiTests-apiBugDemonstration-ocis\t\t${BLUE}run apiBugDemonstration test suite${RESET}" @echo @echo -e "${GREEN}Run full oCIS test suites against oCIS with ownCloud storage:${RESET}\n" @echo -e "\tmake localApiTests-apiAccountsHashDifficulty-owncloud\t\t${BLUE}run apiAccountsHashDifficulty test suite${RESET}" - @echo -e "\tmake localApiTests-apiOcisSpecific-owncloud\t${BLUE}run apiOcisSpecific test suite${RESET}" + @echo -e "\tmake localApiTests-apiBugDemonstration-owncloud\t${BLUE}run apiBugDemonstration test suite${RESET}" @echo @echo -e "${GREEN}Run full ownCloud test suites against oCIS with oCIS storage:${RESET}\n" @echo -e "\tmake Core-API-Tests-ocis-storage-${RED}X${RESET}\t\t${BLUE}run test suite number X, where ${RED}X = 1 .. 10${RESET}" @@ -68,13 +68,13 @@ help: @echo -e "\tmake test-ocis-feature-ocis-storage ${YELLOW}BEHAT_FEATURE='...'${RESET}\t${BLUE}run single feature test${RESET}" @echo @echo -e "\twhere ${YELLOW}BEHAT_FEATURE='...'${RESET} contains a relative path to the feature definition." - @echo -e "\texample: ${RED}tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature${RESET}" + @echo -e "\texample: ${RED}tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsDELETEAuth.feature${RESET}" @echo @echo -e "${GREEN}Run an oCIS feature test against oCIS with owncloud storage:${RESET}\n" @echo -e "\tmake test-ocis-feature-owncloud-storage ${YELLOW}BEHAT_FEATURE='...'${RESET}\t${BLUE}run single feature test${RESET}" @echo @echo -e "\twhere ${YELLOW}BEHAT_FEATURE='...'${RESET} contains a relative path to the feature definition." - @echo -e "\texample: ${RED}tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature${RESET}" + @echo -e "\texample: ${RED}tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsDELETEAuth.feature${RESET}" @echo @echo -e "${GREEN}Run an ownCloud feature test against oCIS with oCIS storage:${RESET}\n" @echo -e "\tmake test-oc10-feature-ocis-storage ${YELLOW}BEHAT_FEATURE='...'${RESET}\t${BLUE}run single feature test${RESET}" @@ -99,14 +99,14 @@ help: @echo -e "\tmake clean-docker-volumes\t\t${BLUE}removes used docker volumes (used for caching)${RESET}" @echo .PHONY: test-ocis-feature-ocis-storage -test-ocis-feature-ocis-storage: ## test a ocis feature with oCIS storage, useage: make ... BEHAT_FEATURE='tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature:7' +test-ocis-feature-ocis-storage: ## test a ocis feature with oCIS storage, useage: make ... BEHAT_FEATURE='tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsDELETEAuth.feature:7' @TEST_SOURCE=ocis \ STORAGE=ocis \ BEHAT_FEATURE=$(BEHAT_FEATURE) \ $(MAKE) --no-print-directory testSuite .PHONY: test-ocis-feature-owncloud-storage -test-ocis-feature-owncloud-storage: ## test a ocis feature with oc10 storage, useage: make ... BEHAT_FEATURE='tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature:7' +test-ocis-feature-owncloud-storage: ## test a ocis feature with oc10 storage, useage: make ... BEHAT_FEATURE='tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsDELETEAuth.feature:7' @TEST_SOURCE=ocis \ STORAGE=owncloud \ BEHAT_FEATURE=$(BEHAT_FEATURE) \ @@ -126,11 +126,11 @@ test-oc10-feature-owncloud-storage: ## test a oC10 feature with oc10 storage, us BEHAT_FEATURE=$(BEHAT_FEATURE) \ $(MAKE) --no-print-directory testSuite -.PHONY: localApiTests-apiOcisSpecific-owncloud -localApiTests-apiOcisSpecific-owncloud: ## run apiOcisSpecific test suite with owncloud storage +.PHONY: localApiTests-apiBugDemonstration-owncloud +localApiTests-apiBugDemonstration-owncloud: ## run apiBugDemonstration test suite with owncloud storage @TEST_SOURCE=oc10 \ STORAGE=owncloud \ - BEHAT_SUITE=apiOcisSpecific \ + BEHAT_SUITE=apiBugDemonstration \ $(MAKE) --no-print-directory testSuite .PHONY: localApiTests-apiAccountsHashDifficulty-owncloud @@ -140,11 +140,11 @@ localApiTests-apiAccountsHashDifficulty-owncloud: ## run apiAccountsHashDifficul BEHAT_SUITE=apiAccountsHashDifficulty \ $(MAKE) --no-print-directory testSuite -.PHONY: localApiTests-apiOcisSpecific-ocis -localApiTests-apiOcisSpecific-ocis: ## run apiOcisSPecific test suite with ocis storage +.PHONY: localApiTests-apiBugDemonstration-ocis +localApiTests-apiBugDemonstration-ocis: ## run apiBugDemonstration test suite with ocis storage @TEST_SOURCE=ocis \ STORAGE=ocis \ - BEHAT_SUITE=apiOcisSpecific \ + BEHAT_SUITE=apiBugDemonstration \ $(MAKE) --no-print-directory testSuite .PHONY: localApiTests-apiAccountsHashDifficulty-ocis diff --git a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature b/tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsDELETEAuth.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsDELETEAuth.feature rename to tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsDELETEAuth.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature b/tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsGETAuth.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsGETAuth.feature rename to tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsGETAuth.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature b/tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsPOSTAuth.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPOSTAuth.feature rename to tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsPOSTAuth.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature b/tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsPUTAuth.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiAuthOcs-ocsPUTAuth.feature rename to tests/acceptance/features/apiBugDemonstration/apiAuthOcs-ocsPUTAuth.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavLOCKAuth.feature b/tests/acceptance/features/apiBugDemonstration/apiAuthWebDav-webDavLOCKAuth.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavLOCKAuth.feature rename to tests/acceptance/features/apiBugDemonstration/apiAuthWebDav-webDavLOCKAuth.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavMOVEAuth.feature b/tests/acceptance/features/apiBugDemonstration/apiAuthWebDav-webDavMOVEAuth.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiAuthWebDav-webDavMOVEAuth.feature rename to tests/acceptance/features/apiBugDemonstration/apiAuthWebDav-webDavMOVEAuth.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiCapabilities-capabilitiesWithNormalUser.feature b/tests/acceptance/features/apiBugDemonstration/apiCapabilities-capabilitiesWithNormalUser.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiCapabilities-capabilitiesWithNormalUser.feature rename to tests/acceptance/features/apiBugDemonstration/apiCapabilities-capabilitiesWithNormalUser.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiMain-main.feature b/tests/acceptance/features/apiBugDemonstration/apiMain-main.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiMain-main.feature rename to tests/acceptance/features/apiBugDemonstration/apiMain-main.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature b/tests/acceptance/features/apiBugDemonstration/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature rename to tests/acceptance/features/apiBugDemonstration/apiShareCreateSpecial2-createShareWithInvalidPermissions.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature b/tests/acceptance/features/apiBugDemonstration/apiShareManagementBasic-createShare.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiShareManagementBasic-createShare.feature rename to tests/acceptance/features/apiBugDemonstration/apiShareManagementBasic-createShare.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiShareOperations-gettingShares.feature b/tests/acceptance/features/apiBugDemonstration/apiShareOperations-gettingShares.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiShareOperations-gettingShares.feature rename to tests/acceptance/features/apiBugDemonstration/apiShareOperations-gettingShares.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-copyFromPublicLink.feature b/tests/acceptance/features/apiBugDemonstration/apiSharePublicLink2-copyFromPublicLink.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiSharePublicLink2-copyFromPublicLink.feature rename to tests/acceptance/features/apiBugDemonstration/apiSharePublicLink2-copyFromPublicLink.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature b/tests/acceptance/features/apiBugDemonstration/apiShareUpdate-updateShare.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiShareUpdate-updateShare.feature rename to tests/acceptance/features/apiBugDemonstration/apiShareUpdate-updateShare.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature b/tests/acceptance/features/apiBugDemonstration/apiTrashbin-trashbinDelete.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiTrashbin-trashbinDelete.feature rename to tests/acceptance/features/apiBugDemonstration/apiTrashbin-trashbinDelete.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiVersions-fileVersions.feature b/tests/acceptance/features/apiBugDemonstration/apiVersions-fileVersions.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiVersions-fileVersions.feature rename to tests/acceptance/features/apiBugDemonstration/apiVersions-fileVersions.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolder.feature b/tests/acceptance/features/apiBugDemonstration/apiWebdavMove1-moveFolder.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolder.feature rename to tests/acceptance/features/apiBugDemonstration/apiWebdavMove1-moveFolder.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolderToBlacklistedName.feature b/tests/acceptance/features/apiBugDemonstration/apiWebdavMove1-moveFolderToBlacklistedName.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiWebdavMove1-moveFolderToBlacklistedName.feature rename to tests/acceptance/features/apiBugDemonstration/apiWebdavMove1-moveFolderToBlacklistedName.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFile.feature b/tests/acceptance/features/apiBugDemonstration/apiWebdavMove2-moveFile.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFile.feature rename to tests/acceptance/features/apiBugDemonstration/apiWebdavMove2-moveFile.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFileToBlacklistedName.feature b/tests/acceptance/features/apiBugDemonstration/apiWebdavMove2-moveFileToBlacklistedName.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiWebdavMove2-moveFileToBlacklistedName.feature rename to tests/acceptance/features/apiBugDemonstration/apiWebdavMove2-moveFileToBlacklistedName.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-refuseAccess.feature b/tests/acceptance/features/apiBugDemonstration/apiWebdavOperations-refuseAccess.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiWebdavOperations-refuseAccess.feature rename to tests/acceptance/features/apiBugDemonstration/apiWebdavOperations-refuseAccess.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature b/tests/acceptance/features/apiBugDemonstration/apiWebdavPreviews-previews.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiWebdavPreviews-previews.feature rename to tests/acceptance/features/apiBugDemonstration/apiWebdavPreviews-previews.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-createFolder.feature b/tests/acceptance/features/apiBugDemonstration/apiWebdavProperties1-createFolder.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiWebdavProperties1-createFolder.feature rename to tests/acceptance/features/apiBugDemonstration/apiWebdavProperties1-createFolder.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavProperties2-getFileProperties.feature b/tests/acceptance/features/apiBugDemonstration/apiWebdavProperties2-getFileProperties.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiWebdavProperties2-getFileProperties.feature rename to tests/acceptance/features/apiBugDemonstration/apiWebdavProperties2-getFileProperties.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavUpload1-uploadFile.feature b/tests/acceptance/features/apiBugDemonstration/apiWebdavUpload1-uploadFile.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiWebdavUpload1-uploadFile.feature rename to tests/acceptance/features/apiBugDemonstration/apiWebdavUpload1-uploadFile.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavUploadTUS-optionsRequest.feature b/tests/acceptance/features/apiBugDemonstration/apiWebdavUploadTUS-optionsRequest.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiWebdavUploadTUS-optionsRequest.feature rename to tests/acceptance/features/apiBugDemonstration/apiWebdavUploadTUS-optionsRequest.feature diff --git a/tests/acceptance/features/apiOcisSpecific/apiWebdavUploadTUS-uploadFile.feature b/tests/acceptance/features/apiBugDemonstration/apiWebdavUploadTUS-uploadFile.feature similarity index 100% rename from tests/acceptance/features/apiOcisSpecific/apiWebdavUploadTUS-uploadFile.feature rename to tests/acceptance/features/apiBugDemonstration/apiWebdavUploadTUS-uploadFile.feature From 5751b0826656276bd24437db6446e093d1031e92 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 26 Jan 2021 20:50:28 +0545 Subject: [PATCH 08/13] Bump commit ids for tests --- .drone.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.env b/.drone.env index a65e073144..1daeaaa400 100644 --- a/.drone.env +++ b/.drone.env @@ -1,7 +1,7 @@ # The test runner source for API tests -CORE_COMMITID=1628f6156c64717aa23b1e48dd8e51154f68cde8 +CORE_COMMITID=bf15046c221d1e85f74ce2658d36729d0870f5f3 CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=5945833ca594c16d33514da74b3d2eb64d3560fd +WEB_COMMITID=9a3c3149646ec27a49b26fad0eaf96cd1ae5892e WEB_BRANCH=master From 6f27c726cea71a45649436780c8d670894e31f03 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 26 Jan 2021 22:09:07 +0545 Subject: [PATCH 09/13] Adjust expected-failures --- .drone.env | 2 +- .../expected-failures-API-on-OCIS-storage.md | 43 ++++++++++++++++ ...pected-failures-API-on-OWNCLOUD-storage.md | 49 +++++++++++++++++-- 3 files changed, 88 insertions(+), 6 deletions(-) diff --git a/.drone.env b/.drone.env index 1daeaaa400..e4821599f9 100644 --- a/.drone.env +++ b/.drone.env @@ -1,5 +1,5 @@ # The test runner source for API tests -CORE_COMMITID=bf15046c221d1e85f74ce2658d36729d0870f5f3 +CORE_COMMITID=81191d99368f5dcfa2b3b1a7ba4719fa61541bd5 CORE_BRANCH=master # The test runner source for UI tests diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md index 4f2daad39b..5d69baff16 100644 --- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md @@ -140,8 +140,12 @@ - [apiProvisioning-v1/enableUser.feature:32](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/enableUser.feature#L32) - [apiProvisioning-v1/getUser.feature:34](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/getUser.feature#L34) - [apiProvisioning-v1/getUser.feature:35](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/getUser.feature#L35) + - [apiProvisioning-v2/addUser.feature:29](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/addUser.feature#L29) - [apiProvisioning-v2/addUser.feature:30](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/addUser.feature#L30) +- [apiProvisioning-v2/addUser.feature:121](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/addUser.feature#L121) +- [apiProvisioning-v2/addUser.feature:122](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/addUser.feature#L122) +- [apiProvisioning-v2/addUser.feature:123](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/addUser.feature#L123) - [apiProvisioning-v2/deleteUser.feature:29](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature#L29) - [apiProvisioning-v2/deleteUser.feature:30](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature#L30) - [apiProvisioning-v2/disableUser.feature:29](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/disableUser.feature#L29) @@ -179,6 +183,10 @@ - [apiProvisioning-v2/apiProvisioningUsingAppPassword.feature:67](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/apiProvisioningUsingAppPassword.feature#L67) ### [disable users /cloud/users/disable|enable not available](https://github.com/owncloud/ocis/issues/1420) + +- [apiProvisioning-v1/enableUser.feature:92](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/enableUser.feature#L92) +- [apiProvisioning-v1/enableUser.feature:102](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/enableUser.feature#L102) +- [apiProvisioning-v1/enableUser.feature:129](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/enableUser.feature#L129) - [apiProvisioning-v1/disableUser.feature:99](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/disableUser.feature#L99) - [apiProvisioning-v1/disableUser.feature:129](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/disableUser.feature#L129) - [apiProvisioning-v1/disableUser.feature:165](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/disableUser.feature#L165) @@ -219,8 +227,39 @@ - [apiProvisioning-v2/getUser.feature:47](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/getUser.feature#L47) ### [subadmin endpoints not implemented](https://github.com/owncloud/product/issues/289) +- [apiProvisioning-v1/addUser.feature:125](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/addUser.feature#L125) +- [apiProvisioning-v1/createSubAdmin.feature:48](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/createSubAdmin.feature#L48) +- [apiProvisioning-v1/deleteUser.feature:73](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/deleteUser.feature#L73) +- [apiProvisioning-v1/disableUser.feature:222](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/disableUser.feature#L222) +- [apiProvisioning-v1/editUser.feature:131](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/editUser.feature#L131) +- [apiProvisioning-v1/editUser.feature:143](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/editUser.feature#L143) +- [apiProvisioning-v1/getUser.feature:170](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/getUser.feature#L170) +- [apiProvisioning-v1/resetUserPassword.feature:113](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/resetUserPassword.feature#L113) + +- [apiProvisioning-v2/addUser.feature:125](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/addUser.feature#L125) +- [apiProvisioning-v2/createSubAdmin.feature:48](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/createSubAdmin.feature#L48) +- [apiProvisioning-v2/deleteUser.feature:64](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature#L64) +- [apiProvisioning-v2/deleteUser.feature:74](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature#L74) +- [apiProvisioning-v2/deleteUser.feature:88](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature#L88) +- [apiProvisioning-v2/deleteUser.feature:101](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature#L101) +- [apiProvisioning-v2/deleteUser.feature:115](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature#L115) - [apiProvisioning-v2/disableUser.feature:48](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/disableUser.feature#L48) - [apiProvisioning-v2/disableUser.feature:64](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/disableUser.feature#L64) +- [apiProvisioning-v2/disableUser.feature:223](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/disableUser.feature#L223) +- [apiProvisioning-v2/disableUser.feature:237](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/disableUser.feature#L237) +- [apiProvisioning-v2/editUser.feature:131](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/editUser.feature#L131) +- [apiProvisioning-v2/editUser.feature:143](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/editUser.feature#L143) +- [apiProvisioning-v2/editUser.feature:159](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/editUser.feature#L159) +- [apiProvisioning-v2/enableUser.feature:104](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/enableUser.feature#L104) +- [apiProvisioning-v2/enableUser.feature:118](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/enableUser.feature#L118) +- [apiProvisioning-v2/enableUser.feature:131](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/enableUser.feature#L131) +- [apiProvisioning-v2/enableUser.feature:146](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/enableUser.feature#L146) +- [apiProvisioning-v2/getUser.feature:145](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/getUser.feature#L145) +- [apiProvisioning-v2/getUser.feature:156](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/getUser.feature#L156) +- [apiProvisioning-v2/getUser.feature:171](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/getUser.feature#L171) +- [apiProvisioning-v2/resetUserPassword.feature:101](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/resetUserPassword.feature#L101) +- [apiProvisioning-v2/resetUserPassword.feature:113](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/resetUserPassword.feature#L113) +- [apiProvisioning-v2/resetUserPassword.feature:129](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/resetUserPassword.feature#L129) ### [invalid format of sharees response](https://github.com/owncloud/product/issues/292) ### [Searching sharee with displayname](https://github.com/owncloud/ocis/issues/547) @@ -2346,3 +2385,7 @@ ### [oCIS-storage overwriting a file as share receiver, does not create a new file version for the sharer](https://github.com/owncloud/ocis/issues/766) - [apiVersions/fileVersionsSharingToShares.feature:291](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiVersions/fileVersionsSharingToShares.feature#L291) + +### [deleting a share with wrong authentication returns OCS status 996 / HTTP 500](https://github.com/owncloud/ocis/issues/1229) +- [apiShareManagementBasicToShares/deleteShareFromShares.feature:211](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/deleteShareFromShares.feature#211) +- [apiShareManagementBasicToShares/deleteShareFromShares.feature:212](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/deleteShareFromShares.feature#212) diff --git a/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md b/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md index 18d5ad2ef2..3591d6d04d 100644 --- a/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md +++ b/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md @@ -180,8 +180,12 @@ - [apiProvisioning-v1/enableUser.feature:32](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/enableUser.feature#L32) - [apiProvisioning-v1/getUser.feature:34](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/getUser.feature#L34) - [apiProvisioning-v1/getUser.feature:35](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/getUser.feature#L35) + - [apiProvisioning-v2/addUser.feature:29](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/addUser.feature#L29) - [apiProvisioning-v2/addUser.feature:30](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/addUser.feature#L30) +- [apiProvisioning-v2/addUser.feature:121](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/addUser.feature#L121) +- [apiProvisioning-v2/addUser.feature:122](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/addUser.feature#L122) +- [apiProvisioning-v2/addUser.feature:123](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/addUser.feature#L123) - [apiProvisioning-v2/deleteUser.feature:29](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature#L29) - [apiProvisioning-v2/deleteUser.feature:30](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature#L30) - [apiProvisioning-v2/disableUser.feature:29](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/disableUser.feature#L29) @@ -207,6 +211,9 @@ ### [disable users /cloud/users/disable|enable not available](https://github.com/owncloud/ocis/issues/1420) +- [apiProvisioning-v1/enableUser.feature:92](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/enableUser.feature#L92) +- [apiProvisioning-v1/enableUser.feature:102](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/enableUser.feature#L102) +- [apiProvisioning-v1/enableUser.feature:129](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/enableUser.feature#L129) - [apiProvisioning-v1/disableUser.feature:99](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/disableUser.feature#L99) - [apiProvisioning-v1/disableUser.feature:129](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/disableUser.feature#L129) - [apiProvisioning-v1/disableUser.feature:165](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/disableUser.feature#L165) @@ -250,11 +257,6 @@ - [apiProvisioning-v2/getUser.feature:47](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/getUser.feature#L47) -### [subadmin endpoints not implemented](https://github.com/owncloud/product/issues/289) - -- [apiProvisioning-v2/disableUser.feature:48](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/disableUser.feature#L48) -- [apiProvisioning-v2/disableUser.feature:64](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/disableUser.feature#L64) - ### [invalid format of sharees response](https://github.com/owncloud/product/issues/292) ### [Searching sharee with displayname](https://github.com/owncloud/ocis/issues/547) @@ -660,6 +662,7 @@ User cannot create a folder named Share ### [Set quota over settings](https://github.com/owncloud/ocis/issues/1290) +- [apiProvisioning-v1/editUser.feature:131](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/editUser.feature#L131) - [apiSharePublicLink2/uploadToPublicLinkShare.feature:148](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/uploadToPublicLinkShare.feature#L148) - [apiSharePublicLink2/uploadToPublicLinkShare.feature:158](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/uploadToPublicLinkShare.feature#L158) - [apiSharePublicLink2/uploadToPublicLinkShare.feature:167](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiSharePublicLink2/uploadToPublicLinkShare.feature#L167) @@ -1751,6 +1754,7 @@ restoring a file doesn't changes the etags of the parents - [apiProvisioning-v1/createSubAdmin.feature:19](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/createSubAdmin.feature#L19) - [apiProvisioning-v1/createSubAdmin.feature:27](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/createSubAdmin.feature#L27) - [apiProvisioning-v1/createSubAdmin.feature:35](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/createSubAdmin.feature#L35) +- [apiProvisioning-v1/createSubAdmin.feature:48](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/createSubAdmin.feature#L48) - [apiProvisioning-v1/getSubAdmins.feature:11](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/getSubAdmins.feature#L11) - [apiProvisioning-v1/getSubAdmins.feature:21](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/getSubAdmins.feature#L21) - [apiProvisioning-v2/createSubAdmin.feature:11](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/createSubAdmin.feature#L11) @@ -2394,6 +2398,12 @@ restoring a file doesn't changes the etags of the parents - [apiProvisioningGroups-v1/addToGroup.feature:124](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioningGroups-v1/addToGroup.feature#L124) ### [subadmin endpoints not implemented](https://github.com/owncloud/product/issues/289) +- [apiProvisioning-v1/addUser.feature:125](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/addUser.feature#L125) +- [apiProvisioning-v1/deleteUser.feature:73](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/deleteUser.feature#L73) +- [apiProvisioning-v1/disableUser.feature:222](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/disableUser.feature#L222) +- [apiProvisioning-v1/editUser.feature:143](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/editUser.feature#L143) +- [apiProvisioning-v1/getUser.feature:170](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/getUser.feature#L170) +- [apiProvisioning-v1/resetUserPassword.feature:111](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/resetUserPassword.feature#L111) - [apiProvisioningGroups-v1/addGroup.feature:87](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioningGroups-v1/addGroup.feature#L87) - [apiProvisioningGroups-v1/addToGroup.feature:133](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioningGroups-v1/addToGroup.feature#L133) - [apiProvisioningGroups-v1/addToGroup.feature:146](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioningGroups-v1/addToGroup.feature#L146) @@ -2404,7 +2414,32 @@ restoring a file doesn't changes the etags of the parents - [apiProvisioningGroups-v1/getUserGroups.feature:56](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioningGroups-v1/getUserGroups.feature#L56) - [apiProvisioningGroups-v1/removeFromGroup.feature:110](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioningGroups-v1/removeFromGroup.feature#L110) - [apiProvisioningGroups-v1/removeFromGroup.feature:123](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioningGroups-v1/removeFromGroup.feature#L123) +- [apiProvisioning-v1/resetUserPassword.feature:113](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v1/resetUserPassword.feature#L113) +- [apiProvisioning-v2/addUser.feature:125](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/addUser.feature#L125) +- [apiProvisioning-v2/createSubAdmin.feature:48](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/createSubAdmin.feature#L48) +- [apiProvisioning-v2/deleteUser.feature:64](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature#L64) +- [apiProvisioning-v2/deleteUser.feature:74](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature#L74) +- [apiProvisioning-v2/deleteUser.feature:88](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature#L88) +- [apiProvisioning-v2/deleteUser.feature:101](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature#L101) +- [apiProvisioning-v2/deleteUser.feature:115](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/deleteUser.feature#L115) +- [apiProvisioning-v2/disableUser.feature:48](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/disableUser.feature#L48) +- [apiProvisioning-v2/disableUser.feature:64](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/disableUser.feature#L64) +- [apiProvisioning-v2/disableUser.feature:223](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/disableUser.feature#L223) +- [apiProvisioning-v2/disableUser.feature:237](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/disableUser.feature#L237) +- [apiProvisioning-v2/editUser.feature:131](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/editUser.feature#L131) +- [apiProvisioning-v2/editUser.feature:143](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/editUser.feature#L143) +- [apiProvisioning-v2/editUser.feature:159](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/editUser.feature#L159) +- [apiProvisioning-v2/enableUser.feature:104](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/enableUser.feature#L104) +- [apiProvisioning-v2/enableUser.feature:118](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/enableUser.feature#L118) +- [apiProvisioning-v2/enableUser.feature:131](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/enableUser.feature#L131) +- [apiProvisioning-v2/enableUser.feature:146](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/enableUser.feature#L146) +- [apiProvisioning-v2/getUser.feature:145](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/getUser.feature#L145) +- [apiProvisioning-v2/getUser.feature:156](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/getUser.feature#L156) +- [apiProvisioning-v2/getUser.feature:171](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/getUser.feature#L171) +- [apiProvisioning-v2/resetUserPassword.feature:101](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/resetUserPassword.feature#L101) +- [apiProvisioning-v2/resetUserPassword.feature:113](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/resetUserPassword.feature#L113) +- [apiProvisioning-v2/resetUserPassword.feature:129](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioning-v2/resetUserPassword.feature#L129) - [apiProvisioningGroups-v2/addGroup.feature:87](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioningGroups-v2/addGroup.feature#L87) - [apiProvisioningGroups-v2/addGroup.feature:109](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioningGroups-v2/addGroup.feature#L109) - [apiProvisioningGroups-v2/addToGroup.feature:128](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiProvisioningGroups-v2/addToGroup.feature#L128) @@ -2498,3 +2533,7 @@ special character username not valid ### [Deletion time in trash bin shows a wrong date](https://github.com/owncloud/ocis/issues/541) - [apiTrashbin/trashbinFilesFolders.feature:284](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinFilesFolders.feature#L284) - [apiTrashbin/trashbinFilesFolders.feature:285](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiTrashbin/trashbinFilesFolders.feature#L285) + +### [deleting a share with wrong authentication returns OCS status 996 / HTTP 500](https://github.com/owncloud/ocis/issues/1229) +- [apiShareManagementBasicToShares/deleteShareFromShares.feature:211](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/deleteShareFromShares.feature#211) +- [apiShareManagementBasicToShares/deleteShareFromShares.feature:212](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/deleteShareFromShares.feature#212) From 18426be9a2eb4ca0c054b8c536f4bbd4d8601bb6 Mon Sep 17 00:00:00 2001 From: Erwin Palma <30660343+erwinpalma@users.noreply.github.com> Date: Thu, 28 Jan 2021 15:05:01 +0100 Subject: [PATCH 10/13] Update CONFIGURATION.tmpl The following link does no exist [our repository](https://github.com/owncloud/ocis/tree/master/config), --- ocis/templates/CONFIGURATION.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocis/templates/CONFIGURATION.tmpl b/ocis/templates/CONFIGURATION.tmpl index d86a7033c4..0b26b350a0 100644 --- a/ocis/templates/CONFIGURATION.tmpl +++ b/ocis/templates/CONFIGURATION.tmpl @@ -39,7 +39,7 @@ $HOME/.ocis For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-proxy reads `proxy.json | yaml | toml ...`*. -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at (--> This link does not exist) [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. ### Environment variables From 30c80b09238d830b233568240de7a56e2fc6b65d Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Fri, 22 Jan 2021 14:11:13 +0100 Subject: [PATCH 11/13] Check if roles are present in user object before looking those up --- changelog/unreleased/account-roles-fix.md | 3 +++ ocis-pkg/middleware/account.go | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changelog/unreleased/account-roles-fix.md diff --git a/changelog/unreleased/account-roles-fix.md b/changelog/unreleased/account-roles-fix.md new file mode 100644 index 0000000000..35dce3a1bd --- /dev/null +++ b/changelog/unreleased/account-roles-fix.md @@ -0,0 +1,3 @@ +Bugfix: Check if roles are present in user object before looking those up + +https://github.com/owncloud/ocis/pull/1388 diff --git a/ocis-pkg/middleware/account.go b/ocis-pkg/middleware/account.go index c02ca9f30a..1e9b70c2de 100644 --- a/ocis-pkg/middleware/account.go +++ b/ocis-pkg/middleware/account.go @@ -67,7 +67,11 @@ func ExtractAccountUUID(opts ...account.Option) func(http.Handler) http.Handler ctx = context.WithValue(ctx, UUIDKey, u.Id.OpaqueId) // TODO: implement token manager in cs3org/reva that uses generic metadata instead of access token from header. ctx = metadata.Set(ctx, AccountID, u.Id.OpaqueId) - ctx = metadata.Set(ctx, RoleIDs, string(u.Opaque.Map["roles"].Value)) + if u.Opaque != nil { + if roles, ok := u.Opaque.Map["roles"]; ok { + ctx = metadata.Set(ctx, RoleIDs, string(roles.Value)) + } + } next.ServeHTTP(w, r.WithContext(ctx)) }) } From 414b635433614f9e602dfba84c77453d216ef629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 29 Jan 2021 09:46:37 +0000 Subject: [PATCH 12/13] Automated changelog update [skip ci] --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b3f3fba03..006278cffa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,16 @@ The following sections list the changes for unreleased. ## Summary +* Bugfix - Check if roles are present in user object before looking those up: [#1388](https://github.com/owncloud/ocis/pull/1388) * Change - Move runtime code on refs/pman over to owncloud/ocis/ocis: [#1483](https://github.com/owncloud/ocis/pull/1483) * Enhancement - Update reva to v1.5.2-0.20210125114636-0c10b333ee69: [#1482](https://github.com/owncloud/ocis/pull/1482) ## Details +* Bugfix - Check if roles are present in user object before looking those up: [#1388](https://github.com/owncloud/ocis/pull/1388) + + https://github.com/owncloud/ocis/pull/1388 + * Change - Move runtime code on refs/pman over to owncloud/ocis/ocis: [#1483](https://github.com/owncloud/ocis/pull/1483) Tags: ocis, runtime From 29129cdb9d3d3b8c0e7dec08258ccfbf398a4cb2 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 29 Jan 2021 11:12:00 +0100 Subject: [PATCH 13/13] fix config links --- accounts/templates/CONFIGURATION.tmpl | 2 +- docs/extensions/onlyoffice/getting-started.md | 2 +- glauth/templates/CONFIGURATION.tmpl | 2 +- konnectd/templates/CONFIGURATION.tmpl | 2 +- ocis/templates/CONFIGURATION.tmpl | 2 +- ocs/templates/CONFIGURATION.tmpl | 2 +- onlyoffice/templates/CONFIGURATION.tmpl | 2 +- proxy/templates/CONFIGURATION.tmpl | 2 +- storage/templates/CONFIGURATION.tmpl | 2 +- store/templates/CONFIGURATION.tmpl | 2 +- thumbnails/templates/CONFIGURATION.tmpl | 2 +- web/templates/CONFIGURATION.tmpl | 2 +- webdav/templates/CONFIGURATION.tmpl | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/accounts/templates/CONFIGURATION.tmpl b/accounts/templates/CONFIGURATION.tmpl index e56dd42397..9a76bdb9d4 100644 --- a/accounts/templates/CONFIGURATION.tmpl +++ b/accounts/templates/CONFIGURATION.tmpl @@ -35,7 +35,7 @@ $HOME/.ocis For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-accounts reads `accounts.json | yaml | toml ...`*. -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/accounts/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. ### Environment variables diff --git a/docs/extensions/onlyoffice/getting-started.md b/docs/extensions/onlyoffice/getting-started.md index 33ca2a19c6..e10fc18340 100644 --- a/docs/extensions/onlyoffice/getting-started.md +++ b/docs/extensions/onlyoffice/getting-started.md @@ -168,7 +168,7 @@ If you prefer to configure the service with commandline flags you can see the av ### Configuration file -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/onlyoffice/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/onlyoffice.yml`, `${HOME}/.ocis/onlyoffice.yml` or `$(pwd)/config/onlyoffice.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/onlyoffice/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/onlyoffice.yml`, `${HOME}/.ocis/onlyoffice.yml` or `$(pwd)/config/onlyoffice.yml`. ## Usage diff --git a/glauth/templates/CONFIGURATION.tmpl b/glauth/templates/CONFIGURATION.tmpl index 1b8e77928a..753f23b780 100644 --- a/glauth/templates/CONFIGURATION.tmpl +++ b/glauth/templates/CONFIGURATION.tmpl @@ -35,7 +35,7 @@ $HOME/.ocis For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-glauth reads `glauth.json | yaml | toml ...`*. -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/glauth/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. ### Environment variables diff --git a/konnectd/templates/CONFIGURATION.tmpl b/konnectd/templates/CONFIGURATION.tmpl index 4b70fdbdab..1ae4a82f1c 100644 --- a/konnectd/templates/CONFIGURATION.tmpl +++ b/konnectd/templates/CONFIGURATION.tmpl @@ -35,7 +35,7 @@ $HOME/.ocis For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-konnectd reads `konnectd.json | yaml | toml ...`*. -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/konnectd/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. ### Environment variables diff --git a/ocis/templates/CONFIGURATION.tmpl b/ocis/templates/CONFIGURATION.tmpl index 0b26b350a0..3e853e66b3 100644 --- a/ocis/templates/CONFIGURATION.tmpl +++ b/ocis/templates/CONFIGURATION.tmpl @@ -39,7 +39,7 @@ $HOME/.ocis For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-proxy reads `proxy.json | yaml | toml ...`*. -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at (--> This link does not exist) [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/ocis/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. ### Environment variables diff --git a/ocs/templates/CONFIGURATION.tmpl b/ocs/templates/CONFIGURATION.tmpl index 55d5b95aab..3f56913c27 100644 --- a/ocs/templates/CONFIGURATION.tmpl +++ b/ocs/templates/CONFIGURATION.tmpl @@ -35,7 +35,7 @@ $HOME/.ocis For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-ocs reads `ocs.json | yaml | toml ...`*. -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/ocs/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. ### Environment variables diff --git a/onlyoffice/templates/CONFIGURATION.tmpl b/onlyoffice/templates/CONFIGURATION.tmpl index 1919e5735c..602b02070f 100644 --- a/onlyoffice/templates/CONFIGURATION.tmpl +++ b/onlyoffice/templates/CONFIGURATION.tmpl @@ -39,7 +39,7 @@ $HOME/.ocis For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: onlyoffice reads `onlyoffice.json | yaml | toml ...`*. -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/onlyoffice/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. ### Environment variables diff --git a/proxy/templates/CONFIGURATION.tmpl b/proxy/templates/CONFIGURATION.tmpl index f2097e4465..1315be9e53 100644 --- a/proxy/templates/CONFIGURATION.tmpl +++ b/proxy/templates/CONFIGURATION.tmpl @@ -35,7 +35,7 @@ $HOME/.ocis For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-proxy reads `proxy.json | yaml | toml ...`*. -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/proxy/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. ### Environment variables diff --git a/storage/templates/CONFIGURATION.tmpl b/storage/templates/CONFIGURATION.tmpl index 109c7ae2fa..6f1434ad8b 100644 --- a/storage/templates/CONFIGURATION.tmpl +++ b/storage/templates/CONFIGURATION.tmpl @@ -48,7 +48,7 @@ $HOME/.ocis For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-proxy reads `proxy.json | yaml | toml ...`*. -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/storage/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. ### Environment variables diff --git a/store/templates/CONFIGURATION.tmpl b/store/templates/CONFIGURATION.tmpl index d62b484439..f873688830 100644 --- a/store/templates/CONFIGURATION.tmpl +++ b/store/templates/CONFIGURATION.tmpl @@ -35,7 +35,7 @@ $HOME/.ocis For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-proxy reads `proxy.json | yaml | toml ...`*. -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/store/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. ### Environment variables diff --git a/thumbnails/templates/CONFIGURATION.tmpl b/thumbnails/templates/CONFIGURATION.tmpl index 39b0175939..e660f082c7 100644 --- a/thumbnails/templates/CONFIGURATION.tmpl +++ b/thumbnails/templates/CONFIGURATION.tmpl @@ -35,7 +35,7 @@ $HOME/.ocis For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-proxy reads `proxy.json | yaml | toml ...`*. -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/thumbnails/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. ### Environment variables diff --git a/web/templates/CONFIGURATION.tmpl b/web/templates/CONFIGURATION.tmpl index 2a43964eb7..6d3fc2752f 100644 --- a/web/templates/CONFIGURATION.tmpl +++ b/web/templates/CONFIGURATION.tmpl @@ -35,7 +35,7 @@ $HOME/.ocis For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-web reads `web.json | yaml | toml ...`*. -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/web/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. ### Environment variables diff --git a/webdav/templates/CONFIGURATION.tmpl b/webdav/templates/CONFIGURATION.tmpl index 7aea1bee54..7b0e79c85e 100644 --- a/webdav/templates/CONFIGURATION.tmpl +++ b/webdav/templates/CONFIGURATION.tmpl @@ -35,7 +35,7 @@ $HOME/.ocis For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-proxy reads `proxy.json | yaml | toml ...`*. -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/webdav/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. ### Environment variables