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

8486 commits

Author SHA1 Message Date
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