Morris Jobke
5ac26d12f0
Merge pull request #1247 from nextcloud/storage-id-global-cache
...
more efficient querying of numeric storage ids
2016-09-08 21:09:14 +02:00
Lukas Reschke
9a2ae2fe7d
Fix tests
2016-09-08 20:11:21 +02:00
Morris Jobke
6bb95de1c5
Adding a optional disclaimer to the anonymous upload page
2016-09-08 18:44:27 +02:00
Joas Schilling
0cec06d0c8
Change updater URL
2016-09-08 12:30:17 +02:00
Lukas Reschke
ff691b4d8a
Merge pull request #836 from nextcloud/php7.1
...
Add PHP 7.1 drone tests
2016-09-08 09:19:59 +02:00
Joas Schilling
cdfe538452
Merge pull request #1243 from nextcloud/fix-detection-of-file-types-a-bit
...
Fix detection of file types a bit
2016-09-08 09:19:33 +02:00
Roeland Jago Douma
9d00f367f9
Compare arrays not json strings
...
In php 7.1 the pretty print json output changed. Thus now we compare
arrays.
2016-09-07 23:06:18 +02:00
Roeland Jago Douma
1cdf4e9540
Set default
2016-09-07 22:09:32 +02:00
Roeland Jago Douma
835daedbbc
Fix getMock settings
2016-09-07 20:42:38 +02:00
Roeland Jago Douma
ab797929e2
Fix getMock Updater
2016-09-07 20:42:38 +02:00
Roeland Jago Douma
d8a4769cd6
Fix getMock Template
2016-09-07 20:42:38 +02:00
Roeland Jago Douma
9d4729cb6a
Fix getMock TempManagerTest
2016-09-07 20:42:38 +02:00
Roeland Jago Douma
80c519fe89
Fix getMock Share
2016-09-07 20:42:38 +02:00
Roeland Jago Douma
65409f5327
Fix getMock SetupTest
2016-09-07 20:42:38 +02:00
Roeland Jago Douma
e1096c964d
Fix getMock Security
2016-09-07 20:42:38 +02:00
Roeland Jago Douma
dc60f4c441
Fix getMock Repair
2016-09-07 20:42:38 +02:00
Roeland Jago Douma
1b5ed67857
Fix getMock Migration
2016-09-07 20:42:38 +02:00
Roeland Jago Douma
b8b9fc2b1c
Fix getMock OCSClient
2016-09-07 20:42:38 +02:00
Roeland Jago Douma
c95d5c77d7
Fix getMock LegacyHelperTest
2016-09-07 20:42:38 +02:00
Roeland Jago Douma
f167e65d49
Fix getMock L10NTest
2016-09-07 20:42:38 +02:00
Roeland Jago Douma
ba3a90d30c
Fix getMock checkertest
2016-09-07 20:42:37 +02:00
Roeland Jago Douma
97f6410ac8
Fix getMock Http Client
2016-09-07 20:42:37 +02:00
Roeland Jago Douma
aa670cab14
Fix getMock HTTPHelper
2016-09-07 20:42:37 +02:00
Roeland Jago Douma
28c801b3d5
Fix getMock MetaDataTest
2016-09-07 20:42:37 +02:00
Roeland Jago Douma
7656a8fa12
File getMock Files tests
2016-09-07 20:42:37 +02:00
Roeland Jago Douma
a819fd3f1e
Fix getMock FileChunkingTest
2016-09-07 20:42:37 +02:00
Roeland Jago Douma
4da1ee99d6
Fix getMock Encryption
2016-09-07 20:42:37 +02:00
Roeland Jago Douma
9ea2153e9b
Fix getMock Command/Intergrity
2016-09-07 20:42:37 +02:00
Roeland Jago Douma
4066f04c4b
Fix getMock MapperTestUtility
2016-09-07 20:42:37 +02:00
Morris Jobke
2d9574db34
fix tests
2016-09-07 17:27:41 +02:00
Robin Appelman
e8e950a4d2
more efficient querying of numeric storage ids
2016-09-07 17:22:40 +02:00
Roeland Jago Douma
8a5af2d335
Fix tests
...
* hasParameterOption has an additional default value which we must match
in the return map
* Fix deprecated getMock calls
2016-09-06 21:20:01 +02:00
Joas Schilling
7c0951244a
Deprecate getEditionString()
2016-09-06 16:05:28 +02:00
Morris Jobke
b6bdf81d55
Merge pull request #1275 from nextcloud/OCS_forward_headers_cleanup
...
Internal OCS Controller cleanup
2016-09-06 14:46:05 +02:00
Roeland Jago Douma
3c55fe6bab
Split OCS version handling
...
This cleans up a bit the OCSController/Middleware. Since the 2 versions
of OCS differ a bit. Moved a lot of stuff internal since it is of no
concern to the outside.
2016-09-06 11:57:39 +02:00
Roeland Jago Douma
c609e291bd
Fix getMock share
2016-09-06 09:33:48 +02:00
Roeland Jago Douma
1a05201543
Fix getMock Avatar
2016-09-06 09:33:48 +02:00
Roeland Jago Douma
4d3b92e687
Fix getMock Authentication
2016-09-06 09:29:27 +02:00
Roeland Jago Douma
3a3a17b2e3
Fix getMock TwoFactorMiddlewareTest
2016-09-06 09:29:27 +02:00
Roeland Jago Douma
777c3ee325
Add FileDisplayResponse
...
A lazy implementation of the DisplayResponse that only hits the
filesystem if the etag and mtime do not match.
2016-09-05 15:09:54 +02:00
Lukas Reschke
06fa486706
Merge pull request #1158 from nextcloud/cache_avatars
...
Cache avatars
2016-09-05 15:08:43 +02:00
Joas Schilling
db6a3367ad
Merge pull request #1259 from nextcloud/language_order
...
ACCEPT_LANGUAGE goes before default_langauge
2016-09-05 12:37:44 +02:00
Joas Schilling
24d90a4bb1
Correctly remove the charset from finfo mimetype
2016-09-05 09:48:22 +02:00
Roeland Jago Douma
581a83c2a1
Fix AppTest and intergration test
2016-09-05 09:42:58 +02:00
Christoph Wurst
ddb659dd90
increase core version number to trigger db ugprade and fix app manager tests
2016-09-05 08:51:13 +02:00
Christoph Wurst
8acb734854
add 2fa backup codes app
...
* add backup codes app unit tests
* add integration tests for the backup codes app
2016-09-05 08:51:13 +02:00
Roeland Jago Douma
0228bc6e66
ACCEPT_LANGUAGE goes before default_langauge
...
See https://github.com/nextcloud/server/issues/970
Before we had
1. Users settings in personal settings
2. Admins default language settings
3. Accept-Language settings of the browser
However this is not in line with
https://www.w3.org/International/questions/qa-lang-priorities
So this changes the order to
1. Users settings in personal settings
3. Accept-Language settings of the browser
2. Admins default language settings
2016-09-04 13:19:40 +02:00
Morris Jobke
7ffed2deae
Merge pull request #1221 from nextcloud/proper_204_304_response
...
No body or content-length for 204 and 304 responses
2016-09-01 15:04:09 +02:00
Joas Schilling
d3f82356bb
Merge pull request #1227 from nextcloud/improve-tests
...
Improve tests
2016-09-01 14:02:04 +02:00
Morris Jobke
a3c1d74829
Remove unneeded Windows logic
2016-09-01 10:47:57 +02:00
Roeland Jago Douma
74fdaab870
Fix depreccated getMock in Core/Command tests
2016-09-01 09:20:54 +02:00
Roeland Jago Douma
21a87d3c2e
No body or content-length for 204 and 304 responses
...
See: https://tools.ietf.org/html/rfc7230#section-3.3
2016-08-31 23:07:48 +02:00
Lukas Reschke
2685129184
Merge pull request #1188 from nextcloud/2fa-redirect-default-app
...
redirect to default app after solving the 2FA challenge
2016-08-31 19:46:38 +02:00
Joas Schilling
f9cea0b582
Merge pull request #797 from nextcloud/only-match-for-auth-cookie
...
Match only for actual session cookie
2016-08-31 15:59:16 +02:00
Joas Schilling
e4311a2ebd
Merge pull request #608 from nextcloud/small-encryption-improvement
...
skip shared files, if files get decrypted only for a specific user we…
2016-08-31 12:30:37 +02:00
Lukas Reschke
57f9117843
Merge pull request #1087 from nextcloud/get-delay-twice
...
dont get bruteforce delay twice
2016-08-30 18:43:01 +02:00
Christoph Wurst
8e5c4c91fa
check same URL in unit tests
2016-08-30 13:28:04 +02:00
Christoph Wurst
0a0c7a9b92
redirect to default app after solving the 2FA challenge
2016-08-30 11:10:45 +02:00
Roeland Jago Douma
6a85882f61
Fix tests
2016-08-30 09:00:22 +02:00
Morris Jobke
e341bde8b9
Merge pull request #1172 from nextcloud/core_cleanup
...
Core controller cleanup
2016-08-30 08:32:55 +02:00
Morris Jobke
4afe4bda26
Merge pull request #891 from nextcloud/us_25810
...
[OC] Fix unmerged shares repair targetdecision
2016-08-30 08:22:34 +02:00
Roeland Jago Douma
b1a090f357
AvatarController use proper JSONResponse
...
* Do not rely on DataResponse magic. We want JSON so use JSON
* Fix tests
2016-08-29 21:52:14 +02:00
Roeland Jago Douma
f6423f74e3
Minor cleanup in core Controllers
2016-08-29 21:52:09 +02:00
Christoph Wurst
291dd0bd31
redirect to 2fa provider if there's only one active for the user
2016-08-29 18:36:39 +02:00
Jörn Friedrich Dreyer
d5518735c9
always return numeric storage id as int, also check type equality in test asserts
2016-08-29 14:20:51 +02:00
Robin Appelman
6c93fe08f5
dont get bruteforce delay twice
2016-08-29 13:36:49 +02:00
Lukas Reschke
4d85ffc27c
Merge pull request #1054 from nextcloud/less-cache-hits
...
Reduce the number of cache operations for dav operations
2016-08-27 22:44:29 +02:00
Lukas Reschke
8bf9be2167
Merge pull request #1058 from nextcloud/avatarController_cleanup
...
Avatar controller cleanup
2016-08-27 22:25:34 +02:00
Joas Schilling
89c78bbce4
Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loop
...
prevent infinite redirect loops if the there is no 2fa provider to pass
2016-08-26 16:03:05 +02:00
Joas Schilling
ad4cab130e
Merge pull request #1069 from nextcloud/l10ntest_nodb
...
L10N tests do not require DB
2016-08-25 23:38:27 +02:00
Roeland Jago Douma
c5bdb4d4e8
L10N tests do not require DB
...
* Makes CI a bit more efficient
* Cleanup getMock warning
2016-08-25 22:41:23 +02:00
Roeland Jago Douma
04cffe6d81
CappedMemoryCacheTest does not require DB
...
Makes CI a bit more efficient
2016-08-25 22:32:39 +02:00
Roeland Jago Douma
2f03853fb9
AvatarController cleanup
...
* Use all DI components
* Let the AppFramework resolve the AvatarController
* Update unit tests
* Unit tests no longer require DB
2016-08-25 21:39:14 +02:00
Robin Appelman
2693ae870e
cache user folders
2016-08-25 17:22:25 +02:00
Lukas Reschke
a27a8d733b
Merge pull request #1024 from nextcloud/remove-password-reset-link-after-successful-login
...
Remove "password reset token" after successful login
2016-08-24 13:44:41 +02:00
Christoph Wurst
6af2efb679
prevent infinite redirect loops if the there is no 2fa provider to pass
...
This fixes infinite loops that are caused whenever a user is about to solve a 2FA
challenge, but the provider app is disabled at the same time. Since the session
value usually indicates that the challenge needs to be solved before we grant access
we have to remove that value instead in this special case.
2016-08-24 10:49:23 +02:00
Lukas Reschke
2f1b17d44a
Merge pull request #1007 from nextcloud/shared-storage-non-recursive
...
Fix shared storage recursive setup
2016-08-23 22:15:38 +02:00
Joas Schilling
736e884e9a
Move the reset token to core app
2016-08-23 15:01:38 +02:00
Robin Appelman
a0c2342c20
prevent infinite recursion while getting storage from mount
2016-08-23 14:52:18 +02:00
Joas Schilling
139fb8de94
Remove "password reset token" after successful login
2016-08-23 12:54:45 +02:00
Lukas Reschke
3ed102497e
Merge pull request #995 from nextcloud/workflow-section
...
Workflow section + hidden empty sections
2016-08-23 11:20:43 +02:00
Arthur Schiwon
5cd3f4e4dc
add test
2016-08-22 16:56:00 +02:00
Arthur Schiwon
baa91809bd
adjust test
2016-08-22 08:29:49 +02:00
Arthur Schiwon
7972fa5527
enlist only registered sections that also have settings registered to
2016-08-22 08:29:49 +02:00
Lukas Reschke
d50e7ee36c
Remove reading PATH_INFO from server variable
...
Having two code paths for this is unreliable and can lead to bugs. Also, in some cases Apache isn't setting the PATH_INFO variable when mod_rewrite is used.
Fixes https://github.com/nextcloud/server/issues/983
2016-08-19 14:48:13 +02:00
Julius Haertl
162b153f22
Fix loading of ThemingDefaults
2016-08-19 11:26:22 +02:00
Roeland Jago Douma
fe80bb1aff
Merge pull request #867 from nextcloud/notification-primary-action-always-first
...
Make sure the primary action is always the first one
2016-08-17 19:31:14 +02:00
Vincent Petry
df9b509ed3
Improve regexp to detect duplicate folders when repairing unmerged shares
2016-08-17 15:31:47 +02:00
Vincent Petry
7a2d25fab4
Fix unmerged shares repair with mixed group and direct shares
...
Whenever a group share is created after a direct share, the stime order
needs to be properly considered in the repair routine, considering that
the direct user share is appended to the $subShares array and breaking
its order.
2016-08-17 15:31:36 +02:00
Vincent Petry
56b94b220d
Improve file_target finding logic when repairing unmerged shares
...
Pick the most recent subshare that has no parenthesis from duplication
which should match whichever name the user picked last. If all
subshares have duplicate parenthesis names, use the least recent group
share's target instead.
2016-08-17 15:31:35 +02:00
Roeland Jago Douma
c5d0a056de
Merge pull request #868 from nextcloud/changepasswordcontroller
...
Make ChangePassword a real Controller
2016-08-17 11:50:41 +02:00
Joas Schilling
027069cbae
Merge pull request #846 from nextcloud/provisioning_api_ocs
...
Move Provisioning API to the AppFramework
2016-08-17 10:23:13 +02:00
Roeland Jago Douma
789082e014
Add tests for ChangePasswordController
2016-08-17 10:21:18 +02:00
Marius Blüm
c1632c3abd
Merge pull request #893 from nextcloud/ie8_be_gone
...
IE8 be gone!
2016-08-17 09:02:58 +02:00
Roeland Jago Douma
fd95985a21
Remove IE8 support in CertificateController
...
* Also fix getMock warnings in tests
2016-08-16 20:51:43 +02:00
Arthur Schiwon
4943441bde
adjust tests to latest changes
2016-08-16 18:59:45 +02:00
Arthur Schiwon
717e22267a
Merge branch 'master' into implement_712
2016-08-16 18:31:59 +02:00
Björn Schießle
6dc956b192
Merge pull request #886 from nextcloud/capabilities_error_proof
...
Make the capabilities manager more error proof
2016-08-16 11:40:42 +02:00
Lukas Reschke
6c6338b810
Merge branch 'master' into implement_712
2016-08-15 21:55:09 +02:00
Roeland Jago Douma
c044aa34fa
Make the capabilities manager more error proof
...
If an app registers an invalid capabilty we should not crash hard.
Instead we should catch the exception. Log it (error) and carry on.
* Added tests
2016-08-15 20:37:19 +02:00
Roeland Jago Douma
87ac72d004
We have to mock the is_uploaded_file in the OC\Core\Controller namespace
2016-08-15 20:08:20 +02:00
Roeland Jago Douma
09f4ce4389
Fix mock call in AvatarControllerTest
2016-08-15 20:07:07 +02:00
Lukas Reschke
cf3cfca356
Use generated URL
2016-08-15 17:37:55 +02:00
Lukas Reschke
910176c540
Fix CheckSetupController tests
2016-08-15 17:36:45 +02:00
Lukas Reschke
d6992e3f9f
Fix template test
2016-08-15 17:19:50 +02:00
Lukas Reschke
75d135d8d4
Fix tests for LoginController
2016-08-15 17:19:32 +02:00
Lukas Reschke
1c7fa3333e
Add reference to current user
2016-08-15 17:15:14 +02:00
Lukas Reschke
c16c411275
Add new dependency
2016-08-15 17:13:58 +02:00
Lukas Reschke
65d1472005
Don't use create mock
...
Not compatible with this PHPunit version
2016-08-15 17:08:27 +02:00
Lukas Reschke
166a7667d3
Use proper casing
2016-08-15 17:00:35 +02:00
Lukas Reschke
7ffb7b0d84
Use MockBuilder instead of createMock
...
CI uses an older PHPUnit
2016-08-15 16:43:22 +02:00
Lukas Reschke
8a7a0f3287
Add unit tests
2016-08-15 16:25:34 +02:00
Joas Schilling
3ed05f8769
Make sure the primary action is always the first one
2016-08-15 11:13:54 +02:00
Roeland Jago Douma
a0b22227fc
Add tests
2016-08-14 18:34:01 +02:00
Lukas Reschke
72b5f9bfac
Use createMock instead of deprecated getMock
2016-08-11 15:22:29 +02:00
Lukas Reschke
9ca25e857c
Redirect users when already logged-in on login form
2016-08-11 15:22:29 +02:00
Roeland Jago Douma
1f370c97ed
OCSController requires DataResponse
...
The OCS Controller requires a DataResponse object to be returned.
This means that all error handling will have to be done via exceptions
thrown and handling in the middleware.
2016-08-10 12:40:26 +02:00
Lukas Reschke
9fbdb0efe8
Merge pull request #529 from nextcloud/vendor-maintenance-downgrade
...
Allow downgrades of maintenance accross vendors
2016-08-10 00:25:53 +02:00
Lukas Reschke
5214b62d55
Merge pull request #691 from nextcloud/ocs_allow_all_old_routes
...
Allow ocs/v2.php/cloud/... routes
2016-08-09 20:52:49 +02:00
Lukas Reschke
b53ea18ea5
Match only for actual session cookie
...
OVH has implemented load balancing in a very questionable way where the reverse proxy actually internally adds some cookies which would trigger a security exception. To work around this, this change only checks for the session cookie.
2016-08-09 19:23:08 +02:00
Lukas Reschke
b4ed4e152e
Merge pull request #746 from nextcloud/jail-root
...
getJailedPath expects $path to have a trailing /
2016-08-09 11:04:11 +02:00
Roeland Jago Douma
0032a5c2d1
Hanlde Core and Settings app in AppFramework
...
'core' and 'settings' are just apps but we treat them slightly
different. Make sure that we construct the correct namespace so we can
actually do automatic AppFramework stuff.
2016-08-08 20:48:16 +02:00
Roeland Jago Douma
63f6d2d558
Allow ocs/v2.php/cloud/... routes
...
One of the possibilities of the old OCS API is that you can define the
url yourself.
This PR makes this possible again by adding an optional root elemenet to
the route. Routes are thus:
.../ocs/v2.php/<root>/<url>
By default <root> = apps/<app>
This will allow for example the provisioning API etc to be in
../ovs/v2/php/cloud/users
2016-08-08 15:01:26 +02:00
Joas Schilling
f37fa6e45c
Move Share backends to PSR-4 instead of using class path ( #24941 )
2016-08-05 14:13:41 +02:00
Thomas Müller
f1cd68d713
Adding test case for getPathById including a jailed cache where root is just empty
2016-08-05 14:06:05 +02:00
Vincent Petry
0c6352e095
Fix RepairUnmergedShares to not skip valid repair cases
...
The repair step was a bit overeager to skip repairing so it missed the
case where a group share exists without subshares but with an
additional direct user share.
2016-08-03 10:16:28 +02:00
Vincent Petry
67fa6bf9bc
Add repair step for unmerged shares (WIP)
2016-08-03 10:16:28 +02:00
Roeland Jago Douma
5c718b13b8
We should properly check for 'true' instaed of the bool
2016-08-01 08:52:50 +02:00
Roeland Jago Douma
f7f5216aa3
Dark hackery to not always disable CSRF for OCS controllers
2016-07-29 15:49:27 +02:00
Morris Jobke
54ae8eede3
Merge pull request #556 from nextcloud/nextcloud-version-check
...
Allow apps to check for a given nextcloud version
2016-07-29 09:26:25 +02:00
Bjoern Schiessle
351cab6bce
skip shared files, if files get decrypted only for a specific user we shouldn't touch files owned by a different user.
2016-07-27 15:39:24 +02:00
Roeland Jago Douma
8bdd0adcee
Support subdir in the OCS v2 endpoint
...
We should check against the ending substring since people could
run their nextcloud in a subfolder.
* Added test
2016-07-27 15:28:35 +02:00
Morris Jobke
9c21067c19
fix enabled apps tests
2016-07-27 08:36:03 +02:00
Morris Jobke
6482be040b
fix unit tests
2016-07-26 16:43:58 +02:00
Joas Schilling
0fcc39cd8e
Translate the server version for nextcloud
2016-07-26 14:40:18 +02:00
Morris Jobke
2f42a3fc31
Add workflowengine
2016-07-26 11:16:34 +02:00
William Bargent
352e24e703
Merge pull request #292 from nextcloud/recent-files
...
Add "Recent" file listing
2016-07-25 15:25:02 +01:00
Joas Schilling
4ad0c383ad
Merge pull request #523 from Faldon/master
...
Renamed file logging
2016-07-25 11:41:24 +02:00
Robin Appelman
81e103074e
use limit instead of since when listing recent files
2016-07-22 15:20:55 +02:00
Robin Appelman
a4ba3eadd0
fix test
2016-07-22 15:20:55 +02:00
Joas Schilling
5c34346479
Allow downgrades of maintenance accross vendors
2016-07-22 14:51:43 +02:00
Thomas Pulzer
61a1d56d27
Renamed test classes for file logging tests.
2016-07-22 14:47:50 +02:00
Robin Appelman
e321ecd592
add recent files to node api
2016-07-22 14:39:32 +02:00
Roeland Jago Douma
72b06d250d
Add tests
2016-07-22 12:53:47 +02:00
Thomas Pulzer
ba3f4f118e
Changed logtype to file instead of owncloud.
...
- Updated the config sample to point to log_type='file'
- Renamed the Class for logfile logging to File in namespace 'OC\Log\'.
Changed the occurrences of 'OC\Log\Owncloud' to 'OC\Log\File'.
- Renamed the Class for log:file command to File in namespace 'OC\Core\Command\Log\File'.
Changed registration of the command to use 'OC\Core\Command\Log\File'.
- Changed default Syslog tag to Nextcloud
- Retained backwards compatibility for configs with 'logtype' => 'owncloud'
- Adjusted tests for the new file log.
Closes #490 .
2016-07-22 11:44:19 +02:00
Lukas Reschke
c385423d10
Merge pull request #479 from nextcloud/add-bruteforce-throttler
...
Implement brute force protection
2016-07-21 00:31:02 +02:00
Lukas Reschke
c1589f163c
Mitigate race condition
2016-07-20 23:09:27 +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
020a2a6958
Merge pull request #476 from nextcloud/port-same-site-cookies
...
[master] Port Same-Site Cookies to master
2016-07-20 21:35:02 +02:00
Roeland Douma
78cad699fe
Merge pull request #475 from nextcloud/ocs-middleware
...
Add OCS Middleware
2016-07-20 21:04:25 +02:00