Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Do not read certificate bundle from data dir by default" #24556

Merged
merged 1 commit into from
Dec 4, 2020

Conversation

MorrisJobke
Copy link
Member

This reverts commit 18b0d75 from #21090

Problem:

  • custom SSL certs are not properly used

Test

  • start mitmproxy (https://mitmproxy.org)
  • add 'proxy' => '127.0.0.1:8080', to your config.php
  • import the self signed certificate: php occ security:certificates:import ~/.mitmproxy/mitmproxy-ca-cert.pem
  • open the admin settings with the setup checks
  • before: "no internet connection" warning and cURL error 60: SSL certificate problem: self signed certificate in certificate chain in the logs
  • after: no setup warnings and no logs (also clean HTTPS connections in the mitmproxy interface)

@blizzz
Copy link
Member

blizzz commented Dec 4, 2020

also federated shares with a custom (and imported CA) fail in the current state

@MorrisJobke
Copy link
Member Author

BTW: Works properly in master because there we did more changes to the certificate handling, which were intentionally not back ported.

@faily-bot
Copy link

faily-bot bot commented Dec 4, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 200: failure

mariadb10.4-php7.3

Show full log
There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There was 1 failure:

1) Test\Files\ObjectStore\ObjectStoreStorageTest::testCopy with data set #5 ('/sòurcē.txt', '/target.txt')
Expected /target.txt to be a copy of /drone/src/tests/data/lorem.txt
Failed asserting that false matches expected 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\n
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.\n
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.\n
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'.

/drone/src/tests/lib/Files/Storage/Storage.php:222
/drone/src/tests/lib/Files/Storage/Storage.php:235

@rullzer rullzer merged commit c7cb8eb into stable20 Dec 4, 2020
@rullzer rullzer deleted the revert/stable20/21090 branch December 4, 2020 14:09
@rullzer rullzer mentioned this pull request Dec 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants