Skip to content

add basic support for SSL connections with CA cert validation #179

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
May 5, 2015
Merged

add basic support for SSL connections with CA cert validation #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2dff491
add basic support for SSL connections with CA cert validation
dancannon Apr 14, 2015
2865eac
CaCert -> CACert, return err on cert parse issue
jipperinbham Apr 19, 2015
8509489
abstract the TLSConfig out to its own variable in ConnectOpts
jipperinbham Apr 20, 2015
e5a2b8e
removing unused imports
jipperinbham Apr 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ For more details checkout the [README](https://github.com/dancannon/gorethink/bl
- Changed driver to use the v0.4 protocol (used to use v0.3).
- Fixed geometry tests not properly checking the expected results.
- Fixed bug causing nil pointer panics when using an `Unmarshaler`
- Fixed dropped millisecond precision if given value is too old

## v0.6.3 - 2015-03-04
### Added
Expand Down
7 changes: 6 additions & 1 deletion connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package gorethink

import (
"crypto/tls"
"encoding/binary"
"encoding/json"
"io"
Expand Down Expand Up @@ -49,7 +50,11 @@ func NewConnection(address string, opts *ConnectOpts) (*Connection, error) {
}
// Connect to Server
nd := net.Dialer{Timeout: c.opts.Timeout}
c.conn, err = nd.Dial("tcp", address)
if c.opts.TLSConfig == nil {
c.conn, err = nd.Dial("tcp", address)
} else {
c.conn, err = tls.DialWithDialer(&nd, "tcp", address, c.opts.TLSConfig)
}
if err != nil {
return nil, err
}
Expand Down
2 changes: 2 additions & 0 deletions session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package gorethink

import (
"crypto/tls"
"time"

p "github.com/dancannon/gorethink/ql2"
Expand All @@ -22,6 +23,7 @@ type ConnectOpts struct {
Database string `gorethink:"database,omitempty"`
AuthKey string `gorethink:"authkey,omitempty"`
Timeout time.Duration `gorethink:"timeout,omitempty"`
TLSConfig *tls.Config `gorethink:"tlsconfig,omitempty"`

MaxIdle int `gorethink:"max_idle,omitempty"`
MaxOpen int `gorethink:"max_open,omitempty"`
Expand Down