wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
44274 commits 157 branches 562 tags 714 MiB
Commit graph

8627 commits

Author SHA1 Message Date
Morris Jobke
2aa108000c
Merge pull request #9293 from nextcloud/feature/9166/custom-auditlogfile 
option for a seperate audit log file
 2018-05-02 16:16:28 +02:00
Robin Appelman
d71783fb93
Log mount and storage issues in getFileInfo 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-02 15:11:59 +02:00
Roeland Jago Douma
dfe6d65410
Merge pull request #9310 from nextcloud/bugfix/noid/allow-to-inject-collaboration-search-result 
Allow to inject ISearchResult
 2018-05-02 09:45:25 +02:00
Roeland Jago Douma
db96b0bb0b
Make it possible to make external storages read only 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-01 15:18:56 +02:00
Robin Appelman
57ba18f47f
Use better way to determine stream type in encryption stream wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-01 15:06:21 +02:00
Morris Jobke
7306d30708
Merge pull request #9321 from nextcloud/bugfix/noid/return_root_folder_when_at_root 
Actually return the root folder when traversing up the tree
 2018-04-27 13:59:29 +02:00
Arthur Schiwon
aff5fe68b3
use SystemConfig, less dependencies, and not publicly needed 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 23:54:11 +02:00
Roeland Jago Douma
a0e038f912
generateTokenFromCache is only valid for V3 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:51:05 +02:00
Roeland Jago Douma
7318882357
json_decode an associative array for the swift cached token 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:47:47 +02:00
Roeland Jago Douma
235e3480e6
Actually return the root folder when traversing up the tree 
If you now keep calling $node->getParent() you will at some point get
the RootFolder back. This is a nice termination check and will prevent
endless loops if an exit condition is slightly off.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:04:19 +02:00
Joas Schilling
f5b143e318
Allow to inject ISearchResult 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-26 12:19:15 +02:00
Arthur Schiwon
b841a477c6
log to $datadir/audit.log by default and add rotation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:53 +02:00
Arthur Schiwon
5751788282
add missing php doc and type hints 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:53 +02:00
Arthur Schiwon
a21a5bc4ec
improve Syslog a little 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:53 +02:00
Arthur Schiwon
0e6a317516
revert Log's dependency to SystemConfig to work during Installation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:53 +02:00
Arthur Schiwon
69592408c4
move IFileBased to public namespace, logreader needs it 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:52 +02:00
Arthur Schiwon
cfc3ab0119
offer API to create own File log. admin_audit makes use of it 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:10:52 +02:00
Arthur Schiwon
5fbf184134
destaticfy Log classes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 12:00:06 +02:00
Arthur Schiwon
38a90130ce
move log constants to ILogger 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 10:45:52 +02:00
Morris Jobke
b3a0dec8d5
Merge pull request #8540 from nextcloud/theming-advanced 
Add option for header logo and favicon in theming app
 2018-04-25 08:47:14 +02:00
Roeland Jago Douma
81f71cb1f9
Numeric only uids are no fun 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 14:23:50 +02:00
Roeland Jago Douma
074a0e0665
Cast retrieved DB fields to string 
Fixes #9279

If a pure numerical user is in the DB the value might be casted to a int
when returned. Cast it all to a string so we don't break the strict
typing.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 12:48:52 +02:00
Roeland Jago Douma
1ceb081c9b
Merge pull request #9280 from nextcloud/bugfix/noid/swift-v3-scope 
Swift v3 requires setting a scope
 2018-04-24 09:49:27 +02:00
Roeland Jago Douma
ba71918ad2
Swift v3 requires setting a scope 
Unscoped auth is not guaranteed to return a catalog. So require the
scope to be set properly.

See https://developer.openstack.org/api-ref/identity/v3/index.html#password-authentication-with-unscoped-authorization

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 19:34:09 +02:00
Daniel Calviño Sánchez
9b150001ff
Merge pull request #9272 from nextcloud/bugfix/noid/save-a-query-help-saving-the-world 
Only query last comment info, when there is one
 2018-04-23 16:43:09 +02:00
Joas Schilling
05a6b71a61
Merge pull request #9271 from nextcloud/fix-undefined-variable 
Fix undefined variable - found by Phan
 2018-04-23 15:51:15 +02:00
Roeland Jago Douma
961b27eeb0
Convert group Database backend 
This now uses the new interfaces

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 14:39:30 +02:00
Morris Jobke
4fd697e733
Remove a check for an unused variable 
Left over from a refactoring

https://github.com/nextcloud/server/pull/1940

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:53:48 +02:00
Joas Schilling
446efa4625
Only query last comment info, when there is one 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-23 11:50:30 +02:00
Morris Jobke
431ccb6386
Fix undefined variable - found by phan 
Added in https://github.com/nextcloud/server/pull/8314/files#diff-a55c10804586cd797b7f3f16556c1457R157

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:34:41 +02:00
Morris Jobke
67dcff7a1f
Fix undefined variable - found by Phan 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 11:30:22 +02:00
Roeland Jago Douma
0ed6f9c2da
Merge pull request #9129 from nextcloud/feature/noid/proper-comments-offset 
Add proper comment offset support
 2018-04-22 20:47:30 +02:00
Roeland Jago Douma
9f4e928c0f
Merge pull request #9225 from nextcloud/bugfix/9157/ipv6-database-host 
Allow IPv6 database hosts
 2018-04-22 20:43:29 +02:00
Julius Härtl
272b392cac
Move to more generic image handling and add extra images 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:38 +02:00
Joas Schilling
5157349b69
Fix docs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-19 17:10:03 +02:00
Joas Schilling
78ee3abb78
Move regex to a function and add tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-19 12:49:36 +02:00
Roeland Jago Douma
a0028a2a5f
Allow to skip retrieving from cache in the DiscoveryService 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-18 19:18:34 +02:00
Joas Schilling
8f7a0af951
Allow IPv6 database hosts 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-18 14:48:21 +02:00
Joas Schilling
f50abde7ac
Add proper comment offset support 
The offset is based on the last known comment instead of limit-offset,
so new comments don't mess up requests which get the history of an object-

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-04-18 14:23:15 +02:00
Robin Appelman
f399e1591f
Log classnames of arguments in exception trace 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-17 13:46:36 +02:00
Robin Appelman
46d0d0cda1
fix appinfo parsing when a single localized option is provided 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-17 11:14:03 +02:00
Morris Jobke
9ee1febf62
Provide an option to disable HTML emails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-16 19:00:05 +02:00
Morris Jobke
4d832cd4e3
Fixes false positive possible sql injection by phan 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-16 11:47:11 +02:00
Morris Jobke
1517b1452e
Fix autoloader 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-12 16:24:44 +02:00
Jan-Christoph Borchardt
04f47a7653
Merge pull request #8535 from nextcloud/new-color-generator 
New color generator algorithm
 2018-04-12 14:37:53 +02:00
Robin Appelman
89a9d35d90 dont keep shared database locks when running cli scripts 
For cli scripts we don't have the assumption that the universe will be cleaned up soon

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-11 19:21:45 +02:00
Morris Jobke
88c1b8edbd
Merge pull request #9024 from nextcloud/fix/app-fetcher-major-minor-versions 
Fix version comparison with minor and patch level requirements
 2018-04-11 15:48:23 +02:00
Robin Appelman
96f14a2e90 log previous exception 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-11 14:35:08 +02:00
Morris Jobke
7a3ce073da
Merge pull request #8946 from nextcloud/log-exceptions-as-nested-array-2 
Log exceptions as nested array instead of encoded json
 2018-04-11 14:24:47 +02:00
Robin Appelman
15815c034f adjust tests to new exception log format 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-11 11:46:36 +02:00
Morris Jobke
185a260f6b
Merge pull request #9074 from nextcloud/ARGON2I 
Add ARGON2I support to the hasher
 2018-04-11 11:04:42 +02:00
