Don't panic in SSL code #734
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ainar-g
force-pushed
the
nopanicssl
branch
2 times, most recently
from
e07bd0f to
dac763b
Compare
maddyblue
reviewed
Mar 26, 2018
ssl.go
Outdated
| @@ -12,7 +12,7 @@ import ( | |||
|
|
|||
| // ssl generates a function to upgrade a net.Conn based on the "sslmode" and | |||
| // related settings. The function is nil when no upgrade should take place. | |||
| func ssl(o values) func(net.Conn) net.Conn { | |||
| func ssl(o values) (f func(net.Conn) (net.Conn, error), err error) { | |||
There was a problem hiding this comment.
What's the reason to use a named return here? I don't see one. Ditto below.
ssl.go
Outdated
| @@ -31,7 +31,7 @@ func ssl(o values) func(net.Conn) net.Conn { | |||
| // behavior is discouraged, and applications that need certificate | |||
| // validation should always use verify-ca or verify-full. | |||
| if sslrootcert, ok := o["sslrootcert"]; ok { | |||
| if _, err := os.Stat(sslrootcert); err == nil { | |||
There was a problem hiding this comment.
This should stay since the err here is definitely not the same as the one in the return.
This change removes panics from SSL code. This is a part of the ongoing process of removing panics from lib/pq code. Refs lib#681.
|
@mjibson PTAL. |
maddyblue
approved these changes
Mar 27, 2018
|
Quite late for a review, but I wanted to mention that this line is partly why I left the panics alone: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change removes panics from SSL code. This is a part of the ongoing process of removing panics from lib/pq code.
Refs #681.