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

15369 commits

Author SHA1 Message Date
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
Nextcloud bot
5105f1d466
[tx-robot] updated from transifex 2018-04-03 00:11:47 +00:00
Nextcloud bot
25c479c0c5
[tx-robot] updated from transifex 2018-04-02 00:11:49 +00:00
Nextcloud bot
0f398e7611
[tx-robot] updated from transifex 2018-03-31 00:13:51 +00: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
f5b378fa84
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-27 16:23:26 +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
Roeland Jago Douma
4edcaa945f
Merge pull request #8981 from nextcloud/strict_2fa 
Strict 2FA
 2018-03-26 21:40:36 +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
8a28bacb8c
Remove \OCP\DB 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-26 14:40:23 +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
24b12385d0
Strict 2FA 
* make OCP\Authentication\TwoFactorAuth strict
* scalar types
* return types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-26 11:31:02 +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
e2866091bc
Merge pull request #8943 from nextcloud/dep_oc_json 
Remove \OCP\JSON
 2018-03-23 15:20:38 +01:00
Roeland Jago Douma
2c9fd794b8
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-23 13:31:16 +01:00
Roeland Jago Douma
26073eac0c
Finally remove \OCP\JSON 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-23 08:50:17 +01: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
f5ce2531d8
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-22 16:32:05 +01:00
Roeland Jago Douma
b723a2b8ca
Document parameters 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-22 16:32:05 +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
5aa0d83268
Remove type declarations where not yet possible 
Because we don't return consistent things yet :(

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-22 16:32:04 +01:00
Roeland Jago Douma
c30b9dacae
Deprecate implementsActions 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-22 16:32:04 +01:00
Roeland Jago Douma
140e7b609f
Fix phpdoc 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-22 16:32:04 +01:00
Roeland Jago Douma
355abbc96d
Add abstract bakend to still be backwards compatible with the old logic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-22 16:32:04 +01:00
Roeland Jago Douma
226439a31c
Add interfaces for user backend functionality 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-22 16:32:04 +01:00
Roeland Jago Douma
3dac15a891
Move calls to \OCP\JSON to private \OC_JSON 
They should be properly fixed at some point.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-22 13:19:29 +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
Nextcloud bot
c1b36e165e
[tx-robot] updated from transifex 2018-03-22 01:11:40 +00:00
Morris Jobke
de3297848e
Merge pull request #8918 from nextcloud/remove-deprecated-ocp-response 
Remove deprecated and unused OCP\Response
 2018-03-21 16:54:19 +01:00
Morris Jobke
d435061f8e
Remove deprecated and unused OCP\Response 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-21 16:53:56 +01:00
Morris Jobke
cd201686a7
Merge pull request #8920 from nextcloud/hint-files-api 
Add hint about OCP\Folder::getById
 2018-03-21 16:53:12 +01:00
Morris Jobke
24292be917
Merge pull request #8919 from nextcloud/remove-deprecated-method-of-ocp-user 
Remove deprecated and unused method OCP\User::getDisplayNames
 2018-03-21 15:05:24 +01:00
Morris Jobke
39bb32af71
Add hint about OCP\Folder::getById 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-21 14:49: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
591d84f5fd
Remove deprecated and unused method OCP\User::getDisplayNames 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-21 14:19:59 +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
Nextcloud bot
af3ab1de10
[tx-robot] updated from transifex 2018-03-21 01:11:55 +00: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
d984c8d633
Remove unused deprecated functions from OCP\JSON 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 11:30:35 +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
Roeland Jago Douma
d304f4bebb
Remove old deprecated function from the BackgroundJob 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-19 10:47:31 +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
Nextcloud bot
3cac7911d5
[tx-robot] updated from transifex 2018-03-17 01:11:30 +00: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
Morris Jobke
8d4b76c0e2
Remove deprecated OCP\Contacts 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-14 10:47:09 +01:00
Roeland Jago Douma
2d5febd0b9
Merge pull request #8811 from nextcloud/remove_dep_util_link 
Remove deprecated URL functions for OCP\Util
 2018-03-14 09:49:51 +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
83873e3da1
Remove deprecated URL functions for OCP\Util 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 22:04:08 +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