Morris Jobke
3d80ade8d7
Log possible exception caused by wrong version number 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-11 10:08:23 +02:00
Christoph Wurst
ac939e8fd4
Fix version comparison with minor and patch level requirements 
If an app requires a specific minor or path level server version,
the version_compare prevented the installation as only the major
version had been compared and that checks obviously returns `false`.

Now the full version is used for comparison, making it possible to
release apps for a specific minor or patch level version of Nextcloud.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-04-11 10:08:23 +02:00
Morris Jobke
e302266a6a
Merge pull request #9137 from nextcloud/default-log-rotate-size 
Set the default log rotate size to 100 MB
 2018-04-11 02:10:54 +02:00
Morris Jobke
38961a725f
Merge pull request #8833 from nextcloud/feature/noid/add_ldap_user_hooks 
add anounce- and (pre/|post)RevokeUser signals for non-native backends
 2018-04-11 00:44:39 +02:00
Morris Jobke
058f8123e6
Set the default log rotate size to 100 MB 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-11 00:27:51 +02:00
Robin Appelman
b9583c6dce Log exceptions as nested array instead of encoded json 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-10 15:53:43 +02:00
Christoph Wurst
6248b61193 Fix AppFetcher::setVersion phpdoc 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-04-10 12:32:56 +02:00
Morris Jobke
acbcc607ea
Merge pull request #9111 from nextcloud/use-proper-bool-user-disabled-state 
Return proper boolean and do not save enabled state in db
 2018-04-09 23:39:02 +02:00
John Molakvoæ (skjnldsv)
eae55761de
Properly return boolean on enable state 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-04-09 11:26:26 +02:00
John Molakvoæ (skjnldsv)
d5cfd09d47
fixup! Updated php generator 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-04-06 21:32:45 +02:00
John Molakvoæ (skjnldsv)
57a1dc1231
Updated php generator 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-04-06 21:32:44 +02:00
Daniel Calviño Sánchez
90fdf83ca7
Use zip32 only if there are less than 65536 files 
A zip32 file can contain, at most, 65535 files (and folders), so take
that constraint into account.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-04-06 15:59:30 +02:00
Roeland Jago Douma
4a73f645e5
Use zip32 if possible 
* OSX doesn't handle 64zip that well
* Some other implentations don't handle it perfectly either
* If the file is belog 4GiB (some overhead) => zip32
* This covers the 99% case I bet

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-06 15:59:30 +02:00
Roeland Jago Douma
8edbeb159e
Use the uid_lower column 
This can use a proper index

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-06 13:42:52 +02:00
Jared Boone
a5b50e487e Do not convert email addresses with idn_to_ascii if INTL_IDNA_VARIANT_UTS46 is undefined. 
Fixes https://github.com/nextcloud/server/issues/8387.

Signed-off-by: Jared Boone <jared.boone@gmail.com>
 2018-04-05 16:09:08 -07:00
Roeland Jago Douma
bbc4c6036a
Merge pull request #9092 from nextcloud/log-objectstorage-stuff 
Add more logging for the object storage during creation of the buckets
 2018-04-05 21:44:48 +02:00
Morris Jobke
2f068bc9d1
Add more logging for the object storage during creation of the buckets 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-05 17:26:09 +02:00
Arthur Schiwon
373a1d5391
more consistent naming 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-05 12:46:15 +02:00
Arthur Schiwon
2ebf26e444
admin_audit and dav listen to announce and revoke signals 
also place them in doc

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-05 12:38:43 +02:00
Roeland Jago Douma
ab04f3cb19
Fix Array to String conversion in QueryBuilder 
Fixes #9080

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-05 09:08:32 +02:00
Roeland Jago Douma
84316aec66
Add ARGON2I support to the hasher 
When on php7.2 we can use the new and improved ARGON2I hashing.
This adds support for that to the hasher. When verifying an old hash
we'll update rehash to move all hashes eventually to the new hash
function.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-04 15:43:50 +02:00
Morris Jobke
9c4d562808
Merge pull request #9063 from nextcloud/fix-callForSeenUsers 
Move on with the next user if we found the user on one user back-end
 2018-04-04 15:01:04 +02:00
