-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into spaces-crud
- Loading branch information
Showing
47 changed files
with
882 additions
and
223 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| # The test runner source for API tests | ||
| CORE_COMMITID=901157f2b3d0ba1f36b1e4d22c8384e255094b11 | ||
| CORE_COMMITID=370fd807e464dcc5cb9619a8890107424254dfa6 | ||
| CORE_BRANCH=master |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| Enhancement: fail initialization of a WOPI AppProvider if | ||
| the underlying app is not WOPI-compliant nor it is supported | ||
| by the WOPI bridge extensions | ||
|
|
||
| https://github.com/cs3org/reva/pull/2034 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| Enhancement: escape ldap filters | ||
|
|
||
| Added ldap filter escaping to increase the security of reva. | ||
|
|
||
| https://github.com/cs3org/reva/pull/2042 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| Bugfix: Do not truncate logs on restart | ||
|
|
||
| This change fixes the way log files were opened. | ||
| Before they were truncated and now the log file | ||
| will be open in append mode and created it if it | ||
| does not exist. | ||
|
|
||
| https://github.com/cs3org/reva/pull/2047 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| Bugfix: Fix the storage id of shares | ||
|
|
||
| The storageid in the share object contained an incorrect value. | ||
|
|
||
| https://github.com/cs3org/reva/pull/2033 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| Enhancement: Nextcloud user backend | ||
|
|
||
| Adds Nextcloud as a user backend (Nextcloud drivers for 'auth' and 'user'). | ||
| Also adds back the Nextcloud storage integration tests. | ||
|
|
||
| https://github.com/cs3org/reva/pull/2043 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| Enhancement: Add utility methods for creating share filters | ||
|
|
||
| Updated the CS3 API to include the new share grantee filter and added utility methods for creating share filters. This will help making the code more concise. | ||
|
|
||
| https://github.com/cs3org/reva/pull/2044 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| [shared] | ||
| gatewaysvc = "localhost:19000" | ||
|
|
||
| [grpc] | ||
| address = "0.0.0.0:19000" | ||
|
|
||
| [grpc.services.gateway] | ||
| authregistrysvc = "localhost:19000" | ||
| appprovidersvc = "localhost:19000" | ||
| appregistry = "localhost:19000" | ||
| storageregistrysvc = "localhost:19000" | ||
| preferencessvc = "localhost:19000" | ||
| userprovidersvc = "localhost:19000" | ||
| usershareprovidersvc = "localhost:19000" | ||
| publicshareprovidersvc = "localhost:19000" | ||
| ocmcoresvc = "localhost:19000" | ||
| ocmshareprovidersvc = "localhost:19000" | ||
| ocminvitemanagersvc = "localhost:19000" | ||
| ocmproviderauthorizersvc = "localhost:19000" | ||
| commit_share_to_storage_grant = false | ||
| datagateway = "http://localhost:19001/data" | ||
| transfer_expires = 6 # give it a moment | ||
|
|
||
| [grpc.services.authregistry] | ||
| driver = "static" | ||
|
|
||
| [grpc.services.authregistry.drivers.static.rules] | ||
| basic = "localhost:19000" | ||
|
|
||
| [grpc.services.storageregistry] | ||
| driver = "static" | ||
|
|
||
| [grpc.services.storageregistry.drivers.static] | ||
| home_provider = "/home" | ||
|
|
||
| [grpc.services.storageregistry.drivers.static.rules] | ||
| "/home" = {"address" = "localhost:19000"} | ||
| "123e4567-e89b-12d3-a456-426655440000" = {"address" = "localhost:19000"} | ||
|
|
||
| [grpc.services.usershareprovider] | ||
| driver = "memory" | ||
|
|
||
| [grpc.services.ocmcore] | ||
| driver = "json" | ||
|
|
||
| # Note that ocmcore and ocmshareprovider should use the same file for storing the shares. | ||
| [grpc.services.ocmcore.drivers.json] | ||
| file = "/var/tmp/reva/shares_server_1.json" | ||
|
|
||
| [grpc.services.ocminvitemanager] | ||
| driver = "json" | ||
|
|
||
| [grpc.services.ocmshareprovider] | ||
| driver = "json" | ||
|
|
||
| [grpc.services.ocmshareprovider.drivers.json] | ||
| file = "/var/tmp/reva/shares_server_1.json" | ||
|
|
||
| [grpc.services.ocmproviderauthorizer] | ||
| driver = "json" | ||
|
|
||
| [grpc.services.ocmproviderauthorizer.drivers.json] | ||
| providers = "/etc/revad/providers.json" | ||
|
|
||
| [grpc.services.publicshareprovider] | ||
| driver = "memory" | ||
|
|
||
| [grpc.services.appprovider] | ||
| driver = "demo" | ||
| iopsecret = "testsecret" | ||
| wopiurl = "http://0.0.0.0:8880/" | ||
| wopibridgeurl = "http://localhost:8000/wopib" | ||
|
|
||
| [grpc.services.appregistry] | ||
| driver = "static" | ||
|
|
||
| [grpc.services.appregistry.static.rules] | ||
| "text/plain" = "localhost:19000" | ||
| "text/markdown" = "localhost:19000" | ||
| "application/compressed-markdown" = "localhost:19000" | ||
| "application/vnd.oasis.opendocument.text" = "localhost:19000" | ||
| "application/vnd.oasis.opendocument.spreadsheet" = "localhost:19000" | ||
| "application/vnd.oasis.opendocument.presentation" = "localhost:19000" | ||
|
|
||
| [grpc.services.storageprovider] | ||
| driver = "nextcloud" | ||
| mount_path = "/home" | ||
| mount_id = "123e4567-e89b-12d3-a456-426655440000" | ||
| expose_data_server = true | ||
| data_server_url = "http://127.0.0.1:19001/data" | ||
| enable_home_creation = true | ||
| disable_tus = true | ||
|
|
||
| [grpc.services.storageprovider.mimetypes] | ||
| ".zmd" = "application/compressed-markdown" | ||
|
|
||
| [grpc.services.storageprovider.drivers.nextcloud] | ||
| end_point = "http://localhost/apps/sciencemesh/" | ||
| user_layout = "{{.Username}}" | ||
|
|
||
|
|
||
| [grpc.services.authprovider] | ||
| auth_manager = "nextcloud" | ||
| [grpc.services.authprovider.drivers.nextcloud] | ||
| end_point = "http://localhost/apps/sciencemesh/" | ||
|
|
||
| [grpc.services.userprovider] | ||
| driver = "nextcloud" | ||
| [grpc.services.userprovider.drivers.nextcloud] | ||
| end_point = "http://localhost/apps/sciencemesh/" | ||
|
|
||
| [http] | ||
| enabled_services = ["ocmd"] | ||
| enabled_middlewares = ["providerauthorizer", "cors"] | ||
| address = "0.0.0.0:19001" | ||
|
|
||
| [http.services.dataprovider] | ||
| driver = "nextcloud" | ||
|
|
||
| [http.services.prometheus] | ||
| [http.services.sysinfo] | ||
|
|
||
| [http.services.dataprovider.drivers.localhome] | ||
| user_layout = "{{.Username}}" | ||
|
|
||
| [http.services.ocmd] | ||
| prefix = "ocm" | ||
|
|
||
| [http.middlewares.providerauthorizer] | ||
| driver = "json" | ||
|
|
||
| [http.middlewares.providerauthorizer.drivers.json] | ||
| providers = "/etc/revad/providers.json" | ||
|
|
||
| [http.services.ocs] | ||
| prefix = "ocs" | ||
|
|
||
| [http.services.ocdav] | ||
|
|
||
| [http.middlewares.cors] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.