增加 ssl 验证开关
diff --git a/webservice.go b/webservice.go
index ec8ff4c..3857002 100644
--- a/webservice.go
+++ b/webservice.go
@@ -19,12 +19,6 @@
"time"
)
-func dailTimeout(network, addr string) (net.Conn, error) {
- // default_timeout := time.Duration(theSession.DefaultTimeout) * time.Second
- default_timeout := time.Duration(3) * time.Second
- return net.DialTimeout(network, addr, default_timeout)
-}
-
type WebSession struct {
AppId string
TermId string
@@ -32,6 +26,7 @@
BaseUrl string
DefaultTimeout int
session_key string
+ ssl_verify bool
}
func safe_get_json_int(value interface{}) int {
@@ -123,7 +118,13 @@
func (w *WebSession) NewClient(timeout int) *http.Client {
var transport http.Transport
if strings.HasPrefix(w.BaseUrl, "https://") {
- transport = http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+ var b bool
+ if w.ssl_verify {
+ b = false
+ } else {
+ b = true
+ }
+ transport = http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: b},
TLSHandshakeTimeout: time.Duration(timeout) * time.Second}
} else if strings.HasPrefix(w.BaseUrl, "http://") {
transport = http.Transport{Dial: func(network, addr string) (net.Conn, error) {
@@ -169,14 +170,14 @@
return nil
}
-func NewSession(appid, appsecret, termid, baseurl string, timeout int) *WebSession {
+func NewSession(appid, appsecret, termid, baseurl string, timeout int, sslVerify bool) *WebSession {
return &WebSession{
AppId: appid,
Appsecret: appsecret,
TermId: termid,
BaseUrl: baseurl,
DefaultTimeout: timeout,
- }
+ ssl_verify: sslVerify}
}
func (w *WebSession) getAuthToken() (string, error) {