Skip to content

Conversation

@kkeirstead
Copy link
Member

Part of the security review is to address "swallow everything" exceptions; this is an initial pass at adding logging to some of the places where we catch as well as expanding to specify which exceptions we want to catch. Things to consider:

  • Where we should/shouldn't log (and what level makes the most sense)
  • What exceptions we need to handle that were previously being encompassed by Exception
  • Places where the exception handling should not be altered (and the reasoning)

If there are other places where we should make changes that aren't included here, please let me know and I'll add them in.

@kkeirstead kkeirstead requested a review from a team as a code owner June 22, 2022 17:13
@kkeirstead kkeirstead merged commit 6159f81 into dotnet:main Jun 23, 2022
@jander-msft jander-msft added servicing-patch Servicing fixes that is targeted for a patch release (0.0.x version) servicing-minor Servicing fixes that is targeted for a minor release (0.x.0 version) labels Jun 28, 2022
@kkeirstead
Copy link
Member Author

/backport to release/6.x

@github-actions
Copy link
Contributor

Started backporting to release/6.x: https://github.com/dotnet/dotnet-monitor/actions/runs/2584030465

@kkeirstead
Copy link
Member Author

/backport to release/6.2

@kkeirstead
Copy link
Member Author

/backport to release/6.1

@github-actions
Copy link
Contributor

Started backporting to release/6.2: https://github.com/dotnet/dotnet-monitor/actions/runs/2584290594

@github-actions
Copy link
Contributor

Started backporting to release/6.1: https://github.com/dotnet/dotnet-monitor/actions/runs/2584291507

@github-actions
Copy link
Contributor

@kkeirstead backporting to release/6.1 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Initial pass at adding logging and/or switching Exceptions to specific types of Exceptions
Applying: Minor tweaks
Applying: Pulled out the logging previously added in DiagController; may revert this in a future commit
Applying: Re-added continue
Applying: Changes based on discussion from PR meeting
.git/rebase-apply/patch:172: trailing whitespace.
        
.git/rebase-apply/patch:188: trailing whitespace.
        
.git/rebase-apply/patch:204: trailing whitespace.
        
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	src/Tools/dotnet-monitor/LoggingExtensions.cs
M	src/Tools/dotnet-monitor/Strings.Designer.cs
M	src/Tools/dotnet-monitor/Strings.resx
Falling back to patching base and 3-way merge...
Auto-merging src/Tools/dotnet-monitor/Strings.resx
CONFLICT (content): Merge conflict in src/Tools/dotnet-monitor/Strings.resx
Auto-merging src/Tools/dotnet-monitor/Strings.Designer.cs
CONFLICT (content): Merge conflict in src/Tools/dotnet-monitor/Strings.Designer.cs
Auto-merging src/Tools/dotnet-monitor/LoggingExtensions.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0005 Changes based on discussion from PR meeting
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@jander-msft jander-msft removed servicing-patch Servicing fixes that is targeted for a patch release (0.0.x version) servicing-minor Servicing fixes that is targeted for a minor release (0.x.0 version) labels Jul 18, 2022
Egyptmaster pushed a commit to Egyptmaster/dotnet-monitor that referenced this pull request Sep 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants