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

Catch the errors related to untrusted self signed certificates for federation #7450

Merged
merged 1 commit into from
Dec 11, 2017

Conversation

rullzer
Copy link
Member

@rullzer rullzer commented Dec 11, 2017

Found in our sentry setup.

Basically catch more generic exceptions. As well as the ringexceptions. They basically can happen for some weird curl reasons. Just catch them and log. Since the admin can't help what curl is getting back anyway.

…deration

* Added tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@MorrisJobke
Copy link
Member

Rebased to contain the fixes from master.

@codecov
Copy link

codecov bot commented Dec 11, 2017

Codecov Report

Merging #7450 into master will decrease coverage by 0.28%.
The diff coverage is 100%.

@@             Coverage Diff              @@
##             master    #7450      +/-   ##
============================================
- Coverage     51.08%   50.79%   -0.29%     
- Complexity    24858    25074     +216     
============================================
  Files          1596     1596              
  Lines         94590    95156     +566     
  Branches       1367     1367              
============================================
+ Hits          48317    48334      +17     
- Misses        46273    46822     +549
Impacted Files Coverage Δ Complexity Δ
...s/federation/lib/BackgroundJob/GetSharedSecret.php 66.66% <100%> (+1.07%) 21 <0> (+1) ⬆️
...deration/lib/BackgroundJob/RequestSharedSecret.php 69.87% <100%> (+1.12%) 19 <0> (+1) ⬆️
lib/private/Server.php 58.53% <0%> (-23.45%) 228% <0%> (+100%)
lib/private/Files/View.php 70.07% <0%> (-14.15%) 485% <0%> (+114%)
apps/files_trashbin/lib/Trashbin.php 72.28% <0%> (-0.25%) 136% <0%> (ø)

@MorrisJobke
Copy link
Member

@blizzz @ChristophWurst @skjnldsv I would like to have this in the beta 2 as well.

@rullzer rullzer merged commit f18ac08 into master Dec 11, 2017
@rullzer rullzer deleted the log_correct_self_signed branch December 11, 2017 18:15
@ChristophWurst ChristophWurst mentioned this pull request Dec 22, 2020
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants