Commit Graph

610 Commits

Author SHA1 Message Date
Roeland Jago Douma 1ee9122244
Fix npm audit warning in build
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-30 11:46:24 +02:00
dependabot-preview[bot] 88cf6e13af
[Security] Bump mixin-deep from 1.3.1 to 1.3.2 in /build
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-27 18:07:31 +00:00
dependabot[bot] 3eef078b4f
Bump js-yaml from 3.12.0 to 3.13.1 in /build
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.0 to 3.13.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases)
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/3.12.0...3.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
2019-08-08 07:43:03 +00:00
dependabot-preview[bot] 0d278eddf6
[Security] Bump fstream from 1.0.11 to 1.0.12 in /build
Bumps [fstream](https://github.com/npm/fstream) from 1.0.11 to 1.0.12. **This update includes a security fix.**
- [Release notes](https://github.com/npm/fstream/releases)
- [Commits](https://github.com/npm/fstream/compare/v1.0.11...v1.0.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-25 14:01:22 +00:00
dependabot-preview[bot] efd6c06658
Bump jsdoc from 3.6.2 to 3.6.3 in /build
Bumps [jsdoc](https://github.com/jsdoc/jsdoc) from 3.6.2 to 3.6.3.
- [Release notes](https://github.com/jsdoc/jsdoc/releases)
- [Changelog](https://github.com/jsdoc/jsdoc/blob/master/CHANGES.md)
- [Commits](https://github.com/jsdoc/jsdoc/compare/3.6.2...3.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-21 01:12:55 +00:00
dependabot-preview[bot] 7a4e9f7a81
[Security] Bump lodash from 4.17.11 to 4.17.14 in /build
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-11 02:21:38 +00:00
Morris Jobke c5c14d09b1
Merge pull request #16186 from nextcloud/bugfix/noid/also-check-permissions-when-creating-a-share
Better check reshare permissions part2
2019-07-03 20:07:05 +02:00
Joas Schilling e4addbae3e
Better check reshare permissions when creating a share
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-07-03 14:00:13 +02:00
Roeland Jago Douma cf7bc3fe9d
Fix phan
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-06-27 22:29:45 +02:00
Daniel Calviño Sánchez f01a772a1a
Add integration test for increasing sub reshare permissions
The tests check an user share and a link share; there is a slight
difference in style between them as each one is based on the test above
it, which tests increasing reshare permissions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-06-27 15:27:30 +02:00
Daniel Calviño Sánchez 3802174f06
Do not create folders with admin user
The admin user is not deleted after each integration test is run, so
folders created by the admin user in one test are still there when the
next tests run; tests should be independent one from each other, so a
regular user that is created and deleted for each test should be used
instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-06-27 15:27:30 +02:00
Christoph Wurst 409acf1131
Fix js l10n registration to also work with more than one bundle
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-06-26 10:07:21 +02:00
Arthur Schiwon 437b33ff63
add LDAP integr. test for receiving share candidates with group limitation
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-06-14 06:23:58 +02:00
dependabot-preview[bot] 430f56a3a7
[Security] Bump tar from 2.2.1 to 2.2.2 in /build
Bumps [tar](https://github.com/npm/node-tar) from 2.2.1 to 2.2.2. **This update includes security fixes.**
- [Release notes](https://github.com/npm/node-tar/releases)
- [Commits](https://github.com/npm/node-tar/compare/v2.2.1...v2.2.2)
2019-05-24 23:26:19 +00:00
blizzz 755611866e
Merge pull request #15604 from nextcloud/fix/12682/fix-possible-override-of-uniquemember
fixes possible override of uniqueMember by autodetection
2019-05-22 19:09:28 +02:00
Arthur Schiwon 54299f4e66
set the ldapGroupMemberAssocAttr for group tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-05-22 12:48:12 +02:00
Morris Jobke d3511f69f9
Merge pull request #15499 from nextcloud/app-update-script
Add scripts to update server & apps or apps only
2019-05-21 17:42:57 +02:00
dependabot[bot] cb53a582e6
Bump jsdoc from 3.6.1 to 3.6.2 in /build
Bumps [jsdoc](https://github.com/jsdoc/jsdoc) from 3.6.1 to 3.6.2.
- [Release notes](https://github.com/jsdoc/jsdoc/releases)
- [Changelog](https://github.com/jsdoc/jsdoc/blob/master/CHANGES.md)
- [Commits](https://github.com/jsdoc/jsdoc/compare/3.6.1...3.6.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-19 01:13:24 +00:00
Jan-Christoph Borchardt fa066da77c
Fix app update script for macOS
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2019-05-17 22:49:39 +02:00
Jan-Christoph Borchardt 8f0656aae9
Remove eduplicate git fetch from update scripts
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2019-05-17 22:49:39 +02:00
Jan-Christoph Borchardt bc61b15e2f
Adjust script to remove branches which are deleted on GitHub
Co-Authored-By: Morris Jobke <hey@morrisjobke.de>
2019-05-17 22:49:39 +02:00
Jan-Christoph Borchardt 934924577a
Fix for update script when submodule is not initialized
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2019-05-17 22:49:39 +02:00
Jan-Christoph Borchardt b403d72f51
Also add script to update both server and apps
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2019-05-17 22:49:38 +02:00
Jan-Christoph Borchardt 9f4ae034c1
Add script to update Nextcloud apps from latest git master, ref #15145
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2019-05-17 22:49:38 +02:00
Daniel Kesselberg bc35b59fc7
Remove whitespace
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-05-15 20:37:06 +02:00
Daniel Kesselberg 941018cfe5
Use DRONE_SOURCE_BRANCH instead of DRONE_COMMIT_REFSPEC
Looks like DRONE_COMMIT_REFSPEC is not available anymore on Drone 1.x

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-05-15 19:56:20 +02:00
Daniel Kesselberg 3e9f9ea06b
Update regex to also match version/x.y.z
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-05-15 19:36:01 +02:00
dependabot[bot] f0932344cb
Bump jsdoc from 3.6.0 to 3.6.1 in /build
Bumps [jsdoc](https://github.com/jsdoc/jsdoc) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/jsdoc/jsdoc/releases)
- [Changelog](https://github.com/jsdoc/jsdoc/blob/master/CHANGES.md)
- [Commits](https://github.com/jsdoc/jsdoc/compare/3.6.0...3.6.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-12 01:12:56 +00:00
Arthur Schiwon 3a5d4abdf1
use webpack to compile handlebars
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-05-10 14:50:40 +02:00
Arthur Schiwon 3ec5ee47fa
adjust paths to template location
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-05-10 13:15:49 +02:00
dependabot[bot] 927c040fe8
Bump jsdoc from 3.5.5 to 3.6.0 in /build
Bumps [jsdoc](https://github.com/jsdoc/jsdoc) from 3.5.5 to 3.6.0.
- [Release notes](https://github.com/jsdoc/jsdoc/releases)
- [Changelog](https://github.com/jsdoc/jsdoc/blob/master/CHANGES.md)
- [Commits](https://github.com/jsdoc/jsdoc/compare/3.5.5...3.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-05 01:12:46 +00:00
dependabot[bot] fa96185efe
Bump node-sass from 4.11.0 to 4.12.0 in /build
Bumps [node-sass](https://github.com/sass/node-sass) from 4.11.0 to 4.12.0.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.11.0...v4.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-01 19:15:19 +00:00
Roeland Jago Douma b222f66d46
Merge pull request #15090 from nextcloud/dependabot/npm_and_yarn/build/handlebars-4.1.2
Bump handlebars from 4.1.1 to 4.1.2 in /build
2019-04-17 22:56:14 +02:00
Julius Härtl 771ad85f85
Add integration tests for updating folder shares
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-04-16 15:03:52 +02:00
dependabot[bot] 2b41953686
Bump handlebars from 4.1.1 to 4.1.2 in /build
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.1...v4.1.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-15 07:13:24 +00:00
Roeland Jago Douma d2f9366b39
Run less phan processes
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-04-09 22:04:31 +02:00
Roeland Jago Douma 9a5edbb923
Do not try to compile templates that are not there
Makes for a bit cleaner drone output.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-04-08 09:12:59 +02:00
dependabot[bot] f410519da4
Bump handlebars from 4.1.0 to 4.1.1 in /build
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/v4.1.1/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-23 02:12:57 +00:00
Arthur Schiwon a692f28320
add an integration test that ensures deletion of LDAP users
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-14 15:21:52 +01:00
Morris Jobke f6a12864a5
Disable failing federated sharing tests
Fails with:

 * build/integration/federation_features/federated.feature:183
 * build/integration/federation_features/federated.feature:232
 * build/integration/federation_features/federated.feature:247
 * build/integration/federation_features/federated.feature:263
<details><summary>Show full log</summary>

```
  Scenario: Reshare a federated shared file                                                             # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:183
    Given Using server "REMOTE"                                                                         # FederationContext::usingServer()
    And user "user1" exists                                                                             # FederationContext::assureUserExists()
    And user "user2" exists                                                                             # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                            # FederationContext::usingServer()
    And user "user0" exists                                                                             # FederationContext::assureUserExists()
    And User "user0" from server "LOCAL" shares "/textfile0.txt" with user "user1" from server "REMOTE" # FederationContext::federateSharing()
    And User "user1" from server "REMOTE" accepts last pending share                                    # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                           # FederationContext::usingServer()
    And As an "user1"                                                                                   # FederationContext::asAn()
    When creating a share with                                                                          # FederationContext::creatingShare()
      | path        | /textfile0 (2).txt |
      | shareType   | 0                  |
      | shareWith   | user2              |
      | permissions | 19                 |
    Then the OCS status code should be "100"                                                            # FederationContext::theOCSStatusCodeShouldBe()
      Failed asserting that SimpleXMLElement Object &000000007d8e0d3c00000000403fd08a (
          0 => '404'
      ) matches expected '100'.
    ...
{"message":"Can not find share with ID: 8"}

  Scenario: Overwrite a federated shared folder as recipient                                             # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:232
    Given Using server "REMOTE"                                                                          # FederationContext::usingServer()
    And user "user1" exists                                                                              # FederationContext::assureUserExists()
    And user "user2" exists                                                                              # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                             # FederationContext::usingServer()
    And user "user0" exists                                                                              # FederationContext::assureUserExists()
    And User "user0" from server "LOCAL" shares "/PARENT" with user "user1" from server "REMOTE"         # FederationContext::federateSharing()
    And User "user1" from server "REMOTE" accepts last pending share                                     # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                            # FederationContext::usingServer()
    And As an "user1"                                                                                    # FederationContext::asAn()
    And User "user1" modifies text of "/textfile0.txt" with text "BLABLABLA"                             # FederationContext::modifyTextOfFile()
    When User "user1" uploads file "../../data/user1/files/textfile0.txt" to "/PARENT (2)/textfile0.txt" # FederationContext::userUploadsAFileTo()
      Client error: `PUT http://localhost:8180/remote.php/webdav/PARENT%20(2)/textfile0.txt` resulted in a `404 Not Found` response:
      <?xml version="1.0" encoding="utf-8"?>
      <d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
        <s:exception>Sabre\DA (truncated...)
       (GuzzleHttp\Exception\ClientException)
    ...
{"message":"Can not find share with ID: 10"}

  Scenario: Overwrite a federated shared file as recipient using old chunking                           # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:247
    Given Using server "REMOTE"                                                                         # FederationContext::usingServer()
    And user "user1" exists                                                                             # FederationContext::assureUserExists()
    And user "user2" exists                                                                             # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                            # FederationContext::usingServer()
    And user "user0" exists                                                                             # FederationContext::assureUserExists()
    And User "user0" from server "LOCAL" shares "/textfile0.txt" with user "user1" from server "REMOTE" # FederationContext::federateSharing()
    And User "user1" from server "REMOTE" accepts last pending share                                    # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                           # FederationContext::usingServer()
    And As an "user1"                                                                                   # FederationContext::asAn()
    And user "user1" uploads chunk file "1" of "3" with "AAAAA" to "/textfile0 (2).txt"                 # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
      Client error: `PUT http://localhost:8180/remote.php/webdav/textfile0%20(2).txt-chunking-42-3-0` resulted in a `404 Not Found` response:
      <?xml version="1.0" encoding="utf-8"?>
      <d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
        <s:exception>Sabre\DA (truncated...)
       (GuzzleHttp\Exception\ClientException)
    ...
{"message":"Can not find share with ID: 11"}

  Scenario: Overwrite a federated shared folder as recipient using old chunking                  # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:263
    Given Using server "REMOTE"                                                                  # FederationContext::usingServer()
    And user "user1" exists                                                                      # FederationContext::assureUserExists()
    And user "user2" exists                                                                      # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                     # FederationContext::usingServer()
    And user "user0" exists                                                                      # FederationContext::assureUserExists()
    And User "user0" from server "LOCAL" shares "/PARENT" with user "user1" from server "REMOTE" # FederationContext::federateSharing()
    And User "user1" from server "REMOTE" accepts last pending share                             # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                    # FederationContext::usingServer()
    And As an "user1"                                                                            # FederationContext::asAn()
    And user "user1" uploads chunk file "1" of "3" with "AAAAA" to "/PARENT (2)/textfile0.txt"   # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
      Client error: `PUT http://localhost:8180/remote.php/webdav/PARENT%20(2)/textfile0.txt-chunking-42-3-0` resulted in a `404 Not Found` response:
      <?xml version="1.0" encoding="utf-8"?>
      <d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
        <s:exception>Sabre\DA (truncated...)
       (GuzzleHttp\Exception\ClientException)
    ...
{"message":"Can not find share with ID: 12"}

```
</details>

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-13 18:01:24 +01:00
blizzz 3af7f2c2ea
Merge pull request #14464 from nextcloud/fix/noid/ldap-nested-group-filter
resolve user and groups in nested groups first before filtering the results
2019-03-07 22:31:51 +01:00
Arthur Schiwon 987db8e6c5
add missing config bits to integration tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-06 00:09:23 +01:00
Arthur Schiwon dfc7007242
with LDAP server set offline, config cannot be controlled via ocs anymore
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-05 23:13:49 +01:00
Daniel Kesselberg 75337ff621
DRONE_BRANCH is the target branch. DRONE_COMMIT_REFSPEC should work.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-03-05 15:20:47 +01:00
Morris Jobke 2bbef58153
Add test for updated CA bundle
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 15:10:33 +01:00
Arthur Schiwon 5dd2207c95
fix nested group retrieval also for 2 other cases
and also consolidate logic in one method

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-05 11:07:40 +01:00
Morris Jobke f7de518ec0
Exclude Makefile from check
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-02-25 15:49:29 +01:00
Daniel Kesselberg 75b7d6ae4e
Add install logic for enable command
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-02-19 21:03:06 +01:00
Daniel Kesselberg 76b5f44f05
Strict Types, Return Types
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-02-19 21:03:06 +01:00
Joas Schilling a1b87bc81e
Update PHP-Parser for 7.1 compatibility
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-02-14 20:04:17 +01:00