Commit Graph

4203 Commits

Author SHA1 Message Date
Kyle Fazzari 697774112f
{J,CS}SResourceLocator: account for symlinks in app path
Currently, if the app path includes a symlink, the calculated webDir
will be incorrect when generating CSS and URLs will be pointing to the
wrong place, breaking CSS.

Use realpath when retrieving app path, and these issues go away.

Fix #6028

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-14 09:22:33 -08:00
blizzz 14986e0f5c
Merge pull request #6464 from nextcloud/proper-english-nowhave-backport-stable12
[stable12] Improve text: 'you have now' -> 'you now have'
2017-11-10 15:48:37 +01:00
Morris Jobke d8cf19b258
Fix welcome text for better grammar in themed instances
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 09:28:29 +01:00
Julius Härtl fa380c0b53
Theming: theme flow redirection page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-08 21:20:26 +01:00
Morris Jobke 21b8399e88
Improve mimetype detection for object storages
Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 15:23:35 +01:00
Morris Jobke 9b41236d4a
Provide tests for future timestamp formatting
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 15:42:14 +02:00
Bjoern Schiessle 7aaf12b37d
fix url
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-10-17 11:27:06 +02:00
Robin Appelman df2fa2fce2 Merge pull request #6737 from nextcloud/aws-sdk-12
[12] Update aws sdk + s3 improvements
2017-10-09 18:05:16 +02:00
Robin Appelman 239f561ab2
Add tests for multipart upload
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-09 15:29:44 +02:00
Robin Appelman 95dc9a89b3
dont run invalid path repair step when upgrading from 11.0.5.2 and later
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 16:28:54 +02:00
Lukas Reschke 44ae66e7d2
Add filter for `shareapi_allow_share_dialog_user_enumeration`
This adjusts the contacts menu to also support searching by email address which is relevant in scenarios where no UID is known such as LDAP, etc.

Furthermore, if `shareapi_allow_share_dialog_user_enumeration` is disabled only results are shown that match the full user ID or email address.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-18 17:28:07 +02:00
Tobia De Koninck d2d6ed5c97
Add tests
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:33 +02:00
Tobia De Koninck 88ccbef546
Fix tests
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:28 +02:00
Roeland Jago Douma ab50f0b1de
Fix AppPassword 2FA auth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-12 22:35:16 +02:00
Leon Klingele 33ae6a4e9e
Improve text: 'you have now' -> 'you now have'
Signed-off-by: Leon Klingele <leon@struktur.de>
2017-09-12 14:11:52 +02:00
Joas Schilling 2a6855a76d
Use the language of the recipient for the share notification
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:28:20 +02:00
Morris Jobke 7c3148f1aa Merge pull request #6386 from nextcloud/12-6247
[stable12] Fix undefined index oauthState
2017-09-07 09:32:45 +02:00
Roeland Jago Douma ef1c81188b Merge pull request #6319 from nextcloud/improve_2fa-12
[stable12] Improve 2FA
2017-09-06 20:07:46 +02:00
Morris Jobke 04583a7587
Fix tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-06 19:48:12 +02:00
Roeland Jago Douma dbcd549e35
Fix login with basic auth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-06 17:07:11 +02:00
Morris Jobke c0692abee7
Fix tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-05 16:04:29 +02:00
Joas Schilling 6428359820
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-05 16:04:17 +02:00
Roeland Jago Douma faffebc718
Improve 2FA
* Store the auth state in the session so we don't have to query it every
time.
* Added some tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-31 10:54:10 +02:00
Bjoern Schiessle 3e6833f5a6
add prefix to user and system keys to avoid name collisions
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 20:36:10 +02:00
Bjoern Schiessle 5f49398e13
extend the identity proof manager to allow system wide key pairs
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 20:36:10 +02:00
Lukas Reschke 5755897712
Inject \OCP\IURLGenerator to make tests work
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-30 14:42:50 +02:00
Lukas Reschke 245080e647
Properly allow \OCP\Authentication\IApacheBackend to specify logout URL
Any `\OCP\Authentication\IApacheBackend` previously had to implement `getLogoutAttribute` which returns a string.
This string is directly injected into the logout `<a>` tag, so returning something like `href="foo"` would result
in `<a href="foo">`.

This is rather error prone and also in Nextcloud 12 broken as the logout entry has been moved with
054e161eb5 inside the navigation manager where one cannot simply inject attributes.

Thus this feature is broken in Nextcloud 12 which effectively leads to the bug described at nextcloud/user_saml#112,
people cannot logout anymore when using SAML using SLO. Basically in case of SAML you have a SLO url which redirects
you to the IdP and properly logs you out there as well.

