Commit graph

52734 commits

Author SHA1 Message Date
Roeland Jago Douma
0a79de3652
Merge pull request #21211 from nextcloud/backport/20938/stable18
[stable18] Fix the Talk verification
2020-06-06 09:33:37 +02:00
Nextcloud bot
b07978f18e
[tx-robot] updated from transifex 2020-06-06 02:16:17 +00:00
Roeland Jago Douma
bcdc6c5580
Merge pull request #21248 from nextcloud/backport/21229/stable18
[stable18] Fix empty event UUID reminder notifications
2020-06-05 13:39:04 +02:00
Thomas Citharel
bff012a2b2 Fix empty event UUID reminder notifications
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-06-05 07:07:51 +00:00
Nextcloud bot
d1f40575f9
[tx-robot] updated from transifex 2020-06-05 02:16:55 +00:00
Roeland Jago Douma
4ad03e1955
Merge pull request #21230 from nextcloud/backport/20427/stable18
[stable18] Fix password reset saying Admin changed my password when reset from login page
2020-06-04 19:02:36 +02:00
Roeland Jago Douma
871df8d4b0
Merge pull request #21227 from nextcloud/backport/21199/stable18
[stable18] Prevent harder to share your root
2020-06-04 19:02:10 +02:00
Thomas Citharel
b210ed6990
Use \OC::$CLI instead of PHP_SAPI
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-06-04 11:34:33 +02:00
Thomas Citharel
6c2cde3d0c
Fix password reset saying Admin changed my password when reset from
login page

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2020-06-04 11:16:39 +02:00
Joas Schilling
f97a61aa14 Prevent harder to share your root
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-04 09:03:54 +00:00
Roeland Jago Douma
857b09e068
Merge pull request #21201 from nextcloud/backport/21181/stable18
[stable18] Do not only catch Exceptions but any Throwable during rmt share delete
2020-06-04 10:59:26 +02:00
Roeland Jago Douma
52cc0c7bb4
Merge pull request #21184 from nextcloud/version/18.0.5/final
18.0.5
2020-06-04 08:26:16 +02:00
Nextcloud bot
d1e606aebd
[tx-robot] updated from transifex 2020-06-04 02:16:35 +00:00
Daniel Calviño Sánchez
1d7cc2e356 Restore previous state when failing to change video verification state
When video verification can not be enabled or disabled the previous
state is set again in the JavaScript share object. This ensures that the
UI will not reflect a misleading state.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-06-03 14:18:33 +00:00
Christoph Wurst
d41e5778a0 Fix the Talk verification
When enabling or disabling Talk verification in mail shares the server
expects also a new password to be set. As we always just update one
property at a time this means the Talk verification was impossible to
activate or deactivate. With this patch, we send the talk option AND the
new password. If there is no new password, the Talk option is disabled
(in mail shares; in link shares it is possible to enable or disable the
video verification without changing the password).

When we finally have descriptive text on ActionCheckbox'es we should
definitely add some explanatory text for the user. Right now this is as
good as it gets.

We'll have to backport to 18.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-06-03 13:55:35 +00:00
Christoph Wurst
fab0888fb2 Do not only catch Exceptions but any Throwable during rmt share delete
When a remote share is deleted, we notify the remove instance. This may
trigger various error conditions, which we want to catch in order to
avoid undeletable shares. The try-catch, however, did only capture
exceptions, so things like TypeErrors were not caught and caused the
process to fail hard.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-06-03 09:15:55 +00:00
Nextcloud bot
7e8803ba9f
[tx-robot] updated from transifex 2020-06-03 02:16:28 +00:00
Roeland Jago Douma
c754706112
18.0.5
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-06-02 09:31:16 +02:00
Nextcloud bot
db16e67e05
[tx-robot] updated from transifex 2020-06-02 02:16:11 +00:00
Nextcloud bot
802de535c6
[tx-robot] updated from transifex 2020-06-01 02:16:10 +00:00
Nextcloud bot
bdff0fad1f
[tx-robot] updated from transifex 2020-05-31 02:16:28 +00:00
Nextcloud bot
556a9e88f0
[tx-robot] updated from transifex 2020-05-30 02:16:15 +00:00
Morris Jobke
29fea4fc57
Merge pull request #21159 from nextcloud/revert-21152-backport/21143/stable18
Revert "[stable18] Fix password changes in link and mail shares"
2020-05-29 21:36:10 +02:00
Morris Jobke
555108dc65
Revert "[stable18] Fix password changes in link and mail shares" 2020-05-29 21:35:57 +02:00
Morris Jobke
c31b2d6ce1
Merge pull request #21152 from nextcloud/backport/21143/stable18
[stable18] Fix password changes in link and mail shares
2020-05-29 21:34:52 +02:00
Daniel Calviño Sánchez
b5ffa2ea3d Add integration tests for video verification
Enabling the "send password by Talk" property of shares require that
Talk is installed and enabled, so the Drone step that runs them has to
first clone the Talk repository.

When the integration tests are run on a local development instance,
however, it is not guaranteed that Talk is installed. Due to this the
"@Talk" tag was added, which ensures that any feature or scenario marked
with it will first check if Talk is installed and, if not, skip the
scenario (instead of failing).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-05-29 16:56:56 +02:00
Daniel Calviño Sánchez
f5eb93e29a Add integration tests for creating and updating a mail share
In most cases, when a mail share is created or updated an e-mail is sent
to the sharee, which is done by connecting to the SMTP server set in the
configuration. If the server can not be contacted then the creation or
update of the mail share fails.

