mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
38,462 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

4009 Commits

Author SHA1 Message Date
Lukas Reschke 66835476b5
Add support for ratelimiting via annotations 
This allows adding rate limiting via annotations to controllers, as one example:

```
@UserRateThrottle(limit=5, period=100)
@AnonRateThrottle(limit=1, period=100)
```

Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:16 +02:00
Lukas Reschke 01f3698175 Merge pull request #3966 from nextcloud/downstream-26570 
Override config.php values through environment variables
 2017-04-13 10:51:09 +02:00
Morris Jobke 7cb6038fca Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login 
Dont create a log entry on email login
 2017-04-13 01:04:11 -05:00
Morris Jobke 1f962f9115
Update email template for lost password email 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 15:19:53 -05:00
Roeland Jago Douma b3b24172e4 Merge pull request #4307 from nextcloud/sharing-emails 
New emails for sharebymail
 2017-04-12 21:23:11 +02:00
Morris Jobke ae4c2893a2
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 12:42:23 -05:00
Joas Schilling 1c8c62272c
Use instance name as alt-text 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 17:16:26 +02:00
Morris Jobke 050ce1d40b
Add addBodyButton to add a single button to email templates 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 17:16:26 +02:00
Roeland Jago Douma dccb8928a1 Merge pull request #4325 from nextcloud/downstream-27522 
Optimize put - Dont try to fetch filecache for not existing filecache…
 2017-04-12 16:04:03 +02:00
Björn Schießle b90e91144b Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints 
Discover federatedsharing endpoints
 2017-04-12 16:01:07 +02:00
Joas Schilling 30817fa319
Simplify the test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-12 13:23:55 +02:00
Piotr M dc78f1251e
Optimize put - Dont try to fetch filecache for not existing filecache in encription 2017-04-12 12:54:20 +02:00
Lukas Reschke b5d31e4e65 Merge pull request #4309 from nextcloud/remove-unused-code 
Removes unused code for link share emails
 2017-04-12 10:15:59 +02:00
Morris Jobke be9a514dff
Allow to set text versions for the plain text email 
* allows different texts for HTML and text version of the email

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-11 17:50:06 -05:00
Morris Jobke 8fa5141aaa
Removes unused code for link share emails 
* now handled by sharebymail app
* see https://github.com/nextcloud/server/pull/657

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-11 17:32:48 -05:00
Lukas Reschke 280a075c9c
Adjust class references 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-11 17:35:59 +02:00
Lukas Reschke 3600dd4f52
Add IEMailTemplate to public OCP API 
Also adds `\OCP\Mail\IMailer::createEMailTemplate` as helper so the functionality can easily be used within apps.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-11 16:35:46 +02:00
Bjoern Schiessle 449011dae7
remove discovery manager in favour of the OCSDiscoveryService 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-11 15:04:01 +02:00
Bjoern Schiessle 0dea31d48b
add tests for discovery service 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-11 15:04:01 +02:00
Lukas Reschke afb5d45705 Merge pull request #4256 from nextcloud/theming 
Move OC_Defaults to OCP\Defaults
 2017-04-11 14:39:46 +02:00
Morris Jobke a045f3c4d7 Merge pull request #4146 from nextcloud/unread-comments-folder 
Allow getting the unread comment count for an entire folder at once
 2017-04-10 13:21:39 -05:00
