certificate pinning for servers without domain
This commit is contained in:
parent
2707a8f0a9
commit
a20eb4660b
@ -3,12 +3,14 @@ package main
|
|||||||
import (
|
import (
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
|
"crypto/x509"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/ginuerzh/gost"
|
"github.com/ginuerzh/gost"
|
||||||
"github.com/go-log/log"
|
"github.com/go-log/log"
|
||||||
@ -128,6 +130,31 @@ func parseChainNode(ns string) (nodes []gost.Node, err error) {
|
|||||||
InsecureSkipVerify: !node.GetBool("secure"),
|
InsecureSkipVerify: !node.GetBool("secure"),
|
||||||
RootCAs: rootCAs,
|
RootCAs: rootCAs,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If the argument `ca` is given, but not open `secure`, we verify the
|
||||||
|
// certificate manually.
|
||||||
|
if rootCAs != nil && !node.GetBool("secure") {
|
||||||
|
tlsCfg.VerifyConnection = func(state tls.ConnectionState) error {
|
||||||
|
opts := x509.VerifyOptions{
|
||||||
|
Roots: rootCAs,
|
||||||
|
CurrentTime: time.Now(),
|
||||||
|
DNSName: "",
|
||||||
|
Intermediates: x509.NewCertPool(),
|
||||||
|
}
|
||||||
|
|
||||||
|
certs := state.PeerCertificates
|
||||||
|
for i, cert := range certs {
|
||||||
|
if i == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
opts.Intermediates.AddCert(cert)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = certs[0].Verify(opts)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if cert, err := tls.LoadX509KeyPair(node.Get("cert"), node.Get("key")); err == nil {
|
if cert, err := tls.LoadX509KeyPair(node.Get("cert"), node.Get("key")); err == nil {
|
||||||
tlsCfg.Certificates = []tls.Certificate{cert}
|
tlsCfg.Certificates = []tls.Certificate{cert}
|
||||||
}
|
}
|
||||||
|
5
tls.go
5
tls.go
@ -2,7 +2,6 @@ package gost
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
"crypto/x509"
|
|
||||||
"errors"
|
"errors"
|
||||||
"net"
|
"net"
|
||||||
"sync"
|
"sync"
|
||||||
@ -290,6 +289,9 @@ func wrapTLSClient(conn net.Conn, tlsConfig *tls.Config, timeout time.Duration)
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We can do this in `tls.Config.VerifyConnection`, which effective for
|
||||||
|
// other TLS protocols such as WebSocket. See `route.go:parseChainNode`
|
||||||
|
/*
|
||||||
// If crypto/tls is doing verification, there's no need to do our own.
|
// If crypto/tls is doing verification, there's no need to do our own.
|
||||||
if tlsConfig.InsecureSkipVerify == false {
|
if tlsConfig.InsecureSkipVerify == false {
|
||||||
return tlsConn, nil
|
return tlsConn, nil
|
||||||
@ -320,6 +322,7 @@ func wrapTLSClient(conn net.Conn, tlsConfig *tls.Config, timeout time.Duration)
|
|||||||
tlsConn.Close()
|
tlsConn.Close()
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
return tlsConn, err
|
return tlsConn, err
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user