Roeland Jago Douma
73e6eea57e
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-04 12:50:54 +02:00
Roeland Jago Douma
37233471b6
Add pathcache 
* If we find the mountpoint for a path cache it
* If we modify the mount points empty the pathCache

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-04 12:44:56 +02:00
Roeland Jago Douma
6868da9958
Make normalized cache path larger 
On larger instances with a large number of shares this can make a real
impact as the default 512 entries are easily filled.

Making this contain max 2048 entries has basically no effect on smaller
installations (as they probably never hit the 512 now). But makes sure
we don't evict entries in the larger case.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-04 12:44:52 +02:00
Roeland Jago Douma
dc222aa3a5
Comparing stringlength is cheaper than strpos 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-04 12:44:28 +02:00
Roeland Jago Douma
e48d4c4aad
Cache the $foundMountPointLength 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-04 12:44:28 +02:00
Roeland Jago Douma
003c624596
Inspections 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-04 12:44:28 +02:00
Roeland Jago Douma
7f1141f7e9
Make the MountManager strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-04 12:44:28 +02:00
Björn Schießle
c3900c9d0d
Merge pull request #9018 from nextcloud/fix-copy-encrypted-files 
reset encryptionVersion to '1' if a file was stream copied
 2018-04-03 18:24:27 +02:00
Bjoern Schiessle
a0923d9ffb
reset encryptionVersion to '1' if a file was stream copied, because this means that we basically write the file from scratch 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-04-03 18:01:23 +02:00
Bjoern Schiessle
6795b35cdf
Move on with the next user if we found the user on one user back-end 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-04-03 17:00:18 +02:00
Morris Jobke
75cf631fd6
Merge pull request #9008 from nextcloud/disable-if-no-appinfo 
Do not fail hard if no appinfo is returned during update
 2018-04-03 13:32:50 +02:00
Roeland Jago Douma
cdb2cc1814
Merge pull request #8999 from nextcloud/css-js-name-based-on-apps-versions 
Use app version to generate scss filename
 2018-03-28 15:59:07 +02:00
Julius Härtl
eb6e5a27a3
Do not fail hard if no appinfo is returned during update 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-28 11:12:56 +02:00
John Molakvoæ (skjnldsv)
1d7b14dfb1
Use app version to generate scss filename 
Fixed scsscacher tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-28 08:33:46 +02:00
Roeland Jago Douma
2124ebae72
Merge pull request #8737 from nextcloud/file_return_put_contents 
Pass on the return value of file_put_content
 2018-03-28 08:25:04 +02:00
Roeland Jago Douma
b2e34167eb
Merge pull request #8976 from nextcloud/dep_user_code 
Remove deprecated functions from OCP\User
 2018-03-28 08:23:57 +02:00
Roeland Jago Douma
1e13b3a8fa
Merge pull request #8994 from nextcloud/deprecate-theme-sync-clients 
Deprecate theme sync clients
 2018-03-28 08:23:16 +02:00
Roeland Jago Douma
53447ae2b2
Throw an exception if file_put_contents fails 
* This will help with AppData hardening etc
* Introduced a GenericFileException for if nothing else is appropiate
  - Maybe the other File exceptions should base on this?

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-27 16:23:06 +02:00
Joas Schilling
709589f2db
Merge pull request #8780 from nextcloud/bugfix/noid/query-builder-database-backends 
Move the group database backend fully to query builder
 2018-03-27 16:10:26 +02:00
Joas Schilling
b98c218201
Remove orderBy so the query works correctly on postgres 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-27 14:50:09 +02:00
Roeland Jago Douma
36dbd7ec8f
Merge pull request #8985 from nextcloud/cleanup_ocp_db 
Cleanup ocp db
 2018-03-26 21:45:25 +02:00