Robin Appelman a7c611039d
Dont use the permissions mask while scanning 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-10 15:19:21 +02:00
Joas Schilling bc217cdf87
Also send the new account data with the event 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-10 10:22:57 +02:00
Morris Jobke 5b4adf66e5
Move OC_Defaults to OCP\Defaults 
* currently there are two ways to access default values:
  OCP\Defaults or OC_Defaults (which is extended by
  OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
  it hard to work on theme values
* this extended the public interface with the missing
  methods and uses them everywhere to only rely on the
  public interface

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-09 21:43:01 -05:00
Morris Jobke ca9d25169d Merge pull request #4136 from nextcloud/expire-date-for-all-shares 
Unified sharing options
 2017-04-07 17:14:05 -05:00
Lukas Reschke 281ad406e8
Add support for theming 
Add support for theming in generated emails and simplify API

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-07 12:03:47 -05:00
Lukas Reschke 1be75e8db8
Fix tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-07 12:03:47 -05:00
Morris Jobke 0560e69913
New layout for welcome email 
* thanks to @espina2 for make this nice design
* the button says "Set password" if the admin didn't specified a password

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-07 12:03:32 -05:00
Bjoern Schiessle 3323d01db1
update unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-07 15:43:59 +02:00
Joas Schilling 9f3d9b5b23
Don't force the use of Accept-Language anymore 
This is not intended anymore, since it falls back to force english
when the header is not set. Also 0228bc6e66
makes clear that the order should be:

1. User setting
2. Accept language
3. Admin default

This is the case since the commit from above, unless via OCS and DAV.
Both forced to accept-language falling back to english.
By removing the force, it now also matches the w3 priority list:
https://www.w3.org/International/questions/qa-lang-priorities

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-07 11:10:04 +02:00
Joas Schilling 7ad791efb4
Dont create a log entry on email login 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-07 10:15:20 +02:00
Arthur Schiwon 7b3fdfeeaa
do login routine only once when done via LoginController 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-04-06 15:22:42 +02:00
Arthur Schiwon 2994cbc586
fix login controller tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-04-06 15:20:17 +02:00
Robin Appelman baec42e80a
Save the scope of an auth token in the session 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-05 17:58:33 +02:00
Roeland Jago Douma 6bdd3a167d Merge pull request #4123 from nextcloud/allow-password-reset-with-email 
Allow to reset the password with the email as an input
 2017-04-05 09:12:41 +02:00
Morris Jobke 95a21e2f2a
Check for boolean false and add tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-04 15:56:50 -05:00
Morris Jobke 0fcb37adcb
OC_ -> NC_ 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-04 15:56:50 -05:00
Philipp Schaffrath 695a17804e
Override config.php values through ENV variables (#26570) 
* added functionality to override config.php values with 'OC_' prefixed environment variables

* use getenv to read environment variables since apache does not set $_ENV variables, fixed test

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-04 15:56:50 -05:00
Lukas Reschke e0227cb458 Merge pull request #2095 from nextcloud/bruteforcesetttings 
Introduce bruteforce settings
 2017-04-04 11:57:43 +02:00
Roeland Jago Douma efb21a948e Merge pull request #4093 from nextcloud/endorse-password-protection 
Endorse password protection
 2017-04-04 11:04:21 +02:00
Roeland Jago Douma aee2d6318f
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-04 10:29:12 +02:00
Roeland Jago Douma 2a9192334e
Don't try to parse empty body if there is no body 
Fixes #3890

If we do a put request without a body the current code still tries to
read the body. This patch makes sure that we do not try to read the body
if the content length is 0.

See RFC 2616 Section 4.3

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-04 08:22:33 +02:00
Bjoern Schiessle 5e7197e49f
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-03 10:58:25 +02:00
Morris Jobke ed00bab80b
Fixed layout of bruteforcesettings 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-02 21:19:30 +02:00
Roeland Jago Douma 4e0479f3a8
Update App Manager test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-02 21:13:51 +02:00
Roeland Jago Douma be674c19a5
Respect bruteforce settings in the Throttler 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-02 21:13:50 +02:00
Roeland Jago Douma dca555b7f3
Adds security section to the admin page 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-02 21:13:09 +02:00
Roeland Jago Douma 6a40dce138
Initial commit of the bruteforcesettings app 
This adds the bruteforce settings app that allows to configure (for now)
subnets that are to be ignored when doing brute force analysis. This can
for example be the LAN since we trust people from there.

* Add app
* Add php tests
* Add js tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-02 21:08:53 +02:00
Robin Appelman 48df99f2e0
fix quote helper test 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 12:49:05 +02:00
Robin Appelman 2a4d9f71af
update FakeManager 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 12:48:34 +02:00
Robin Appelman 212d9fd277
Add test for getting unread comment count by folder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 12:48:27 +02:00
Robin Appelman d4a7cfec7c
rename fun to func 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:15:06 +02:00
Robin Appelman fee818f493
Add tests for query builder (i)like 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:15:03 +02:00
Robin Appelman 4279b13270
Add function builder to the query builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:09:26 +02:00
Robin Appelman a65652fc1e
add support for escaping like parameters when using the query builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-30 11:09:22 +02:00
Morris Jobke 9813023aab
Fix gzip files for Safari 
* Safari support gzip only if the filename does not
  end on .gz - so this renames them to .gzip

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-29 00:11:51 -06:00
Morris Jobke f9bc53146d
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-28 21:00:12 -06:00
Roeland Jago Douma 3a0ef65f33
Fix controller tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-28 23:42:20 +02:00
Roeland Jago Douma a40405531c
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-28 23:13:59 +02:00
Joas Schilling 4bae7ef96d
Allow to reset the password with the email as an input 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-28 21:17:37 +02:00
Morris Jobke f76a3b532d Merge pull request #4096 from nextcloud/touch-floor 
round the mtime in touch
 2017-03-27 09:46:10 -06:00
Robin Appelman 8de4209c3e
round the mtime in touch 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-27 17:07:48 +02:00
Joas Schilling e0b040d623
Allow multiple navigation links from info.xml 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-26 21:15:25 +02:00
Lukas Reschke d81cdcbe88
Don't run JSCombiner when not installed 
When the instance is not installed don't run the JSCombiner as the appdata folder does not yet exist.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-25 15:25:06 +01:00
Roeland Jago Douma 677e11b1a4
Tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-24 11:31:48 +01:00
Roeland Jago Douma 34632de102 Merge pull request #4025 from nextcloud/downstream-27292 
Update karma
 2017-03-24 08:44:42 +01:00
Morris Jobke 1397b84777 Merge pull request #3928 from nextcloud/downstream-17978 
Adjust 4 byte MySQL code to upstream
 2017-03-23 23:45:43 -06:00
Vincent Petry 46a32045d7
Update karma, use sinon from npm 
Update karma library and use sinon JS library provided by
karma-jasmine-sinon instead of local file.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 23:35:41 -06:00
Roeland Jago Douma 35a21b4180
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 20:14:18 +01:00
Roeland Jago Douma e3925ba2a1
Cache SCSS dependency file in memcache 
Since reading a file from disks can be costly. Lets store the dependency
json also in memcache.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 20:14:08 +01:00
Roeland Jago Douma 8b94fbe014
Add the AppContainer 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 11:24:16 +01:00
Joas Schilling 5695a4ec92
Don't do a recursive search 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-22 10:44:13 +01:00
Morris Jobke 1aef2f417b
Adjust tests as well 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-21 16:42:42 -06:00
Morris Jobke 713f684a8b
Adding tests for 4 byte unicode characters 
* success on SQLite and Postgres
* failure on MySQL due to the limited charset that only supports up to 3 bytes

Add config option to update charset of mysql to utf8mb4

* fully optional
* requires additional options set in the database

only disable unicode test on mysql

Fixing ctor call

Adding docker based unit test execution for mysql utf8mb4

Add mysqlmb4 test configuration to Jenkinsfile

fix collation on utf8mb4

Properly setup charset and collation in the doctrine connection

Allow files containing 4-byte chars in case the database supports it

During setup of a mysql database we try to detect if charset 'utf8mb4' can be used

Fix mysql settings

Add console command to migrate the charset

Set ROW_FORMAT before setting collation to mb4

Also select tables with wrong collation

Faster MySQL docker

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-21 16:42:12 -06:00
Joas Schilling 348d97dfd6 Merge pull request #3844 from nextcloud/unshare_event 
Unshare event
 2017-03-21 16:57:09 +01:00
Roeland Jago Douma 7e95837097 Merge pull request #3955 from nextcloud/downstream-27113 
Can we get some faster phpunit execution?
 2017-03-21 11:27:00 +01:00
Roeland Jago Douma 0fb5776133
Fix NODB tests etc 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma 21641302a9
Add DI intergration tests 
* Moved some interface definitions to Server.php (more to come)
* Build/Query only for existing classes in the AppContainer
* Build/Query only for classes of the App in the AppContainer
* Offload other stuff to the servercontainer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma 7cece61ff6
Extend DI tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Lukas Reschke 21cf1b22e9 Merge pull request #3530 from nextcloud/scss-variables 
Implement scss variables
 2017-03-20 19:49:53 +01:00
Thomas Müller 5bfce597a9
[CI] Can we get some faster phpunit execution? (#27113) 
* Don't backup globals and static attributes

* Unset global variable to remove impact on followup tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 12:34:05 -06:00
Christoph Wurst 03a92eaf74 Merge pull request #3957 from nextcloud/downstream-27307 
Follow up to #3949 (app exists on enable)
 2017-03-20 18:10:05 +01:00
Roeland Jago Douma 1565177fb5
Revert "Add a magic wrapper to allow phpunit4 to run the code again " 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-20 14:25:43 +01:00
Julius Härtl a0f7d4b688
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 14:20:34 +01:00
Julius Härtl 29ec58f1b5
Add tests for SCSSCacher 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 14:12:35 +01:00
Julius Haertl 4fbf9a4feb
Add tests for SCSSCacher 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Joas Schilling 85a5c24934 Merge pull request #3939 from nextcloud/downstream-27159 
Fix malformed logging in exception
 2017-03-20 12:46:48 +01:00
Joas Schilling 257fbd85eb Merge pull request #3929 from nextcloud/downstream-27068 
cache loadUser if not exists
 2017-03-20 12:44:54 +01:00
Joas Schilling 35f6b8716e Merge pull request #3884 from nextcloud/downstream-26956 
Skip null groups in group manager
 2017-03-20 12:27:38 +01:00
Lukas Reschke a3739906f6 Merge pull request #3924 from nextcloud/preview_fixes 
Do not generate the max preview twice
 2017-03-20 11:45:51 +01:00
Joas Schilling 5795482282
createMock 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-20 11:14:14 +01:00
Lukas Reschke ab9e3525cc
Move error message to log entry 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-20 11:06:08 +01:00
Joas Schilling 3eb8313657
Fix the test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-20 10:45:27 +01:00
Joas Schilling 591e75df5c
Don't use a generic exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-20 10:33:16 +01:00
Morris Jobke c969d8005e Merge pull request #3949 from nextcloud/downstream-27307 
Check if app exists before enabling
 2017-03-20 03:21:02 -06:00
Morris Jobke 50b0a4b181
Improve the test case 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 02:47:32 -06:00
Vincent Petry aacfef463c
Add tests for database user backend caching 
Add comment, closeCursor in user DB query

Invalidate user in cache after successful creation

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 02:03:03 -06:00
noveens 5481a9b84a
checking if app exists in the FileStream now 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 00:38:29 -06:00
Jörn Friedrich Dreyer c96486cfae
test setTagGroups with empty groupids 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 22:01:46 -06:00
Morris Jobke edd55b0ea9
Use SystemConfig instead of AllConfig for DB stuff 
* preparation for followup PRs to clean up the DB bootstrapping

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 15:53:49 -06:00