decc5c844b
Fix reverse registration and missing comments tab
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-24 08:28:19 +01:00
d9708ebece
Add proper alias for internal router class
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-24 08:01:39 +01:00
f4c1512bb7
Fix typo in @deprecated PHPDoc tag
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-24 00:13:09 +01:00
9bf76d2bad
Streamline user creation and deletion events
...
CreateUserEvent was the only one that didn't matched the naming scheme of BeforePASTTENSEEvent and PASTTENSEEvent. The event wasn't used at all so this just removes it again as there is BeforeUserCreatedEvent that is also available since 18.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-23 23:59:52 +01:00
a5d4d3d4cc
Add IRequest taint sources
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2020-11-22 23:04:43 +01:00
9a0428835f
Merge pull request #24267 from nextcloud/techdebt/noid/auto-wire-encryption-app-view-dependent
...
Auto-wire remaining encryption app services that depend on View
2020-11-22 22:33:53 +01:00
032de4f333
Merge pull request #24269 from nextcloud/taint-specialize
...
Mark getAppPath as specialized taint
2020-11-22 13:39:46 +01:00
d25ca1976b
Mark getAppPath as specialized taint
...
Should remove some false positives.
https://psalm.dev/docs/security_analysis/avoiding_false_positives/
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2020-11-21 01:15:15 +00:00
98ddfdd1e8
Mark cleanAppId as sanitizer for include
...
Should remove a bunch of false positive code scanning results.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2020-11-21 00:57:25 +00:00
e606c0eef4
Allow View to be used via DI
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-21 00:18:59 +01:00
db3a3bee37
Merge pull request #24064 from nextcloud/techdebt/noid/auto-wire-encryption-app
...
Auto-wire as much as possible in the encryption app
2020-11-21 00:04:54 +01:00
6811274cfd
Merge pull request #24246 from LukasReschke/add-taint-flow-analysis
...
Add Psalm Security Analysis
2020-11-21 00:04:37 +01:00
5be18215fb
Auto-wire as much as possible in the encryption app
...
Also cleans up only non-classname services in the server container
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-20 23:13:22 +01:00
47ac8e0028
Add Psalm Taint Flow Analysis
...
This adds the Psalm Security Analysis, as described at
https://psalm.dev/docs/security_analysis/
It also adds a plugin for adding input into AppFramework.
The results can be viewed in the GitHub Security tab at
https://github.com/nextcloud/server/security/code-scanning
**Q&A:**
Q: Why do you not use the shipped Psalm version?
A: I do a lot of changes to the Psalm Taint behaviour. Using released
versions is not gonna get us the results we want.
Q: How do I improve false positives?
A: https://psalm.dev/docs/security_analysis/avoiding_false_positives/
Q: How do I add custom sources?
A: https://psalm.dev/docs/security_analysis/custom_taint_sources/
Q: We should run this on apps!
A: Yes.
Q: What will change in Psalm?
A: Quite some of the PHP core functions are not yet marked to propagate
the taint. This leads to results where the taint flow is lost. That's
something that I am currently working on.
Q: Why is the plugin MIT licensed?
A: Because its the first of its kind (based on GitHub Code Search) and
I want other people to copy it if they want to. Security is for all :)
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2020-11-20 23:12:00 +01:00
a42eb05a35
Simple typo in comments
2020-11-20 20:01:28 +01:00
691409cdec
Merge pull request #24062 from nextcloud/revert-24060-revert-24039-faster-installation
...
Revert "Revert "Installation goes brrrr""
2020-11-20 15:02:51 +01:00
b71803802c
Harden EncryptionLegacyCipher a bit
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-20 09:52:55 +01:00
1b613c84e9
Merge pull request #24007 from nextcloud/select-distinct-multiple
...
allow selecting multiple columns with SELECT DISTINCT
2020-11-19 22:39:01 +01:00
c2510ecae9
Merge pull request #24103 from nextcloud/bugfix/noid/groupfolder-share-object-storage
...
Only check path for being accessible when the storage is a object home
2020-11-19 22:37:28 +01:00
650ffc587f
Merge pull request #24164 from nextcloud/fix/lazy-app-registration
...
Allow lazy app registration
2020-11-19 22:35:09 +01:00
1e111b2ad2
Fix DataResponse typehints
...
We use this already in several places where we just pass strings or
numbers.
This all works because we just convert it to a json response in the end.
So better to have the typehints reflect this.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-19 20:34:42 +01:00
d602aa1825
Merge pull request #24135 from medical-cloud/fix/23357-nextcloud-logo-in-email-notifications-is-misaligned-in-version-20
...
Fix nextcloud logo in email notifications misalignment
2020-11-19 10:48:18 +01:00
ecbc7f62be
Merge pull request #24207 from nextcloud/bugfix/noid/missing-level-psrlogged
...
missing level in ScopedPsrLogger
2020-11-19 08:38:05 +01:00
c773cee305
[tx-robot] updated from transifex
2020-11-19 02:20:10 +00:00
87ec4a0da3
Fix #23357
...
Signed-off-by: medcloud <42641918+medcloud@users.noreply.github.com>
2020-11-18 22:29:02 +01:00
a0d9b15a80
missing level
...
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-11-18 18:30:07 -01:00
66013f906d
Merge pull request #24189 from nextcloud/enh/csp/frame-ancestors
...
Set frame-ancestors to none if none are filled
2020-11-18 11:29:28 +01:00
9163790b7c
Set frame-ancestors to none if none are filled
...
frame-ancestors doesn't fall back to default-src. So when we apply a
very restricted CSP we should make sure to set it to 'none' and not
leave it empty.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-18 10:13:36 +01:00
3cf39c573f
Allow lazy app registration
...
During app installation we run migration steps. Those steps may use
services the app registers or classes from composer. Hence we have to
make sure the app runs through the registration.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-18 08:48:45 +01:00
72a9c35be3
Remove some IRouter methods
...
This is not the end. IRouter needs to burn.
But it is a start.
🎵 we didn't start the fire 🎵
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-17 14:08:20 +01:00
a8cb8e21c1
Add types to function builder
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 19:46:24 +01:00
9a3ce2f71f
Don't drop the table anymore when we create it again
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 19:34:38 +01:00
a61a757b85
allow selecting multiple columns with SELECT DISTINCT
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-16 15:45:17 +01:00
426dc68b45
Merge pull request #24069 from nextcloud/fix-default-internal-expiration-date
...
Fix default internal expiration date
2020-11-16 14:13:56 +01:00
d0f738fd59
Merge pull request #24112 from nextcloud/bugfix/24099/setup-fs-before-query-storage-in-settings
...
Set up FS before querying storage info in settings
2020-11-16 11:46:22 +01:00
bcf0a69af4
Fix default internal expiration date
...
The default expiration date for internal shares was set from the default
link expiration date instead of the internal one.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 08:54:18 +01:00
91a3e439cb
Don't throw on SHOW VERSION query
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 08:43:48 +01:00
569c615383
[tx-robot] updated from transifex
2020-11-14 02:19:36 +00:00
2143f2bb82
Set up FS before querying storage info in settings
...
The personal info section of the personal settings is querying the
storage quota information. For this it requires the FS to be setup which
is not always guaranteed.
This fixes an issue where refreshing the settings page would cause it to
fail after Redis caches are full. It is likely that when Redis cache is
populated, some code path is initializing the FS, so it works so far.
But when the cache is populated, that code path is skipped so the FS is
not guaranteed to be setup...
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-11-13 17:06:37 +01:00
d665981447
Only check path for being accessible when the storage is a object home
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-13 13:48:32 +01:00
81070c753b
Merge pull request #24053 from nextcloud/bugfix/noid/fix-user-status-for-oracle
2020-11-12 21:43:31 +01:00
51a02c8009
ReflectionParamter::getClass is deprecated
...
In php8 this starts throwing warnings. And since we use it quite often
we flood the log. This moves it to getType which does the same. Only non
deprecated now.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-11 20:42:14 +01:00
d7b5d4cb58
Revert "Revert "Installation goes brrrr""
2020-11-11 20:12:13 +01:00
d36155620c
Revert "Installation goes brrrr"
2020-11-11 17:40:12 +01:00
c27ed22488
Dump autoloader
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-11 16:49:37 +01:00
77713ab454
Don't create a schema to check if the migrations table exists
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-11 11:45:00 +01:00
dde0e73c6b
Reduce the number of schemas we generate when we just run all migrations anyway
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-11 11:45:00 +01:00
7f45f90789
Only update the schema when we install anyway
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-11 11:40:51 +01:00
61496d3482
Merge pull request #24041 from nextcloud/techdebt/noid/remove-oc_hooks-for-group-management
...
Remove old OC_Hook for OC_Group events
2020-11-11 11:17:31 +01:00
e39d657e24
Merge pull request #23882 from nextcloud/tests/oracle
...
Run unit tests against oracle
2020-11-11 10:05:24 +01:00
0ee4f43048
[tx-robot] updated from transifex
2020-11-11 02:20:12 +00:00
e187c1d778
Remove old OC_Hook for OC_Group events
...
Those mappings exist and we will remove the first ones (labeled as `old`):
old: `\OC_Hook::listen('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid));`
since OC 8 (owncloud/core#12618): `$groupManager->listen('\OC\Group', 'preCreate', function ($gid) { ... });`
since NC 17 (#18350 ): `OCP\Group\Events\BeforeGroupCreatedEvent`
old: `\OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID()));`
since OC 8 (owncloud/core#12618 ): `$groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) { ... });`
since NC 17 (#18350 ): `OCP\Group\Events\GroupCreatedEvent`
old: `\OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID()));`
since OC 8 (owncloud/core#12618 ): `$groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) { ... });`
since NC 17 (#18350 ): `OCP\Group\Events\BeforeGroupDeletedEvent`
old: `\OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID()));`
since OC 8 (owncloud/core#12618 ): `$groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) { ... });`
since NC 17 (#18350 ): `OCP\Group\Events\GroupDeletedEvent`
old: `\OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()));`
since OC 8 (owncloud/core#12618 ): `$groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) { ... });`
since NC 17 (#18350 ): `OCP\Group\Events\BeforeUserAddedEvent`
old: `\OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));`
since OC 8 (owncloud/core#12618 ): `$groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) { ... });`
since NC 17 (#18350 ): `OCP\Group\Events\UserAddedEvent`
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-10 21:58:44 +01:00
d5df033ede
Create primary keys on all tables and add a command to create the afterwards
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:36:27 +01:00
5b5aebbf66
Replace the credentials table with one that can have empty user
...
Primary key columns on Oracle can not have empty strings
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:36:27 +01:00
fbda2d1d25
Don't try to update on NotNullConstraintViolationException, only on unique or foreign key
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:36:27 +01:00
1aa9c9164d
Fix comparing the empty string for global credentials
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:36:26 +01:00
cffad62771
Empty string is returned as null, but empty string in file cache is the root and exists
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:35:43 +01:00
ecbb066dec
Make sure columns with an empty default are nullable for Oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 15:35:16 +01:00
f23c2162ad
Merge pull request #23993 from nextcloud/bugfix/noid/close-cursors
...
Don't leave cursors open
2020-11-10 15:15:03 +01:00
979b291a36
Show the full trace of an exception
...
Because often we catch the exception at some point and then the trace is
misleading. What's really interesting is the trace of the *previous*
exception.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-10 10:35:08 +01:00
4686deb298
Merge pull request #23999 from nextcloud/fix/old-legacy-scripts
...
Remove old legacy scripts references
2020-11-09 16:58:40 +01:00
2b7ea590e1
Merge pull request #23994 from nextcloud/fix/comment_search
...
Update comment search to initFS
2020-11-09 15:52:01 +01:00
8027dcbc6f
Don't leave cursors open when tests fail
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-09 12:28:17 +01:00
3bacb4780b
Removed config.js
2020-11-09 12:23:51 +01:00
72545ffd07
Merge pull request #23937 from nextcloud/bugfix/noid/files-ocdb
...
Use query builder instead of OC_DB in OC\Files\*
2020-11-09 11:58:36 +01:00
f02bab1425
Merge pull request #23976 from nextcloud/enh/reduce_getAppPath_and_autoload_reg
...
Reduce the getAppPath and autoloader calls
2020-11-09 11:10:33 +01:00
28464f71a2
Merge pull request #23982 from nextcloud/fix/quota-storage-getsize
...
Make sure root storage is valid before checking its size
2020-11-09 11:03:25 +01:00
005a132938
Merge pull request #23741 from Ashod/lock-leak
...
Unlock when promoting to exclusive lock fails
2020-11-09 11:00:46 +01:00
2f70a25076
Merge pull request #23978 from nextcloud/enh/query_servercontainer_first
...
First query the server container
2020-11-09 10:58:26 +01:00
d1c53981eb
Update comment search to initFS
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-09 09:52:23 +01:00
c07720de77
Use query builder instead of OC_DB in OC\Files\*
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-09 09:05:15 +01:00
6a453ac184
Make sure root storage is valid before checking its size
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-11-09 08:49:30 +01:00
f5be2c722a
[tx-robot] updated from transifex
2020-11-09 02:18:51 +00:00
889bb44b42
First query the server container
...
When the servercontainer wants to obtain something changes are very high
this is something from the server container. Esp on setups with a lot of
shares this can change quite a bit as it avoid a needless check on the
strpos OCA\\ etc.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-07 17:51:41 +01:00
d8637c62e0
Reduce the getAppPath and autoloader calls
...
The getAppPath will always return the same data for the same appId. It
is actually already cached. However we do some cleanup of the appId
(again). Same for the autoloading it is actually already checked.
This just removes the unneeded calls. Which can add up if you have a lot
of incomming shares.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-07 17:24:41 +01:00
a5fa9604ba
Merge pull request #23923 from nextcloud/bugfix/oci/fix-greatest-order-for-oracle
...
Fix greatest/least order for oracle
2020-11-07 16:55:13 +01:00
a66fb45c0b
Unlock when promoting to exclusive lock fails
...
In certain cases changeLock to EXCLUSIVE fails
and throws LockedException. This leaves the
file locked as SHARED in file_put_contents,
which prevents retrying (because on second
call file_put_contents takes another SHARED
lock on the same file, and changeLock doesn't
allow more than a single SHARED lock to promote
to EXCLUSIVE).
To avoid this case, we catch the LockedException
and unlock before re-throwing.
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2020-11-07 10:31:26 -05:00
d9e471771a
Update parameters
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-07 14:06:03 +01:00
d25e5366b8
Merge pull request #23934 from nextcloud/enh/avoid_scss_compile
2020-11-07 10:11:50 +01:00
1a30e4d28f
Merge pull request #23821 from nextcloud/td/enh/no_fs_setup_by_default
...
Do not setup the default FS on normal routes
2020-11-06 23:03:09 +01:00
cab80e685b
Merge pull request #23942 from nextcloud/techdebt/cookie-lax-php7.3
...
Remove the cookie paths for php<7.3
2020-11-06 22:42:20 +01:00
1da559f5e9
Merge pull request #23938 from nextcloud/bugfix/oci/sharing-ocdb
...
Replace some usages of OC_DB in OC\Share\* with query builder
2020-11-06 22:41:20 +01:00
659ea6ad79
Merge pull request #23851 from nextcloud/enh/read_env_only_once
...
Read the env variables only once
2020-11-06 22:35:00 +01:00
fb5d1b40e4
Merge pull request #23943 from nextcloud/bugfix/oci/fix-ilike-on-oracle
...
Fix iLike() falsely turning escaped % and _ into wildcards
2020-11-06 22:27:30 +01:00
9981ffd784
Merge pull request #23922 from nextcloud/bugfix/noid/fix-query-type-detection
...
Improve query type detection
2020-11-06 22:18:14 +01:00
63f996408b
Merge pull request #23928 from nextcloud/bugfix/oci/dont-leave-stray-cursors-on-mimetype-update
...
Fix repair mimetype step to not leave stray cursors
2020-11-06 22:09:44 +01:00
b70cf435a7
Merge pull request #23940 from nextcloud/enh/skip_already_loaded_apps
...
Skip already loaded apps in loadApps
2020-11-06 21:58:44 +01:00
3f88ab8252
Merge pull request #23929 from nextcloud/techdebt/noid/deprecate-prepare-and-execute-audited-as-they-leak-cursors
...
Deprecate OC_DB::prepare and OC_DB::executeAudited as they leak cursors
2020-11-06 16:24:29 +01:00
cb8bef1f37
Fix iLike() falsely turning escaped % and _ into wildcards
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 16:22:13 +01:00
9e2ced609e
Merge pull request #23932 from nextcloud/enh/s3/do_not_check_bucket_exists_on_every_request
...
Allow config to specify the bucket exists
2020-11-06 16:13:20 +01:00
7e2c3a820e
Remove the cookie paths for php<7.3
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-06 15:57:17 +01:00
0dece78617
Skip already loaded apps in loadApps
...
Otherwise you might end up calling a lot of functions unneeded.
And while the individual calls are cheap if you multiply them by 20k
they still get somewhat expensive.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-06 14:56:06 +01:00
ad8b848444
Replace some usages of OC_DB in OC\Share\* with query builder
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 13:02:14 +01:00
3aaf2fabb1
Make sure Oracle always casts everything in the best way
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 12:13:22 +01:00
4b125d4402
Use Query builder function
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 12:13:22 +01:00
3c027bd0cf
Fix order of GREATEST for Oracle
...
As per https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions060.htm
Oracle uses the first value to cast the rest or the values.
So when the first value is a plain int, instead of doing the math,
it will cast the expression to int and continue with a potential 0.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 12:13:22 +01:00
3f4fb9dc89
Merge pull request #23921 from nextcloud/techdebt/oci/fix-casting-to-integer
...
Fix casting to integer on Oracle
2020-11-06 11:39:48 +01:00
cd849db8be
Avoid SCSS compilation if not needed
...
Now we do on each template load a compile with the SCSS variables to see
if they changed or not. However there is no real reason for this if the
variables didn't change.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-06 11:31:36 +01:00
65141d4864
Allow config to specify the bucket exists
...
In the 99% case the bucket is just always there. And if it is not the
read/write will fail hard anyways. Esp on big instances the Objectstore
is not always fast and this can save a few hundered ms of each request
that acess the objectstore.
In short it is adding
'verify_bucket_exists' => false
To the S3 config part
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-06 11:08:38 +01:00
a847aea19c
Deprecate OC_DB::prepare and OC_DB::executeAudited as they leak cursors
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 10:37:37 +01:00
da1c2bdfe6
Fix repair mimetype step to not leave stray cursors
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 10:33:59 +01:00
48d843858d
Do not setup the default FS on normal routes
...
This should help with load times hopefully. Only initialize the FS if we
actually ned it.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-06 09:03:32 +01:00
3d2f71cfa9
Improve query type detection
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 08:38:56 +01:00
cfc35fa49a
Fix casting to integer on Oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 08:38:08 +01:00
e93823cba0
Bearer must be in the start of the auth header
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-06 08:32:50 +01:00
0247f22c83
Merge pull request #23887 from ecsecta/fix_23797
...
Do not emit UserCreatedEvent twice
2020-11-05 22:58:30 +01:00
12e2b74872
Merge pull request #23901 from nextcloud/techdebt/noid/deprecate-old-usermanager-events
...
Deprecate old user manager events for user creation
2020-11-05 09:37:07 +01:00
a79d7c0be0
fix: also remove use statement of UserCreatedEvent
...
Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
2020-11-05 08:53:20 +01:00
645e1c55b8
Merge pull request #23819 from nextcloud/td/routing/move_things_around
...
Cleanup routing
2020-11-04 22:16:13 +01:00
c3969d9493
Merge pull request #23792 from nextcloud/techdebt/noid/group-unread-comment-count-query
...
Add a function to get the unread count for multiple objects in one go
2020-11-04 21:45:44 +01:00
fd3d7c394a
Deprecate old user manager events for user creation
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-04 21:19:16 +01:00
ede7510854
Add a function to get the unread count for multiple objects in one go
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-04 11:01:21 +01:00
83c60496a9
Document the behaviour inline
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-04 10:13:15 +01:00
ded2acc966
fix: no more translation from postCreateUser hook to UserCreatedEvent anymore, as event is already emitted in user manager
...
Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
2020-11-04 09:18:35 +01:00
8d02ee9ac7
Merge pull request #21693 from nextcloud/fix/noid/import-certificates-only-by-system
...
Improve CertificateManager to not be user context dependent
2020-11-03 21:48:37 +01:00
f49630f48c
Replace prefix in executeUpdate
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-03 11:03:02 +01:00
1c496a5a35
Add a background job that checks for potential user imported SSL certificates and shows a warning in the admin settings
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-03 10:06:33 +01:00
e25a7137cc
Cleanup route registration logic
...
This was a bunch of cylic things being called.
This is an attempt to clean this all up. If an app provides an array of
routes. We just parse them and hand them back.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-03 09:39:49 +01:00
54b9f639a6
Always return the default path if we can
...
Just check in the certifcate manager. So every part of the system that
request the certificatebundle gets the defaullt one (the 99% case) if we
can.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-03 00:13:01 +01:00
dc479aae2d
Improve CertificateManager to not be user context dependent
...
* removes the ability for users to import their own certificates (for external storage)
* reliably returns the same certificate bundles system wide (and not depending on the user context and available sessions)
The user specific certificates were broken in some cases anyways, as they are only loaded if the specific user is logged in and thus causing unexpected behavior for background jobs and other non-user triggered code paths.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-03 00:13:01 +01:00
17ffe46d0b
Read the env variables only once
...
We read config.php an awefull lot of times. So it only makes sense to
kill this as much as wel can.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-02 21:37:09 +01:00
2d67cb9510
Merge pull request #23839 from nextcloud/fix/noid/avatar-status
...
No need to check if there is an avatar available, because it is gener…
2020-11-02 19:07:57 +01:00
7debc6e0b6
No need to check if there is an avatar available, because it is generated on the fly nowadays
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-02 15:39:45 +01:00
441a3434f3
Move localecache to array
...
It seems the DS Set in the polyfill implementation is a lot less
efficient than normal arrays. (A LOT!).
So for now use a stupid normal array.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-02 15:02:04 +01:00
ff08b10a89
Merge pull request #23822 from nextcloud/enh/parse_localse_only_once
...
Only parse the locales ones
2020-11-02 12:24:38 +01:00
a3e4094792
Merge pull request #23827 from nextcloud/td/cleanup/ocsresponse
...
Remove deprecated OCSResponse
2020-11-02 10:00:19 +01:00
fa6a790859
Remove deprecated OCSResponse
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-01 14:12:27 +01:00
b1620344f3
[tx-robot] updated from transifex
2020-11-01 02:18:23 +00:00
25a1df9c7e
Merge pull request #22373 from nextcloud/fix-example-usage-for-mailer
...
Fix example usage
2020-10-31 15:58:29 +01:00
6e377a9daf
Only parse the locales ones
...
Before we'd go over the entire list for each translation (so each app)
we'd use translation for. This means we'd also go over thise locale list
(currently containing 750 entries) * apps so often this added up to ~20k
calls.
now we just dump the locales in a set once and then check if the entry
is there.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-31 15:25:19 +01:00
5396e98d2d
Merge pull request #23764 from nextcloud/3rdparty/doctrine/dbal/2.12.0
...
[3rdparty] Bump doctrine/dbal to 2.12.0
2020-10-31 08:47:18 +01:00
ffda62b421
[tx-robot] updated from transifex
2020-10-31 02:18:47 +00:00
fe46149560
Psalm fixes
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-30 19:27:53 +01:00
28be188fbc
Update internal connection class
...
executeUpdate is deprecated in favor of executeStatement.
We overwrote the old one hence the prefix was no longer replaced.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-30 19:27:53 +01:00
f438ee40a4
Revert "[Automated] Update psalm-baseline.xml"
2020-10-30 10:36:46 +01:00
1654826e83
Merge pull request #23742 from nextcloud/enhancement/eventdispatcher-typed-listener-callable
...
Type the event dispatcher listener callables with Psalm
2020-10-30 09:54:48 +01:00
54888587cd
Merge pull request #23786 from nextcloud-pr-bot/automated/noid/psalm-baseline-update
...
[Automated] Update psalm-baseline.xml
2020-10-30 08:14:37 +01:00
ac8a5ca18c
Update psalm baseline
...
Signed-off-by: GitHub <noreply@github.com>
2020-10-30 04:18:38 +00:00
f12e7e0e95
Fetch the logger and system config once for all query builder instances
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-29 22:35:06 +01:00
de7026f6e4
use file name instead of path in 'not allowed to share' message
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-10-29 16:43:21 +01:00
7ed11b6dfa
Merge pull request #23765 from nextcloud/techdebt/noid/sudadmin-events-into-typed-events
...
Add typed events for adding and removing a subadmin
2020-10-29 11:18:01 +01:00
e5cd4ead04
Merge pull request #23766 from nextcloud/techdebt/noid/remove-unused-private-emitters
...
Remove unused private ForwardEmitter and LegacyEmitter
2020-10-29 10:03:36 +01:00
3076eb4e9b
Merge pull request #23767 from nextcloud/techdebt/noid/add-deprecated-tag-to-all-methods
...
Add deprecated tag also to methods of deprecated classes - OC\\Hooks\\Emitter namespace
2020-10-29 09:03:52 +01:00
5fab33ddc5
Merge pull request #23770 from nextcloud/techdebt/noid/remove-deprecated-isection
...
Remove ISection in favor of IIconSection
2020-10-29 09:00:57 +01:00
b9de133e16
Merge pull request #23771 from nextcloud/techdebt/noid/remove-deprecated-inotifystorage-listen
...
Remove deprecated INotifyStorage::listen
2020-10-29 08:58:15 +01:00
1d8b954a22
Merge pull request #23768 from nextcloud/techdebt/noid/deprecate-ocp-util-emitHook-and-connectHook
...
Deprecate OCP\Util::connectHook and emitHook
2020-10-29 08:47:21 +01:00
f576374fe6
[tx-robot] updated from transifex
2020-10-29 02:19:13 +00:00
b8ed997238
Remove ISection in favor of IIconSection
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-28 23:05:00 +01:00
32e4a61cac
Remove deprecated INotifyStorage::listen
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-28 23:02:25 +01:00
8218ae4274
Deprecate OCP\Util::connectHook and emitHook
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-28 22:30:24 +01:00
704fb2dbf2
Add deprecated tag also to methods of deprecated classes - OC\\Hooks\\Emitter namespace
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-28 22:27:27 +01:00
6e35457fcc
Remove unused private ForwardEmitter and LegacyEmitter
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-28 22:23:39 +01:00
e4f53ff91b
Add typed events for adding and removing a subadmin
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-28 21:55:08 +01:00
b5f75ccdd8
Merge pull request #23746 from nextcloud/enhancement/iusermanager-callforseenusers-typed-closure
...
Type the \OCP\IUserManager::callForSeenUsers closure with Psalm
2020-10-28 20:05:53 +01:00
7e72866811
Type the \OCP\IUserManager::callForSeenUsers closure with Psalm
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-28 19:21:00 +01:00
6b2cf46125
Merge pull request #23752 from nextcloud/fix/noid/wfe-ux-errors
...
inform the user when flow config data exceeds thresholds
2020-10-28 16:05:35 +01:00
1eb86e46fd
inform the user when flow config data exceeds thresholds
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-10-28 14:07:14 +01:00
ad3063a77b
Merge pull request #23744 from nextcloud/enhancement/appframework-initialstate-typed-closure
...
Type the \OCP\AppFramework\Services\IInitialState::provideLazyInitial…
2020-10-28 14:03:34 +01:00
e8e13c845c
Type the \OCP\AppFramework\Services\IInitialState::provideLazyInitialState closure with Psalm
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-28 09:04:15 +01:00
a2206b8cfb
Type the \OCP\IUserManager::callForAllUsers closure with Psalm
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-28 08:58:38 +01:00
469ba175ce
Type the event dispatcher listener callables with Psalm
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-28 08:54:24 +01:00
cf1af5b83b
Merge pull request #23496 from lynn-stephenson/fix/related-key-issue
...
Fixes related key issue.
2020-10-27 20:23:07 +01:00
eadce7fadd
Merge pull request #23601 from nextcloud/techdebt/noid/comments-manager-improvements
...
Comments manager improvements/extensions needed by Talk
2020-10-27 19:57:55 +01:00
7949854837
Merge pull request #23712 from nextcloud/enh/noid/add-size-to-file-obj-definition
...
Add optional size field for the file obj
2020-10-27 19:51:31 +01:00
54f2d9b524
Merge pull request #23722 from nextcloud/fix/noid/use-correct-l10n-module
...
Use lib instead if core as l10n module in OC_Files
2020-10-27 17:28:13 +01:00
a79ed0653b
Deprecate \OCP\EventDispatcher\IEventDispatcher::dispatch
...
As discussed in
https://help.nextcloud.com/t/deprecation-of-ieventdispatcher-dispatch/95381
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-27 15:43:07 +01:00
fc403135d1
Use lib instead if core as l10n module in OC_Files
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-27 15:37:57 +01:00
f7fd8d520d
Add optional size field for the file obj
...
Add optional size field for the file rich object definition.
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-10-27 11:48:41 +01:00
ae54ae6c9b
[tx-robot] updated from transifex
2020-10-27 02:18:34 +00:00
9976e47035
Merge pull request #23602 from nextcloud/fix/appconfig_update_null
...
Fix updates of NULL appconfig values
2020-10-23 10:43:26 +02:00
2ba34cba2c
Merge pull request #23608 from nextcloud/enh/23482/forward-error-message
...
Add more details if extract fails
2020-10-22 12:51:47 +02:00
da3d384426
Fix missing since
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-22 12:02:48 +02:00
1f1244fdcc
Fix PHP CS
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-22 11:00:54 +02:00
8600e51df5
Fix manager creation and testing
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-22 10:54:03 +02:00
d11de8c8e7
Add more details if extract fails.
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-10-22 10:15:46 +02:00
c1834bac7d
Only use index of mount point when it is there
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-21 13:37:56 +02:00
2dd50b4adc
Fix return type
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-21 11:02:05 +02:00
4b8fec49e7
Add return description
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-21 10:05:51 +02:00
db82d27239
Fix updates of NULL appconfig values
...
The comparisson of NULL is a bit special.
So we need to handle this a tad beter else it might not replace NULL
values. or allow you to set NULL values on updates.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-21 10:04:06 +02:00
6400221fba
Less magic
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-21 09:47:40 +02:00
d462439a63
Get the last comment date for a list of actors (to allow sorting mention suggestions e.g.)
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-21 09:18:51 +02:00
89651c5233
Allow to search on multiple objects with one query
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-21 09:16:42 +02:00
326640462b
Add methods to get the number of comments and last comment since a date
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-21 09:15:38 +02:00
2cc35cc65d
Include an option to also include the lastKnownCommentId object
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-21 09:08:48 +02:00
766590d204
Merge pull request #23173 from nextcloud/feat/comments-sidebar-vue
2020-10-20 20:46:21 +02:00
6cd7549509
Bump @nextcloud/vue to 3.0.0
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-10-20 18:02:45 +02:00
f2541e7a8b
Use auto-wiring on most outer level
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-20 17:43:50 +02:00
4bc821edd9
PSR logger for accounts
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-20 17:41:47 +02:00
3e1916080a
Add ICommentsManager::load method
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-10-20 14:39:28 +02:00
e7f5516b4d
Init vue comments tab
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-10-20 13:58:06 +02:00
ffd76d05c9
Merge pull request #23374 from nextcloud/bugfix/noid/app-fetch-retry
...
Only retry fetching app store data once every 5 minutes in case it fails
2020-10-20 09:21:51 +02:00
f116595b3f
[tx-robot] updated from transifex
2020-10-20 02:18:38 +00:00
09501e1710
Merge pull request #23508 from nextcloud/fix/23355/iuser-expected-null-given
...
fixes potential passing of null to getUserGroupIds
2020-10-16 14:57:54 +02:00
4bf891f605
Merge pull request #23478 from nextcloud/fix/21059/fix-deadlock-in-scsscacher
...
Clear cached app config while waiting for the SCSSCache lock to return
2020-10-16 14:56:43 +02:00
4512c73293
Only retry fetching app store data once every 5 minutes in case it fails
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-10-16 14:32:58 +02:00
cce716f9f3
Clear cached app config while waiting for the SCSSCache to finish processing the file
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-16 13:28:00 +02:00
fd23614c08
fixes potential passing of null to getUserGroupIds
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-10-16 12:29:35 +02:00
9273436534
SCSSCacher - Lock should not be removed
...
This is within the failed lock acquiring branch. So the lock is free by another process and should not be removed because the cached file (that was created by the process having the lock) appeared on the filesystem.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-16 10:02:18 +02:00
2456969b41
Merge pull request #23490 from nextcloud/debug/noid/log-statements-for-scss-locking
...
Provide log statements for SCSS cache
2020-10-16 09:48:09 +02:00
648b60fa0e
Derive encryption key & MAC key from a single key.
...
Signed-off-by: lynn-stephenson <lynn.stephenson@protonmail.com>
2020-10-15 21:23:24 -08:00
e5fe3426c3
Provide log statements for SCSS cache
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-16 00:09:11 +02:00
b47a2730c0
Type the authentication listeners
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-15 16:43:21 +02:00
e646d7d5a9
Add psalm types for the event dispatcher
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-15 16:23:26 +02:00
65fb50f9fb
Add psalm types for the migration schema closure
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-15 10:58:51 +02:00
f464ef050b
Fix type errors detected by Psalm
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-14 15:40:12 +02:00
f9f20b63f4
Annotate IContainer so Psalm knows what resove and query return
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-14 12:29:26 +02:00
42fcc74b67
[tx-robot] updated from transifex
2020-10-14 02:18:46 +00:00
a70f283734
Merge pull request #23409 from nextcloud/fix/cache-entry-array-access
...
The file cache entry is array accessible
2020-10-13 17:54:21 +02:00
b2de9a6f9e
The encryption decrypt position can be int or string
...
The public API said string, internally we treated it as int. In reality
both are used. Let's reflect that in the documented argument type.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-13 10:51:22 +02:00
0da89c0fa1
The file cache entry is array accessible
...
… so let's make this part of our API. We use it as array already.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-13 10:47:00 +02:00
349da3395a
Merge pull request #23382 from nextcloud/techdebt/noid/psr-logger-in-authentication
...
Use PSR logger in authentication
2020-10-13 09:45:11 +02:00
85570abc9a
[tx-robot] updated from transifex
2020-10-13 02:18:40 +00:00
49ff48fcd3
Use PSR logger in authentication
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-12 22:07:04 +02:00
14af2246f3
Merge pull request #23378 from R0Wi/bugfix/registration_typo
...
Fix typo 'shared'
2020-10-12 20:04:33 +02:00
ccfe6a9fa5
Add Psalm type for the bootstrap registration context
...
This can potentially catch a few bugs with wrong class strings.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-12 15:16:16 +02:00
6a1f8fb3be
Fix typo 'shared'
2020-10-12 14:19:41 +02:00
2664c7f75f
Type some of the core mappers
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-12 11:10:09 +02:00
a1b351036c
Add template typing to the QBMapper
...
The QBMapper is kind of a generic type, though this concept does not
exist in php. Hence you have a lot of type coercion in subtypes (mappers
in the individual apps) because you suddenly don't expect an Entity[]
but your specific type.
Luckily Psalm lets us type those. Then in the subclass you can
psalm-implement the mapper with a concrete type and psalm will do all
the magic to ensure types are used correctly.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-12 11:10:08 +02:00
049d5b3a4b
Merge pull request #23249 from nextcloud/techdebt/server-container-cleanup
...
Server container cleanup
2020-10-09 09:19:41 +02:00
174a550edb
Merge pull request #23287 from nextcloud/enh/bruteforce/limit_storage
...
Limit storing bruteforce attempts
2020-10-09 08:51:33 +02:00
56b67c8c13
Clean up the server
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-09 08:25:56 +02:00
9c21bd22b5
[tx-robot] updated from transifex
2020-10-09 02:18:45 +00:00
8fae2beece
Limit throttler to 48 hours
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-08 19:51:13 +02:00
6c1b542def
Add cleanup job for old brutefoce attempts
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-08 19:51:13 +02:00
b2dedbcc13
Merge pull request #23291 from nextcloud/techdebt/noid/use-psr-logger-in-event-dispatcher
...
Use PSR Logger in event dispatcher
2020-10-08 19:43:03 +02:00
51fbcb0801
Use PSR Logger in event dispatcher
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-08 16:52:56 +02:00
26a38c4e8a
Job::run() does not return anything
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-08 16:52:02 +02:00
fa374aceeb
Merge pull request #23245 from nextcloud/techdebt/server-bus-deprecate-alias
...
Deprecate the named alias of IBus
2020-10-08 11:50:21 +02:00
ae59636227
[tx-robot] updated from transifex
2020-10-08 02:18:45 +00:00
6a63d7b4ee
Deprecate the named alias of IBus
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-07 18:58:05 +02:00
3b82c6cc84
Merge pull request #23184 from nextcloud/bugfix/noid/make-sure-getUsersFavoritingObject-can-be-run-without-a-user
...
Make sure getUsersFavoritingObject can be run without a user
2020-10-07 13:08:02 +02:00
4e14c18192
Merge pull request #23248 from nextcloud/techdebt/server-getters-query-get
...
Use the ContainerInterface::get inside the server container
2020-10-07 11:40:22 +02:00
67704a9643
Merge pull request #23252 from nextcloud/fix/l10n/activities
...
Use the correct l10n for activities
2020-10-07 11:34:57 +02:00
106257733e
Merge pull request #23244 from nextcloud/techdebt/noid/user-psr-logger-interface-in-comments
...
Use PSR logger interface in comments manager
2020-10-07 10:58:54 +02:00
03d156a824
Use the correct l10n for activities
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-07 10:50:06 +02:00
e509c6515e
Use the ContainerInterface::get inside the server container
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-07 10:12:17 +02:00
17454f6ce9
Use PSR logger interface in comments manager
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-07 08:57:45 +02:00
678ef8466d
[tx-robot] updated from transifex
2020-10-07 02:18:12 +00:00
c1fd22b025
Merge pull request #23144 from nextcloud/enh/noid/update-param-for-psalm
...
Less psalm warnings
2020-10-06 22:07:58 +02:00
9f99f859a1
Make sure getUsersFavoritingObject can be run without a user
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-06 16:49:23 +02:00
ac59f23daa
Only run the query to get the account data once
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-06 10:34:34 +02:00
d9015a8c94
Format code to a single space around binary operators
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-10-05 20:25:24 +02:00
f312cfade0
Merge pull request #22913 from nextcloud/group-folder-quota-warning-mountpoint
...
add mount point to quota warning message
2020-10-04 12:57:56 +02:00
b976cd5535
Merge pull request #21821 from nextcloud/enh/bootstrap/initial_state
...
Bootstrap: add initial state registration
2020-10-04 11:09:18 +02:00
0dfdf3ee99
add mount point to quota warning message
...
makes it more clear to the user what the quota applies to
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-10-04 11:02:32 +02:00
1896f37465
Merge pull request #22937 from nextcloud/enh/allow_configuring_token_auth_activity_interval
...
Allow configuring the activity update interval of token
2020-10-04 10:37:41 +02:00
f4707d178e
Merge pull request #23047 from nextcloud/techdebt/noid/warn-on-database-abuse
...
Log the number of queries built and executed
2020-10-04 10:07:49 +02:00
f865a3a1c2
Move initial state provider to boostrap
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-04 09:35:33 +02:00
76a7600e2e
Allow configuring the activity update interval of token
...
On some systems with a lot of users this creates a lot of extra DB
writes.
Being able to increase this interval helps there.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-04 09:31:41 +02:00
0e3ddf1b27
Add explicit typecast for $value.
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-10-03 17:15:14 +02:00
64b10f61df
Update signature for set
...
also ILiteral and IQueryFunction are valid.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-10-02 19:15:34 +02:00
8fdb74bdd5
Update signature for in/notIn
...
$y is always passed to quoteColumnName hence ILiteral|IParameter|IQueryFunction are supported.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-10-02 19:09:28 +02:00
d14c971ad6
Update signature for like/notLike/in/notIn
...
$x is always passed to quoteColumnName hence ILiteral|IParameter|IQueryFunction are supported.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-10-02 18:59:53 +02:00
95a301ea57
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-02 10:37:18 +02:00
6b7d91d7c1
[tx-robot] updated from transifex
2020-10-01 02:18:34 +00:00
18411b8da3
Merge pull request #23083 from nextcloud/bugfix/extend-php-error-logging
...
Generate exception to log on php errors
2020-09-29 10:02:33 +02:00
cb08c6cd18
Merge pull request #23074 from nextcloud/fix/sharee-search-empty-email-match
...
Do not match sharees on an empty email address
2020-09-29 09:27:49 +02:00
7d776091bd
Merge pull request #23013 from nextcloud/bugfix/noid/show-federation-results-with-the-same-name
...
Show federation and email results also with exact user match unless c…
2020-09-29 09:13:08 +02:00
b0699d4126
Generate exception to log on php errors
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-29 08:54:53 +02:00
bbd962043b
Do not match sharees on an empty email address
...
When asking for sharees we compare not only UID and displayname but also
the email address. And if that matches we return the sharee as an exact
match. This logic had a flaw as in that it also matched the empty string
to users with no email address.
This is most noticeable when you disable sharee enumeration and open the
ownership transfer dialog. It suggested other users of the instance
before. This has stopped now.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-09-28 15:35:11 +02:00
3212c074b9
Log the number of queries built and executed
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-25 14:55:53 +02:00
8ab2422b6c
Add acutal response to BeforeTemplateRenderedEvent
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-24 20:00:23 +02:00
fe30bfd232
Update autloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-09-24 14:59:41 +02:00
0e2f316ece
Merge pull request #23015 from nextcloud/bugfix/noid/warn-on-slow-dashboard-widgets
...
Log slow dashboard widgets
2020-09-24 14:57:17 +02:00
aa95b3d71b
Add occ command to set theming values
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-24 08:22:07 +02:00
6c6d640e39
Don't log "duplicate section" for the shared "connected-accounts" section
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-23 12:25:08 +02:00
b497067ead
Log a warning if a "lazy" initial state loads longer than 1 second
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-23 12:14:31 +02:00
74f4dbe9de
Log an error if a dashboard widget loads longer than 1 second
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-23 12:14:01 +02:00
5415eeda43
Show federation and email results also with exact user match unless containing @
...
Before when you have a user "smith" and a federated user "smith@example.com"
you could see the federation result with "smit" but not with "smith" anymore.
With most LDAP configurations and local backend setups this is disturbing and
causes issues.
The idea of not showing the email and federation on a matching user was with:
Local user registered with "smith@example.com" user id and having that same
email / cloud id in your contacts addressbook. So we now only hide those
"side results" when the search does contain an @
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-23 10:21:55 +02:00
bdc60ef9b2
[tx-robot] updated from transifex
2020-09-20 02:17:05 +00:00
58790aadf0
[tx-robot] updated from transifex
2020-09-18 19:05:24 +00:00
cfd67fd18b
Allow to also use PHP 8.0
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-18 09:16:30 +02:00
fd1c2ef698
Nextcloud 21 runs on PHP 7.3+ only
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-18 09:16:30 +02:00
cb735c671b
Provide correct PHPDoc tags for public namespace
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-17 19:50:44 +02:00
cd88b93a8b
Autoloader update
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-17 18:13:56 +02:00
68ce17e59b
Unify links to php.net
...
Update all links to https://www.php.net/
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
2020-09-17 17:40:04 +02:00
674db6da88
add event to allow apps to overwrite user quota
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-09-17 16:32:48 +02:00
ec07ca2abb
Merge pull request #22844 from nextcloud/enh/richdocumentscode-arm
...
Support architecture limitations for apps and allow richdocumentscode_arm64 though htaccess
2020-09-17 12:22:42 +02:00
d144a84df1
Merge pull request #22903 from nextcloud/techdebt/16696/no-need-to-get-full-path-again
...
Do not fetch the normalized full path again if it is already available
2020-09-17 11:54:47 +02:00
063ac9d353
Do not fetch the normalized full path again if it is already available
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-17 09:56:45 +02:00
b0c04a3e0c
Merge pull request #22867 from nextcloud/shared-storage-init-less
...
Shared storage optimizations
2020-09-17 08:55:35 +02:00
04eb1bb949
Allow to specify supported architectures in appinfo.xml
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-17 08:55:15 +02:00
364b96d5b9
Add htaccess exception for richdocumentscode_arm64
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-17 08:55:15 +02:00
5340215871
Install richdocumentscode depending on the architecture
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-17 08:55:14 +02:00
05edd1e5d6
Merge pull request #22890 from nextcloud/techdebt/18680/help-static-code-analysis-understand-code
...
Help static code analysis to understand code
2020-09-17 08:51:20 +02:00
cbd13a26f4
[tx-robot] updated from transifex
2020-09-17 02:27:04 +00:00
1bed77c5fc
Merge pull request #22888 from nextcloud/techdebt/18680/remove-unused-code
...
Remove not needed semicolon and PHPDoc hint
2020-09-16 20:44:46 +02:00
096fe20611
Help static code analysis to understand code.
...
It adds proper type hints to private namespace to allow private namespace methods.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-09-16 16:37:17 +02:00
6b4998f20f
Merge pull request #22884 from nextcloud/phpdoc/21873/define-deprecated-version
...
Specific version for @deprecated PHPDoc
2020-09-16 16:25:11 +02:00
d3680e682a
Remove not needed semicolon and PHPDoc hint
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-16 16:18:43 +02:00
99c9423766
Remove @suppress SqlInjectionChecker
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-16 15:53:56 +02:00
4cfbe0c97d
Specific version for @deprecated PHPDoc
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-16 15:09:00 +02:00
cfde74442c
optimize View::getPath if we already know the storage id
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-09-16 13:49:07 +02:00
244fd6ae49
disable update checking for shared storages
...
update checking is already handled by the share source
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-09-15 16:42:40 +02:00
869f3f5895
[tx-robot] updated from transifex
2020-09-15 10:48:26 +00:00
702c858604
It is very highly recommended to set an object for better filtering
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-15 10:22:54 +02:00
a053aa7221
Merge pull request #22809 from nextcloud/bugfix/noid/remove-unneeded-isset-check
...
Remove unneeded isset check
2020-09-14 08:49:46 +02:00
441adaa74a
Remove unneeded isset check
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-11 16:20:30 +02:00
0022b63fe8
Fix serializing indexed unified search array as object
...
We expect an array of results from the search provider. If the search
provider returns an array with indexes, php will serialize it as object,
not as array (to preserve the keys). The client doesn't need this info,
so we should just discard it and take the values only to always render a
JSON array.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-09-11 15:57:04 +02:00
e269f15d56
Merge pull request #22234 from nextcloud/bugfix/noid/reshare-mount
...
Use user mount with matching shared storage only
2020-09-10 16:19:04 +02:00
3d61f7b258
Merge pull request #22774 from nextcloud/bugfix/noid/no-delay-without-ip
...
Don't break when the IP is empty
2020-09-10 16:11:06 +02:00
4ae8caaf28
Merge pull request #22768 from nextcloud/fix/22288/change-0-to-null-for-bmp-encoding
...
Change 0 to null to properly encode image to BMP if the first pixel is black
2020-09-10 15:25:08 +02:00
0aa442220b
Merge pull request #22739 from nextcloud/bugfix/16989
...
Don't fail if copying a file of 0 byte size
2020-09-10 15:16:19 +02:00
c25063dc07
Don't break when the IP is empty
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-10 14:20:27 +02:00
9708b004f7
Merge pull request #22552 from nextcloud/bugfix/noid/opendocument-templates
...
Add opendocument templates to mimetype mappings
2020-09-10 12:42:29 +02:00
46525f8639
Change 0 to null to properly encode image to BMP if the first pixel is black
...
Ref #22288
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-09-10 12:08:01 +02:00
cee531d6bc
Annotate that writeStream can throw a GenericFileException
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-10 09:03:53 +02:00
b5a70b31c1
Don't create a deprecation log in base.php
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-10 09:03:39 +02:00
6895d97cf0
Merge pull request #22520 from nextcloud/normalize-path-invalid-utf8
...
dont use `false` as cache key for non utf8 path in normalizePath
2020-09-09 21:52:36 +02:00
bb06b6cce4
Fix reading empty files from objectstorage
...
Since we try to do range requests this will fail hard.
However since empty files are not that interesting to read anyways we
just read from an emptry memory stream.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-09-09 20:45:13 +02:00
cd563023db
Merge pull request #22657 from nextcloud/bugfix/noid/quota-trash-creation
...
Check if quota should be applied to path when creating directories
2020-09-09 17:37:28 +02:00
e280c05053
Merge pull request #22636 from nextcloud/bugfix/noid/initial-stte-cspv3
...
Make sure that getConfig is still called for browsers that do not support CSPv3
2020-09-09 13:11:59 +02:00
d8dea5070b
Merge pull request #22729 from nextcloud/fix/object_storage_permissions_shortcut
...
Run stat less often for objectstorages
2020-09-09 10:43:37 +02:00
9fdeed8cc0
Run stat less often for objectstorages
...
When we want to get the permissions we now do stat at least 5 times for
each entry. Which is a bit much. Especially since the permssions are all
just in the database already.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-09-08 14:38:36 +02:00
919a8d473b
Merge pull request #22646 from nextcloud/bugfix/mimetype-mapping
...
Fix detecting text/x-php mimetype and secure mimetype mapping
2020-09-08 10:41:09 +02:00
ac5f2914c7
Merge pull request #22641 from nextcloud/fix/credentials-store-upgrade-property-undefined
...
Fix undefined class property access after upgrade from 19 to 20
2020-09-08 10:26:23 +02:00
87e5fd0d2c
Check if quota should be applied to path when creating directories
...
This fixes an issue where the files_trashbin hierarchy of a user could
not been created as the mkdir operations were blocked by the quota
storage wrapper. Even with 0 quota, users should be able to have a
trashbin for external storages.
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-08 07:33:57 +02:00
34d2ae25f7
Merge pull request #22643 from nextcloud/bugfix/noid/fix-installing-on-oracle
...
Fix installing on Oracle
2020-09-07 20:55:50 +02:00
6f4ea73e0c
Merge pull request #22644 from nextcloud/fix/license-headers-20-2
...
Update license headers for Nextcloud 20 (again)
2020-09-07 20:34:36 +02:00
5e4303b1fe
Properly add both mimetypes to secure mimetype mapping
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-07 16:42:11 +02:00
99ee00be8c
Merge pull request #22548 from nextcloud/bugfix/noid/improved_status_cleanup
...
Improved status cleanup
2020-09-07 15:19:42 +02:00
1f7f93a695
Update license headers for Nextcloud 20 (again)
...
There are still lots of outdated headers, so time for another round of
updates.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-09-07 14:37:44 +02:00
adf100a42f
Fix undefined class property access after upgrade from 19 to 20
...
The serialized data in 19 has one property less and this was not
considered in the code. Hence adding a fallback. Moreover I'm changing
the deserialization into an array instead of object, as that is the
safer option.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-09-07 13:31:24 +02:00
50230847ce
Warn about adding NotNull columns with nullable default
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-07 13:14:49 +02:00
3eb748fc39
Merge pull request #22589 from nextcloud/bugfix/noid/allow-additional-personal-settings-via-normal-registration
...
Allow additional personal settings via normal registration
2020-09-07 11:34:06 +02:00
d7ccc616e4
Always use IUserStatus consts
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-09-07 11:30:18 +02:00
a9f39bf500
Make sure that getConfig is still called for browsers that do not support CSPv3
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-07 09:37:49 +02:00
da8cff9061
[tx-robot] updated from transifex
2020-09-07 02:16:39 +00:00
27fbab131c
[tx-robot] updated from transifex
2020-09-06 02:16:52 +00:00
c538b1e4c6
Merge pull request #22597 from nextcloud/techdebt/noid/allow-to-di-the-settings-manager
...
Add missing alias for OCP\Settings\IManager and deprecate the old one
2020-09-04 20:22:52 +02:00
593d64d935
Merge pull request #17456 from brad2014/feature/brad2014/12391-improve-imip-mail-message-take-2
2020-09-04 19:53:02 +02:00
770d12d191
Add missing alias for OCP\Settings\IManager and deprecate the old one
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-04 16:39:01 +02:00
cb146c8486
Allow additional personal settings via normal registration
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-04 15:21:48 +02:00
e690f0e7e3
Merge pull request #22550 from nextcloud/bugfix/13556/use-correct-root-when-compiling-scss
...
Use the correct root to determinate the webroot for the resource
2020-09-04 08:58:07 +02:00
b0970f86f0
Update repair step apply new opendocument template mimes
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-04 08:42:32 +02:00
84fe4447a7
[tx-robot] updated from transifex
2020-09-04 02:17:18 +00:00
0452877a67
Fix app password updating out of bounds
...
When your password changes out of bounds your Nextcloud tokens will
become invalid. There is no real way around that. However we should make
sure that if you successfully log in again your passwords are all
updates
* Added event listener to the PostLoggedInEvent so that we can act on it
- Only if it is not a token login
* Make sure that we actually reset the invalid state when we update a
token. Else it keeps being marked invalid and thus not used.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-09-03 21:13:36 +02:00
442af8c5d5
Minor cleanup: php-cs-fixer, tests, interface consistency
...
IMipPlugin.php Removed blank lines to make php-cs-fixer happy.
Minor cleanup: bugs found by Psalm static checker
IEMailTemplate: The public interface to addBodyListItem also needs to include the new plainIndent parameter.
IMipPlugin: Fixes an undefined variable for events that do not have DTEND. Also use explicit string conversion for parameters and properties in several places.
The new email template adds an additional blank line before "button" links in plain text, so the tests were fixed to include that additional blank line.
Signed-off-by: Brad Rubenstein <brad@wbr.tech>
2020-09-02 17:54:36 +02:00
87aa9b187e
Use the correct root to determinate the webroot for the resource
...
Since all the compiled routes are based on the server webroot,
we have to use this, independent from which app this belongs to.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-02 17:13:24 +02:00
6bda2c26c7
Merge pull request #22423 from nextcloud/bugfix/noid/direct-editing-encryption
...
Do not expose direct editing if no master key is available
2020-09-01 20:32:21 +02:00
ab6bd79c02
Only disable zip64 if the size is known
...
Else we might run into the issue that for an external storage where the
size is not known yet we do not use zip64. Which then of course fails on
large zip files.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-09-01 15:01:12 +02:00
e0ae37745a
Do not expose direct editing if no master key is available
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-01 11:40:27 +02:00
d0a7f833cc
Merge pull request #22116 from nextcloud/bugfix/noid/transfer-ownership-share-root
...
Fix share transfer of single files and on the transfered node
2020-09-01 08:50:22 +02:00
e0d767d3e1
Merge pull request #16632 from nextcloud/bugfix/external-reshare
...
Set proper root path for single file shares originating from other storages
2020-09-01 08:48:31 +02:00
8dd249937f
Merge pull request #22514 from nextcloud/fix/s3/only_delete_new_failed
...
Fix S3 error handling
2020-08-31 19:03:24 +02:00
a792a51dca
dont use `false` as cache key for non utf8 path in normalizePath
...
since `json_encode` returns `false` if it's input isn't utf8, all non utf8 paths passed to normalizePath will currently return the same cached result.
Fixing this makes working with non utf8 storages a *little* bit more possible for apps
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-08-31 17:29:36 +02:00
81c5aa9819
set the mount id before calling storage wrapper
...
this allows the storage wrapper to use the mount id for it's own logic
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-08-31 16:38:47 +02:00
849c13f202
Merge pull request #22472 from nextcloud/fix/contacts-interaction-blob-postgres
...
Fix writing BLOBs to postgres with recent contacts interaction
2020-08-31 15:07:22 +02:00
ac2999a26a
Transfer shares of the transferred root node
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-31 14:23:34 +02:00
789b33aba4
Only update the filecache entry once the file has been written to S3
...
If we already update before we have no way to revert if the upload
fails.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-08-31 12:28:04 +02:00
Christoph Wurst
Julius Härtl
Morris Jobke
Lukas Reschke
Roeland Jago Douma
Carlos Ferreira
Roeland Jago Douma
Christoph Wurst
Nextcloud bot
medcloud
Maxence Lange
Joas Schilling
Robin Appelman
Daniel Calviño Sánchez
Vincent Petry
Joas Schilling
John Molakvoæ
John Molakvoæ (skjnldsv)
Ashod Nakashian
Tobias Assmann
Nextcloud-PR-Bot
blizzz
kesselb
lynn-stephenson
Robin Windey
J0WI
Georg Ehrke
Brad Rubenstein