Julius Härtl
cf4d27b115
Use customclient_* values by default and do not use them in custom themes anymore 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-26 19:26:36 +02:00
Roeland Jago Douma
f4fd0224db
Do not use \OCP\DB anymore 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-26 14:40:23 +02:00
Roeland Jago Douma
91cc44a4e6
Remove deprecated OC_Group_Backend 
* Private class
* Has been deprecated since NC10

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-26 14:19:04 +02:00
Joas Schilling
421a00854c
Make sure DI is done 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-26 11:35:07 +02:00
Joas Schilling
7ea00b7b5f
Move the group database backend fully to query builder 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-26 11:35:07 +02:00
Roeland Jago Douma
74f0e37233
Remove deprecated \OCP\User::userExists 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-26 11:16:23 +02:00
Roeland Jago Douma
7ebd96416c
Remove deprecated OCP\User::getDisplayname 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-25 20:42:03 +02:00
Roeland Jago Douma
6c8caa1641
Remove deprecated \OCP\User::getUsers 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-25 20:33:24 +02:00
Roeland Jago Douma
34cb8ea161
Merge pull request #8935 from nextcloud/backend_interfaces 
Backend interfaces
 2018-03-23 08:48:03 +01:00
Roeland Jago Douma
471272d456
Move to ABackend 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-22 16:32:05 +01:00
Roeland Jago Douma
cbd2be583a
Move Database backend over to new User/Backend interfaces 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-22 16:32:05 +01:00
Roeland Jago Douma
4e1161d254
Fix proper permissions for multiple file access 
Fixes #8890

In case you have access to a file via multiple ways, for example:
1. the file is shared with you with permission read only
2. the folder containing the file is shared with your read/write

Requesting the getById function on the userFolder would give back two
entries but both with the same permissions. Depending on the node you
picked this is not right.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-22 12:06:41 +01:00
Morris Jobke
f843b7edfe
Merge pull request #8506 from nextcloud/use-appmanager 
Use isInstalled of AppManger instead of reimplement it
 2018-03-22 09:55:19 +01:00
Morris Jobke
be35b54f69
Merge pull request #8791 from nextcloud/cleanup-oc_json 
Remove unused methods of OC_Json
 2018-03-22 09:54:55 +01:00
Roeland Jago Douma
dc4ba31e7e
Merge pull request #8922 from nextcloud/deprecated-ocp-files-methods 
Deprecated some methods of OCP\Files
 2018-03-22 08:33:32 +01:00
Morris Jobke
24f1b8f01a
Merge pull request #8923 from nextcloud/typos 
Fix some typos
 2018-03-21 14:43:32 +01:00
Morris Jobke
78211a58e6
Remove unused methods of OC_Json 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-21 14:36:34 +01:00
Morris Jobke
2b73779568
Fix some typos 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-21 14:30:56 +01:00
Morris Jobke
8eb57dd835
Deprecate OCP\Files 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-21 14:29:35 +01:00
Morris Jobke
3579487798
Remove unused and deprecated methods of OCP\DB 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-21 12:17:55 +01:00
Morris Jobke
514de5dfa1
Use isInstalled of AppManger instead of reimplement it 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-21 11:34:18 +01:00
Joas Schilling
ec1e039790
Show EOL warning in the update section 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-20 15:52:30 +01:00
blizzz
7ae42f1f5d
Merge pull request #8822 from nextcloud/fix/8641/undefined-index 
the FN is optional, carrying the displayname if present
 2018-03-19 17:57:12 +01:00
Roeland Jago Douma
431750828e
Store setUserValue as string in cache 
We cache the values we set in the setUserValue function.
However since the values are strings in the database we check if a value
is equal with string comparison

Now if the function was called with a $value of int or float. It would
be stored in the DB (and thus converted to string) and in the cache (not
converted thus as int/float).

Now if another call comes in that sets it to the same value (I'm looking
at you LDAP!). The check would fail since we would be comparing
int/float to string which fails by definition.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 12:57:48 +01:00
Roeland Jago Douma
9834f33d56
Merge pull request #8878 from nextcloud/remove_tmpfile 
Remove deprecated tmpFile/tmpFolder
 2018-03-19 12:29:08 +01:00
Roeland Jago Douma
68871caf3c
Remove unused private function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 11:32:10 +01:00
Roeland Jago Douma
1088068c60
Remove \OCP\Files::tmpFolder 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 10:54:39 +01:00
Roeland Jago Douma
47a3008141
Remove \OCP\Files::tmpFile 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 10:52:35 +01:00
Morris Jobke
63bc633d89
Merge pull request #8857 from nextcloud/swift-verify-cached-token 
verify cached swift token
 2018-03-19 10:10:04 +01:00
Robin Appelman
41954d2903
verify cached swift token 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-03-16 15:20:16 +01:00
Morris Jobke
ade05f40ec
Remove unused resolveReshare of old sharing code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-16 12:26:38 +01:00
Roeland Jago Douma
fa886ef4eb
Merge pull request #8830 from nextcloud/node_emit_read 
Emit read for nodes
 2018-03-15 14:04:14 +01:00
blizzz
208e38e84e
Merge pull request #8255 from nextcloud/bugfix/noid/group-display-name 
Full implement group display names
 2018-03-15 12:07:30 +01:00
Roeland Jago Douma
d6b326650b
Emit read for nodes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-15 11:18:39 +01:00
Roeland Jago Douma
fde08a9619
Merge pull request #8793 from nextcloud/swift-config 
Swift uses `containter` not `bucket`
 2018-03-15 08:34:58 +01:00
Roeland Jago Douma
f2b93f5246
Merge pull request #8828 from nextcloud/fix-configuration-values-matched-in-user-searches 
Fix configuration values matched in user searches
 2018-03-15 08:34:21 +01:00
Daniel Calviño Sánchez
0b96a71a68 Fix configuration values matched in user searches 
Due to a misplaced closing parenthesis the condition of the left join
clause was just "userid = uid"; the other conditions were passed as
additional parameters to "leftJoin", and thus they were ignored.
Therefore, the result set contained every preference of each user
instead of only the email, so the "WHERE configvalue LIKE XXX" matched
any configuration value of the user.

Besides the closing parenthesis this commit also fixes the literal
values. Although "Literal" objects represent literal values they must be
created through "IExpressionBuilder::literal()" to be properly quoted;
otherwise it is just a plain string, which is treated as a column name.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-14 23:31:42 +01:00
Arthur Schiwon
f42c29ebac
the FN is optional, carrying the displayname if present 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-03-14 14:30:45 +01:00
Roeland Jago Douma
d3e7996e80
Fix bucket and container usage 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-14 13:57:14 +01:00
Roeland Jago Douma
0e48afafed
Merge pull request #8804 from nextcloud/remove_httphelper 
Remove deprecated HTTPHelper
 2018-03-14 09:49:24 +01:00
Roeland Jago Douma
7785c3752f
Remove deprecated HTTPHelper 
* Remove the HTTP Helper
* Remove from Server Containter
* Removed legacy share tests that use it

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 21:54:56 +01:00
blizzz
76d23a1600
Merge pull request #8806 from nextcloud/add-local-memcache-check 
Properly provide local memcache check to ICacheFactory
 2018-03-13 21:27:24 +01:00
Morris Jobke
dde5353f98
Properly provide local memcache check to ICacheFactory 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-13 18:18:04 +01:00
Morris Jobke
ede723f1b1
Merge pull request #8796 from nextcloud/varadic_qb 
Make QueryBuilder varadic
 2018-03-13 14:11:19 +01:00
Morris Jobke
45895de531
Merge pull request #8794 from nextcloud/swift-v3-cache-token 
Properly cache swift v3 token
 2018-03-13 11:35:38 +01:00
Morris Jobke
7488218535
Merge pull request #8792 from nextcloud/cleanup-oc_response 
Remove unused methods of OC_Response
 2018-03-13 09:47:29 +01:00