Instead of monkey patching the Navigation manager I decided to instead change `\OCP\Authentication\IApacheBackend` to
use `\OCP\Authentication\IApacheBackend::getLogoutUrl` instead where it can return a string with the appropriate logout
URL. Since this functionality is only prominently used in the SAML plugin. Any custom app would need a small change but
I'm not aware of any and there's simply no way to fix this properly otherwise.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-30 14:42:46 +02:00
Morris Jobke 37bc43c19c Enable object storage tests again
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-17 19:35:26 +02:00
Daniel Calviño Sánchez 0b00d770fe Add acceptance tests for setting the color in the Theming app
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 13:42:29 +02:00
Daniel Calviño Sánchez 340a774fe2 Add getter for the timeout multiplier
In some cases the acceptance tests have to explicitly wait for something
to happen without using the "find" method from the actor; in those cases
the timeout multiplier needs to be taken into account too, so the test
cases must be able to retrieve it from the actor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 13:34:38 +02:00
Morris Jobke 3f8e3fbb6b Merge pull request #5946 from nextcloud/12-5897
[stable12] Send an email once a file/folder is shared with a user
2017-08-08 16:36:46 +02:00
Joas Schilling d6e902fd03
Fix last failures with oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:46 +02:00
Joas Schilling ae55fefcf6
Fix querybuilder and functionbuilder tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:35 +02:00
Joas Schilling d6b888461d
Can not insert auto increment on oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:00 +02:00
Joas Schilling 18ba973c13
Fix missing escape on column and table name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:39:51 +02:00
Morris Jobke 1ef19bb0ec Send an email once a file/folder is shared with a user
* only if user has set an email address
* only for user shares (no group shares for now)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-01 15:17:32 +02:00
Lukas Reschke 7568b04705 Add new bundle
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-26 11:47:15 +02:00
Morris Jobke f45e4471f0 Remove unneeded styles
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-24 13:46:17 +02:00
Lukas Reschke 3353dbfab4 Adjust to height=120
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-24 13:46:09 +02:00
Robin Appelman 13831085c3 add tests for renaming paths with multibyte utf8 characters
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-22 11:10:37 +02:00
Morris Jobke c6e3368af7 Merge pull request #5786 from nextcloud/path-repair-steps-storage-12
[12] Also repair storage id's when repairing invalid entries
2017-07-21 14:03:38 +02:00
Daniel Calviño Sánchez fcc1570789 Add option to acceptance test runner to set the Selenium server
By default "127.0.0.1:4444" is used, so nothing needs to be set when the
acceptance tests and the Selenium server share the same network (like
when called by "run.sh").

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-20 11:32:58 +02:00
Daniel Calviño Sánchez 140b23f85f Add option to acceptance test runner to set the Nextcloud server domain
By default "127.0.0.1" is used, so nothing needs to be set when the
Selenium server and the Nextcloud test server share the same network
(like when called by "run.sh").

Besides passing the domain to the acceptance tests the Nextcloud test
server configuration must be modified to see the given domain as a
trusted domain; otherwise the access would be forbidden.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-20 11:32:54 +02:00
Daniel Calviño Sánchez 9722291454 Make possible to configure the domain for the Nextcloud test server
The NextcloudTestServerLocalHelper started the PHP built-in web server
for the Nextcloud test server at 127.0.0.1; as the Selenium server has
to access the Nextcloud test server they were forced to share the same
network. Now, the domain at which the PHP built-in web server is started
can be specified when the NextcloudTestServerLocalHelper is created,
which removes the need of sharing the same network, as the Selenium
server now can access the Nextcloud test server at an arbitrary domain.
However, by default "127.0.0.1" is still used if no domain is given.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-20 11:32:50 +02:00
Robin Appelman 9c2dce34e9
Also repair storage id's when repairing invalid entries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-19 12:34:00 +02:00
Pauli Järvinen 22b29943ed Fix emitting of legacy hook post_unshare
- When a file was unshared, the legacy hook pre_unshare fired twice and the hook post_unshare did not fire at all. This was obviously a copy-paste error.

Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
2017-07-19 11:42:23 +02:00
Morris Jobke 239ff34f3d Fix drone
Fix service container host name
check current folder
fix redis for integration test
Fix more hostnames

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-14 13:02:16 +02:00
Morris Jobke 9a07f78480 Merge pull request #5710 from nextcloud/nested-permissions-mask-12
[12] Fix scan permissions with nested permissions masks
2017-07-13 23:42:15 +02:00
Morris Jobke 90972044b1 Merge pull request #5655 from nextcloud/moveFromCache-from-shared-12
[12] fix moving folders out of a cache jail
2017-07-13 16:35:57 +02:00
Morris Jobke 61bac5637f Merge pull request #5697 from nextcloud/stable12-4984
Write cert bundle to tmp file first
2017-07-13 15:08:37 +02:00