Robin Appelman
498e8f712c
Merge pull request #19268 from owncloud/revert-18911
...
Revert "Show cached previews directly"
2015-09-22 16:05:38 +02:00
Individual IT Services
5f11049852
reduce amount of db calls needed for file-locks
...
return result of insertIfNotExist()
reducing initLockField, throwing exeption in releaseLock
don't throw exception in releaseLock()
cleaning up whitespaces
2015-09-22 15:04:15 +02:00
Robin Appelman
d9db959331
Revert "Show cached previews directly"
...
This reverts commit 1b708e26ef
.
2015-09-22 15:01:31 +02:00
Vincent Petry
b9cd5bc1dc
Prevent wrong matches in getRelativePath
...
Before this fix, the root "/files" with path "/files_trashbin" would
return "_trashbin" as relative path...
2015-09-22 11:34:37 +02:00
Bjoern Schiessle
17a64360e5
catch excexptions during the copy operation and make sure that we free the lock correctly
2015-09-22 11:32:10 +02:00
Lukas Reschke
36ce254ffd
Move dummy backend to Tests namespace
2015-09-22 11:01:11 +02:00
Thomas Müller
67231ed9a7
Merge pull request #19231 from phil-davis/r1
...
Minor text typos
2015-09-21 23:35:30 +02:00
Phil Davis
a165710e99
Minor text typos
...
that I noticed while looking at some code.
2015-09-21 23:04:25 +05:45
Thomas Müller
fd6b4de2d4
Merge pull request #18481 from owncloud/fix-apache-login-master
...
Repeated calls to loginWithApache() should not not try to set user in…
2015-09-21 16:09:33 +02:00
Thomas Müller
d8901cf7cd
Merge pull request #19221 from owncloud/improved_error_messages
...
decrypt-all: improved error message if user doesn't exists
2015-09-21 16:06:43 +02:00
Robin Appelman
b23a5e6886
Merge pull request #17347 from owncloud/dav-fopen-overwrite
...
dont download the existing file for webdav if we're going to overwrite it
2015-09-21 14:13:04 +02:00
Robin Appelman
b520a1e520
Merge pull request #19081 from owncloud/prevent0bytedownloads
...
prevent 0 byte downloads when storage returns false
2015-09-21 13:50:35 +02:00
Robin Appelman
4ecf710dcd
dont download the existing file for webdav if we're going to overwrite it
2015-09-21 13:45:25 +02:00
Bjoern Schiessle
d2e90b6050
improved error message if user doesn't exists
2015-09-21 13:19:35 +02:00
Thomas Müller
0f2865abb2
Repeated calls to loginWithApache() should not not try to set user information in the session again
2015-09-21 11:55:41 +02:00
Thomas Müller
e589226f58
fix PHPDoc
2015-09-21 11:54:46 +02:00
Thomas Müller
2c8eaacec7
Merge headers of ocs results
2015-09-21 11:54:46 +02:00
Thomas Müller
6006a03ef1
Merge pull request #19122 from owncloud/discardexpirationdatefornonlinkshares
...
Discard expiration date from result for non-link shares
2015-09-21 11:47:37 +02:00
Georg Ehrke
b3ff773bbf
delete cached preview when rolling back file's version
...
add random number using OC.parseQueryString and _.extend()
version rollback: add missing prefix to OC\Preview::post_delete
add test to assure that the rollback hook is called
2015-09-20 11:22:40 +02:00
Thomas Müller
9dc136a0d0
Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7
...
[jenkins] changed ZipStreamer to use composer for updates, update to 0.7
2015-09-18 17:03:49 +02:00
Thomas Müller
bbf128f1b2
Merge pull request #19098 from owncloud/db-lock-no-transaction
...
Remove the need for the transaction in the database locking backend
2015-09-18 17:02:18 +02:00
Thomas Müller
eb41a4da7f
Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer-0.7
2015-09-18 14:43:37 +02:00
Lukas Reschke
7c6d811584
Prefer OCS Id from database
...
To be consistent with other logic the app id from the database needs to be prefered. Especially when it comes to be able to replace an outdated OCS id.
2015-09-18 13:27:26 +02:00
Lukas Reschke
947e3d7ab5
Add repair step for outdated OCS IDs
...
There is the case where OCs IDs might become outdated such as it has been with the calendar and contacts app which refer to the old dummy entry. This means that users with the old OCS id can't update updates as well will receive invalid state flags. (e.g. "experimental" instead of "approved")
To allow instances to properly update the applications in the future we need to migrate the OCS IDs for now manually.
2015-09-18 13:27:26 +02:00
Thomas Müller
188d6d2e28
Merge pull request #18911 from owncloud/preview-show-cached-directly
...
Show cached previews directly
2015-09-18 13:02:10 +02:00
Thomas Müller
0101b1c65f
Merge pull request #18840 from owncloud/fix-app-disable-route
...
Rebuild app navigation in JS
2015-09-18 13:00:58 +02:00
Thomas Müller
0eb37e2d64
Merge pull request #19092 from owncloud/allow-checking-for-notifiers
...
Allow checking whether there are notifiers registered
2015-09-18 11:57:56 +02:00
Thomas Müller
2eeb1b2b79
Merge pull request #19088 from owncloud/fix-availability-int
...
Explicitly cast number to integer
2015-09-18 08:31:56 +02:00
Thomas Müller
100d9e1976
Merge pull request #19095 from owncloud/set-priority-to-1-for-maintenance
...
Make sure Maintenance is checked before auth and others
2015-09-18 08:17:58 +02:00
Joas Schilling
44e6c4f398
Do not "use" Server
2015-09-17 15:11:05 +02:00
Robin Appelman
e9b1aa6037
improve doc
2015-09-17 14:09:28 +02:00
Joas Schilling
5eddde6486
Add a Sabre plugin that emits an event for apps
2015-09-17 13:59:27 +02:00
Robin Appelman
05fddec022
expire old lock rows
2015-09-17 13:55:04 +02:00
Vincent Petry
1911472b88
Discard expiration date from result for non-link shares
2015-09-17 13:45:26 +02:00
Jörn Friedrich Dreyer
773941dfb0
prevent 0 byte downloads when storage returns false
2015-09-17 11:16:00 +02:00
Joas Schilling
c3420fface
Allow checking whether there are notifiers registered
2015-09-17 11:08:17 +02:00
Robin Appelman
7c66328381
Remove the need for the transaction in the database locking backend
2015-09-17 11:07:59 +02:00
Joas Schilling
bc89bca803
Make sure Maintenance is checked before auth and others
2015-09-17 11:06:51 +02:00
Thomas Müller
a1e343ae7c
Merge pull request #19086 from owncloud/restore-loadapp-autoload
...
Restore loadApp() autoload registration
2015-09-16 15:19:41 +02:00
Thomas Müller
b0414f6a30
Merge pull request #19022 from owncloud/console-loader-validroot
...
Register valid root for all installed apps in console
2015-09-16 15:17:43 +02:00
Robin McCorkell
a0094d28f1
Explicitly cast number to integer
2015-09-16 11:22:52 +01:00
Robin McCorkell
862afd80b3
Restore loadApp() autoload registration
...
Also changes the autoloader validRoots into a hashmap to try and reduce
duplicate entries
2015-09-16 10:48:03 +01:00
Thomas Müller
ed872589a3
Merge pull request #19077 from owncloud/check-maintenance-before-everything-else-master
...
Check for maintenance mode first so we send the 503 instead of login…
2015-09-16 10:22:10 +02:00
Joas Schilling
e0992c1297
Check for maintenance mode first so we send the 503 instead of login verification
2015-09-16 09:38:36 +02:00
Arthur Schiwon
c17d022ca4
started to implement sharee list view. not completed yet, do not cry please.
2015-09-16 07:23:27 +02:00
Arthur Schiwon
ffd4e0dc5a
split off expirationView
2015-09-16 07:23:26 +02:00
Arthur Schiwon
f9c232c4ce
split off linkShareView
2015-09-16 07:23:26 +02:00
Arthur Schiwon
dcb084a617
split ShareDialogResharerInfoView from base view
2015-09-16 07:23:26 +02:00
Arthur Schiwon
83d91ddf20
further work on reimplementing the dialog layout
2015-09-16 07:23:25 +02:00
Arthur Schiwon
edd163a611
refactor share dialog for multi-purpose use (dropdown, sidebar) and better maintainability
2015-09-16 07:23:25 +02:00
Bjoern Schiessle
9bd4f2d41e
occ script to disable encryption and to decrypt all files again
2015-09-15 22:39:44 +02:00
Robin Appelman
9883d5b85d
Merge pull request #18915 from owncloud/node-getfoldercontents-use-view-logic
...
Use the view logic for getFolderContent for the node api
2015-09-15 18:04:01 +02:00
Robin Appelman
e545c2eec5
Merge pull request #17811 from owncloud/dav-lock-wide
...
Wrap the entire dav PUT in a read lock
2015-09-15 17:22:00 +02:00
Thomas Müller
decdaf0018
Merge pull request #19024 from owncloud/remove-get_temp_dir
...
Remove get_temp_dir()
2015-09-15 14:18:29 +02:00
Thomas Müller
e82a225d04
Merge pull request #18964 from owncloud/availability-integer
...
Use integer for availability instead of bool
2015-09-15 13:24:55 +02:00
Lukas Reschke
8e1b403b16
Catch apps which have been removed manually
2015-09-15 12:10:23 +02:00
Lukas Reschke
4680691ca6
Define allowed app roots earlier
...
The autoloader needs to be run before including the app.php, otherwise it depends on what app gets executed first and apps that rely on the dependency of other apps in app.php may break.
2015-09-15 12:10:23 +02:00
Robin McCorkell
f8619870ea
Remove get_temp_dir()
2015-09-15 11:33:25 +02:00
Robin McCorkell
5ca690e2f8
Use integer for availability instead of bool
2015-09-15 10:18:32 +02:00
Robin McCorkell
31a8949adf
Prevent warning decoding content
2015-09-14 22:36:40 +01:00
Robin McCorkell
35d4851af2
Merge branch 'master' into fix-app-disable-route
2015-09-14 19:50:52 +01:00
Robin Appelman
688981b55c
allow hook cancel
2015-09-14 20:35:33 +02:00
Robin Appelman
75f126da49
use the correct path for cache updates when doing chunked assembly
2015-09-14 20:35:33 +02:00
Robin Appelman
6386327150
work directly on storages when doing a chunked upload assembly
2015-09-14 20:35:33 +02:00
Robin Appelman
b424151459
handle notfound exceptions in lock plugin
2015-09-14 20:35:33 +02:00
Robin Appelman
e612d3123f
wrap the entire put operation in a read lock
2015-09-14 20:35:33 +02:00
Robin Appelman
209abaadbb
expose locking api in sabre connector
2015-09-14 20:35:33 +02:00
Thomas Müller
fb9e75edb6
Merge pull request #18973 from owncloud/try-fixing-app-config-on-oracle
...
Do not compare the value on Oracle
2015-09-14 17:59:52 +02:00
Robin McCorkell
dad56921ae
Register valid root for all installed apps in console
...
We need to use commands from apps that aren't enabled (so don't get loaded).
2015-09-14 16:58:25 +01:00
Nicolai Ehemann
6c6be72e6b
use zipstreamer via composer
2015-09-14 15:33:28 +02:00
Nicolai Ehemann
be2023dae3
lib/private/files.php: adapted to minimally changed ZipStreamer API
2015-09-14 12:57:50 +02:00
Joas Schilling
0e805d5310
Do not compare the value on Oracle
...
As per docs: http://docs.oracle.com/cd/E11882_01/server.112/e26088/conditions002.htm#i1033286
> Large objects (LOBs) are not supported in comparison conditions.
2015-09-14 12:14:25 +02:00
Lukas Reschke
3adbfbfd69
Use / instead of an empty string as cookie path
...
When an empty string is used as cookie path PHP will assign the current directory as cookie path.
This means when an user had installed an ownCloud under "/", which is mapped to an empty string in \OC::$WEBROOT, and accessed it the cookie was set to values such as "/index.php/apps/files" since the web browser assumed this to be a directory. This means that multiple encryption cookies were set for the same domain resulting in potential havoc.
With this patch the path will be set to "/" in case an empty web root is installed which makes the cookie accessible to the whole domain.
To test this setup multiple ownCloud instances on the same domain under different ports and have both installed under "/", then try to login in both of it and previously this can in some cases lead to a lockout of the user.
Note that this affects the cookies that the browsers do sent and thus to test this you need to clear all cookies from your browser previously. I consider this an acceptable behaviour for now since this code is only in master.
Fixes https://github.com/owncloud/core/issues/18919
2015-09-14 11:22:34 +02:00
Bernhard Posselt
fd74522804
make resolve public to avoid boiler plate code
...
add resolve to public interface
2015-09-13 17:44:24 +02:00
Frank Karlitschek
7562e4959b
Merge pull request #18658 from owncloud/configurable-temp
...
Configurable temporary directory
2015-09-12 22:04:41 +02:00
Lukas Reschke
1924dd348a
Merge pull request #18653 from owncloud/dav-stream-guzzle
...
stream webdav downloads using http client
2015-09-11 17:10:10 +02:00
Robin McCorkell
188d0e09b8
Add reset method to mimetype loader
...
Used to solve concurrency issues
2015-09-11 12:44:53 +01:00
Robin McCorkell
e99988b9c7
Merge pull request #18676 from owncloud/ext-eventdispatcher
...
files_external event dispatcher
2015-09-11 09:34:05 +01:00
Robin McCorkell
620173c792
Merge pull request #18851 from owncloud/memcached-getallkeys-fallback
...
Fallback to complete Memcached flush if getAllKeys fails
2015-09-10 20:33:18 +01:00
Lukas Reschke
fb717f254f
Merge pull request #18699 from owncloud/notification-manager
...
Notification manager
2015-09-10 15:26:36 +02:00
Lukas Reschke
89cd929560
Merge pull request #17791 from owncloud/make-eventsource-compatible-with-win10
...
Add custom CSP for Win 10 compatibility
2015-09-10 15:00:35 +02:00
Lukas Reschke
0b91087489
Write to session in batch at the end of the request
2015-09-09 12:48:37 +02:00
Lukas Reschke
e579dd62fd
Write session data to single key
...
This prevents decrypting values multiple times.
2015-09-09 12:48:08 +02:00
Lukas Reschke
bfa26db472
Use md5 over the version file to prevent cyclyc dependency
2015-09-09 12:48:08 +02:00
Morris Jobke
c4c9c5ffad
Merge pull request #18684 from owncloud/explicit-upgrade-version
...
Explicit upgrade version + prevent downgrades
2015-09-09 11:08:55 +02:00
Björn Schießle
acee9d4750
Merge pull request #18908 from owncloud/allow-0-as-password
...
Allow 0 and false as password
2015-09-09 10:29:29 +02:00
Robin Appelman
9f11b27797
Use the view logic for getFolderContent for the node api
2015-09-08 22:38:50 +02:00
Lukas Reschke
a03422c55a
Cache generated result
...
Saves 50ms
2015-09-08 21:28:15 +02:00
Robin Appelman
1b708e26ef
Show cached previews directly
2015-09-08 19:51:15 +02:00
Lukas Reschke
7cbf2bc56d
Allow 0 and false as password
...
When we use the check for "empty" here passwords such as 0 will not work.
Fixes https://github.com/owncloud/password_policy/issues/8
2015-09-08 17:53:29 +02:00
Joas Schilling
38001d824b
Move interfaces to private until they are no longer experimental
2015-09-08 09:01:02 +02:00
Joas Schilling
190d2c3d5b
Add tests for the notification manager
2015-09-08 09:01:02 +02:00
Joas Schilling
c6469be8bd
Add tests for notification
2015-09-08 09:01:02 +02:00
Joas Schilling
acf8149f17
Add tests for Action
2015-09-08 09:01:01 +02:00
Joas Schilling
0d154595f8
Fix the subject of notifications
2015-09-08 09:01:01 +02:00
Joas Schilling
57c273b2da
Fix closures and adding parsed Actions
2015-09-08 09:01:01 +02:00
Joas Schilling
d04021b1ac
Fix the request type and the validity
2015-09-08 09:01:01 +02:00
Joas Schilling
21b83dc730
Allow getting the request type
2015-09-08 09:01:01 +02:00
Joas Schilling
913e2e9ae6
Use an INotification to getCount() and markProcessed()
2015-09-08 09:01:01 +02:00
Joas Schilling
3bdfef9107
Add the request type to the action
2015-09-08 09:01:01 +02:00
Joas Schilling
f0ecfa6e6c
Add the app id to the markProcessed method
2015-09-08 09:01:01 +02:00
Joas Schilling
0bcae89d14
Handle InvalidArgumentException more gracefully
2015-09-08 09:01:01 +02:00
Joas Schilling
f16c5a38a8
Add language to the preparation method
2015-09-08 09:01:01 +02:00
Joas Schilling
4e347170ac
Notification API
2015-09-08 09:00:57 +02:00
Lukas Reschke
84797023ed
Remove XSendFile support
...
Required to ensure proper locking
2015-09-07 16:52:50 +02:00
Morris Jobke
c57595bcb4
Merge pull request #18839 from owncloud/autoloader-supersecure
...
Restrict autoloaded paths to loaded apps (and other enhancements)
2015-09-07 00:09:00 +02:00
Roeland Douma
24f5f50b20
Merge pull request #18742 from owncloud/mimetype-updatedb
...
Introduce mimetype DB update occ command
2015-09-06 16:56:35 +02:00
Robin McCorkell
b64e3f8db6
Fallback to complete Memcached flush if getAllKeys fails
...
Newer Memcached's do not support the underlying protocol commands that
getAllKeys() is implemented with. We should fallback to clearing
everything in that case, as causing (temporary) performance problems for
other applications on the server is better than having stale cached data.
2015-09-05 20:02:49 +01:00
Robin McCorkell
0fac2e3f3a
Unique exception for invalid autoload paths, better handling
...
Background jobs are tolerant of stale entries left by disabled apps,
which will cause an autoload exception.
2015-09-05 16:50:02 +01:00
Robin McCorkell
b06bc409e0
Rebuild app navigation in JS
...
Retrieve all app navigations to prevent reloading appinfo/app.php and
causing an error when the app isn't fully loaded. The addition/deletion
logic has been moved to JS, simplifying a lot of code.
2015-09-05 02:24:18 +01:00
Robin McCorkell
b3acf09c60
Only add valid root for enabled apps
2015-09-05 00:04:58 +01:00
Robin McCorkell
cdf01f0419
Split mimetype handling to new class
2015-09-04 17:28:20 +01:00
Morris Jobke
7f8bca64cb
Merge pull request #18833 from owncloud/share-prevent-twice
...
Prevent sharing twice with user when already a group
2015-09-04 18:26:50 +02:00
Vincent Petry
f100ef0fc6
Prevent sharing twice with user when already a group
2015-09-04 16:22:01 +02:00
Morris Jobke
e54513cddd
Merge pull request #18799 from owncloud/appconfig-with-one-request
...
Only query the appconfig once per request
2015-09-03 16:13:14 +02:00
Joas Schilling
38a164aa7a
Make sure the array exists
2015-09-03 15:41:30 +02:00
Robin Appelman
8123df9489
setup owner when getting users for share
2015-09-03 14:34:46 +02:00
Morris Jobke
a1e13d95ad
Merge pull request #18777 from owncloud/locking-default
...
enable transational locking by default
2015-09-03 11:33:10 +02:00
Joas Schilling
21ba3b8737
Only query the appconfig once
2015-09-03 11:30:57 +02:00
Lukas Reschke
f9e90e92d4
Encode HTML tags in JSON
...
While not encoding the HTML tags in the JSON response is perfectly fine since we set the proper mimetype as well as disable content sniffing a lot of automated code scanner do report this as security bug. Encoding them leads to less discussions and a lot of saved time.
2015-09-03 00:44:46 +02:00
Joas Schilling
8f2110e5da
Revert "Soft fail when deleting and no entry found"
2015-09-02 19:52:45 +02:00
Robin Appelman
4880d7729b
enable transational locking by default
2015-09-02 16:56:47 +02:00
Robin McCorkell
c9c246a3f5
Soft fail when deleting and no entry found
2015-09-02 14:50:07 +01:00
Robin Appelman
0f6df2e0b6
Allow creating previewss that cover the specified dimensions
2015-09-02 10:32:39 +02:00
Robin Appelman
1c10fb5c9f
also use httpclient for uploadFile
2015-09-01 18:01:27 +02:00
Robin McCorkell
5b2529b448
Delay adding OCS prefix to route collection until all is loaded
...
->addPrefix() iterates over all registered routes, so must be run after
all apps have had a chance to load their OCS routes.
2015-09-01 15:42:41 +01:00
Vincent Petry
87b3e28f06
Merge pull request #18730 from owncloud/appframework_proper_304
...
Properly return 304 in AppFramework
2015-09-01 15:39:59 +02:00
Robin McCorkell
9e9ffb1356
Allow access to full alias and mapping arrays
2015-09-01 14:07:14 +01:00
Roeland Jago Douma
f12caf930e
Properly return 304
...
The ETag set in the IF_NONE_MODIFIED header is wraped in quotes (").
However the ETag that is set in response is not (yet). Also we need to
cast the ETag to a string.
* Added unit test
2015-09-01 11:04:41 +02:00
Vincent Petry
6ccbf4bce6
Improved update version detection logic
2015-08-31 18:35:35 +02:00
Vincent Petry
85b62c7d82
Merge pull request #18635 from owncloud/stickify-files-and-sharing-notification-types
...
Sticky the notification types of files and sharing
2015-08-31 17:56:48 +02:00
Robin McCorkell
3142a20f25
Expose files_external services from Server
...
Not exposed to OCP yet
2015-08-31 15:18:26 +01:00
Vincent Petry
f8d8de5da6
Merge pull request #17899 from owncloud/enc_make_key_storage_root_configurable
...
Make root of key storage configurable
2015-08-31 15:58:30 +02:00
Morris Jobke
c34fbea197
Merge pull request #18691 from owncloud/request-no-read
...
Decode request content only on getContent
2015-08-31 14:58:48 +02:00
Vincent Petry
3b37c20319
Simplify comparison algo
2015-08-31 14:31:17 +02:00
Robin McCorkell
e60c4bada1
Decode request content only on getContent
2015-08-31 01:05:25 +01:00
Robin McCorkell
a0dfaf9be3
Clean up TempManager to follow code guidelines
...
tmpBaseDir can be overridden for unit testing purposes
2015-08-30 23:30:56 +01:00
Morris Jobke
b50ac6ff2f
Merge pull request #10149 from owncloud/storage-wrapper-check
...
Check result of storage wrappers
2015-08-30 19:48:37 +02:00
Bjoern Schiessle
37513f9411
don't read certificates if ownCloud is not installed
2015-08-30 19:00:03 +02:00
Bjoern Schiessle
289e9130f3
make system root of key storage configurable
2015-08-30 19:00:03 +02:00
Vincent Petry
d5b0b55eef
Throw exception on downgrade attempt
2015-08-30 18:07:22 +02:00
Vincent Petry
2b08659f7d
Restrict upgrades to explicit allowed version
...
version.php now contains the previous ownCloud version from which
upgrades are allowed. Any other upgrades will show a message that the
upgrade/downgrade is not supported.
2015-08-30 18:04:18 +02:00
Vincent Petry
045f8cc971
Merge pull request #18651 from owncloud/ocs_share_create_with_expire
...
Allow to directly set the expireDate on a new (link)share
2015-08-30 10:50:12 +02:00
Roeland Jago Douma
2aff11c80b
Actually validate the expire date on share
...
* Added more intergration tests
2015-08-30 10:31:43 +02:00
Robin Appelman
4cb8ca1860
Check result of storage wrappers
2015-08-30 10:02:42 +02:00
root
acae208f2f
moved code to /lib/private/tempmanager.php
...
fix for unit test
some fixes
2015-08-29 16:59:02 +01:00
Vincent Petry
723f8c8f1b
Merge pull request #18620 from owncloud/add-public-interface-for-factory
...
Add a public interface for the language factory so apps can use it
2015-08-29 16:44:08 +02:00
Robin Appelman
df8cb2cc63
stream webdav downloads using http client
2015-08-29 14:56:15 +02:00
Robin Appelman
b67d395089
allow streamed responses in http client
2015-08-29 14:56:08 +02:00
Joas Schilling
0ddcc7da44
Merge pull request #18511 from owncloud/downgrad-sharing-error-logs-to-debug
...
Change log level of debugging logs to debug
2015-08-28 21:05:02 +02:00
Björn Schießle
6e210d960c
Merge pull request #18423 from owncloud/occ_encrypt_all
...
occ command line tool to encrypt all files
2015-08-28 20:44:55 +02:00
Joas Schilling
42f0651b83
Sticky the notification types of files and sharing
2015-08-28 18:40:50 +02:00
Joas Schilling
a12d354762
Deprecate OC_L10N::get()
2015-08-28 12:04:52 +02:00
Joas Schilling
c3c7689b67
Add a public interface for the language factory so apps can use it
2015-08-27 13:14:50 +02:00
Bjoern Schiessle
e51fe617d8
copy always file by file to encrypt/decrypt it if needed
2015-08-26 14:58:22 +02:00
Lukas Reschke
3d2ee95f1e
Remove last occurence of `forcessl`
...
This shoudl have been adjusted as well, now it's consistent with `setMagicInCookie`. While it does not have a security impact directly some automated scanners reported this all the time.
2015-08-26 14:29:36 +02:00
Thomas Müller
749e3d5219
Merge pull request #18553 from owncloud/write-l10n-on-login
...
Save detected l10n of browser on login
2015-08-26 08:44:25 +02:00
Thomas Müller
534b2e407a
Merge pull request #17662 from owncloud/locking-db
...
Database backend for locking
2015-08-26 03:56:37 +02:00
Lukas Reschke
f3561e2349
Explicitly specify status code 200 as response code
...
Potentially fixes https://github.com/owncloud/core/issues/17586
2015-08-25 18:07:40 +02:00
Morris Jobke
4f13f96981
Save detected l10n of browser on login
...
* fixes owncloud/activity#373
2015-08-25 15:47:31 +02:00
Thomas Müller
6f6a5f6c29
Adding path to log message
2015-08-25 14:31:21 +02:00
Thomas Müller
2f86be9ced
Merge pull request #18523 from owncloud/crazy-scanner
...
Prevent bkg scanner going crazy with unavailable storages (ajax/scan.php)
2015-08-25 09:23:42 +02:00
Vincent Petry
fe575feca8
Prevent scanner going crazy with unavailable storages
2015-08-24 16:42:53 +02:00
Morris Jobke
e88b380973
Remove DEBUG constant and use config value
...
* introduces config.php option 'debug' that defaults to false
* migrate DEBUG constant to config value
2015-08-24 15:14:05 +02:00
Lukas Reschke
bd13126a80
Fix master again
...
Caused due to merge of two PRs
2015-08-24 12:19:03 +02:00
Joas Schilling
4e0e2eb222
Change log level of debugging logs to debug
2015-08-24 12:12:08 +02:00
Morris Jobke
b3495a1dc9
Merge pull request #18482 from owncloud/encrypt-session-data
...
Add a session wrapper to encrypt the data before storing it on disk
2015-08-24 12:10:15 +02:00
Vincent Petry
fe568ab64d
Merge pull request #18486 from owncloud/use-client-service-to-work-behind-proxy
...
Use client service to work behind proxy for checks for remote ownCloud instances
2015-08-24 11:05:14 +02:00
Vincent Petry
31d62c10bf
Merge pull request #17501 from tbartenstein/patch-1
...
Update fileinfo.php
2015-08-24 09:57:27 +02:00
Morris Jobke
40b1054530
Merge pull request #18254 from owncloud/mitigate-breach
...
Add mitigation against BREACH
2015-08-24 09:14:27 +02:00
Lukas Reschke
0a1d551090
Use IClientService to check for remote ownCloud instances
...
1. Allows to set a timeout (though still not perfect but way better than before)
2. Allows to have unit tests
3. I also added unit tests for the existing controller code
4. Corrected PHPDoc on IClient
2015-08-22 14:39:43 +02:00
Lukas Reschke
6a3fb0d3b3
Handle failures gracefully, remove switch
2015-08-21 19:16:28 +02:00
Joas Schilling
36eef2ddab
Add a session wrapper to encrypt the data before storing it on disk
2015-08-21 17:59:23 +02:00
Morris Jobke
ac086a11c1
Merge pull request #18426 from owncloud/joblist-next-non-existing
...
handle non existing job classes in $jobList->getNext
2015-08-21 10:34:33 +02:00
Joas Schilling
9573d7d60d
Merge pull request #18372 from owncloud/issue-18358-object-type-and-id-for-activities
...
Issue 18358 object type and id for activities
2015-08-20 15:53:36 +02:00
Joas Schilling
c58316b1ae
Expand the doc blocks on the new methods
2015-08-20 15:35:24 +02:00
Morris Jobke
d725de505e
Merge pull request #18439 from owncloud/fix-appmanagement-install
...
[app management] fix dependency check on install
2015-08-20 13:26:55 +02:00
Joas Schilling
6697844c01
Remove unnecessary code
2015-08-20 13:10:11 +02:00
Morris Jobke
06d8edd963
Merge pull request #17434 from owncloud/update-showappnameonappupdate
...
Display app names in update page for app updates
2015-08-20 11:50:01 +02:00
Vincent Petry
a2674b2b30
Additions to update page
...
Apps to update and to disable will always be shown.
Main title changes only when apps need updated, not core.
Added bullet style.
Exclude incompatible apps from updated apps list.
2015-08-20 11:14:30 +02:00
Joas Schilling
389a32e92a
Add test coverage for Activity Event and Manager
2015-08-20 10:25:49 +02:00
Morris Jobke
29decf698c
[app management] fix dependency check on install
2015-08-19 21:32:56 +02:00
Morris Jobke
b3356b1288
Merge pull request #18432 from owncloud/ext-backends.simple
...
Migrate simple external storage backends to new registration API [part 1]
2015-08-19 20:04:20 +02:00
Thomas Müller
313cb092f9
Merge pull request #18427 from owncloud/fix-format-ocs
...
Fix format of log/private/ocs.php
2015-08-19 19:09:32 +02:00
Vincent Petry
b919ae96f0
Display app names in update page for app updates
...
Whenever the update page is displayed for apps, show app names instead
of the core update text.
2015-08-19 18:03:35 +02:00
Joas Schilling
4314c8fc6f
Use an IEvent object instead of a huge parameter list
2015-08-19 17:44:57 +02:00
Joas Schilling
bc2aa14849
Extend the interfaces IManager and IConsumer to allow passing in the object
2015-08-19 17:44:57 +02:00
Robin McCorkell
3b27603762
Revert "Fix mounting wrapped storages resulting in many-layered wrapping"
...
This reverts commit 75a5e6e12b
.
2015-08-19 14:41:43 +01:00
Robin McCorkell
3bb793b6a7
Implement password authentication mechanisms
...
Introduces the basic password authentication mechanism, along with a
mechanism based on ownCloud credentials stored in the user session.
Change to lib/private is an extension of PermissionsMask, as
isSharable() override was missing.
Session credentials auth mechanism now disables sharing on applied
storages, as credentials will not be available.
2015-08-19 14:20:09 +01:00
Lukas Reschke
40b87b1394
Add warning for not existing CA bundle when updating
...
For newer releases we shall use an integrity check. But that's a good alternative for now.
2015-08-19 15:03:33 +02:00
Morris Jobke
8fbb0c7b49
Fix format of log/private/ocs.php
...
Fixes https://github.com/owncloud/core/pull/14314#discussion_r37305256
2015-08-19 14:21:10 +02:00
Robin Appelman
beaef820cf
handle non existing job classes in $jobList->getNext
2015-08-19 14:16:05 +02:00
Morris Jobke
127b6e2f3f
Merge pull request #18374 from owncloud/router-apps
...
Only load app routes if the app has already been loaded [re-merge]
2015-08-19 09:52:09 +02:00
Bernhard Posselt
66d8476e9e
Merge pull request #14314 from owncloud/clean-up-ocs-code
...
Cleanup OCS code
2015-08-18 16:47:53 +02:00
Robin McCorkell
1c26755686
Only load app routes if the app has already been loaded
2015-08-18 09:18:36 +01:00
Robin McCorkell
675d852c7d
Merge pull request #17182 from owncloud/user_ini_upload_size
...
Update .user.ini when setting upload size limit
2015-08-17 13:27:47 +01:00
Morris Jobke
24e20a51eb
Degrade log message about missing app in appstore to debug
...
* fixes #18154
2015-08-17 11:27:41 +02:00
Thomas Müller
0b64268910
Adding EventDispatcher to IServerContainer
2015-08-14 15:40:15 +02:00
Lukas Reschke
a7e4785be9
Cleanup OCS code
...
This removes unused code from `OC_OCS` which nobody understood what it really was for anyways.
2015-08-14 13:42:56 +02:00
Lukas Reschke
8313a3fcb3
Add mitigation against BREACH
...
While BREACH requires the following three factors to be effectively exploitable we should add another mitigation:
1. Application must support HTTP compression
2. Response most reflect user-controlled input
3. Response should contain sensitive data
Especially part 2 is with ownCloud not really given since user-input is usually only echoed if a CSRF token has been passed.
To reduce the risk even further it is however sensible to encrypt the CSRF token with a shared secret. Since this will change on every request an attack such as BREACH is not feasible anymore against the CSRF token at least.
2015-08-14 01:31:32 +02:00
Thomas Müller
1d219cf799
With V2 we should ensure that the status codes are kept in sync
2015-08-13 10:45:25 +02:00
Thomas Müller
abd3d5c6a5
Merge pull request #17982 from owncloud/appframework-sanitize-name
...
Sanitize class names before registerService/query
2015-08-12 12:19:24 +02:00
Thomas Müller
eb13cb8d75
Merge pull request #18127 from owncloud/dav-request-tests
...
add test framework for doing full request webdav tests
2015-08-12 10:07:20 +02:00
Robin McCorkell
cd5342d0ff
Merge pull request #18202 from owncloud/revert-route-breaking-changes
...
Revert route breaking changes
2015-08-11 15:28:06 +01:00
Robin Appelman
b7cbff23d9
handle single file dav endpoints
2015-08-11 14:46:46 +02:00
Robin Appelman
fd35365041
only add tags plugin when loggedin
2015-08-11 14:43:46 +02:00
Robin Appelman
b0c8654f9e
split out creating the sabre dav server to it's own factory
2015-08-11 14:43:46 +02:00
Robin Appelman
8c5302847b
add test framework for doing full request webdav tests
2015-08-11 14:43:46 +02:00
Robin McCorkell
cd0a2874de
Merge pull request #17852 from owncloud/register-alias-factory
...
Add test for factories
2015-08-11 13:30:56 +01:00
Joas Schilling
32ccd66214
Revert "make knowledge base url configurable"
...
This reverts commit 8fb89056bd
.
2015-08-11 14:20:25 +02:00
Joas Schilling
c16fd29f29
Revert "Only load app routes if the app has already been loaded"
...
This reverts commit 50ebea41f6
.
2015-08-11 14:19:59 +02:00
Thomas Müller
aed068b237
Merge pull request #17868 from owncloud/x-forwarded-for
...
Set default 'forwarded for' headers for reverse proxy
2015-08-11 14:02:46 +02:00
Thomas Müller
d5bba42030
Merge pull request #17932 from owncloud/fix_move_files
...
make sure that hooks are emitted properly on file move operation
2015-08-11 13:54:09 +02:00
Joas Schilling
669d705792
Merge pull request #17830 from owncloud/issue-17825-dont-silently-ignore-invalid-consumers-extensions
...
Throw a InvalidArgumentException when a consumer/extension is invalid
2015-08-11 10:16:20 +02:00
Robin McCorkell
8944af57cb
Set default `forwarded_for_headers` to 'HTTP_X_FORWARDED_FOR'
2015-08-10 23:04:52 +02:00
Thomas Müller
54aa57b47a
Merge pull request #18109 from owncloud/fix-router-app-loaded
...
Only load app routes if the app has already been loaded
2015-08-10 21:42:13 +02:00
Thomas Müller
bfb9a8e58e
Merge pull request #18175 from owncloud/automatic-db-prefix-query-builder
...
Automatic db prefix query builder
2015-08-10 21:41:32 +02:00
Roeland Douma
c2856c05aa
Merge pull request #15093 from rullzer/capabilities_manager
...
Capabilities manager
2015-08-10 20:33:50 +02:00
Joas Schilling
e6eb74958f
Remove unnecessary DB prefixes from existing query builder usages
2015-08-10 16:21:41 +02:00
Joas Schilling
5fea6f753e
Automatically prefix table names with *PREFIX* unless specified
2015-08-10 16:20:42 +02:00
Robin Appelman
d979e54030
log a warning while trying to acquire a db lock from within a transaction
2015-08-10 14:39:34 +02:00
Robin Appelman
58e96e53b0
add method to check if we're inside a transaction
2015-08-10 14:15:44 +02:00
Robin Appelman
06065189d7
cleanup empty locks
2015-08-10 14:15:29 +02:00
Roeland Jago Douma
f0b617b508
Use DI
...
* Register OCP\Capability\IManager at DIContainer
* Add register capabilities to appframework
* Register capabilities in DI way
* Make unit test pass again
* Remove CapabiltiesManager from OCP
2015-08-10 10:45:16 +02:00
Roeland Jago Douma
c80c9819dc
Move core capabilities to new class
2015-08-10 10:45:16 +02:00
Roeland Jago Douma
7e6a2b71fd
Added Capabilities Manager
...
* This should allow the capabilities to be intergrated into the
appframework
* Unit tests
* Throw exception if closure does not return ICapability instance
2015-08-10 10:45:08 +02:00
michag86
c7c021e1c9
Update installer.php
2015-08-10 10:34:44 +02:00
michag86
1a23690522
Check if archive contains a directory named like appid
2015-08-10 09:36:16 +02:00
Robin McCorkell
214729a552
Merge pull request #14779 from owncloud/use-iterator-directory
...
Use the new IteratorDirectory instead of the fakedir wrapper
2015-08-07 22:16:47 +01:00
Morris Jobke
ca8f7fd69c
Merge pull request #18124 from owncloud/share-permwrongvar
...
Fix removal of share permissions when share disabled for user
2015-08-07 18:42:35 +02:00
Lukas Reschke
77f71fbb08
Merge pull request #18120 from owncloud/appframework-isessio
...
Add \OCP\ISession to AppFramework
2015-08-07 18:03:51 +02:00
Vincent Petry
b3a1aef934
Merge pull request #13641 from owncloud/cache-storage-status
...
Store storage availability in database
2015-08-07 17:31:03 +02:00
Vincent Petry
143e4a81f0
Fix removal of share permissions when share disabled for user
2015-08-07 15:43:27 +02:00
Robin McCorkell
fcc03e588a
Add \OCP\ISession to AppFramework
2015-08-07 12:29:57 +01:00
Thomas Müller
0595c05200
Adding header support to class OC_OCS_Result
2015-08-07 13:12:43 +02:00
Robin McCorkell
50ebea41f6
Only load app routes if the app has already been loaded
2015-08-06 16:09:34 +01:00
Vincent Petry
6c139674a4
Merge pull request #18030 from owncloud/dav-upload-updater
...
go trough the updater when uploading over webdav
2015-08-06 15:28:10 +02:00
Thomas Müller
db1416346c
Following the spec:
...
"`statuscode`: The OCS status code of the response, everything except 100 MUST be handled as failure."
2015-08-05 17:49:44 +02:00
Bernhard Posselt
7cb0934fa2
Merge pull request #18035 from owncloud/ocs-2.0
...
Adding ocs/v2.php with status code mapper
2015-08-05 17:28:08 +02:00
Thomas Müller
a70f145d71
Merge pull request #17961 from owncloud/make_knowledgebase_configurable
...
make knowledge base url configurable
2015-08-05 11:54:58 +02:00
Thomas Müller
6c46430cdb
Return 200 not null - we should return consistent types
2015-08-05 11:23:29 +02:00
Lukas Reschke
90a11efecd
Remove "use" statement
...
Ref https://bugs.php.net/bug.php?id=66773
2015-08-05 09:31:21 +02:00
Lukas Reschke
4efa7c09b1
Use StringUtils::equals on CSRF token and add unit tests
2015-08-04 18:34:33 +02:00
Thomas Müller
728780aee8
Merge pull request #18024 from owncloud/phpseclib-2.0
...
Update phpseclib to 2.0 for increased PHP7 compatibility
2015-08-04 16:33:14 +02:00
Lukas Reschke
c6a181d00b
[PHP 7] Change type hint to also accept Errors
...
PHP 7 changed the exception types and thus our error handler needs to be able to catch this.
Without this in some cases just a white page is shown instead of an error message.
2015-08-04 11:54:05 +02:00
Thomas Müller
649cc2fa89
Remove duplicate and unused code
2015-08-03 21:03:11 +02:00
Thomas Müller
cd1bfd7eb6
Fix authors
2015-08-03 21:02:41 +02:00
Thomas Müller
3358db320b
Reduce duplicate code
2015-08-03 18:06:07 +02:00
Thomas Müller
bacf1603ff
Adding ocs/v2.php with status code mapper
2015-08-03 16:05:50 +02:00
Robin Appelman
9729e67e3d
more phpdoc
2015-08-03 16:02:24 +02:00
Robin Appelman
cd205249e4
more phpdoc
2015-08-03 15:46:23 +02:00
Robin Appelman
132a564a21
rename path field to key
2015-08-03 15:46:19 +02:00
Morris Jobke
767ca44988
Merge pull request #17820 from owncloud/dav-exception-log-class
...
also log the class for dav exceptions
2015-08-03 15:14:21 +02:00
Robin Appelman
c39ded21d2
initialize unused (for now) ttl field to 0
2015-08-03 14:13:36 +02:00
Robin Appelman
96a9d171b3
Fix db schema
2015-08-03 14:13:36 +02:00
Robin Appelman
86acd535c2
use the database backend for locking if no memcache is configured for it
2015-08-03 14:13:36 +02:00
Robin Appelman
4ea7cbb0f5
Add database backend for high level locking
2015-08-03 14:13:35 +02:00
Robin Appelman
a8552a1b24
split off keeping track of acquire locks
2015-08-03 14:12:56 +02:00
Robin Appelman
2a90cbe603
go trough the updater when uploading over webdav
2015-08-03 13:42:36 +02:00
Andreas Fischer
3b803db6d8
Update phpseclib to 2.0
2015-08-03 09:43:45 +02:00
Bjoern Schiessle
51a67a54e0
always update file cache, the cache can handle partial data correctly if the file doesn't already exists in the file cache
2015-07-31 17:14:32 +02:00
Robin McCorkell
182bc17aeb
Sanitize class names before registerService/query
...
Leading backslashes are removed, so a `registerService('\\OC\\Foo')`
can still be resolved with `query('OC\\Foo')`.
2015-07-30 21:02:16 +01:00
Thomas Müller
22fd04eb41
Merge pull request #17981 from owncloud/correct-regex
...
Correct regular expressions
2015-07-30 16:07:46 +02:00
Lukas Reschke
e95bc68ac7
Check for PDO instead of removed function for PHP 7 compatibility
2015-07-30 12:32:22 +02:00
Lukas Reschke
ad4c731c4c
Correct regular expressions
...
Previously the regex was only matching on single characters. Meaning that file names such as "👍 .txt" where possible while "👍 " alone never was. This check apparently never worked as expected.
2015-07-30 11:22:14 +02:00
Thomas Müller
c3cac887f5
- more injection
...
- less static calls
- use params on sql queries
- handle sql exception on database and user creation gracefully
2015-07-30 00:04:30 +02:00
Thomas Müller
114f128fc3
Moving mysql setup code over to Doctrine
2015-07-29 23:12:59 +02:00
Thomas Müller
5ed38a75d6
Remove remainings of mssql
2015-07-29 18:19:31 +02:00
Bjoern Schiessle
8fb89056bd
make knowledge base url configurable
2015-07-29 18:07:04 +02:00
Robin McCorkell
3ef680d966
Merge pull request #17950 from owncloud/config-dontdetectfschangesinrootbydefault
...
Disable filesystem_check_changes by default
2015-07-29 15:34:02 +01:00
Vincent Petry
7c9405a921
Disable filesystem_check_changes by default
...
This will prevent detecting remote changes done in the data folder /
root storage by default. In the rare cases where the data folder is
shared with other apps/users outside ownCloud and change detection is
needed, the admin will have to set the option explicitly from now on.
Note that this doesn't affect external storages which have their own
setting in the mount options.
2015-07-29 12:01:12 +02:00
Bjoern Schiessle
fb4c99fe06
make sure that we emit the hooks if a file gets moved from a subfolder to the root folder with the nodes API
2015-07-29 11:02:38 +02:00
Morris Jobke
c34e63bb1f
Merge pull request #15543 from rullzer/mimetypedetector
...
Mimetypedetector
2015-07-28 13:35:26 +02:00
Roeland Douma
73169b0edb
Merge pull request #17195 from rullzer/no_multiple_remote_shares_of_same_file
...
Remote shares should be uique
2015-07-28 13:06:25 +02:00
Andreas Böhler
3a0d42ecf3
Add hook 'pre_displayLoginPage'
2015-07-28 13:00:18 +02:00
Andreas Böhler
3645308d0b
Add possibility for alternative logins to force redirection of login page
2015-07-28 10:31:49 +02:00
Vincent Petry
6ada1e3276
Merge pull request #17902 from owncloud/fix_17898
...
get header size before we open the file to avoid locking exception
2015-07-27 16:58:32 +02:00
Thomas Müller
68f14a943a
Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryption
...
Only set is encrypted when encryption is enabled
2015-07-27 16:06:39 +02:00
Roeland Jago Douma
d276aebf40
Pass config dir as parameter to detection class
...
In order to properly test the mimetype function:
* constructor takes path to configdir
* Added unit tests for mimetype (only if vfsStream is available)
2015-07-27 14:59:49 +02:00
Roeland Jago Douma
88fb389eab
Proper deprecate methods
2015-07-27 14:59:49 +02:00
Roeland Jago Douma
9cdd637050
Loading of mapping/aliases is done in class
2015-07-27 14:59:49 +02:00
Roeland Jago Douma
141a0f0f47
Move mimetypedetection to files/type/detection
2015-07-27 14:59:45 +02:00
Roeland Jago Douma
6db6689740
Added mimetype detector
...
* Copied unit tests from old functions
2015-07-27 14:58:45 +02:00
Bjoern Schiessle
0736b45d92
get header size before we open the file to avoid locking exception
2015-07-27 14:29:07 +02:00
Robin Appelman
f74525c349
check if the user is trying to scan a valid path
2015-07-27 11:21:48 +02:00
Bernhard Posselt
d8673dabe3
add test for factories
...
use ref for factory test
use a factory for registerAlias
Ensure we construct SimpleContainer
Use single instance of DIContainer in routing tests
2015-07-25 01:59:30 +02:00
Thomas Müller
11244736ae
Merge pull request #17838 from owncloud/sharing-password-policy-master
...
Use a hook to integrate sharing password verification
2015-07-24 16:47:18 +02:00
Robin Appelman
91fbee8988
also log the class for dav exceptions
2015-07-24 13:30:52 +02:00
Thomas Müller
1f8ee61006
Merge pull request #17755 from owncloud/alias-container-alive
...
Add registerAlias method to shortcut interface registration #17714
2015-07-24 13:11:32 +02:00
Thomas Müller
632e39a750
Fix PHPDoc on setPassword
2015-07-23 16:11:06 +02:00
Joas Schilling
9cee8ff9f8
Only set is encrypted when encryption is enabled
2015-07-23 15:18:59 +02:00
Thomas Müller
ac08685234
Use a hook to integrate sharing password verification
2015-07-23 14:44:48 +02:00
Joas Schilling
02323eca01
Throw a InvalidArgumentException when a consumer/extension is invalid
2015-07-23 11:00:29 +02:00
Lukas Reschke
874ccbfb81
Add custom CSP for Win 10 compatibility
...
The default content-security-policy of ownCloud forbids inline
JavaScript for security reasons. IE starting on Windows 10 will
however also obey the CSP which will break the event source fallback.
As a workaround thus we set a custom policy which allows the execution
of inline JavaScript.
This fixes https://github.com/owncloud/core/issues/14286
2015-07-21 20:40:32 +02:00
Joas Schilling
20cd0ae55b
Add a log message when the Doctrine Query Builder is retrieved
2015-07-21 15:53:28 +02:00
Joas Schilling
f9071ed5b7
Comment out LIMIT 0 case because of the mixed results
2015-07-21 15:25:48 +02:00
Joas Schilling
c9564503c2
Fix tests for setFirstResult and setMaxResults on oracle
2015-07-21 15:25:48 +02:00
Joas Schilling
f77e5f411d
Fix existing usages by removing the quotes
2015-07-21 15:25:47 +02:00
Joas Schilling
516f7e8299
Add unit tests and automatic quoting
2015-07-21 15:25:47 +02:00
Joas Schilling
de348180ae
Use the public interface and our method instead of the doctrine thing
2015-07-21 15:25:47 +02:00
Joas Schilling
1bfb944d51
Add QueryBuilder, ExpressionBuilder and CompositeExpression wrappers
2015-07-21 15:25:47 +02:00
Morris Jobke
2d691c2fb4
Merge pull request #17381 from owncloud/fix_sharing_add_to_group
...
[sharing] fix addToGroup hook
2015-07-21 13:30:41 +02:00
Morris Jobke
5a5c59639b
Escape ampersand in logout URL
...
* fixes #17757
2015-07-21 00:26:30 +02:00
Bernhard Posselt
d20e2002a6
Merge pull request #17743 from owncloud/return-proper-statuscodes
...
Return proper status code in case of a CORS exception
2015-07-20 18:03:25 +02:00
Robin McCorkell
75a5e6e12b
Fix mounting wrapped storages resulting in many-layered wrapping
...
This usually doesn't cause issues, but in unit tests sometimes a wrapped
storage is passed to Filesystem::mount() and gets rewrapped, hitting the
XDebug function nesting level limit when used.
2015-07-20 16:27:26 +01:00
Robin McCorkell
df19cabb44
Store storage availability in database
...
Storage status is saved in the database. Failed storages are rechecked every
10 minutes, while working storages are rechecked every request.
Using the files_external app will recheck all external storages when the
settings page is viewed, or whenever an external storage is saved.
2015-07-20 16:27:26 +01:00
Robin McCorkell
aac84f732d
Unit test OC_Files::setUploadLimit()
...
There was also a bug with checking the upper limit on the passed upload
size. PHP does funny things with integer vs float comparisons, so our
check didn't work. Now the check is much simpler, and ensures the value
is sane.
2015-07-20 15:03:09 +01:00
Robin McCorkell
d3bcafe618
Update .user.ini when setting upload size limit
2015-07-20 12:52:43 +01:00
Lukas Reschke
7dda86f371
Return proper status code in case of a CORS exception
...
When returning a 500 statuscode external applications may interpret this as an error instead of handling this more gracefully. This will now make return a 401 thus.
Fixes https://github.com/owncloud/core/issues/17742
2015-07-20 12:54:22 +02:00
Joas Schilling
0dd1a785fe
Merge pull request #16935 from owncloud/allow-app-check-code-for-deprecated-classes
...
Allow app check code for deprecated classes
2015-07-20 08:39:53 +02:00
Lukas Reschke
1e4496c1cb
Merge pull request #17698 from owncloud/allow-update-of-disabled-apps
...
Allow upgrade of not enabled apps
2015-07-19 12:14:13 +02:00
Bernhard Posselt
a4e3939204
add registerAlias method to shorcut interface registration
...
remove unused import
add since tag
fix typo
2015-07-18 13:43:54 +02:00
Björn Schießle
f363fc2d4a
Merge pull request #17540 from owncloud/enc_detect_legacy_files2
...
make sure that we always detect legacy files correctly
2015-07-17 21:42:32 +02:00
Thomas Müller
2e1cc2d825
Merge pull request #17682 from owncloud/fix-undefined-REMOTE_ADDR-master
...
Fixing 'Undefined index: REMOTE_ADDR'
2015-07-17 14:27:33 +02:00
Bjoern Schiessle
16d8014cdd
set targetIsEncrypted to true if file cache indicates that we try to read a encrypted file
2015-07-17 13:30:08 +02:00
Bjoern Schiessle
a2e2005e67
make sure that we always detect legacy files correctly
2015-07-17 13:30:08 +02:00
Morris Jobke
f7a78cf650
Merge pull request #17663 from owncloud/occ-memcache
...
Missing memcache should not cause occ hard-fail
2015-07-17 13:15:47 +02:00
Joas Schilling
3566dcf246
PR #17046 deprecated OCP\Util::mb_(sub)str_replace()
2015-07-17 12:34:56 +02:00
Joas Schilling
8a64abf4e4
Only decorate the type when it was matched
2015-07-17 12:34:56 +02:00
Joas Schilling
a0c6f2e5e0
Use the decorator pattern
2015-07-17 12:34:56 +02:00
Joas Schilling
bba87a2a3b
Restructor the code into different classes instead of extending
2015-07-17 12:34:56 +02:00
Joas Schilling
eb1c437941
Check for methods as good as possible
2015-07-17 12:34:56 +02:00
Joas Schilling
2783a78070
Allow checking for functions
2015-07-17 12:34:56 +02:00
Joas Schilling
f228a3dc28
Add support for deprecated constants
2015-07-17 12:34:56 +02:00
Joas Schilling
483c886291
Add deprecation version to the list
2015-07-17 12:34:56 +02:00
Joas Schilling
d2fc1b2302
Correctly handle use statements
2015-07-17 12:34:56 +02:00
Joas Schilling
4e95031ec4
Allow app:check-code to check for deprecated methods
2015-07-17 12:34:55 +02:00
Morris Jobke
3fae984b56
Merge pull request #17282 from owncloud/s2s-catchremotelockexceptions
...
Throw lock exceptions if remote share returned 423 status code
2015-07-17 11:34:34 +02:00
Thomas Müller
bd71540c8a
Fixing 'Undefined index: REMOTE_ADDR' - fixes #17460
2015-07-16 16:40:57 +02:00
blizzz
bfb90d10ed
Merge pull request #17046 from nicolas-grekas/fix-16654
...
Do not use OC*::mb_*_replace(), they are useless
2015-07-16 11:35:25 +02:00
Nicolas Grekas
472d48f6e3
Do not use OC*::mb_*_replace(), they are useless
2015-07-16 11:00:04 +02:00
Robin McCorkell
8efa23c895
Fix memcache factory unit tests
2015-07-16 03:53:18 +01:00
Robin McCorkell
e556d97b64
Fix memcache factory creation when not installed
...
Memcache factory expects a class name, not an instantiated object
2015-07-15 22:55:30 +01:00
Robin McCorkell
7830434d78
Missing memcache should not cause occ hard-fail
...
Warning is now printed to logs, but occ and cron will still work.
2015-07-15 22:53:14 +01:00
Robin Appelman
da951ba059
Use the new IteratorDirectory instead of the fakedir wrapper
2015-07-15 13:57:53 +02:00
Roeland Jago Douma
fea71a81fd
Cannot share the same file multiple times with remote user
...
Fix for #17183
It should not be possible to create multiple remote shares from user A
to user B of the same file/folder.
2015-07-15 12:42:40 +02:00
Vincent Petry
f62d94c4ff
Throw StorageNotAvailable if propfind on root failed
...
If PROPFIND fails with 404 or 405 on the remote share root, it means the
storage is not available. Throw StorageNotAvailable is such case.
2015-07-13 18:28:53 +02:00
Vincent Petry
b3b080e1c0
Strip public webdav info about sharing and mount points
...
Remove information about whether a file is an incoming share or mount
point when requested over public webdav.
2015-07-13 14:20:35 +02:00
Morris Jobke
1006ec56ce
Merge pull request #17481 from rullzer/mimetype-list
...
Move mimetypes.list.php to config/mimetypemapping.dist.json
2015-07-13 08:31:18 +02:00
Roeland Jago Douma
8cac236135
Move to OC::$configDif
2015-07-10 15:15:50 +02:00
Roeland Jago Douma
032ffc969e
Move mimetypealiases.json to mimetypealiases.dist.json
2015-07-10 10:17:49 +02:00
Morris Jobke
bceb38ce82
Merge pull request #17517 from RealRancor/fix_failed_login_syntax
...
Fixed "Remote IP:" syntax on failed logins
2015-07-10 02:34:09 +02:00
Morris Jobke
c86e742e67
Merge pull request #15586 from Egari/addThemeSupportToMimeIcon
...
Add theme support to mimetypeIcon through imagePath integration
2015-07-09 23:02:46 +02:00
Morris Jobke
d52e197b0d
Merge pull request #16965 from owncloud/getUserFolder-in-IRootFolder
...
Add getUserFolder to IRootFolder
2015-07-09 14:29:47 +02:00
Thomas Müller
d3b58d147f
Allow upgrade of not enabled apps
2015-07-09 12:37:57 +02:00
RealRancor
e62c375749
Fixed "Remote IP:" syntax on failed logins
2015-07-09 10:04:51 +02:00
tbartenstein
c48e00294c
Update fileinfo.php
...
Edits isMounted() to remove the check for 'local' prefix, so that folder icons are displayed correctly (see issue #10712 )
2015-07-08 18:48:11 +02:00
Morris Jobke
19f34bafa5
Merge pull request #17472 from RealRancor/add_is_dir
...
Add is_dir check to getAllApps() function
2015-07-08 18:30:45 +02:00
Roeland Jago Douma
895d29adf1
Move mimetypemapping.json to mimetypemapping.dist.json
...
This allows users to create their own mapping file to extend our current
mappings. This makes sure that custom mappings are not lost on OC
upgrades.
2015-07-08 17:16:12 +02:00
Roeland Jago Douma
35fba1ef9f
Move mimetypes.list.php to config/mimetypemapping.json
...
This allows users to add new mimetypemappings (extention -> mimetype)
themself. And not have to wait until a new release for updated
mimetypes.
Fixes : #15384
2015-07-08 13:18:58 +02:00
Morris Jobke
0fe81d2f21
Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptions
...
Fix the path for users which have an exception for a group share
2015-07-08 10:33:42 +02:00
RealRancor
1300204586
Add is_dir check to getAllApps() function
2015-07-08 10:25:39 +02:00
stolter
1fc188fd29
Add theme support to mimetypeIcon through imagePath integration
2015-07-07 14:38:14 +02:00
Joas Schilling
6fb3a8d5f5
Add missing tunnel on new class
2015-07-07 11:18:24 +02:00
Joas Schilling
40eaf71a33
Make sure the owner always has the right path
2015-07-07 11:08:21 +02:00
Roeland Jago Douma
d685327d5a
Make php also use config/mimetypealiases.json
2015-07-07 08:56:15 +02:00
Bjoern Schiessle
058d910f5e
intproduce pre_addToGroup hook. we need to calculate the possible unique
...
targets before the user was added to the group otherwise we will always detect
a name collision
2015-07-06 17:24:05 +02:00
Thomas Müller
9120942bcf
Merge pull request #16924 from owncloud/copy-recursive-polyfill
...
add recursive copy polyfill for storage backends
2015-07-06 17:05:36 +02:00
Thomas Müller
1385b1ec48
Remove OC_Appconfig
2015-07-03 18:00:16 +02:00
Thomas Müller
d3ac73c0c9
Remove OC_Log
2015-07-03 18:00:16 +02:00
Thomas Müller
68fd74963e
Remove legacy search classes
2015-07-03 17:56:14 +02:00
Vincent Petry
3df27a01be
Merge pull request #17379 from owncloud/kill-file-mapper
...
Remove file mapper - was only use in Windows and never worked properly
2015-07-03 17:53:47 +02:00
Thomas Müller
7b9daf84ee
Merge pull request #16923 from owncloud/flysystem-base
...
Flysystem base adapter
2015-07-03 17:48:10 +02:00
Vincent Petry
cc373ab89a
Merge pull request #15470 from rullzer/files_sharing_getUrlContent
...
Move away from private static function OC_Util::getUrlContent
2015-07-03 17:47:46 +02:00
Robin Appelman
de4e4cb6ea
also dont download existing on fopen when using w+ and wb+
2015-07-03 15:53:02 +02:00
Robin Appelman
6cc65b53ab
add phpdoc
2015-07-03 15:53:02 +02:00
Robin Appelman
232872e401
add flysystem adapater
2015-07-03 15:53:02 +02:00
Thomas Müller
f55aa856ad
Remove file mapper - was only use in Windows and never worked properly
2015-07-03 15:41:29 +02:00
Morris Jobke
838ddc72c1
Merge pull request #17348 from owncloud/fix-lower-than
...
Correct lower than wording
2015-07-03 14:42:08 +02:00
Robin Appelman
b849b7c7f2
better handling of folders
2015-07-03 13:43:22 +02:00
Morris Jobke
208985dc1c
fix wording
2015-07-03 12:54:49 +02:00
Morris Jobke
3e97ca3b96
Add getUserFolder to IRootFolder
...
* untangle DI of user specific folders
* allows to autodetect the dependency
2015-07-03 11:11:58 +02:00
Lukas Reschke
0b8ced1ab3
Merge pull request #17345 from owncloud/app-code-check-search
...
[app code check] add OC_Search_Provider and _Result
2015-07-03 09:44:18 +02:00
Vincent Petry
f70791653c
Merge pull request #17291 from owncloud/mount-manager-public
...
expose the mount manager in the public api
2015-07-03 07:57:31 +02:00
Vincent Petry
34043d4647
Throw lock exceptions if remote share returned 423 status code
2015-07-03 07:51:13 +02:00
Morris Jobke
fd8f6a18fd
Merge pull request #17327 from owncloud/fix_index
...
owner is stored as 'uid_owner', not as 'owner' in the oc_share table
2015-07-02 23:26:28 +02:00
Lukas Reschke
8335c7a4e9
Correct wording
...
If a max version of 8.0.1 has been specified the message should indicate that 8.0.1 is also supported.
2015-07-02 16:37:39 +02:00
Lukas Reschke
b21d4a55f2
Add missing type annotations
2015-07-02 16:36:40 +02:00
Bjoern Schiessle
f5a7aa2968
call post_addToGroup als for class OC_User because sharing and LDAP are using this class. Minimal approach to fix #16740
2015-07-02 16:25:11 +02:00
Morris Jobke
081264cb93
[app code check] add OC_Search_Provider and _Result
...
Thanks to @libasys for noticing this.
2015-07-02 16:20:20 +02:00
Joas Schilling
8294ad71fc
Fix the path for users which have an exception for a group share
2015-07-02 15:35:31 +02:00
Morris Jobke
f5c57e076e
Merge pull request #17077 from owncloud/files-scan-absolute-path
...
fix getting mount points when passing a path to the files:scan command
2015-07-02 13:02:20 +02:00
Bjoern Schiessle
f52eec765c
owner is stored as 'uid_owner', not as 'owner' in the oc_share table
2015-07-02 10:49:22 +02:00
Lukas Reschke
d67d4f36bd
Delete OCS ID from DB if none is specified
...
If no OCS ID is specified in appinfo.xml and an app update is triggered and a OCS ID is stored in the DB we should clean the value.
Ref https://github.com/owncloud/activity/issues/320#issuecomment-117937748
2015-07-02 09:16:00 +02:00
Robin Appelman
57945dbc4b
fix typehinting
2015-07-01 16:13:33 +02:00
Robin Appelman
faf642c31d
expose the mount manager in the public api
2015-07-01 15:57:04 +02:00
Morris Jobke
bad499baad
Merge pull request #17252 from owncloud/fix-php-errors-in-app-description
...
Only do the description kung-fu on strings
2015-07-01 15:44:21 +02:00
Thomas Müller
aae55174f6
Only do the description kung-fu on strings - fixes #17028
2015-07-01 13:15:13 +02:00
Vincent Petry
cf245b80fe
Only delete part file on error if it is really a part file
2015-07-01 12:52:06 +02:00
Vincent Petry
fd4efdded9
Clean up part file only once, not twice on error
2015-07-01 09:47:05 +02:00
Morris Jobke
b5c9196ffc
Merge pull request #17088 from owncloud/add-verbosity-to-upgrade
...
[upgrade] add verbosity check and show repair info & steps
2015-07-01 08:56:06 +02:00
Morris Jobke
4e44cc49d9
Merge pull request #17093 from owncloud/upgrade-timestamp
...
[upgrade] show timestamp for output during upgrade
2015-07-01 08:55:32 +02:00
Morris Jobke
da45fad3eb
Merge pull request #17078 from owncloud/fix-initial-server-host
...
Fix undefined offset
2015-07-01 08:55:12 +02:00
Morris Jobke
1469177a3a
Merge pull request #16406 from owncloud/enc-strlenperffix
...
Small perf tweak in strlen loop
2015-07-01 08:54:33 +02:00
Morris Jobke
c703a3a63e
Merge pull request #15569 from owncloud/remove-getetag-properties
...
Remove unneeded getetag entries in properties table
2015-07-01 08:53:37 +02:00
Vincent Petry
b921748e61
Merge pull request #17224 from owncloud/webdav-handle-ServerNotAvailableException
...
Adding exception handling for ServerNotAvailableException
2015-07-01 07:18:36 +02:00
Vincent Petry
f76773bd4c
Merge pull request #17259 from owncloud/chunk-cleanupgracefulonlock
...
Do not try clearing locked files in cache folder
2015-07-01 07:08:47 +02:00
Lukas Reschke
aff55347f9
Use UTF-8 mode for preg_split and preg_replace
...
Otherwise a single application with a description containing a non compliant character can break the whole ownCloud appstore. This is for example https://apps.owncloud.com/content/show.php?content=149553
Fixes https://github.com/owncloud/core/issues/17101#issuecomment-117365224
2015-07-01 01:44:33 +02:00
Vincent Petry
16ff6cff54
Merge pull request #17256 from owncloud/locking-disablecallbackwrapperwhendisabled
...
Do not set callback wrapper when locking is disabled
2015-06-30 18:28:28 +02:00
Vincent Petry
dd4de48418
Do not try clearing locked files in cache folder
2015-06-30 17:00:46 +02:00
Björn Schießle
2c1b0f9a66
Merge pull request #17225 from owncloud/fix_12106
...
if it is a mount point we need to get the path from the mount manager
2015-06-30 16:40:57 +02:00
Bjoern Schiessle
44ec3dd110
if it is a mount point we need to get the path from the mount manager
2015-06-30 15:08:18 +02:00
Thomas Müller
134dc136e6
Avoid namespace clash
2015-06-30 15:07:48 +02:00
Thomas Müller
3f3c603922
Adding exception handling for ServerNotAvailableException - refs #17192
2015-06-30 15:05:59 +02:00
Vincent Petry
0118bf04dc
Merge pull request #17251 from owncloud/issue-17247-filesize-stat-failed-for-in-log
...
Perform the filesize on the file that exists
2015-06-30 14:51:29 +02:00
Vincent Petry
afd83caf69
Do not set callback wrapper when locking is disabled
2015-06-30 13:45:41 +02:00
Morris Jobke
2bcd0af177
Merge pull request #17189 from owncloud/files-straypartfilesonexception
...
Cleanup part file after upload exception
2015-06-30 11:58:26 +02:00
Joas Schilling
9c533342fc
Perform the filesize only when the file exists
...
Regression from 95602d4069
and 9b336765b6
2015-06-30 11:47:58 +02:00
Joas Schilling
a1bfc26b88
Merge pull request #17249 from owncloud/file-cache-is-a-icache
...
Fixing "ImportController::__construct() must implement interface OCP\…
2015-06-30 09:46:09 +02:00
Thomas Müller
fc474de573
Fixing "ImportController::__construct() must implement interface OCP\\ICache, instance of OC\\Cache\\File given"
2015-06-29 22:43:18 +02:00
Vincent Petry
167f57c15e
Unlock first path on rename if second path is locked
2015-06-29 17:31:14 +02:00
Vincent Petry
3217d4dad1
Cleanup part file after upload exception
...
Added unit tests for checking for stray part files.
Convert exception to sabre exception in upload put method.
Also added unit test for exception mapping, which also indirectly tests
that the part file is being deleted on exception.
This applies to both chunking and non-chunking mode.
Added some unit tests for chunk upload.
2015-06-29 17:31:14 +02:00
Vincent Petry
2fa432dfb8
Fix class name conflict
...
Looks like PHP 5.6.x doesn't like name conflicts.
\Sabre\DAV\Server would overlap with \OC\Connector\Sabre\Server.
2015-06-29 17:11:14 +02:00
Morris Jobke
b88a0e7080
Merge pull request #17231 from owncloud/add-missing-version-field
...
Add missing version field
2015-06-29 16:41:47 +02:00
Joas Schilling
30f5fa42e5
Merge pull request #17229 from owncloud/maintenance-plugin-test
...
Unit tests added for MaintenancePlugin
2015-06-29 16:22:38 +02:00
Thomas Müller
372a9afabe
Fixing ctor calls and ctor itself to not break usage in calendar and contacts .....
2015-06-29 15:54:05 +02:00
Lukas Reschke
ab4d5d20ea
Typehint $targetVersion
2015-06-29 15:10:40 +02:00
Lukas Reschke
b56af26199
Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-store
...
Send OC version to appstore so it can reply with the right links
2015-06-29 15:07:00 +02:00
Robin Appelman
8a2ef26b5e
handle invalid results from mount providers
2015-06-29 14:42:34 +02:00
Thomas Müller
f8127046ee
Unit tests added for MaintenancePlugin
2015-06-29 14:18:09 +02:00
Joas Schilling
70eb20e3a7
Merge pull request #17030 from owncloud/lock-posthooks
...
Keep shared lock for post-hooks
2015-06-29 14:17:03 +02:00
Morris Jobke
c57fb19b2f
Merge pull request #17226 from owncloud/webdav-add-message-on-maintenance
...
In case of maintenance we should add a message to the exception
2015-06-29 14:11:36 +02:00
Robin Appelman
786ec82a61
add unit test
2015-06-29 14:06:29 +02:00
Robin Appelman
8ec7e9fac7
fix getting mount points when passing a path to the files:scan command
2015-06-29 14:03:23 +02:00
Lukas Reschke
5810e7ab87
Merge pull request #17050 from owncloud/request-status-from-ocs
...
Request approved state for disabled apps with ocsid
2015-06-29 13:41:11 +02:00
Thomas Müller
e236e564af
In case of maintenance we should add a message to the exception
2015-06-29 12:31:01 +02:00
Joas Schilling
ae3d402dbc
Send OC version to appstore so it can reply with the right links
2015-06-29 12:14:07 +02:00
Lukas Reschke
04fe9e05f0
Use new updater URL + add unit tests
...
Uses the new updater url "https://updates.owncloud.com/server/ "
2015-06-28 11:25:28 +02:00
Lukas Reschke
a793b98fd0
Fix indentation
2015-06-27 20:37:07 +02:00
Lukas Reschke
af01958f3e
Add missing annotations for parameters
2015-06-27 20:35:47 +02:00
Lukas Reschke
d1f0ff372e
Merge pull request #17163 from owncloud/update-licenses
...
Update license headers
2015-06-27 20:22:23 +02:00
Roeland Douma
708c6268ad
Merge pull request #17206 from oparoz/bpg-media-type
...
Adding BPG media type
2015-06-27 10:19:56 +02:00
Olivier Paroz
158c5b5e47
Adding BPG media type
2015-06-26 19:22:12 +02:00
Vincent Petry
0684cc15dc
Merge pull request #17071 from owncloud/share-get-users-non-existing
...
fix getUsersSharingFile with locking
2015-06-26 18:27:53 +02:00
Vincent Petry
271ef9dedb
Remove test-specific method to make Bjoern and Joas happy
2015-06-26 17:37:04 +02:00
Robin Appelman
c338999032
fix getUsersSharingFile with locking
2015-06-26 16:31:52 +02:00
Thomas Müller
ac94126393
Merge pull request #17191 from owncloud/issue-17188-group-share-part-file
...
Correctly check if the real file exists, otherwise try the part file
2015-06-26 16:01:41 +02:00
Björn Schießle
b318b9cf17
Merge pull request #17008 from owncloud/fix-17006
...
Improve splitting of username and remote adress when username contains an `@`
2015-06-26 16:01:16 +02:00
Joas Schilling
9b336765b6
Correctly check if the real file exists, otherwise try the part file
2015-06-26 13:17:23 +02:00
Thomas Müller
796aae4402
Merge pull request #17009 from owncloud/lock-downloadfile
...
Lock file during download
2015-06-26 13:04:34 +02:00
Thomas Müller
6c3a4282e5
Merge pull request #17165 from owncloud/federated_cloud_sharing_search_address_book
...
Search address book for federated cloud id
2015-06-26 10:53:02 +02:00
Vincent Petry
538e466c30
Keep shared locks in post hooks
...
Instead of unlocking after the file operation, change exclusive locks
back to shared locks during post hooks, and unlock after that.
Also added unit tests to test locking in pre-hooks, during operation and
post-hooks.
2015-06-25 16:33:02 +02:00
Morris Jobke
f63915d0c8
update license headers and authors
2015-06-25 14:13:49 +02:00
Bjoern Schiessle
a288d0eea3
ne need to check twice if $row['share_with'] is set
2015-06-25 12:14:46 +02:00
Bjoern Schiessle
dd9dfc4461
show nice display name for remote shares if possible
2015-06-25 12:14:03 +02:00
Morris Jobke
1601867c9d
Remove unneeded getetag entries in properties table
...
* fixes #13281
2015-06-25 08:44:26 +02:00
Vincent Petry
58439c337c
Merge pull request #17070 from owncloud/lock-movemountbug
...
Lock correct paths when moving mount
2015-06-24 18:37:48 +02:00
Morris Jobke
5f59393b30
Merge pull request #17110 from owncloud/share-error-handling
...
[sharing] handle shares of users that aren't available anymore
2015-06-24 17:38:34 +02:00
Lukas Reschke
004280e407
Merge pull request #17136 from rullzer/fix_remove_link_OCS
...
Allow removing of link password in OCS again
2015-06-24 16:45:00 +02:00
Vincent Petry
8859004a2b
Rollback folder scan if an entry was locked
2015-06-24 15:42:00 +02:00
Thomas Müller
161ca900e0
Merge pull request #17130 from owncloud/update-mime-types
...
Update wmv and add mts and mt2s
2015-06-24 13:35:58 +02:00
Roeland Jago Douma
6977eff106
set NULL correctly in password update
...
Old code used 'NULL' but docterine wants null. Now it is possible again
to remove the password from a link share.
2015-06-24 12:37:59 +02:00
Morris Jobke
300d1c88d0
Merge pull request #17106 from owncloud/htaccess-update-only-once
...
Only update the htaccess ErrorDocument links when they are not set yet
2015-06-24 12:20:22 +02:00
Vincent Petry
35047a2300
Fix locked paths in the moveMount case
...
When moving a mount point directly, the lock must be applied on the
local mount point path instead of the attached storage root.
Other operations will still lock the attached storage root.
2015-06-24 11:33:28 +02:00
Thomas Müller
5c213539af
Update wmv and add mts and mt2s - fixes #17128 and owncloud/firewall#107
2015-06-24 11:06:29 +02:00
Morris Jobke
5ff536b45a
[upgrade] add verbosity check and show repair info & steps
2015-06-24 10:25:05 +02:00
Joas Schilling
dba5d5e205
Use a OutputFormatter instead of hacking into writeln()
2015-06-24 09:26:30 +02:00
Morris Jobke
4f2f8a6f28
[sharing] handle shares of users that aren't available anymore
...
* properly handle the case where an abandoned share is left and
simply skip it
2015-06-23 18:22:36 +02:00
Morris Jobke
02b2b60581
Merge pull request #17095 from owncloud/proper-error-handling
...
Proper error handling
2015-06-23 17:40:55 +02:00
Joas Schilling
0db311c9db
Only update the htaccess ErrorDocument links when they are not set yet
2015-06-23 16:45:56 +02:00
Morris Jobke
c86e129ce9
[updater] keep maintenance active on failure and mark failure in red
2015-06-23 14:45:53 +02:00
Björn Schießle
cce841c665
Merge pull request #17045 from owncloud/enc_improvements
...
encryption improvements
2015-06-23 14:30:21 +02:00
Morris Jobke
1ba9fd3ada
[upgrade] print update message before running the update code
...
* otherwise you don't know during which app update something failed
2015-06-23 13:13:44 +02:00
Bjoern Schiessle
95602d4069
make sure that we always read the header from the original file
2015-06-23 11:41:21 +02:00
Morris Jobke
fe42553e8a
[updater] propagate error case properly
...
* add $success to the updateEnd hook
* add new return code for a update failure
* add exception class to failure hook message
2015-06-23 10:03:27 +02:00
Morris Jobke
fdd01cf15c
Added error message on initMountpoints exception
2015-06-23 09:54:03 +02:00
Joas Schilling
738b78f1b0
Use \OC\HintException and translate the hint
2015-06-22 15:34:06 +02:00
Joas Schilling
2b7e5f841a
Merge spliteUserRemote with fixRemoteUrlInShareWith
2015-06-22 15:25:23 +02:00
Bjoern Schiessle
d38a378b8c
make sure that we split username and server address at the first '@' from the right to allow usernames containing '@'
2015-06-22 15:25:23 +02:00
Björn Schießle
a88b370dc8
Merge pull request #12546 from oparoz/patch-1
...
Send the mime icon if we can't generate a preview
2015-06-22 13:55:17 +02:00
Lukas Reschke
4d23e06097
Fix undefined offset
...
There are cases where no trusted host is specified such as when installing the instance, this lead to an undefined offset warning in the log right after installing. (when another domain than localhost or 127.0.0.1 was used)
2015-06-22 12:28:07 +02:00
Thomas Müller
c74c8eff3a
Enable x-sendfile only if we do not lock the file system
2015-06-22 12:07:53 +02:00
Thomas Müller
ced15c44b4
Merge pull request #16657 from owncloud/view-emit-path
...
emit hooks from a view as long as the path is inside the default root
2015-06-22 11:29:11 +02:00
Bernhard Posselt
7fe5ab4d4a
Merge pull request #17056 from owncloud/appframework-type-cast
...
Allow multiple whitespace in type hints in AppFramework
2015-06-22 10:35:28 +02:00
Robin McCorkell
04b6f67f07
Allow multiple whitespace in type hints in AppFramework
...
Type hints such as `@param bool $doSomething` will now correctly get
parsed, allowing for alignment of docblock parameters if the app developer so
wishes.
2015-06-20 23:52:01 +01:00
Lukas Reschke
1ead0b6f95
Use proper type
...
This is a string
2015-06-19 21:00:42 +02:00
Lukas Reschke
00a65e30ce
Request approved state for disabled apps with ocsid
...
In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git.
With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided.
Fixes https://github.com/owncloud/core/issues/17003
2015-06-19 19:04:54 +02:00
Olivier Paroz
ba3b6f9be4
Remove unneeded returns from private cropping methods
2015-06-19 15:07:49 +02:00
Morris Jobke
7e046d0595
Fix naming of param in private/server.php
2015-06-19 10:23:04 +02:00
Joas Schilling
6adddb3095
Merge pull request #16889 from owncloud/group-sorting-fixes
...
Only sort by group name when LDAP is involved
2015-06-19 08:29:25 +02:00
Vincent Petry
6697f9524c
Merge pull request #16963 from owncloud/fileinfo-lock
...
Acquire read lock when getting file or directory info
2015-06-18 18:27:20 +02:00
Vincent Petry
0b34d888e6
Merge pull request #17017 from owncloud/cache-update-write-lock
...
update the file cache within the write lock
2015-06-18 18:27:02 +02:00
Robin Appelman
17be0993b4
remove unneeded normalize
2015-06-18 15:33:44 +02:00
Robin Appelman
6018567df2
unlock the file if the file doesnt exists
2015-06-18 15:26:17 +02:00
Robin Appelman
d7960d5db6
dont update the cache on rename fail
2015-06-18 14:45:13 +02:00
Robin Appelman
2a50dbd1a1
update noopscanner
2015-06-18 14:42:48 +02:00
Robin Appelman
3e54696f7f
extends phpdoc
2015-06-18 14:30:25 +02:00
Robin Appelman
3526b352dc
update the file cache within the write lock
2015-06-18 13:47:03 +02:00
Olivier Paroz
64f0fd0889
Remove unneeded returns from private cropping methods
2015-06-18 13:30:10 +02:00
Olivier Paroz
8193e1d7c1
Move media type icon preview creation to its own method
2015-06-18 13:24:15 +02:00
Vincent Petry
a9bca9e3aa
Lock file before download
...
This will throw a LockedException if a concurrent request is currently
touching that file.
2015-06-18 12:05:26 +02:00
Olivier Paroz
13617a0475
Send the mime icon if we can't generate a preview
2015-06-18 11:35:08 +02:00
Morris Jobke
6856316122
Fix return value for OCP PHPDoc
2015-06-17 15:47:45 +02:00
Robin Appelman
72eedda16c
use old cache data when locked
2015-06-17 14:13:10 +02:00
Robin Appelman
24f0151f81
handle locked exceptions when getting file/directory info in sabre
2015-06-17 14:13:10 +02:00
Vincent Petry
a89bb1d383
Merge pull request #16988 from owncloud/fix-avatar-fail
...
Fix remaining avatar problems
2015-06-17 13:20:29 +02:00
Lukas Reschke
70ca0102f5
Fix PHPDoc annotations
2015-06-17 11:57:12 +02:00
Thomas Müller
d2305f2527
Merge pull request #16729 from owncloud/scanner-read-lock
...
keep a read lock while scanning a file or folder
2015-06-17 11:52:54 +02:00
Vincent Petry
102c6ffc41
Normalize path in View's lock methods
2015-06-16 17:03:12 +02:00
Vincent Petry
e5d34a2733
Merge pull request #16892 from owncloud/lock-returnfullpath
...
Rethrow LockedException with full path
2015-06-16 16:47:10 +02:00
Lukas Reschke
829f6474ff
Merge pull request #16856 from owncloud/issue-15851-fetch-updates-after-page-completion
...
Load the update information asyncroniously to fix the page load speed
2015-06-16 11:41:44 +02:00
Joas Schilling
497fe93b6c
Do not return backends but add a method to check for one
2015-06-16 11:31:04 +02:00
Joas Schilling
171f86ca2e
Only sort by group name when LDAP is involved
2015-06-16 11:10:00 +02:00
Joas Schilling
7d8b728066
Merge pull request #16832 from owncloud/memcache-fail
...
Throw exception if memcache misconfigured or missing
2015-06-16 11:00:18 +02:00
Joas Schilling
60005bea19
Merge pull request #16943 from owncloud/sabre-convertinvalidpath
...
Convert invalid path exception to sabre exception on MOVE
2015-06-16 10:49:22 +02:00
Vincent Petry
0e3a3dd5d7
Rethrow LockedException with full path
...
Because the path is converted to md5 from the original exception,
rethrow the exception with the correct full path
2015-06-16 10:48:31 +02:00
Lukas Reschke
15ba2a4100
Reintroduce user cache
...
This was required by avatars and was broken with https://github.com/owncloud/core/pull/16200
Fixes https://github.com/owncloud/core/issues/16942
2015-06-15 17:54:48 +02:00
Vincent Petry
1f91e9e65d
Convert invalid path exception to sabre exception on MOVE
2015-06-15 17:49:11 +02:00
Robin Appelman
4b181f73ca
phpdoc
2015-06-15 15:41:52 +02:00
Robin Appelman
567df226e5
fix check if hooks should be emited in runHooks
2015-06-15 15:07:48 +02:00
Robin Appelman
9c0d69a3b2
ensure normalized path form when changing locks
2015-06-15 14:32:29 +02:00
Robin Appelman
a4f808b11d
properly unlock in case of failed fopen
2015-06-15 14:32:29 +02:00
Robin Appelman
7d72f7d8ce
keep a read lock while scanning a file or folder
2015-06-15 14:32:29 +02:00
Thomas Müller
911c43e5f9
Merge pull request #16727 from owncloud/file-put-content-lock
...
add proper locking to file_put_contents when using streams
2015-06-15 14:22:06 +02:00
Thomas Müller
de3ed8e077
Merge pull request #16821 from owncloud/compare-and-delete-locking-watch
...
Compare and delete locking watch
2015-06-15 14:09:06 +02:00
Thomas Müller
b8ab6fb68d
Merge pull request #16915 from aidanamavi/add-opus-mimetype
...
Added Opus Mimetype Support
2015-06-15 13:27:44 +02:00
Thomas Müller
b6165b6865
Merge pull request #16912 from owncloud/webdav-smalltransferlockfix
...
Webdav PUT small file lock must be shared during hooks
2015-06-15 11:30:59 +02:00
Robin Appelman
2fb8a76705
add recursive copy polyfill for storage backends
2015-06-14 15:15:21 +02:00
Aidan Amavi
89a7aefad5
Added Opus Mimetype Support
...
Added Opus audio mimetype support.
2015-06-13 04:39:37 -04:00
Vincent Petry
4497aa4c68
Webdav PUT small file lock must be shared during hooks
...
Fixed code path for Webdav PUT of small files to use shared locks during
hook execution, and exclusive during the file operation
This makes it possible for versions to be copied by accessing the file
in a post_write hook.
2015-06-12 18:52:18 +02:00
Robin Appelman
a9ff242f6a
switch to using watch to implement cas and cad on redis
2015-06-12 17:28:09 +02:00
Robin Appelman
520a741876
clear memcache keys in locking
2015-06-12 17:28:09 +02:00
Robin Appelman
ac9f998abd
add compare-and-delete to the memcache interface
2015-06-12 17:28:09 +02:00
Robin Appelman
1bc56a99e9
compare-and-set and compare-and-delete using lua scripts for redis
2015-06-12 17:28:09 +02:00
Vincent Petry
446f628136
Merge pull request #16886 from owncloud/webdav-verify-path-again
...
verify path when getting a node for sabredav
2015-06-12 16:45:20 +02:00
Jan-Christoph Borchardt
bb0ea6336d
Merge pull request #16888 from owncloud/feature/fix-titles
...
fixing setting page titles
2015-06-12 14:54:42 +02:00
Vincent Petry
3b08b26589
Throw exception if memcache misconfigured or missing
...
Instead of falling back to null memcache, throw exceptions.
Also throw file locking specific exceptions in case the class is not
available.
2015-06-12 12:33:06 +02:00
Joas Schilling
5586b2db09
Don't use limit on explode to have only 1 code path
2015-06-12 11:58:26 +02:00
Joas Schilling
a7d2b3b9ae
Add return value to lock methods and check it in tests
2015-06-12 11:41:05 +02:00
Joas Schilling
caf16b083e
Only lock files in data/username/files/
2015-06-12 11:09:38 +02:00
Clark Tomlinson
62286f00a1
fixing setting page titles
2015-06-11 11:39:34 -04:00
Robin Appelman
05cecb101d
verify path when getting a node for sabredav
2015-06-11 17:11:33 +02:00
Vincent Petry
f13a2d9251
Revert "verify path when getting a node for sabredav"
2015-06-11 15:25:06 +02:00
Robin Appelman
4d10dab813
verify path when getting a node for sabredav
2015-06-11 14:12:04 +02:00
Joas Schilling
4582d14832
Order all use statements correctly
2015-06-11 11:29:27 +02:00
Joas Schilling
05f1ff8715
Correctly import NullCache class
2015-06-11 10:48:30 +02:00
Thomas Müller
3090348bf7
Null -> NullCache
2015-06-11 00:44:13 +02:00
Thomas Müller
48e915c7be
Revert "Null -> NullCache"
...
This reverts commit ff24554e76
.
2015-06-11 00:40:26 +02:00
Thomas Müller
ff24554e76
Null -> NullCache
2015-06-11 00:34:03 +02:00
Joas Schilling
580155abe7
Load the update information asyncroniously to fix the page load speed
2015-06-10 12:11:05 +02:00
Thomas Müller
9d90421e62
Merge pull request #16803 from owncloud/issue/16801-group-reshare-part-file-enc-keys
...
Check if the part files has keys when the original file does not
2015-06-09 11:41:36 +02:00
Victor Dubiniuk
c7c6556187
Do not use digits in random index names
2015-06-08 19:02:07 +03:00
Thomas Müller
64c9c27f7e
Merge pull request #16382 from oparoz/providers-are-responsible-for-the-size-of-their-preview
...
Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly
2015-06-08 16:14:35 +02:00
Joas Schilling
e6681857d2
Check if the part files has keys when the original file does not
2015-06-08 15:42:38 +02:00
Olivier Paroz
3d0a523217
Make sure we have a resource before measuring its size
2015-06-08 15:10:29 +02:00
Thomas Müller
97a3d8c313
Fix login handler for file cache - fixes #16795
2015-06-08 14:13:38 +02:00
Thomas Müller
a968b8409d
Merge pull request #16158 from owncloud/mountprovider-after-setup
...
Call newly registered mount providers after the filesystem is setup
2015-06-08 13:42:02 +02:00
Thomas Müller
f051b7381b
Merge pull request #16402 from owncloud/issue-15956-slow-group-usercount
...
Sort user groups by group name and hide the user count
2015-06-08 12:11:22 +02:00
Olivier Paroz
71d65cb713
Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly
...
* introduces a method in OC_Image which doesn't stretch images when trying to make them fit in a box
* adds the method to all key providers so that they can do their job, as expected by the Preview class
* improves the caching mechanism of Preview in order to reduce I/O and to avoid filling the available disk space
* fixes some long standing issues
* **contains mostly tests**
2015-06-06 16:25:04 +02:00
Lukas Reschke
ca10ee4d0d
Merge pull request #16771 from owncloud/fix-storage-full-message
...
Add owner to the storage stats to enable better notifications
2015-06-05 20:09:55 +02:00
Morris Jobke
3b188d0b72
Merge pull request #16768 from owncloud/add-missing-mime-types
...
Adding mimetype x-h for header files
2015-06-05 20:08:34 +02:00
Lukas Reschke
cbb15f3cbd
Merge pull request #16767 from owncloud/webdav-preventdeleteroot
...
Prevent deleting Webdav root
2015-06-05 19:56:20 +02:00
Morris Jobke
62ae39208a
Add owner to the storage stats to enable better notifications
...
* getstoragestats.php returns now the owner and it's display name
* show proper storage stats notifications for shared folders
2015-06-05 18:21:41 +02:00
Thomas Müller
5481a846c2
Adding mark down mime type mkd - fixes https://github.com/owncloud/files_texteditor/issues/45
2015-06-05 17:11:14 +02:00
Thomas Müller
5d93353a02
Adding mimetype x-h for header files - fixes https://github.com/owncloud/files_texteditor/issues/70
2015-06-05 16:57:01 +02:00
Vincent Petry
6ae5ae2e31
Prevent deleting Webdav root
2015-06-05 16:55:09 +02:00
Thomas Müller
85d1ca11d4
Merge pull request #16765 from owncloud/fix-chunked-upload-jenkins
...
Fix chunked upload jenkins
2015-06-05 16:20:33 +02:00
Thomas Müller
5e60795962
Bring back OC\Cache\File - fixes #16760
2015-06-05 14:21:17 +02:00
Joas Schilling
1df95ea1ca
Fix "@throws" tags on doc blocks
2015-06-05 13:55:59 +02:00
Vincent Petry
06dda427f3
Validate path in getChild
2015-06-05 12:08:18 +02:00
Joas Schilling
bb0cb0aaec
Merge pull request #15895 from owncloud/dav-getremoteetag
...
Get etag from remote OC server
2015-06-03 17:20:25 +02:00
Robin Appelman
bcf13aff6f
change lock back to shared before updating the cache
2015-06-03 17:18:50 +02:00
Robin Appelman
6b0874203d
add proper locking to file_put_contents when using streams
2015-06-03 17:18:50 +02:00
Clark Tomlinson
00742a9d68
Merge pull request #16721 from owncloud/fix-grammar-enc-module
...
Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/t …
2015-06-03 09:54:50 -04:00
Thomas Müller
5dc5b7f86d
Catch NotFoundException and return no quota information which simply reflects the current state - no file storage has been initialized for the user.
2015-06-03 15:00:56 +02:00
Thomas Müller
259b6ac2c1
Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/translate/#en_GB/lib/50330746
2015-06-03 14:56:18 +02:00
Thomas Müller
739c3f01aa
Merge pull request #16434 from owncloud/persist-maintenance-state
...
Persist the state of the maintenance after an upgrade
2015-06-03 13:56:17 +02:00
Thomas Müller
69d1e7aaf4
Merge pull request #16687 from owncloud/issue-16113-redis-minimum-version
...
Check for redis to be 2.2.5+
2015-06-03 13:55:26 +02:00
Morris Jobke
e3440863bc
Merge pull request #16708 from owncloud/enc_fix_move_to_trash
...
make sure that we always use the correct owner for both source and target
2015-06-03 13:49:46 +02:00
Vincent Petry
6ab38be40e
Translate invalid path exception to sabre exception for files
2015-06-03 12:22:31 +02:00
Bjoern Schiessle
7eb2b31e34
make sure that we always use the correct owner for both source and target
2015-06-03 11:59:06 +02:00
Morris Jobke
259937680b
Merge pull request #16667 from owncloud/issue-16510-fix-encryption-with-s2s-shares
...
Add tests for the storage wrapper and fix the wrapping
2015-06-02 16:42:32 +02:00
Joas Schilling
bdc82dcfb9
Check for redis to be 2.2.5+
2015-06-02 15:42:48 +02:00
Robin Appelman
a9455be14a
more hints
2015-06-02 14:16:37 +02:00
Robin Appelman
0497534a6e
more type hints
2015-06-02 14:07:55 +02:00
Robin Appelman
8926bca0c7
phpdoc, strict and type hints
2015-06-02 14:07:55 +02:00
Robin Appelman
6f47a547d8
only use mount provider if we have a valid user
2015-06-02 14:07:54 +02:00
Robin Appelman
24131586d7
call mount providers that are registered after the filesystem is setup
2015-06-02 14:07:54 +02:00
Robin Appelman
c91b52d38c
move emitter implementation to a trait
2015-06-02 14:07:54 +02:00
Robin Appelman
4b48dd424f
emit hooks from a view as long as the path is inside the default root
2015-06-02 14:07:20 +02:00
Thomas Müller
3ebc8f0564
Merge pull request #16107 from owncloud/fix-getLocalFile-encryption-master
...
Fix get local file encryption master
2015-06-02 13:47:37 +02:00
Joas Schilling
be1f319511
Correctly ignore remote shares aswell
2015-06-02 12:33:51 +02:00
Joas Schilling
50a31fa8f9
Add unit tests for wrapStorage
2015-06-02 12:33:17 +02:00
Joas Schilling
9a4040c7ca
Move the storage wrapping into a testable method
2015-06-02 12:29:06 +02:00
Vincent Petry
30d7f92763
Get etag from remote OC server
2015-06-02 11:42:03 +02:00
Morris Jobke
cf2c599218
Merge pull request #16200 from owncloud/kill-globalfilecache
...
Drop file caching
2015-06-02 09:11:33 +02:00
Lukas Reschke
73875da4b0
Clean application identifier before processing
2015-06-01 17:03:51 +02:00
Thomas Müller
2104c2ffdd
Fixing undefined index 'foo'
2015-06-01 14:10:00 +02:00
Robin Appelman
8902e2be73
fix nooplockingprovider
2015-06-01 13:25:27 +02:00
Robin Appelman
ce04cf6610
shared lock around hooks
2015-06-01 13:24:02 +02:00
Robin Appelman
661c9e2444
add changeLock to the storage api
2015-06-01 13:24:02 +02:00
Robin Appelman
a1372b2fb5
add method to atomically change between shared and exclusive lock
2015-06-01 13:24:02 +02:00
Vincent Petry
270a10b754
Return 423 instead of 503 for locked files
2015-06-01 13:24:02 +02:00
Vincent Petry
0451a6652d
Move locking exceptions
2015-06-01 13:24:02 +02:00
Vincent Petry
ba174ac626
Convert LockedException to FileLocked in Sabre connector
...
For Sabre to be able to return the proper error code instead of 500, the
LockedException is now rethrown as FileLocked exception in the Sabre
connector
2015-06-01 13:22:57 +02:00
Robin Appelman
8665a98744
add locking for non-chunking webdav upload
2015-06-01 13:22:57 +02:00
Robin Appelman
72776b165f
use arraycache for locking in unit tests
2015-06-01 13:22:56 +02:00
Robin Appelman
6b965d71d1
add seperate config option for locking memcache backend
2015-06-01 13:22:56 +02:00
Robin Appelman
72847dbc77
always use locking in unit tests
2015-06-01 13:22:56 +02:00
Robin Appelman
437c0b55a6
unlock source file when we cant lock the target in a rename
2015-06-01 13:22:56 +02:00
Robin Appelman
668fafd4d2
close file handle after sending sabre response
2015-06-01 13:22:56 +02:00
Vincent Petry
2f4f468399
Added config switch for file locking
2015-06-01 13:22:56 +02:00
Vincent Petry
6df502a5aa
Fix Null memcache fallback to match interface
2015-06-01 13:22:56 +02:00
Robin Appelman
006eaa84aa
dont release shared lock if we dont have any
2015-06-01 13:22:56 +02:00
Robin Appelman
f0b8672729
fix locking root of a view
2015-06-01 13:22:56 +02:00
Robin Appelman
e08423f956
release all locks on shutdown
2015-06-01 13:22:56 +02:00
Robin Appelman
2d63fd77de
dont apply callback wrapper when fopen failed
2015-06-01 13:22:56 +02:00
Robin Appelman
1270c6800d
dont lock on meta data operations
2015-06-01 13:22:56 +02:00
Robin Appelman
35c377f7a9
phpdoc and minor issues
2015-06-01 13:22:56 +02:00
Vincent Petry
8d53dc803f
Use md5 + prefix for file locking keys in memcache
...
Also trim slashes from paths to make sure the locks are based on the
same paths.
2015-06-01 13:22:56 +02:00
Vincent Petry
0775e9c1ca
Use md5 for lock key
2015-06-01 13:22:56 +02:00
Vincent Petry
5edf294ce5
Add CAS methods to Null memcache
...
This prevents breaking ownCloud completely when memcache is not enabled
and the locking code is triggered
2015-06-01 13:22:56 +02:00
Robin Appelman
a1a25a9b5b
fix unlocking when moving mount points
2015-06-01 13:22:56 +02:00
Robin Appelman
7e418c7d69
high level locking wip
2015-06-01 13:22:56 +02:00
Robin Appelman
e64360e72d
always use arraycache for unit tests
2015-06-01 13:22:56 +02:00
Robin Appelman
bf7002bc65
add locking to the view apo
2015-06-01 13:22:56 +02:00
Robin Appelman
536e187e51
add locking to the storage api
2015-06-01 13:22:56 +02:00
Robin Appelman
cdf7f91259
expose locking provider in the server container
2015-06-01 13:22:55 +02:00
Vincent Petry
06f8c80af6
Validate target file name for some webdav ops
2015-05-29 19:14:38 +02:00
Thomas Müller
67cef93fdd
Merge pull request #16578 from owncloud/fix_16556
...
show txt preview when file contains text
2015-05-28 20:48:16 +02:00
Morris Jobke
7f83829db3
Merge pull request #16592 from owncloud/fix-16574
...
Add type hint for OC_Channel
2015-05-28 20:36:44 +02:00
Vincent Petry
e114d00242
Only use quota stream wrapper on "files"
...
Prevent using the quota stream wrapper on trashbin folders and other
metadata folders
2015-05-28 18:31:20 +02:00
Vincent Petry
ded62ff693
Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storages
...
[encryption] fix move versions between storages
2015-05-28 15:28:25 +02:00
Vincent Petry
474c99e19a
Merge pull request #16577 from owncloud/enc_improve_migration
...
only request encryption module for files which are not excluded
2015-05-28 11:31:33 +02:00
Björn Schießle
e1483f65c3
Merge pull request #16591 from owncloud/enc_improved_error_message
...
improved error message for various states
2015-05-28 10:55:53 +02:00
Bjoern Schiessle
5549641f1f
improve error messages displayed to the user
2015-05-27 21:00:02 +02:00
Victor Dubiniuk
4239054383
Add type hint for OC_Channel
2015-05-27 18:03:11 +03:00
Bjoern Schiessle
0de59acb49
only request encryption module for files which are not excluded
2015-05-27 15:47:40 +02:00
Lukas Reschke
ffd73ef2e4
Fix indentation
2015-05-27 14:57:19 +02:00
Georg Ehrke
bb676f2799
show txt preview when file contains text
2015-05-27 14:11:33 +02:00
Morris Jobke
3de945d13d
Merge pull request #16527 from owncloud/end-processing-when-404
...
End processing when file is not found
2015-05-27 09:36:05 +02:00
Thomas Müller
4513cf5967
Revert "Revert "Revert "FIX for webdav.mediencenter.t-online.de"""
2015-05-26 14:40:07 +02:00
Oliver Kohl D.Sc
f8938f004d
Revert "Revert "FIX for webdav.mediencenter.t-online.de""
2015-05-26 13:36:45 +02:00
Björn Schießle
f70c309c2d
Merge pull request #16561 from owncloud/add-default-timeout-back
...
Add connection timeout to default POST options
2015-05-26 12:23:57 +02:00
Vincent Petry
f1fc7b155c
Merge pull request #16515 from owncloud/deprecate-useless-helper-class
...
Deprecate useless helper class
2015-05-26 12:22:05 +02:00
Vincent Petry
39c6a36488
Merge pull request #16532 from owncloud/cors-no-cookie-auth
...
Disallow cookie auth for cors requests
2015-05-26 12:12:04 +02:00
Björn Schießle
ab0747113c
Merge pull request #16452 from owncloud/enc_ftp_upload
...
always write file, if fseek doesn't work we write the whole file
2015-05-26 12:02:41 +02:00
Thomas Müller
3babcd0344
Merge pull request #16339 from owncloud/master-override-channel
...
Allow change update channel via public API
2015-05-26 11:42:41 +02:00
Lukas Reschke
dff361dc5c
Add connection timeout to default POST options
...
Fixes https://github.com/owncloud/core/issues/16560
2015-05-26 11:22:50 +02:00
jknockaert
a577e723b0
flush() comments + perf opt
2015-05-26 10:22:52 +02:00
Vincent Petry
ce34edacfa
Merge pull request #16526 from owncloud/enc_fix_versions_webdav_upload
...
remove part file extension before we read a filekey
2015-05-22 16:42:52 +02:00
Bjoern Schiessle
c63f2286c0
copy keys before we move a file between storages to make sure that the new target file reuses the old file key, otherwise versions will break
2015-05-22 15:41:28 +02:00
Bernhard Posselt
c8e3599cad
disallow cookie auth for cors requests
...
testing ...
fixes
fix test
add php doc
fix small mistake
add another phpdoc
remove not working cors annotations from files app
2015-05-22 14:06:26 +02:00
Bjoern Schiessle
fef75e5417
remove part file extension before we read a filekey to reuse a existing key if possible, otherwise stuff like versioning will break
2015-05-22 12:12:31 +02:00
Lukas Reschke
8ce3d6ea57
End processing when file is not found
...
We have to end the processing when a file is not found or otherwise the method is proceeding and even sending invalid file paths to the sendfile methods.
Due to nginx preventing directory traversals this is luckily not immediately exploitable. We should for hardening purposes however quit the script execution just as we do for 403 cases and others as well.
2015-05-22 11:53:02 +02:00
Vincent Petry
b82d902e18
Merge pull request #16493 from owncloud/cache-movewithcorrectmimetype
...
Get correct mimetype when moving and changing extension
2015-05-22 11:37:11 +02:00
Joas Schilling
d7b2bc9e2f
Merge pull request #16516 from owncloud/fix-phpdoc-trait
...
Fix PHPDoc
2015-05-22 09:47:59 +02:00
Lukas Reschke
3d8ea96e55
Fix PHPDoc
...
Use correct parameters
2015-05-22 00:17:38 +02:00
Lukas Reschke
c1f8829590
Deprecate useless helper class
...
The helper class has no real reason anymore with 8.1.0 as we now have better public APIs. No need for an `IHelper` class like that from my opinion.
2015-05-21 23:35:37 +02:00
jknockaert
bf6151e799
fix calculation of $count, $count is always 8129 so we need to check this
...
against the unencrypted file size
2015-05-21 14:15:26 +02:00