]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
5 years agoalways allow moving mountpoints inside the same mountpoint 14760/head
Robin Appelman [Thu, 14 Mar 2019 14:52:38 +0000 (15:52 +0100)]
always allow moving mountpoints inside the same mountpoint

even if that mountpoint isn't normally a valid target for moving mounts into

Signed-off-by: Robin Appelman <robin@icewind.nl>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 20 Mar 2019 01:13:05 +0000 (01:13 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 19 Mar 2019 01:13:02 +0000 (01:13 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 18 Mar 2019 01:12:46 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 17 Mar 2019 01:13:41 +0000 (01:13 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 16 Mar 2019 01:12:52 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #14701 from nextcloud/backport/14690/stable14
Morris Jobke [Fri, 15 Mar 2019 09:53:33 +0000 (10:53 +0100)]
Merge pull request #14701 from nextcloud/backport/14690/stable14

[stable14] throw a proper error if rename fails in dav

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 15 Mar 2019 01:15:38 +0000 (01:15 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #14673 from nextcloud/backport/14640/disable-failing-tests-14
Morris Jobke [Thu, 14 Mar 2019 23:24:45 +0000 (00:24 +0100)]
Merge pull request #14673 from nextcloud/backport/14640/disable-failing-tests-14

[stable14] Disable fragile tests

5 years agothrow a proper error if rename fails in dav 14701/head
Robin Appelman [Thu, 14 Mar 2019 14:40:21 +0000 (15:40 +0100)]
throw a proper error if rename fails in dav

Signed-off-by: Robin Appelman <robin@icewind.nl>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 14 Mar 2019 16:08:54 +0000 (16:08 +0000)]
[tx-robot] updated from transifex

5 years agoAdd time between SMB test runs and properly log full changeset 14673/head
Morris Jobke [Thu, 14 Mar 2019 12:34:17 +0000 (13:34 +0100)]
Add time between SMB test runs and properly log full changeset

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing files app test - act 4
Morris Jobke [Thu, 14 Mar 2019 15:30:38 +0000 (16:30 +0100)]
Disable failing files app test - act 4

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing files app test - act 3
Morris Jobke [Thu, 14 Mar 2019 15:24:06 +0000 (16:24 +0100)]
Disable failing files app test - act 3

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing app management test
Morris Jobke [Thu, 14 Mar 2019 15:18:46 +0000 (16:18 +0100)]
Disable failing app management test

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing comments app test - act 2
Morris Jobke [Thu, 14 Mar 2019 12:45:36 +0000 (13:45 +0100)]
Disable failing comments app test - act 2

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing files app test - act 2
Morris Jobke [Thu, 14 Mar 2019 12:44:28 +0000 (13:44 +0100)]
Disable failing files app test - act 2

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoWait up to 10 seconds for incoming changes from SMB notifier
Morris Jobke [Tue, 12 Mar 2019 16:16:03 +0000 (17:16 +0100)]
Wait up to 10 seconds for incoming changes from SMB notifier

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable fragile user acceptance tests
Morris Jobke [Tue, 12 Mar 2019 16:06:04 +0000 (17:06 +0100)]
Disable fragile user acceptance tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing login test
Morris Jobke [Tue, 12 Mar 2019 15:39:57 +0000 (16:39 +0100)]
Disable failing login test

 * tests/acceptance/features/login.feature:15
<details><summary>Show full log</summary>

```
  Scenario: log in with valid user and invalid password once fixed by admin # /drone/src/github.com/nextcloud/server/tests/acceptance/features/login.feature:15
    Given I act as John                                                     # ActorContext::iActAs()
    And I can not log in with user user0 and password 654231                # LoginPageContext::iCanNotLogInWithUserAndPassword()
    When I act as Jane                                                      # ActorContext::iActAs()
    And I am logged in as the admin                                         # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the User settings                                            # SettingsMenuContext::iOpenTheUserSettings()
    And I set the password for user0 to 654321                              # UsersSettingsContext::iSetTheFieldForUserTo()
    And I act as John                                                       # ActorContext::iActAs()
    And I log in with user user0 and password 654321                        # LoginPageContext::iLogInWithUserAndPassword()
    Then I see that the current page is the Files app                       # FilesAppContext::iSeeThatTheCurrentPageIsTheFilesApp()
      Failed asserting that 'http://acceptance-login/index.php/login?user=user0' starts with "http://acceptance-login/index.php/apps/files/".

```
</details>

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing comments test
Morris Jobke [Tue, 12 Mar 2019 13:38:55 +0000 (14:38 +0100)]
Disable failing comments test

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing files app test
Morris Jobke [Tue, 12 Mar 2019 12:41:55 +0000 (13:41 +0100)]
Disable failing files app test

Fails with:

 * tests/acceptance/features/app-files.feature:90
<details><summary>Show full log</summary>

```
  Scenario: show favorites                                            # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files.feature:90
    Given I am logged in                                              # LoginPageContext::iAmLoggedIn()
    And I mark "welcome.txt" as favorite                              # FileListContext::iMarkAsFavorite()
    When I open the "Favorites" section                               # AppNavigationContext::iOpenTheSection()
    Then I see that the current section is "Favorites"                # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    Then I see that the file list contains a file named "welcome.txt" # FileListContext::iSeeThatTheFileListContainsAFileNamed()
      Row for file welcome.txt in file list could not be found after 100 seconds (NoSuchElementException)
```
</details>

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing apps management test
Morris Jobke [Tue, 12 Mar 2019 12:14:25 +0000 (13:14 +0100)]
Disable failing apps management test

Fails with:

 * tests/acceptance/features/apps.feature:66
<details><summary>Show full log</summary>

```
  Scenario: Show section from app store                       # /drone/src/github.com/nextcloud/server/tests/acceptance/features/apps.feature:66
    Given I act as Jane                                       # ActorContext::iActAs()
    And I am logged in as the admin                           # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the Apps management                            # SettingsMenuContext::iOpenTheAppsManagement()
    And I see that the current section is "Your apps"         # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    When I open the "Files" section                           # AppNavigationContext::iOpenTheSection()
      Files section item in App Navigation could not be found after 100 seconds (NoSuchElementException)
    Then I see that there some apps listed from the app store # AppsManagementContext::iSeeThatThereSomeAppsListedFromTheAppStore()
    And I see that the current section is "Files"             # AppNavigationContext::iSeeThatTheCurrentSectionIs()

```
</details>

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing files tag test
Morris Jobke [Tue, 12 Mar 2019 12:13:10 +0000 (13:13 +0100)]
Disable failing files tag test

Fails with:

 * tests/acceptance/features/app-files-tags.feature:42
<details><summary>Show full log</summary>

```
  Scenario: add tags using the dropdown in the details view                                 # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files-tags.feature:42
    Given I am logged in as the admin                                                       # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I visit the settings page                                                           # SettingsMenuContext::iVisitTheSettingsPage()
    And I open the "Tag management" section                                                 # AppNavigationContext::iOpenTheSection()
    And I see that the button to select tags is shown                                       # SettingsContext::iSeeThatTheButtonToSelectTagsIsShown()
    And I create the tag "tag1" in the settings                                             # SettingsContext::iCreateTheTagInTheSettings()
    And I create the tag "tag2" in the settings                                             # SettingsContext::iCreateTheTagInTheSettings()
    And I create the tag "tag3" in the settings                                             # SettingsContext::iCreateTheTagInTheSettings()
    And I create the tag "tag4" in the settings                                             # SettingsContext::iCreateTheTagInTheSettings()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag1" # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag2" # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag3" # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag4" # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I log out                                                                           # SettingsMenuContext::iLogOut()
    And I am logged in                                                                      # LoginPageContext::iAmLoggedIn()
    And I open the details view for "welcome.txt"                                           # FileListContext::iOpenTheDetailsViewFor()
    And I open the input field for tags in the details view                                 # FilesAppContext::iOpenTheInputFieldForTagsInTheDetailsView()
    When I check the tag "tag2" in the dropdown for tags in the details view                # FilesAppContext::iCheckTheTagInTheDropdownForTagsInTheDetailsView()
    And I check the tag "tag4" in the dropdown for tags in the details view                 # FilesAppContext::iCheckTheTagInTheDropdownForTagsInTheDetailsView()
    Then I see that the tag "tag2" in the dropdown for tags in the details view is checked  # FilesAppContext::iSeeThatTheTagInTheDropdownForTagsInTheDetailsViewIsChecked()
    And I see that the tag "tag4" in the dropdown for tags in the details view is checked   # FilesAppContext::iSeeThatTheTagInTheDropdownForTagsInTheDetailsViewIsChecked()
    And I see that the input field for tags in the details view contains the tag "tag2"     # FilesAppContext::iSeeThatTheInputFieldForTagsInTheDetailsViewContainsTheTag()
      Failed asserting that false is true.
    And I see that the input field for tags in the details view contains the tag "tag4"     # FilesAppContext::iSeeThatTheInputFieldForTagsInTheDetailsViewContainsTheTag()

```
</details>

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoDisable failing federated sharing tests
Morris Jobke [Tue, 12 Mar 2019 12:05:23 +0000 (13:05 +0100)]
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>
5 years agoDo not run fragile TrashbinTest
Morris Jobke [Tue, 12 Mar 2019 11:56:19 +0000 (12:56 +0100)]
Do not run fragile TrashbinTest

Fails with:

There was 1 failure:

1) TrashbinTest::testExpireOldFiles
Failed asserting that null is identical to 'file2.txt'.

/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:186

OR

1) TrashbinTest::testExpireOldFiles
Failed asserting that null is identical to 'file2.txt'.

/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:193

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoMerge pull request #14659 from nextcloud/backport/14644/stable14
Morris Jobke [Wed, 13 Mar 2019 16:15:14 +0000 (17:15 +0100)]
Merge pull request #14659 from nextcloud/backport/14644/stable14

[stable14] Remove sensitive SMB arguments from exception log

5 years agoRemove sensitive SMB arguments from exception log 14659/head
Morris Jobke [Tue, 12 Mar 2019 14:51:38 +0000 (15:51 +0100)]
Remove sensitive SMB arguments from exception log

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoMerge pull request #14598 from nextcloud/backport/14425/stable14
Morris Jobke [Fri, 8 Mar 2019 16:32:16 +0000 (17:32 +0100)]
Merge pull request #14598 from nextcloud/backport/14425/stable14

[stable14] Do not calculate folder size for parent that also needs proper scan, fixes #3524

5 years agoMerge pull request #14592 from nextcloud/backport/14464/stable14
Morris Jobke [Fri, 8 Mar 2019 16:31:30 +0000 (17:31 +0100)]
Merge pull request #14592 from nextcloud/backport/14464/stable14

[stable14] resolve user and groups in nested groups first before filtering the results

5 years agoMerge pull request #14595 from nextcloud/backport/14587/stable14
Morris Jobke [Fri, 8 Mar 2019 16:30:31 +0000 (17:30 +0100)]
Merge pull request #14595 from nextcloud/backport/14587/stable14

[stable14] Remove Google+ from Social Sharing Bundle

5 years agoMerge pull request #14600 from nextcloud/backport/14585/stable14
Morris Jobke [Fri, 8 Mar 2019 09:25:39 +0000 (10:25 +0100)]
Merge pull request #14600 from nextcloud/backport/14585/stable14

[stable14] Mention Open Cloud Mesh in Federated User Settings

5 years agoMention Open Cloud Mesh in Federated User Settings 14600/head
Marius Blüm [Thu, 7 Mar 2019 12:55:09 +0000 (13:55 +0100)]
Mention Open Cloud Mesh in Federated User Settings

Signed-off-by: Marius Blüm <marius@lineone.io>
5 years agoAvoid calculating folder size for parent that needs scan. 14598/head
Ari Selseng [Fri, 1 Mar 2019 22:52:58 +0000 (23:52 +0100)]
Avoid calculating folder size for parent that needs scan.

Signed-off-by: Ari Selseng <ari@selseng.net>
5 years agoRemove Google+ from Social Sharing Bundle (2) 14595/head
Marius Blüm [Thu, 7 Mar 2019 13:57:56 +0000 (14:57 +0100)]
Remove Google+ from Social Sharing Bundle (2)

Signed-off-by: Marius Blüm <marius@lineone.io>
5 years agoRemove "socialsharing_googleplus" from Social Sharing Bundle
Marius Blüm [Thu, 7 Mar 2019 13:56:16 +0000 (14:56 +0100)]
Remove "socialsharing_googleplus" from Social Sharing Bundle

Signed-off-by: Marius Blüm <marius@lineone.io>
5 years agoremove unused use statement 14592/head
Arthur Schiwon [Tue, 5 Mar 2019 23:34:29 +0000 (00:34 +0100)]
remove unused use statement

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
5 years agoadd missing config bits to integration tests
Arthur Schiwon [Tue, 5 Mar 2019 23:09:23 +0000 (00:09 +0100)]
add missing config bits to integration tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
5 years agowith LDAP server set offline, config cannot be controlled via ocs anymore
Arthur Schiwon [Tue, 5 Mar 2019 11:53:13 +0000 (12:53 +0100)]
with LDAP server set offline, config cannot be controlled via ocs anymore

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
5 years agofix nested group retrieval also for 2 other cases
Arthur Schiwon [Fri, 1 Mar 2019 23:36:08 +0000 (00:36 +0100)]
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>
5 years agoFixed unit test: groupsMatchFilter will not be called multiple times anymore.
Roland Tapken [Thu, 8 Feb 2018 12:14:57 +0000 (13:14 +0100)]
Fixed unit test: groupsMatchFilter will not be called multiple times anymore.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
5 years agoReduce queries to LDAP by caching nested groups
Roland Tapken [Wed, 7 Feb 2018 15:08:25 +0000 (16:08 +0100)]
Reduce queries to LDAP by caching nested groups

Nested groups are now cached in a CappedMemoryCache object to reduce
queries to the LDAP backend.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
5 years agouser_ldap: really resolve nested groups
Roland Tapken [Wed, 7 Feb 2018 14:49:40 +0000 (15:49 +0100)]
user_ldap: really resolve nested groups

The previous patch fixed the problem only for one level of indirection
because groupsMatchFilter() had been applied on each recursive call (and
thus there would be no second level if the first level fails the check).

This new implementation replaces the recursive call with a stack that
iterates all nested groups before filtering with groupsMatchFilter().

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
5 years agouser_ldap: Filter groups after nexted groups
Roland Tapken [Wed, 7 Feb 2018 13:08:08 +0000 (14:08 +0100)]
user_ldap: Filter groups after nexted groups

Currently groupsMatchFilter is called before nested groups are resolved.
This basicly breaks this feature since it is not possible to inherit
membership in a group from another group.

Minimal example:

  Group filter: (&(objectClass=group),(cn=nextcloud))
  Nested groups: enabled

  cn=nextcloud,ou=Nextcloud,ou=groups,dn=company,dn=local
    objectClass: group

  cn=IT,ou=groups,dn=company,dn=local
    objectClass: group
    memberOf: cn=nextcloud,ou=Nextcloud,ou=groups,dn=company,dn=local

  cn=John Doe,ou=users,dn=company,dn=local
    objectClass: person
    memberOf: cn=IT,ou=groups,dn=company,dn=local

Since 'cn=IT,ou=groups,dn=company,dn=local' doesn't match the group
filter, John wouldn't be a member of group 'nextcloud'.

This patch fixes this by filtering the groups after all nested groups
have been collected. If nested groups is disabled the result will be the
same as without this patch.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
5 years agoMerge pull request #14547 from nextcloud/backport/14373/stable14
Roeland Jago Douma [Tue, 5 Mar 2019 18:52:48 +0000 (19:52 +0100)]
Merge pull request #14547 from nextcloud/backport/14373/stable14

[stable14] Add test for updated CA bundle

5 years agoDRONE_BRANCH is the target branch. DRONE_COMMIT_REFSPEC should work. 14547/head
Daniel Kesselberg [Tue, 5 Mar 2019 14:20:47 +0000 (15:20 +0100)]
DRONE_BRANCH is the target branch. DRONE_COMMIT_REFSPEC should work.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
5 years agoAdd test for updated CA bundle
Morris Jobke [Mon, 25 Feb 2019 12:49:03 +0000 (13:49 +0100)]
Add test for updated CA bundle

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoMerge pull request #14543 from nextcloud/backport/14451/stable14
Morris Jobke [Tue, 5 Mar 2019 15:26:14 +0000 (16:26 +0100)]
Merge pull request #14543 from nextcloud/backport/14451/stable14

[stable14] Check if password can be changed for the users backend in OCS api

5 years agoMerge pull request #14417 from nextcloud/backport/14343/stable14
Morris Jobke [Tue, 5 Mar 2019 14:06:23 +0000 (15:06 +0100)]
Merge pull request #14417 from nextcloud/backport/14343/stable14

[stable14] Parse multiple navigation items

5 years agoCheck if password can be changed for the users backend in OCS api 14543/head
Julius Härtl [Fri, 1 Mar 2019 09:11:37 +0000 (10:11 +0100)]
Check if password can be changed for the users backend in OCS api

Signed-off-by: Julius Härtl <jus@bitgrid.net>
5 years agoMerge pull request #14533 from nextcloud/backport/14528/stable14
Morris Jobke [Tue, 5 Mar 2019 11:21:44 +0000 (12:21 +0100)]
Merge pull request #14533 from nextcloud/backport/14528/stable14

[stable14] Fix database configuration

5 years agoFix whitespaces 14533/head
Joas Schilling [Tue, 5 Mar 2019 08:31:45 +0000 (09:31 +0100)]
Fix whitespaces

Signed-off-by: Joas Schilling <coding@schilljs.com>
5 years agoFix database configuration
Joas Schilling [Tue, 5 Mar 2019 08:28:36 +0000 (09:28 +0100)]
Fix database configuration

Signed-off-by: Joas Schilling <coding@schilljs.com>
5 years agoMerge pull request #14513 from nextcloud/smb-3.0.2-14
Roeland Jago Douma [Mon, 4 Mar 2019 20:28:20 +0000 (21:28 +0100)]
Merge pull request #14513 from nextcloud/smb-3.0.2-14

update icewind/smb to 3.0.2

5 years agoMerge pull request #14504 from nextcloud/backport/stable14/14390
Morris Jobke [Mon, 4 Mar 2019 16:34:59 +0000 (17:34 +0100)]
Merge pull request #14504 from nextcloud/backport/stable14/14390

[stable14] Fix expire date change eventhandler

5 years agoupdate icewind/smb to 3.0.2 14513/head
Robin Appelman [Mon, 4 Mar 2019 15:37:01 +0000 (16:37 +0100)]
update icewind/smb to 3.0.2

Signed-off-by: Robin Appelman <robin@icewind.nl>
5 years agoAdd handler for change event of the expire date field 14504/head
Julius Härtl [Tue, 26 Feb 2019 18:29:15 +0000 (19:29 +0100)]
Add handler for change event of the expire date field

Signed-off-by: Julius Härtl <jus@bitgrid.net>
5 years agoMerge pull request #14498 from nextcloud/backport/14494/stable14
Morris Jobke [Mon, 4 Mar 2019 11:37:25 +0000 (12:37 +0100)]
Merge pull request #14498 from nextcloud/backport/14494/stable14

[stable14] Make header.feature more robust by running it on apache

5 years agoMerge pull request #14496 from nextcloud/backport/14440/stable14
Morris Jobke [Mon, 4 Mar 2019 10:32:43 +0000 (11:32 +0100)]
Merge pull request #14496 from nextcloud/backport/14440/stable14

[stable14] Run tests that fail with "no such process" over to apache server

5 years agoMake header.feature more robust by running it on apache 14498/head
Morris Jobke [Mon, 4 Mar 2019 09:22:16 +0000 (10:22 +0100)]
Make header.feature more robust by running it on apache

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoRun tests that fail with "no such process" over to apache server 14496/head
Morris Jobke [Thu, 28 Feb 2019 12:59:00 +0000 (13:59 +0100)]
Run tests that fail with "no such process" over to apache server

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoMerge pull request #14491 from nextcloud/backport/14489/stable14
Morris Jobke [Sun, 3 Mar 2019 22:24:45 +0000 (23:24 +0100)]
Merge pull request #14491 from nextcloud/backport/14489/stable14

[stable14] Add accessibility translations

5 years agoAdd accessibility translations 14491/head
John Molakvoæ (skjnldsv) [Sun, 3 Mar 2019 18:49:44 +0000 (19:49 +0100)]
Add accessibility translations

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 1 Mar 2019 01:12:57 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #14415 from nextcloud/backport/13844/stable14
Roeland Jago Douma [Thu, 28 Feb 2019 08:43:31 +0000 (09:43 +0100)]
Merge pull request #14415 from nextcloud/backport/13844/stable14

[stable14] Bugfix for issue 10862: Trash-bin ignores trashbin_retention_obligation

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 28 Feb 2019 01:12:58 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #14421 from nextcloud/version/noid/14.0.8 v14.0.8
Morris Jobke [Wed, 27 Feb 2019 20:33:46 +0000 (21:33 +0100)]
Merge pull request #14421 from nextcloud/version/noid/14.0.8

14.0.8

5 years ago14.0.8 14421/head
Morris Jobke [Wed, 27 Feb 2019 16:29:02 +0000 (17:29 +0100)]
14.0.8

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agotwo item => two items 14417/head
Daniel Kesselberg [Mon, 25 Feb 2019 13:52:14 +0000 (14:52 +0100)]
two item => two items

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
5 years agoGenerate id for navigation item
Daniel Kesselberg [Mon, 25 Feb 2019 13:49:51 +0000 (14:49 +0100)]
Generate id for navigation item

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
5 years agoParse multiple navigation items
Daniel Kesselberg [Fri, 22 Feb 2019 14:45:55 +0000 (15:45 +0100)]
Parse multiple navigation items

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
5 years agoFix for issue 10862: calculation of free space ignores external storage (doesn't... 14415/head
Felix Nieuwenhuizen [Sat, 26 Jan 2019 16:23:23 +0000 (17:23 +0100)]
Fix for issue 10862: calculation of free space ignores external storage (doesn't count towards quota)

Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 27 Feb 2019 01:12:27 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 26 Feb 2019 09:10:22 +0000 (09:10 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 26 Feb 2019 01:12:30 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #14375 from nextcloud/version/noid/14.0.8RC2 v14.0.8RC2
Morris Jobke [Mon, 25 Feb 2019 18:51:26 +0000 (19:51 +0100)]
Merge pull request #14375 from nextcloud/version/noid/14.0.8RC2

14.0.8 RC 2

5 years ago14.0.8 RC 2 14375/head
Morris Jobke [Mon, 25 Feb 2019 14:53:04 +0000 (15:53 +0100)]
14.0.8 RC 2

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years agoMerge pull request #14372 from nextcloud/backport/14369/stable14
Morris Jobke [Mon, 25 Feb 2019 14:50:58 +0000 (15:50 +0100)]
Merge pull request #14372 from nextcloud/backport/14369/stable14

[stable14] Use latest ca-bundle.crt from https://curl.haxx.se/docs/caextract.html

5 years agoUse latest ca-bundle.crt from https://curl.haxx.se/docs/caextract.html 14372/head
Daniel Kesselberg [Mon, 25 Feb 2019 10:20:26 +0000 (11:20 +0100)]
Use latest ca-bundle.crt from https://curl.haxx.se/docs/caextract.html

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 25 Feb 2019 01:12:37 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 24 Feb 2019 01:14:01 +0000 (01:14 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 23 Feb 2019 01:13:03 +0000 (01:13 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 22 Feb 2019 01:12:29 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 21 Feb 2019 01:12:22 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #14305 from nextcloud/version/noid/14.0.8RC1 v14.0.8RC1
Morris Jobke [Wed, 20 Feb 2019 15:22:01 +0000 (16:22 +0100)]
Merge pull request #14305 from nextcloud/version/noid/14.0.8RC1

14.0.8 RC 1

5 years ago14.0.8 RC 1 14305/head
Morris Jobke [Wed, 20 Feb 2019 11:03:24 +0000 (12:03 +0100)]
14.0.8 RC 1

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 20 Feb 2019 01:12:14 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #14284 from nextcloud/backport/14194/stable14
Roeland Jago Douma [Tue, 19 Feb 2019 10:25:30 +0000 (11:25 +0100)]
Merge pull request #14284 from nextcloud/backport/14194/stable14

[stable14] Correctly determinate the owner in case of shared external storages

5 years agoCorrectly determinate the owner in case of shared external storages 14284/head
Joas Schilling [Thu, 14 Feb 2019 09:59:17 +0000 (10:59 +0100)]
Correctly determinate the owner in case of shared external storages

Signed-off-by: Joas Schilling <coding@schilljs.com>
5 years agoMerge pull request #14278 from nextcloud/backport/14234/stable14
Morris Jobke [Tue, 19 Feb 2019 08:52:14 +0000 (09:52 +0100)]
Merge pull request #14278 from nextcloud/backport/14234/stable14

[stable14] Catch Request exception in testRemoteUrl

5 years agoCatch Request exception in testRemoteUrl 14278/head
Roeland Jago Douma [Fri, 15 Feb 2019 22:06:21 +0000 (23:06 +0100)]
Catch Request exception in testRemoteUrl

Else the background job fails hard if the remote has for example an
invalid certificate.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 19 Feb 2019 01:12:27 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 18 Feb 2019 01:12:29 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 17 Feb 2019 01:13:48 +0000 (01:13 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 16 Feb 2019 01:12:44 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #14226 from nextcloud/backport/14221/stable14
Morris Jobke [Fri, 15 Feb 2019 13:12:09 +0000 (14:12 +0100)]
Merge pull request #14226 from nextcloud/backport/14221/stable14

[stable14] Remove trailing spaces from localized strings

5 years agoRemove trailing spaces from localized strings 14226/head
Morris Jobke [Fri, 15 Feb 2019 10:26:52 +0000 (11:26 +0100)]
Remove trailing spaces from localized strings

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 15 Feb 2019 01:13:12 +0000 (01:13 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #14196 from nextcloud/backport/14185/stable14
Roeland Jago Douma [Thu, 14 Feb 2019 20:22:05 +0000 (21:22 +0100)]
Merge pull request #14196 from nextcloud/backport/14185/stable14

[stable14] Fix recent files

5 years agoMerge pull request #14086 from nextcloud/backport/14023/stable14
Roeland Jago Douma [Thu, 14 Feb 2019 18:50:01 +0000 (19:50 +0100)]
Merge pull request #14086 from nextcloud/backport/14023/stable14

[stable14] Fix: Check if `$this->params['user']` is an array