Roeland Jago Douma
46c195b58b
Made IExpressionBuilder varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:35:09 +01:00
Roeland Jago Douma
0009358c17
Made orHaving varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:32:31 +01:00
Roeland Jago Douma
408c2103db
Made addHaving varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:31:33 +01:00
Roeland Jago Douma
2c585afea1
Make having varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:31:04 +01:00
Roeland Jago Douma
c6eba3c925
Made addGroupBy varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:30:14 +01:00
Roeland Jago Douma
afbad7e15e
Made groupBy varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:29:36 +01:00
Roeland Jago Douma
d6b93e6620
Made orWhere varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:28:27 +01:00
Roeland Jago Douma
07cb6aaeff
Made andWhere varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:27:43 +01:00
Roeland Jago Douma
222dbb7bc9
Made where varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:27:11 +01:00
Roeland Jago Douma
2976b39102
Made AddSelect varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:25:32 +01:00
Morris Jobke
53a899a1f5
Fix the HTTP 1.0 status code and properly detect 1.0 vs 1.1&2.0 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-13 09:22:26 +01:00
Morris Jobke
57eaa48e3d
Merge pull request #8788 from nextcloud/cleanup-oc_api 
Remove unused methods and constants from legacy OC_API
 2018-03-13 08:52:24 +01:00
Roeland Jago Douma
c8aee70a0b
Made select varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 08:07:08 +01:00
Roeland Jago Douma
4e8d5504d2
Properly cache swift v3 token 
The V3 token has an export function. Without this the token is
effectively never cached.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-12 20:53:50 +01:00
Morris Jobke
e758cfcdc8
Remove unused methods of OC_Response 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 18:42:30 +01:00
Morris Jobke
a1232f46ca
Remove unused methods and constants from legacy OC_API 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 18:03:25 +01:00
Morris Jobke
2b335fd607
Use insertIfNotExist of the new interface 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 17:45:49 +01:00
Morris Jobke
3655951dd7
Merge pull request #8787 from nextcloud/remove-deprecated-and-unused-methods-of-db 
Remove deprecated and unsused methods of OCP\DB
 2018-03-12 16:34:37 +01:00
Morris Jobke
432e529827
Merge pull request #8784 from nextcloud/remove-unused-deprecated-apphelper 
Remove unused and deprecated class and interface AppHelper
 2018-03-12 16:33:46 +01:00
Morris Jobke
f5c5c5181f
Remove unused and deprecated class and interface AppHelper 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 15:27:10 +01:00
Morris Jobke
44289ff134
Use proper method to format absolute timestamp 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 15:16:52 +01:00
Morris Jobke
8195b17ed7
Remove deprecated and unsused methods of OCP\DB 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 15:13:37 +01:00
blizzz
054a45c079
Merge pull request #8710 from nextcloud/followup/8596/tests-for-user-pagination 
Tests for email collaborators pagination
 2018-03-09 11:21:21 +01:00
Roeland Jago Douma
129a608ebe
OCP\AppFramework\App strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-09 08:42:03 +01:00
Roeland Jago Douma
7a7c350a2d
Merge pull request #8716 from nextcloud/fix-cache-prefixing 
Remove base url from global cache prefix
 2018-03-08 21:12:54 +01:00
Roeland Jago Douma
d05469959e
Merge pull request #8715 from nextcloud/objectstore-no-part-files 
disable part files for object stores
 2018-03-08 20:52:16 +01:00
John Molakvoæ (skjnldsv)
00122fa027
Use group displayNames in users list 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-08 17:13:49 +01:00
Joas Schilling
82137f443d
Correctly return the group name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-08 17:13:48 +01:00
Joas Schilling
aef86a5f5a
Show the displayname in the users group list 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-08 17:13:48 +01:00
Joas Schilling
882096653e
Fix calculation if there are more results 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-08 16:22:16 +01:00
Morris Jobke
a2db959f5c
Merge pull request #8593 from eneiluj/master 
Allow public page access to apps with group restrictions
 2018-03-08 11:27:52 +01:00
