25f1fdb275
Merge pull request #847 from nextcloud/quota-mount-in-homefolder
...
fix quota calculation when a filesystem is mounted in a user home
2016-08-28 15:05:46 +02:00
9dc23592c3
Merge pull request #1105 from nextcloud/usermenu-ordering
...
fix ordering of user menu entries
2016-08-28 10:30:16 +02:00
4d85ffc27c
Merge pull request #1054 from nextcloud/less-cache-hits
...
Reduce the number of cache operations for dav operations
2016-08-27 22:44:29 +02:00
0517f41b3f
fix ordering of user menu entries
2016-08-27 22:42:08 +02:00
89c78bbce4
Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loop
...
prevent infinite redirect loops if the there is no 2fa provider to pass
2016-08-26 16:03:05 +02:00
53725d4d15
Merge pull request #771 from nextcloud/theming-fixes
...
Theming: Fix missing color usage
2016-08-26 15:02:21 +02:00
de6ab82766
Merge pull request #1080 from nextcloud/always_lazyroot
...
Always use the LazyRoot
2016-08-26 13:18:01 +02:00
f805aff67c
Always use the LazyRoot
2016-08-26 12:13:34 +02:00
fdab008231
Remove internal from getThemingDefaults
2016-08-26 12:07:52 +02:00
044d7c3bb7
Merge pull request #1026 from nextcloud/theming-extend-defaults
...
Theming: Add logo and background to ThemingDefaults
2016-08-26 11:53:24 +02:00
fb88d66857
optimize getUserFolder for the common case
2016-08-25 17:22:25 +02:00
2693ae870e
cache user folders
2016-08-25 17:22:25 +02:00
b2d365734a
cache root id in mountpoint
2016-08-25 17:22:25 +02:00
680d7f22bb
Merge pull request #1036 from nextcloud/query-logger-stack
...
add stacktrace to query logger
2016-08-25 16:43:08 +02:00
1c3b1e5797
add stacktrace to query logger
2016-08-24 14:37:15 +02:00
4e1d501696
Dark autoloader magic for ThemingDefaults
2016-08-24 13:22:21 +02:00
6af2efb679
prevent infinite redirect loops if the there is no 2fa provider to pass
...
This fixes infinite loops that are caused whenever a user is about to solve a 2FA
challenge, but the provider app is disabled at the same time. Since the session
value usually indicates that the challenge needs to be solved before we grant access
we have to remove that value instead in this special case.
2016-08-24 10:49:23 +02:00
c7c53aefb2
Use the lazy root to make tests pass 🙈
2016-08-24 09:52:05 +02:00
80fe499707
Theming: Add logo and background to ThemingDefaults
2016-08-24 00:40:22 +02:00
2f1b17d44a
Merge pull request #1007 from nextcloud/shared-storage-non-recursive
...
Fix shared storage recursive setup
2016-08-23 22:15:38 +02:00
a0c2342c20
prevent infinite recursion while getting storage from mount
2016-08-23 14:52:18 +02:00
3ed102497e
Merge pull request #995 from nextcloud/workflow-section
...
Workflow section + hidden empty sections
2016-08-23 11:20:43 +02:00
0747e96b9c
Cache registered autoloaders
...
This saves more than 20ms (!) on every request, the previous problem was that `\OC_App::registerAutoloading` calls `\OC\AppFramework\App::buildAppNamespace` which parses the appinfo.xml. Since that was also called multiple times (e.g. on cloud.nextcloud.com over 200 times) that had a significant performance impact. Also on simple PROPFIND requests.
https://blackfire.io/profiles/compare/65a53e6e-7f35-4974-b559-4c81abd01c3b/graph shows the difference nicely.
2016-08-22 23:49:46 +02:00
b13092065a
hide parameters of tryLogin when logging
2016-08-22 16:45:07 +02:00
94432c089f
Save the container with the app's namespace so we can resolve it
2016-08-22 14:25:43 +02:00
e316a7ade7
Allow jail wrappers to lazily initialize the source storage
2016-08-22 12:26:27 +02:00
5e44a2d868
Allow storage wrappers to lazily initialize the source storage
2016-08-22 12:23:55 +02:00
056c1ab035
fix wrong var name
2016-08-22 11:24:48 +02:00
7972fa5527
enlist only registered sections that also have settings registered to
2016-08-22 08:29:49 +02:00
d50e7ee36c
Remove reading PATH_INFO from server variable
...
Having two code paths for this is unreliable and can lead to bugs. Also, in some cases Apache isn't setting the PATH_INFO variable when mod_rewrite is used.
Fixes https://github.com/nextcloud/server/issues/983
2016-08-19 14:48:13 +02:00
162b153f22
Fix loading of ThemingDefaults
2016-08-19 11:26:22 +02:00
3ccd69707e
Merge pull request #865 from nextcloud/ocs_config
...
Move OCS route /config to proper controller
2016-08-19 09:39:05 +02:00
3b6bbf8159
Merge pull request #934 from nextcloud/add-cachebusters
...
Add cachebusters
2016-08-18 15:45:22 +02:00
53d3c8b635
Merge pull request #931 from nextcloud/replace-hardcoded-classname
...
let the containers resolving capabilities find and instantiate the ri…
2016-08-18 14:03:14 +02:00
3c7d2544b9
Add cache buster to left menu bar
2016-08-18 12:34:55 +02:00
f86b20776a
let the containers resolving capabilities find and instantiate the right service
2016-08-18 11:56:19 +02:00
3dba40db7b
Fix "Undefined index" when the values do not exist
2016-08-18 11:53:26 +02:00
3a17fabd04
Remove unused private classes
2016-08-18 09:37:11 +02:00
5aaa065d6d
Merge pull request #848 from nextcloud/public-link-quota
...
fix getting quota for public links with quota_include_external_storage
2016-08-17 20:13:56 +02:00
fe80bb1aff
Merge pull request #867 from nextcloud/notification-primary-action-always-first
...
Make sure the primary action is always the first one
2016-08-17 19:31:14 +02:00
df9b509ed3
Improve regexp to detect duplicate folders when repairing unmerged shares
2016-08-17 15:31:47 +02:00
7a2d25fab4
Fix unmerged shares repair with mixed group and direct shares
...
Whenever a group share is created after a direct share, the stime order
needs to be properly considered in the repair routine, considering that
the direct user share is appended to the $subShares array and breaking
its order.
2016-08-17 15:31:36 +02:00
56b94b220d
Improve file_target finding logic when repairing unmerged shares
...
Pick the most recent subshare that has no parenthesis from duplication
which should match whichever name the user picked last. If all
subshares have duplicate parenthesis names, use the least recent group
share's target instead.
2016-08-17 15:31:35 +02:00
5a599d5c4e
Merge pull request #899 from nextcloud/nfd-default
...
[us] Disable NFD encoding wrapper by default
2016-08-17 14:46:52 +02:00
9f523518f3
Disable NFD encoding wrapper by default
...
Seems I forgot to set it back to false after testing.
Will give a performance boost for all storages.
2016-08-17 11:54:33 +02:00
ce0604bd06
Merge pull request #892 from nextcloud/fix_phpdoc
...
Some scrutinizer phpdoc fixes
2016-08-17 10:38:21 +02:00
027069cbae
Merge pull request #846 from nextcloud/provisioning_api_ocs
...
Move Provisioning API to the AppFramework
2016-08-17 10:23:13 +02:00
c1632c3abd
Merge pull request #893 from nextcloud/ie8_be_gone
...
IE8 be gone!
2016-08-17 09:02:58 +02:00
8f3dc0ba43
Remove IE_8 user agent string
2016-08-16 21:01:32 +02:00
64ff8ac6fa
Fix phpdoc in Comments
2016-08-16 20:33:09 +02:00
035f55c913
Fix phpdoc
2016-08-16 20:26:28 +02:00
717e22267a
Merge branch 'master' into implement_712
2016-08-16 18:31:59 +02:00
f76b64d3d7
add missing encryption modules to settings
2016-08-16 18:11:59 +02:00
58530ab42f
fix missing parameters in sharing settings page
2016-08-16 17:59:21 +02:00
f7bc5ad43b
Merge pull request #864 from nextcloud/us_25652
...
[us] Ensure the user exists before calling a method on it
2016-08-16 12:57:34 +02:00
6dc956b192
Merge pull request #886 from nextcloud/capabilities_error_proof
...
Make the capabilities manager more error proof
2016-08-16 11:40:42 +02:00
208e551216
check registered sections and settings after an app got updated to garbage collect orphaned classes
2016-08-16 00:56:17 +02:00
9edca39b49
attempt to remove section and settings entries when an app got disabled
2016-08-16 00:56:17 +02:00
6c6338b810
Merge branch 'master' into implement_712
2016-08-15 21:55:09 +02:00
c044aa34fa
Make the capabilities manager more error proof
...
If an app registers an invalid capabilty we should not crash hard.
Instead we should catch the exception. Log it (error) and carry on.
* Added tests
2016-08-15 20:37:19 +02:00
8a7a0f3287
Add unit tests
2016-08-15 16:25:34 +02:00
75a73a5a73
satisfy dependencies for files_external
2016-08-15 13:38:02 +02:00
6c360ad79f
Add PHPdoc
2016-08-15 11:14:28 +02:00
3ed05f8769
Make sure the primary action is always the first one
2016-08-15 11:13:54 +02:00
264aaf9ffa
use $userId instead of $user
2016-08-14 19:50:19 +02:00
26342061b9
Ensure the user exists before calling a method on it - fixes #24751
2016-08-14 19:50:03 +02:00
291b3fd8b4
missing PHPDoc
2016-08-14 19:37:52 +02:00
da5633c31a
Type compatability
2016-08-14 19:37:37 +02:00
3593668413
Method is deprecated
2016-08-14 19:37:11 +02:00
5aef60d2ca
Unreachable statement
2016-08-14 19:36:42 +02:00
d2a16c4dc8
Unnecessary fully qualified names
2016-08-14 19:36:06 +02:00
e3b0e50dda
Extend OCSMiddleware
...
* Always set 401 (v1.php and v2.php)
* Set proper error codes for v2.php
* Proper OCS output on unhandled exceptions
2016-08-14 18:34:01 +02:00
deba0f9922
Move OCS Middleware before security middleware
...
This is required to be able to catch the NotLoggedIn exceptions etc in
the OCSMiddleware and convert them to proper OCS Responses.
2016-08-14 18:34:01 +02:00
8188bb4509
simplify encryption manager fetching in DIContainer
2016-08-13 01:26:11 +02:00
158d78e1ab
move mail settings and file handling to additional ones, thus files_external gets its own section
2016-08-13 01:02:25 +02:00
b99ecb3c23
move systemstags to sharign section, drop collaboration section
2016-08-13 00:33:09 +02:00
7a2b96c7e6
change casing in section display names
2016-08-13 00:06:10 +02:00
9aa6b99a56
added some missed diagnosis output
2016-08-12 16:52:20 +02:00
85d3fb76d7
fix getting quota for public links with quota_include_external_storage
2016-08-12 15:59:19 +02:00
ef2116a17a
fix quota calculation when a filesystem is mounted in a user home
2016-08-12 15:41:37 +02:00
18fd8ff70c
rename "Tenmplate" to "ThemingDefaults" to make the auto loader happy"
2016-08-12 15:32:28 +02:00
ac04ba6784
register app autoload instead of loading apps
2016-08-12 13:23:14 +02:00
8261ccce1b
Merge branch 'master' into implement_712
2016-08-11 19:37:17 +02:00
3dfdc8e311
adjust systemtags app
2016-08-11 19:05:06 +02:00
36c1b7eb31
adjust Theming app
2016-08-11 17:29:58 +02:00
ce6ad5de25
make sure shipped apps also setup their admin settings on a fresh install
2016-08-11 16:37:11 +02:00
a2f752bcf3
adjust files_external
2016-08-11 15:50:31 +02:00
14ddf9d923
rename IAdmin to ISettings, the interface is not bound to a specific settings scope
2016-08-11 14:48:21 +02:00
f3b15a9ab9
fixes, improvements, and another app:
...
* setupSettings now also triggered on enable
* fixes detection of present admin section or settings in the DB
* add update routine in such cases
* encryption app migrated
2016-08-11 01:41:18 +02:00
0fc34c99f4
fix registration of admin settings and section on app install
2016-08-11 00:45:15 +02:00
67d016833d
Merge pull request #810 from nextcloud/shared-cachethepropagatorinstance
...
Store the shared propagator instance
2016-08-10 17:24:57 +02:00
1eb8b951c2
more admin page splitup improvements
...
* bump version to ensure tables are created
* make updatenotification app use settings api
* change IAdmin::render() to getForm() and change return type from Template to TemplateResponse
* adjust User_LDAP accordingly, as well as built-in forms
* add IDateTimeFormatter to AppFramework/DependencyInjection/DIContainer.php. This is important so that \OC::$server->query() is able to resolve the
constructor parameters. We should ensure that all OCP/* stuff that is available from \OC::$server is available here. Kudos to @LukasReschke
* make sure apps that have settings info in their info.xml are loaded before triggering adding the settings setup method
2016-08-10 15:21:25 +02:00
219f36d261
Merge pull request #820 from nextcloud/shared-storage-lazy-numeric-id
...
get shared storage storage id without setting up the storage
2016-08-10 14:56:41 +02:00
412b5c5407
Store the shared propagator instance
...
This instead of recreating it for every call.
2016-08-10 10:57:49 +02:00
93047f5e4d
Merge pull request #777 from nextcloud/ocs_capabilities
...
Move /cloud/capabilities and /cloud/user to Core
2016-08-10 00:43:13 +02:00
9fbdb0efe8
Merge pull request #529 from nextcloud/vendor-maintenance-downgrade
...
Allow downgrades of maintenance accross vendors
2016-08-10 00:25:53 +02:00
e2f54559d6
Remove OC_OCS_Cloud and OC\OCS\Cloud
2016-08-09 20:56:31 +02:00
02449c8336
Move getCapabilities over to Core
2016-08-09 20:56:31 +02:00
575875e8d0
Allow OCS routes in Core and Settings
2016-08-09 20:56:31 +02:00
5214b62d55
Merge pull request #691 from nextcloud/ocs_allow_all_old_routes
...
Allow ocs/v2.php/cloud/... routes
2016-08-09 20:52:49 +02:00
b53ea18ea5
Match only for actual session cookie
...
OVH has implemented load balancing in a very questionable way where the reverse proxy actually internally adds some cookies which would trigger a security exception. To work around this, this change only checks for the session cookie.
2016-08-09 19:23:08 +02:00
ceeb44bd04
Initial work on Apps page split:
...
* interfaces for the Admin settings (IAdmin) and section (ISection)
* SettingsManager service
* example setup with LDAP app
2016-08-09 18:05:09 +02:00
a999420c75
get shared storage storage id without setting up the storage
2016-08-09 15:52:13 +02:00
b4ed4e152e
Merge pull request #746 from nextcloud/jail-root
...
getJailedPath expects $path to have a trailing /
2016-08-09 11:04:11 +02:00
4277051442
Merge pull request #660 from gdamjan/custom-config-dir
...
introduce NEXTCLOUD_CONFIG_DIR env variable (see #300 )
2016-08-09 10:58:23 +02:00
0032a5c2d1
Hanlde Core and Settings app in AppFramework
...
'core' and 'settings' are just apps but we treat them slightly
different. Make sure that we construct the correct namespace so we can
actually do automatic AppFramework stuff.
2016-08-08 20:48:16 +02:00
63f6d2d558
Allow ocs/v2.php/cloud/... routes
...
One of the possibilities of the old OCS API is that you can define the
url yourself.
This PR makes this possible again by adding an optional root elemenet to
the route. Routes are thus:
.../ocs/v2.php/<root>/<url>
By default <root> = apps/<app>
This will allow for example the provisioning API etc to be in
../ovs/v2/php/cloud/users
2016-08-08 15:01:26 +02:00
727cd6aad0
Merge pull request #711 from nextcloud/password-policy-on-createUser
...
Apply password policy on user creation
2016-08-08 11:17:07 +02:00
f37fa6e45c
Move Share backends to PSR-4 instead of using class path ( #24941 )
2016-08-05 14:13:41 +02:00
f1cd68d713
Adding test case for getPathById including a jailed cache where root is just empty
2016-08-05 14:06:05 +02:00
d252d79059
getJailedPath expects $path to have a trailing / - fixes #25464
2016-08-05 14:06:05 +02:00
329c714a7e
Correct name in Console Application.php
...
see changes :)
2016-08-04 19:17:13 +02:00
5fb39bd0cb
Apply password policy on user creation
2016-08-03 11:52:15 +02:00
0c6352e095
Fix RepairUnmergedShares to not skip valid repair cases
...
The repair step was a bit overeager to skip repairing so it missed the
case where a group share exists without subshares but with an
additional direct user share.
2016-08-03 10:16:28 +02:00
0c7c9a3b95
Adjust repair version check for unmerged shares
2016-08-03 10:16:28 +02:00
67fa6bf9bc
Add repair step for unmerged shares (WIP)
2016-08-03 10:16:28 +02:00
e90f00791d
add invalidateOldTokens to IProvider interface
2016-08-02 12:08:13 +02:00
5c718b13b8
We should properly check for 'true' instaed of the bool
2016-08-01 08:52:50 +02:00
982bdb1823
introduce NEXTCLOUD_CONFIG_DIR env variable (see #300 )
...
nextcloud by default uses the `/config/` directory in the source/application tree for its config file(s).
with this commit that directory can be overridden by the `NEXTCLOUD_CONFIG_DIR` environment variable.
in uwsgi, you would use the option `--env "NEXTCLOUD_CONFIG_DIR=/tmp/nx-config/"`
in apache `SetENV …`
and the cli command can be run with: `NEXTCLOUD_CONFIG_DIR=/tmp/nx-config ./occ` (or just use `export` once in the
shell).
NEXTCLOUD_CONFIG_DIR can be supplied with or without the trailing slash (`/`), but in all cases `$configDir` will have
it automatically added if needed.
The other changes are several occurrences of `OC::$SERVERROOT . '/config'` to `OC::$configDir`.
2016-07-29 17:49:14 +02:00
f7f5216aa3
Dark hackery to not always disable CSRF for OCS controllers
2016-07-29 15:49:27 +02:00
54ae8eede3
Merge pull request #556 from nextcloud/nextcloud-version-check
...
Allow apps to check for a given nextcloud version
2016-07-29 09:26:25 +02:00
d6c680051c
Merge pull request #612 from nextcloud/improve-xml-loaded-version-handling
...
libxml - compare against loaded version
2016-07-28 11:26:06 +02:00
73311091bf
Merge pull request #519 from GitHubUser4234/master
...
New LDAPProvider for user_ldap
2016-07-28 10:14:34 +02:00
740349fda3
libxml - compare against loaded version
...
* if the compiled in version is older than the loaded version Nextcloud doesn't work
* uses the loaded libxml version to check against
fixes #205
2016-07-28 08:30:33 +02:00
351cab6bce
skip shared files, if files get decrypted only for a specific user we shouldn't touch files owned by a different user.
2016-07-27 15:39:24 +02:00
8bdd0adcee
Support subdir in the OCS v2 endpoint
...
We should check against the ending substring since people could
run their nextcloud in a subfolder.
* Added test
2016-07-27 15:28:35 +02:00
10726dd00d
Merge pull request #596 from nextcloud/adjust-mysql-install-error
...
Fix misleading MySQL DB creation error (#25485 )
2016-07-27 14:34:07 +02:00
da97a69148
Allow DI of the workflow manager by the OCP interface
2016-07-27 11:46:09 +02:00
aeb4011279
Fix misleading MySQL DB creation error ( #25485 )
...
Whenever the GRANT ALL failed, it used to display "Database creation
failed" which is incorrect. It's only the privleges setting that failed.
This moves the privilege setting message to DEBUG and makes it more
precise.
2016-07-27 11:45:13 +02:00
2719dcabed
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-27 15:17:29 +08:00
0fcc39cd8e
Translate the server version for nextcloud
2016-07-26 14:40:18 +02:00
0e83f5dbd7
revert to old setup connection logic
2016-07-26 11:44:15 +02:00
352e24e703
Merge pull request #292 from nextcloud/recent-files
...
Add "Recent" file listing
2016-07-25 15:25:02 +01:00
e51afa1684
Merge pull request #509 from nextcloud/appframework_magic_allow_default_vars
...
AppFramework add default values (ApiController) as parameters
2016-07-25 13:18:53 +02:00
88cbde6a66
Merge pull request #550 from nextcloud/ldap-integration-test-autoloader
...
fix autoloading in LPAP integration tests, resolves #544
2016-07-25 12:54:50 +02:00
4ad0c383ad
Merge pull request #523 from Faldon/master
...
Renamed file logging
2016-07-25 11:41:24 +02:00
686cb599b6
fix autoloading in LPAP integration tests, resolves #544
2016-07-25 11:05:59 +02:00
1fb080df2b
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-25 16:56:14 +08:00
de4236bc4a
Merge pull request #530 from nextcloud/fix-theme-loading
...
Make sure we try to autoload the class
2016-07-25 08:37:13 +02:00
681ac9f19f
Check if an app provide two-factor-auth providers before we try to use them
2016-07-23 13:26:57 +02:00
8cea95390d
Make sure we try to autoload the class
2016-07-22 16:49:33 +02:00
81e103074e
use limit instead of since when listing recent files
2016-07-22 15:20:55 +02:00
5c34346479
Allow downgrades of maintenance accross vendors
2016-07-22 14:51:43 +02:00
b058639a8a
Changed code style and made use of '===' comparison.
2016-07-22 14:45:33 +02:00
e321ecd592
add recent files to node api
2016-07-22 14:39:32 +02:00
32f5073f9f
Reverted the default syslog tag to avoid breaking existing systems.
2016-07-22 14:38:44 +02:00
d499f68fd7
Fix storage id with storage jail
2016-07-22 14:34:59 +02:00
b543fd8d30
Set proper status code in OCS AppFramework Middleware
2016-07-22 12:53:47 +02:00
ba3f4f118e
Changed logtype to file instead of owncloud.
...
- Updated the config sample to point to log_type='file'
- Renamed the Class for logfile logging to File in namespace 'OC\Log\'.
Changed the occurrences of 'OC\Log\Owncloud' to 'OC\Log\File'.
- Renamed the Class for log:file command to File in namespace 'OC\Core\Command\Log\File'.
Changed registration of the command to use 'OC\Core\Command\Log\File'.
- Changed default Syslog tag to Nextcloud
- Retained backwards compatibility for configs with 'logtype' => 'owncloud'
- Adjusted tests for the new file log.
Closes #490 .
2016-07-22 11:44:19 +02:00
02ec8b1726
New LDAPProvider for user_ldap
2016-07-22 16:46:29 +08:00
1b73a63041
Inject parameters
2016-07-22 10:12:26 +02:00
8c7d7d7746
Merge pull request #507 from nextcloud/run-le-script
...
Update emails and license headers with latest changes
2016-07-21 23:27:15 +02:00
562e63cf69
Merge pull request #480 from nextcloud/fix_ocs_response_format
...
AppFramework default response for OCS is xml
2016-07-21 19:52:17 +02:00
0215b004da
Update with robin
2016-07-21 18:13:58 +02:00
ba87db3fcc
Fix others
2016-07-21 18:13:57 +02:00
4f42c3d725
Revert "Remove "Help" link from personal sidebar"
...
This reverts commit deef15a3c7
2016-07-21 02:25:00 +02:00
a9f2789df5
Fix typo
2016-07-21 02:23:42 +02:00
7c6896f091
Link to proper clients
2016-07-21 01:56:47 +02:00
19f770d0db
Port 2d373416d8 to master
2016-07-21 01:43:32 +02:00
977db0a162
Use proper certificates
...
Ports bcf693539b
2016-07-21 01:34:11 +02:00
9a1ff29351
Use proper documentation links
...
Since it is just faking the 10 we need to hardcode this here...
2016-07-21 00:36:52 +02:00
c385423d10
Merge pull request #479 from nextcloud/add-bruteforce-throttler
...
Implement brute force protection
2016-07-21 00:31:02 +02:00
c1589f163c
Mitigate race condition
2016-07-20 23:09:27 +02:00
adf67fac96
JSON encode the values
2016-07-20 22:47:33 +02:00
ba4f12baa0
Implement brute force protection
...
Class Throttler implements the bruteforce protection for security actions in
Nextcloud.
It is working by logging invalid login attempts to the database and slowing
down all login attempts from the same subnet. The max delay is 30 seconds and
the starting delay are 200 milliseconds. (after the first failed login)
2016-07-20 22:08:56 +02:00
e42f2f2650
AppFramework do not get default response
...
The OCSResponse differs from other responses in that it defaults to
XML. However we fell back to json by default.
This makes sure that if nothing is set we don't pass anything.
Which defaults then to the controllers default (which is often 'json')
but in the case of the OCSResponse 'xml'.
2016-07-20 22:05:43 +02:00
020a2a6958
Merge pull request #476 from nextcloud/port-same-site-cookies
...
[master] Port Same-Site Cookies to master
2016-07-20 21:35:02 +02:00
a17ba2f488
Merge pull request #466 from nextcloud/escape-special-characters
...
Escape special characters (#25429 )
2016-07-20 21:24:19 +02:00
ea47974a08
Add OCSMiddleware to catch OCS exceptions
...
* OCSException
* OCSBadRequestException
* OCSForbiddenException
* OCSNotFoundException
2016-07-20 20:03:49 +02:00
a299fa38a9
[master] Port Same-Site Cookies to master
...
Fixes https://github.com/nextcloud/server/issues/50
2016-07-20 18:37:57 +02:00
e9c85e02ac
Merge pull request #462 from nextcloud/master-explode
...
[master] Use explode() instead of split()
2016-07-20 18:31:11 +02:00
7cdf6402ff
Merge pull request #472 from nextcloud/show-app-name-in-errormsg
...
Show app name in error message if app could not be loaded. (#25441 )
2016-07-20 18:20:49 +02:00
1264e9644f
Merge pull request #402 from nextcloud/smb-notifications
...
smb update notifications
2016-07-20 16:19:21 +02:00
99316ec02c
Show app name in error message if app could not be loaded. ( #25441 )
2016-07-20 15:16:16 +02:00
7c0de08cc4
Escape special characters ( #25429 )
...
* Escape LIKE parameter
* Escape LIKE parameter
* Escape LIKE parameter
* Escape LIKE parameter
* Escape LIKE parameter
* Use correct method in the AbstractMapping class
* Change the getNamesBySearch method so that input can be properly escaped while still supporting matches
* Don't escape hardcoded wildcard
2016-07-20 14:46:47 +02:00
4f90447150
[master] Use explode() instead of split()
...
Sync from https://github.com/owncloud/core/pull/25488
2016-07-20 14:36:39 +02:00
8735a05d93
Merge pull request #441 from nextcloud/fix-maintenance-mode
...
Fix maintenance mode
2016-07-19 16:59:24 +02:00
13a25535d2
Merge pull request #400 from nextcloud/ocs_appframework
...
OCS routes use AppFramework
2016-07-19 12:21:14 +02:00
544c3c1565
Merge pull request #436 from nextcloud/public-regex-to-match-our-clients
...
Copy the regexes to the public interface
2016-07-19 11:35:10 +02:00
80168613be
Fix maintenance mode
...
When the server is in maintenance mode, apps are not loaded.
That means apps/theming/ is not in the allowed paths. So we
need to check without autoloading, whether the class exists.
2016-07-19 09:54:42 +02:00
ea470f8777
Merge pull request #405 from nextcloud/theming-fixes
...
Theming fixes
2016-07-18 15:59:47 +02:00
b1d652e8b0
Copy the regexes to the public interface
2016-07-18 15:11:44 +02:00
9781312648
Prevent syntax error when creating user or changing password
2016-07-18 11:44:10 +02:00
0bda09236e
Add route tests
2016-07-18 11:09:49 +02:00
94cd83ca00
Make the router handle OCS AppFramework Routes
2016-07-18 11:09:04 +02:00
1ff4b7f63d
Allow registering of OCS routes with the appframework
2016-07-18 11:09:04 +02:00
5157c5a9c4
Merge pull request #418 from nextcloud/remove_asset_pipeline
...
Remove asset pipelin
2016-07-18 09:44:35 +02:00
72464f1ce4
Remove asset pipelin
...
Fixes #215
The asset pipeline has shown to do more harm than good. Some apps fail
hard with it. Also it makes sure that you download a huge file on each
unvisited page.
2016-07-15 20:14:11 +02:00
2c988ecbf4
Use the themed Defaults everywhere
2016-07-15 09:17:30 +02:00
29eeeb2273
Save the files external mount id in the mount cache table
2016-07-13 16:34:08 +02:00
e5d7612a19
dont check for pgsql extension during setup
2016-07-12 14:38:24 +02:00
7ffda5d10f
use pdo for postgres setup
2016-07-12 14:38:24 +02:00
8a79d314cf
Remove duplicate database connect logic in mysql setup
2016-07-12 14:38:24 +02:00
7c64e1973f
add test for needsRebundling() check
2016-07-11 15:51:48 +02:00
0c1cf5f7eb
Merge pull request #347 from nextcloud/drop-windows-foo
...
Remove unneeded checks if it runs on a Windows machine
2016-07-11 13:16:03 +02:00
103417fd9c
Merge pull request #350 from nextcloud/fix-check-certificate-bundles
...
fix check if the certificate bundle needs to be updated
2016-07-11 11:04:49 +02:00
49cad153af
always check the mtime of the system bundle and additionally the user specific certificate bundle if a user is given
2016-07-08 18:24:37 +02:00
c2d88a08b7
Remove unneeded checks if it runs on a Windows machine
...
* the setup check is still there
2016-07-08 15:55:17 +02:00
390a996297
Sanitize more config options and stack traces
2016-07-08 14:13:16 +02:00
c8ba8f637e
Merge pull request #314 from jernst/master
...
Allow wildcard * to be used in trusted domains
2016-07-07 19:34:11 +02:00
2791b8f00d
Revert "occ web executor ( #24957 )"
...
This reverts commit 854352d9a0
2016-07-07 12:14:45 +02:00
ba16fd0d33
Merge branch 'master' into sync-master
2016-07-07 11:29:46 +02:00
66a134e69e
Disallow certain malformed domain names even if they match the trusted domain expression
...
Stricter checking for valid domain names
2016-07-06 23:51:04 +00:00
2b4ceae620
Trusted domain wildcard checking made shorter, supporting multiple *
...
Added test cases
2016-07-06 23:38:30 +00:00
dc21a38a85
Use named parameter instead of direct value for system tags search param ( #25380 )
2016-07-06 22:39:34 +02:00
0638937ada
Changed the input option for database-port to required when parameter was provided.
...
Added casting database port to int for input sanitation in pgsql and oci connections.
2016-07-06 11:31:28 +02:00
d367318088
Added occ install option for database-port.
...
Extended the database setup to store the database port.
Changed the PostgreSQL connection error message for clarification.
2016-07-06 09:58:38 +02:00
3516b58be6
Duh, no 'next' in PHP.
...
Use === instead of == for extra paranoia.
2016-07-06 04:51:49 +00:00
b1867dc8d1
Allow wildcard * to be used in trusted domains, to support setups where no reliable DNS entry is available (e.g. mDNS) or for simple-to-setup aliasing (e.g. *.example.com)
2016-07-05 18:49:18 +00:00
d2d99a91a0
fix swift primary object store test ( #25281 )
...
* Wait for socket to be open
* Fix call on null
* Allow DB access for MountProviderTest
Makes unit tests pass when using object store, since their FS access is
actually oc_filecache DB access. It is currently not possible to mock
or bypass the logic from "SharedMount::verifyMountPoint()" triggered by
this test.
2016-07-05 08:54:51 +02:00
bca4f42e14
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-04 12:06:52 +02:00
90b7f74da7
Changed name of default logfile from owncloud.log to nextcloud.log.
2016-07-04 11:50:32 +02:00
dc5fea504b
[master] Use paramterized parameter for \OC\SystemTag\SystemTagManager
...
$nameSearchPattern was passed in and directly appended to the SQL query. Luckily the code path isn't reached anywhere in Nextcloud or the included apps.
2016-07-03 16:54:41 +02:00
11be3d6276
remove png references in core
2016-07-01 16:36:37 +02:00
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
b55ab6d22a
Various database migration fixes ( #25209 )
...
* String columns with a length higher then 4000 are converted into a CLOB columns automagically - we have to respect this when migrating
* Adding schema migration tests to prevent unnecessary and non-sense migration steps
Fix Oracle autoincrement and unsigned handling
* Fix sqlite integer type for autoincrement
* Use lower case table names - fixes pg
* Fix postgres with default -1 - this only affect pg 9.4 servers - 9.5 seems to work fine
2016-06-29 14:54:41 +02:00
b6397ef73a
Merge pull request #236 from nextcloud/master-sync-upstream
...
[Master] sync upstream
2016-06-28 09:02:03 +02:00
2a72eff9ee
Fix getting the certificate bundle for dav external storage ( #25274 )
...
* Fix getting the certificate bundle for dav external storages
* Log the original exception in dav external storage
2016-06-27 22:26:43 +02:00
1710de8afb
Login hooks ( #25260 )
...
* fix login hooks
* adjust user session tests
* fix login return value of successful token logins
* trigger preLogin hook earlier; extract method 'loginWithPassword'
* call postLogin hook earlier; add PHPDoc
2016-06-27 22:16:22 +02:00
88ef163276
handle unavailable fed shares while testing for availability ( #25277 )
...
* More explicit http status codes
* handle unavailable fed shares while testing for availability
2016-06-27 21:34:28 +02:00
e0445856b9
Merge pull request #59 from nextcloud/theming-app
...
Theming app
2016-06-27 21:14:40 +02:00
6670d37658
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-27 18:23:00 +02:00
2a990a0db5
verify user password on change
2016-06-27 14:08:11 +02:00
d4989c8037
remove old hook, no longer needed
2016-06-27 14:05:27 +02:00
630e4b1b46
check password for link shares
2016-06-27 14:05:27 +02:00
199c8e304c
Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms
...
Add explicit delete permission to link shares
2016-06-27 12:14:05 +02:00
7269611722
Merge pull request #25258 from owncloud/integritycheck-whennotinstalled
...
Make code integrity check work when OC is not installed yet
2016-06-27 11:58:35 +02:00
89e889c832
Check if server is installed
...
AppManager has a dependency on Nc being installed
2016-06-27 10:26:23 +02:00
27b699bdbc
Migrate logic to dynamic controller
...
Also adds support for having custom login backgrounds
2016-06-27 10:26:23 +02:00
10f6ca20bc
write theme settings to database
2016-06-27 10:26:22 +02:00
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
89198e62e8
check login name when authenticating with client token
2016-06-24 13:57:09 +02:00
e677ad56fd
Make code integrity check work when OC is not installed yet
2016-06-24 10:24:41 +02:00
0ad065cb8d
Repair step to adjust link share delete permissions
2016-06-24 09:48:48 +02:00
955635c7aa
Add explicit delete permission to link shares
...
Link shares always allowed deletion, however internally the permissions
were stored as 7 which lacked delete permissions. This created an
inconsistency in the Webdav permissions.
This fix makes sure we include delete permissions in the share
permissions, which now become 15.
In case a client is still passing 7 for legacy reasons, it gets
converted automatically to 15.
2016-06-24 09:48:48 +02:00
3db5de95bd
Merge pull request #25172 from owncloud/token-login-validation
...
Token login validation
2016-06-22 13:58:56 +02:00
854352d9a0
occ web executor ( #24957 )
...
* Initial web executor
* Fix PHPDoc
Fix broken integration test
OccControllerTests do not require database access - moch them all!
Kill unused sprintf
2016-06-22 13:12:36 +02:00
c49ff83f18
Merge pull request #25208 from owncloud/uploadfolder-firemkdirhooksforparents
...
Fire hooks for mkdir for folder upload
2016-06-22 10:21:00 +02:00
c8b7a059b4
Fire hooks for mkdir for folder upload
...
fromTmpFile function, usual mkdir call is only working for file's parent
directory. Does not care upper parent folders. I added a recursive
function that creates parent non-existing folders with usual mkdir.
2016-06-21 17:10:52 +02:00
7f22aeb5d6
redirect to new login route ( #25099 )
...
* redirect to new login route
* encode anchor in url and restore it client-side
2016-06-21 16:14:51 +02:00
097cba8b38
Merge pull request #185 from nextcloud/fix-permission-issue
...
Show error message if config file is not readable
2016-06-21 12:14:24 +02:00
191a6c65d9
Show error message if config file is not readable
...
* when the config file is not writable there is a error message shown
* same happens now if the config file is not readable
* fixes #180
2016-06-21 11:25:38 +02:00
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
b805908dca
update session token password on user password change
2016-06-21 10:24:25 +02:00
88b9f5a357
Merge pull request #25162 from owncloud/password-login-forbidden-hint
...
Password login forbidden hint
2016-06-20 17:05:20 +02:00
e95c15e53a
fix more strings
2016-06-20 13:14:24 +02:00
2951a70fcb
Update ExcludeFileByNameFilterIterator.php ( #25184 )
...
Gentoo & derivatives use a tool named webapp-config which places two files in a webapp-config manager web application:
1: .webapp tag with more detailed info on the configuration done by webapp-config
2: .webapp-appname with the list of files installed by the tool to be able to later only delete stuff that was installed (in case of upgrade) and updated configurations.
2016-06-20 12:02:23 +02:00
56199eba37
fix unit test warning/errors
2016-06-20 10:41:23 +02:00
e2b0a0f18f
Merge pull request #25174 from owncloud/tokenmapper-close-cursor
...
close cursor after loading a token
2016-06-20 09:54:15 +02:00
01041045da
Merge pull request #25168 from owncloud/capped-user-cache
...
Capped cache for user config
2016-06-20 09:53:58 +02:00
Lukas Reschke
Raghu Nayyar
Jan-Christoph Borchardt
Joas Schilling
Roeland Jago Douma
Roeland Jago Douma
Julius Haertl
Robin Appelman
Christoph Wurst
Arthur Schiwon
Morris Jobke
Vincent Petry
Marius Blüm
Björn Schießle
Jörn Friedrich Dreyer
Thomas Müller
michag86
Damjan Georgievski
root
William Bargent
Thomas Pulzer
root
Klaas Freitag
Aaron Wood
Roeland Jago Douma
Robin Appelman
Johannes Ernst
Thomas Müller
Lukas Reschke
Hendrik Leppelsack
Christoph Wurst
Christoph Wurst
VicDeo
karakayasemi