Commit Graph

244 Commits

Author SHA1 Message Date
Morris Jobke 363ca21085 Merge pull request #505 from nextcloud/fix-license-script
Fix the license script
2016-07-21 23:48:31 +02:00
Joas Schilling 0215b004da
Update with robin 2016-07-21 18:13:58 +02:00
Bjoern Schiessle b64c6d6993
only search the license header for @copyright statements 2016-07-21 18:06:31 +02:00
Joas Schilling c98de829c4
Fix the license script 2016-07-21 18:06:31 +02:00
Lukas Reschke ba4f12baa0
Implement brute force protection
Class Throttler implements the bruteforce protection for security actions in
Nextcloud.

It is working by logging invalid login attempts to the database and slowing
down all login attempts from the same subnet. The max delay is 30 seconds and
the starting delay are 200 milliseconds. (after the first failed login)
2016-07-20 22:08:56 +02:00
Lukas Reschke 813b58ab94 Merge pull request #398 from nextcloud/issue-388-fix-hidden-file-list-master
Fix hidden file list master
2016-07-14 15:37:42 +02:00
Joas Schilling 268e65730a
Add a new integration test for CREATE only shares 2016-07-14 14:33:28 +02:00
Joas Schilling f72f819086
Make sure the update was successful 2016-07-14 14:32:51 +02:00
Bjoern Schiessle 762d76f0c3
- keep copyright notice and only update the authors list
- check if all changes to a file happened after the fork, this allows the authors to check if the file can be relicensed to AGPLv3 or later
2016-07-13 20:31:16 +02:00
Morris Jobke ba16fd0d33 Merge branch 'master' into sync-master 2016-07-07 11:29:46 +02:00
Vincent Petry 17297d4db1 Add integration test for sharing with group, then user in group
Add integration test for the use case where a group share exists and
then the same owner creates a direct share to a user in that group.
2016-07-05 11:16:39 +02:00
Thomas Pulzer 90b7f74da7 Changed name of default logfile from owncloud.log to nextcloud.log. 2016-07-04 11:50:32 +02:00
Lukas Reschke b32b296ed7 Add integration tests 2016-06-30 12:21:01 +02:00
Morris Jobke b6397ef73a Merge pull request #236 from nextcloud/master-sync-upstream
[Master] sync upstream
2016-06-28 09:02:03 +02:00
Lukas Reschke 6670d37658 Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-27 18:23:00 +02:00
Lukas Reschke b7e91c5c3a Adjust integration test
The app is now enabled by default
2016-06-27 10:26:23 +02:00
Vincent Petry 955635c7aa Add explicit delete permission to link shares
Link shares always allowed deletion, however internally the permissions
were stored as 7 which lacked delete permissions. This created an
inconsistency in the Webdav permissions.

This fix makes sure we include delete permissions in the share
permissions, which now become 15.

In case a client is still passing 7 for legacy reasons, it gets
converted automatically to 15.
2016-06-24 09:48:48 +02:00
Lukas Reschke 2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-21 11:18:22 +02:00
Sergio Bertolín 491e2654eb Added test with new endpoint (#23934)
* Added test with new endpoint

* Moved all scenarios using new dav endpoint to a new feature file

* Removed extra slash in welcome.txt

* some fixes

* Incorrect user while downloading with range

* Fixed Content-disposition
2016-06-17 14:10:43 +02:00
Sergio Bertolín 19b7ae673a
Added unfavoriting tests and some rewording 2016-06-15 14:21:59 +02:00
Sergio Bertolín 4232458652
Fixing the tests 2016-06-15 14:21:59 +02:00
David Toledo 39a56c7bc1
Added favorites integration tests 2016-06-15 14:21:59 +02:00
Morris Jobke 553bd71c9b
fix integration tests for new admin_audit app 2016-06-14 16:33:24 +02:00
Morris Jobke 859ca1f9bb
Add integration tests 2016-06-14 16:03:59 +02:00
Thomas Müller d0a2515e2b Us an explicit version of sabre/dav to allow caching on the jenkins slaves - fixes #25087 (#25088) 2016-06-14 09:53:30 +02:00
Arthur Schiwon ae02685e6f
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 2016-06-14 01:06:25 +02:00
Morris Jobke c64c723027
Use proper PhantomJS library and run the tests as separate step
* add dependency for phantomjs
2016-06-13 14:04:25 +02:00
Stefan Weil f7c41fa4e6 Fix typo (found by codespell) (#25073)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-06-13 08:23:33 +02:00
Arthur Schiwon 42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 2016-06-11 15:34:43 +02:00
Arthur Schiwon a636e4ff28
Downstream 2016-06-09
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
2016-06-09 18:45:12 +02:00
blizzz 51fd2602a7 Revert "Downstream 2016-06-08" 2016-06-09 17:41:57 +02:00
Vincent Petry 1399e87d57
DAV now returns file name with Content-Disposition header
Fixes issue where Chrome would append ".txt" to XML files when
downloaded in the web UI
2016-06-09 15:51:41 +02:00
Sergio Bertolin 44f72412bf
Get a range from several chunks 2016-06-09 13:50:28 +02:00
Sergio Bertolin 8de206c7ed
Added another case about overwriting folder using old chunking 2016-06-09 13:50:28 +02:00
Sergio Bertolin 57444b045b
Added same test using old chunking 2016-06-09 13:50:28 +02:00
Sergio Bertolin a2c7b2e4b7
userUploadsChunkFileOfWithToWithChecksum has chunking-42 hardcoded 2016-06-09 13:50:28 +02:00
Sergio Bertolin dbaeedc234
add overwriting using chunking but failing 2016-06-09 13:50:28 +02:00
Sergio Bertolin 91082578ab
Added tests about overwriting files and folders as recipient 2016-06-09 13:50:28 +02:00
Bjoern Schiessle a41c579f63
no more CLA and switch to AGPLv3 or later 2016-06-06 19:18:24 +02:00
Sergio Bertolin 118050dcd0
Get a range from several chunks 2016-05-31 10:41:38 +02:00
Sergio Bertolin a7167409e7
Added another case about overwriting folder using old chunking 2016-05-31 10:41:38 +02:00
Sergio Bertolin dc05f979c2
Added same test using old chunking 2016-05-31 10:41:38 +02:00
Sergio Bertolin f2bf75d3b7
userUploadsChunkFileOfWithToWithChecksum has chunking-42 hardcoded 2016-05-31 10:41:38 +02:00
Sergio Bertolin a626aa21b1
add overwriting using chunking but failing 2016-05-31 10:41:38 +02:00
Sergio Bertolin c6a5a43009
Added tests about overwriting files and folders as recipient 2016-05-31 10:41:38 +02:00
Vincent Petry d288eb062e
Update integration tests for system tags with groups 2016-05-20 17:56:02 +02:00
Christoph Wurst 46bdf6ea2b
fix PHPDoc and other minor issues 2016-05-11 13:36:46 +02:00
Christoph Wurst bfed02b038
add auth integration tests 2016-05-11 13:36:46 +02:00
Christoph Wurst aa85edd224
increase token column width
add some range to time() assertions
2016-05-11 13:36:46 +02:00
Sergio Bertolin 661ab1a8c5
Modified expected output according to rullzer 2016-05-02 09:31:22 +02:00