Roeland Jago Douma
3ad7daeda5
Add tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-08 11:05:18 +01:00
Roeland Jago Douma
340e8ef16c
Make SecurityMiddleware strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-08 10:11:47 +01:00
Morris Jobke
069e3f50a7
Merge pull request #8711 from nextcloud/objectstore-write-only-fopen 
don't read existing file when overwriting using object store
 2018-03-08 09:32:39 +01:00
Roeland Jago Douma
af55b03386
Merge pull request #8662 from nextcloud/better-debugging-unit-tests 
Better debugging for "Your test case is not allowed to access the dat…
 2018-03-07 21:53:34 +01:00
Joas Schilling
1dd40b1f45
Single quotes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-07 16:50:18 +01:00
Joas Schilling
559978c50e
Suppress phan error 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-07 16:43:16 +01:00
Julius Härtl
63e261b444
Actually clear cache values for all base urls 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Julius Härtl
f652c28b21
Use JSCombiner from server container when searching for JS files 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Julius Härtl
50a9beb4bb
Move base url from global cache prefix to frontend related ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Morris Jobke
8d865483f4
Merge pull request #8714 from nextcloud/8705 
Check if the cached js file exists
 2018-03-07 14:45:43 +01:00
Robin Appelman
fc35352122
disable part files for object stores 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-03-07 13:33:35 +01:00
Roeland Jago Douma
34b86edc34
Check if the cached js file exists 
Fixes #8705

If the file does not exist (for whatever reason). It is never cached. No
matter what the depscache etc tell you.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-07 12:55:05 +01:00
Robin Appelman
9764e70494
don't read existing file when overwriting using object store 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-03-07 12:05:57 +01:00
Morris Jobke
65cc155a11
Merge pull request #8596 from nextcloud/bugfix/8454/sharee-email-matches-not-limited 
Also array_slice wide email matches of local users
 2018-03-06 22:21:03 +01:00
Morris Jobke
de56915605
Merge pull request #7419 from Abijeet/feature-7175 
Fixes #7175 - Allow to search for email address in user management
 2018-03-06 21:53:37 +01:00
Morris Jobke
c88112bb41
Merge pull request #8579 from nextcloud/feature/2692/merge-can-i-update 
Display a list of unavailable apps for updates (aka. merge "Can I update?")
 2018-03-06 21:31:06 +01:00
Morris Jobke
846b0d6a42
Merge pull request #5833 from nextcloud/fix_uninstall_rep_step 
Run repair steps on uninstall in all cases
 2018-03-06 17:57:10 +01:00
Morris Jobke
b2a9ea08a3
Remove unused and outdated hook 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-06 17:56:44 +01:00
Joas Schilling
09d8387b00
Try without autoloading 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-06 13:56:44 +01:00
Tobia De Koninck
96a5752340
Remove unused $enableAppsCache in OC_App 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2018-03-06 10:47:16 +01:00
Tobia De Koninck
55b9a5d886
Remove OC_App::disable method 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2018-03-06 10:45:20 +01:00
Tobia De Koninck
539fdaea1e
Run repair steps on uninstall in all cases 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2018-03-06 10:41:55 +01:00
Roeland Jago Douma
d8332d43f8
Make \OC\Security\IdentityProof strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 19:33:16 +01:00
Roeland Jago Douma
5457373407
Merge pull request #8659 from nextcloud/csrf_token_strict 
Make \OC\Security\CSRF strict
 2018-03-05 19:28:10 +01:00
Joas Schilling
97c4c00e3f
Better debugging for "Your test case is not allowed to access the database." 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-05 16:06:29 +01:00
Roeland Jago Douma
4ed9b74a6b
Make OC\Security\CSP strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 15:27:05 +01:00
Roeland Jago Douma
2c8402aa17
Make \OC\Security\CSRF strict 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 15:01:02 +01:00
Morris Jobke
a8f56ac8c7
Merge pull request #8603 from nextcloud/enc-cleanup 
kill old encryption migration steps
 2018-03-05 11:16:27 +01:00
Roeland Jago Douma
f6fe04f3d7
Fix comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 09:06:51 +01:00