Skip to content

Move overwritehost check to isTrustedDomain - #18184

Merged
rullzer merged 1 commit into
masterfrom
bugfix/noid/is-trusted-domain
Dec 9, 2019
Merged

Move overwritehost check to isTrustedDomain#18184
rullzer merged 1 commit into
masterfrom
bugfix/noid/is-trusted-domain

Conversation

@juliusknorr

Copy link
Copy Markdown
Member

Otherwise the trusted domain check in base.php might succeed while calling isTrustedDomain returns false

@juliusknorr

Copy link
Copy Markdown
MemberAuthor

/backport to stable17

@juliusknorr

Copy link
Copy Markdown
MemberAuthor

/backport to stable16

@rullzer

Copy link
Copy Markdown
Member

@nickvergessennickvergessen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Dec 4, 2019
@juliusknorr
juliusknorrforce-pushed the bugfix/noid/is-trusted-domain branch 2 times, most recently from 2faa50b to 3eb0755CompareDecember 6, 2019 12:02
@juliusknorrjuliusknorr added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Dec 6, 2019
@juliusknorr

Copy link
Copy Markdown
MemberAuthor

Let's wait for CI again but I could not see any related failure anymore

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@skjnldsv
skjnldsvforce-pushed the bugfix/noid/is-trusted-domain branch from 3eb0755 to d05f131CompareDecember 7, 2019 08:53
@rullzer
rullzer merged commit 7215500 into masterDec 9, 2019
@rullzer
rullzer deleted the bugfix/noid/is-trusted-domain branch December 9, 2019 20:37
@backportbot-nextcloud

Copy link
Copy Markdown

backport to stable17 in #18306

@backportbot-nextcloud

Copy link
Copy Markdown

backport to stable16 in #18308

@rullzerrullzer mentioned this pull request Dec 11, 2019
43 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@juliusknorr@rullzer@ChristophWurst@nickvergessen