To make possible to test mail shares without using a real SMTP server a
fake one has been added. The original script, which is MIT licensed, was
based on inetd, so it was slightly modified to run on its own.

In order to use it from the integration tests the "Given dummy mail
server is listening" step has to be called in the scenarios in which the
mail server is needed.

For now that is the only available step; things like checking the sent
mails, while possible (as the script can log the mails to certain file),
have not been added yet.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-05-29 15:24:53 +02:00
Daniel Calviño Sánchez
c8dafceb36 Generalize integration test steps to download last share
Note that the "last link share can be downloaded" step was kept as it
tests the "url" property specific of link shares.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-05-29 15:23:15 +02:00
Daniel Calviño Sánchez
8349172c64 Remove unused variables
The step names were adjusted accordingly.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-05-29 15:21:27 +02:00
Daniel Calviño Sánchez
d6f1937502 Fix disabling send password by Talk without new password in mail shares
When "send password by Talk" was disabled in a mail share it was
possible to keep the same password as before, as it does not pose any
security issue (unlike keeping it when "send password by Talk" is
enabled, as in that case the password was already disclosed by mail).

However, if a mail share is updated but the password is not set again
only the hashed password will be available. In that case it would not
make sense to send the password by mail, so now the password must be
changed when disabling "send password by Talk".

Note that, even if explicitly setting the same password again along with
the "send password by Talk" property would work, this was also prevented
for simplicity.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-05-29 14:42:16 +02:00
Daniel Calviño Sánchez
1c580351da Fix enabling send password by Talk with same password in mail shares
When "send password by Talk" is enabled in a mail share a new password
must be also set. However, when the passwords of the original and the
new share were compared it was not taken into account that the original
password is now hashed, while the new one is not (unless no new password
was sent, in which case the password of the original share was set in
the new share by the controller, but that was already prevented due to
both passwords being literally the same), so it was possible to set the
same password again.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-05-29 14:42:16 +02:00
Daniel Calviño Sánchez
26e4c292c7 Fix enabling send password by Talk with empty password in link shares
When "send password by Talk" is enabled in a link share now a non empty
password is enforced.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-05-29 14:42:16 +02:00
Daniel Calviño Sánchez
149d2b0013 Fix creating a mail share with a password
When a mail share was created with a password the given password was not
hashed, so it was not possible to open the share with that password.
Moreover, if passwords were enforced the given password was ignored and
a new one was set (although in this case it was hashed so it worked as
expected). Now the given password is properly hashed and not overriden.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-05-29 14:42:16 +02:00
Daniel Calviño Sánchez
ff810f8e23 Extend mail shares unit tests to check the password and mail template
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-05-29 14:42:16 +02:00
Nextcloud bot
bb107a1f6f
[tx-robot] updated from transifex 2020-05-29 02:16:39 +00:00
Roeland Jago Douma
baa118898f
Merge pull request #21061 from nextcloud/version/18.0.5/RC1
18.0.5 RC1
2020-05-28 16:38:01 +02:00
Roeland Jago Douma
876479799e
Merge pull request #21109 from nextcloud/backport/19793/stable18
[stable18] Fix resharing of federated shares that were created out of links
2020-05-28 16:37:28 +02:00
Christoph Wurst
852b0ba19d
Merge pull request #21127 from nextcloud/fix/make-translation-sanitization-optional-stable18
[stable18] Make the translation sanitization optional
2020-05-28 09:20:03 +02:00
Roeland Jago Douma
6e911c4ad9
Merge pull request #21132 from nextcloud/backport/20933/stable18
[stable18] Move the password confirmation form template to post
2020-05-28 08:17:01 +02:00
Nextcloud bot
8718e0776d
[tx-robot] updated from transifex 2020-05-28 02:16:48 +00:00
Roeland Jago Douma
b6ab18b311 Move the password confirmation form template to post
I know we use JS for this. But it triggers some false positives on
testing.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-27 17:58:10 +00:00
Christoph Wurst
e2bc5ae74e
Fix devices & sessions sanitization
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-05-27 16:17:21 +02:00
Christoph Wurst
0084483a36
Make the translation sanitization optional
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-05-27 16:05:25 +02:00
blizzz
c7c7433f11 Merge pull request #21115 from nextcloud/backport/21106/stable18
[stable18] use the loginname to verify the old password in user password changes
2020-05-27 10:18:58 +02:00
Nextcloud bot
fdb58f1852
[tx-robot] updated from transifex 2020-05-27 02:16:21 +00:00
Arthur Schiwon
292d8c3d9c use the loginname to verify the old password in user password changes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-05-26 19:22:33 +00:00
Roeland Jago Douma
4aed6971fe
Merge pull request #21096 from nextcloud/backport/21090/stable18
[stable18] Do not read certificate bundle from data dir by default
2020-05-26 11:44:15 +02:00
John Molakvoæ (skjnldsv)
9d422a2d9a
Fix federated link sharing permissions
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-05-26 11:30:09 +02:00
Julius Härtl
9a1275b5b9
Fix share update test
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-05-26 11:28:42 +02:00
Roeland Jago Douma
20c47cf7d8
Update public link share permission code
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-05-26 11:28:42 +02:00