Skip to content

Commit

Permalink
修复报错tls: CurvePreferences includes unsupported curve
Browse files Browse the repository at this point in the history
  • Loading branch information
@wangluozhe
wangluozhe committed May 16, 2022
1 parent 859f7e5 commit 1fbf028
Show file tree
Hide file tree
Showing 10 changed files with 234 additions and 225 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ go get github.com/wangluozhe/requests
## 下载指定版本

```bash
go get github.com/wangluozhe/[email protected].1
go get github.com/wangluozhe/[email protected].2
```


Expand Down
60 changes: 30 additions & 30 deletions models/PrepareRequest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,43 +42,43 @@ type PrepareRequest struct {
}

// 预处理所有数据
func (this *PrepareRequest) Prepare(method, url string, params *url.Params, headers *http.Header, cookies *cookiejar.Jar, data *url.Values, files *url.Files, json map[string]interface{}, auth []string) error {
err := this.Prepare_method(method)
func (pr *PrepareRequest) Prepare(method, url string, params *url.Params, headers *http.Header, cookies *cookiejar.Jar, data *url.Values, files *url.Files, json map[string]interface{}, auth []string) error {
err := pr.Prepare_method(method)
if err != nil {
return err
}
err = this.Prepare_url(url, params)
err = pr.Prepare_url(url, params)
if err != nil {
return err
}
err = this.Prepare_headers(headers)
err = pr.Prepare_headers(headers)
if err != nil {
return err
}
this.Prepare_cookies(cookies)
err = this.Prepare_body(data, files, json)
pr.Prepare_cookies(cookies)
err = pr.Prepare_body(data, files, json)
if err != nil {
return err
}
err = this.Prepare_auth(auth, url)
err = pr.Prepare_auth(auth, url)
if err != nil {
return err
}
return nil
}

// 预处理method
func (this *PrepareRequest) Prepare_method(method string) error {
func (pr *PrepareRequest) Prepare_method(method string) error {
method = strings.ToUpper(method)
if !inMethod(method) {
return errors.New("Method does not conform to HTTP protocol!")
}
this.Method = method
pr.Method = method
return nil
}

// 预处理url
func (this *PrepareRequest) Prepare_url(rawurl string, params *url.Params) error {
func (pr *PrepareRequest) Prepare_url(rawurl string, params *url.Params) error {
rawurl = strings.TrimSpace(rawurl)
urls, err := url.Parse(rawurl)
if err != nil {
Expand All @@ -99,23 +99,23 @@ func (this *PrepareRequest) Prepare_url(rawurl string, params *url.Params) error
urls.Params = url.ParseParams(params.Encode())
}
}
this.Url = urls.String()
pr.Url = urls.String()
return nil
}

// 预处理headers
func (this *PrepareRequest) Prepare_headers(headers *http.Header) error {
this.Headers = url.NewHeaders()
func (pr *PrepareRequest) Prepare_headers(headers *http.Header) error {
pr.Headers = url.NewHeaders()
if headers != nil {
for key, values := range *headers {
if len(values) == 1 {
this.Headers.Set(key, values[0])
pr.Headers.Set(key, values[0])
} else {
for index, value := range values {
if index == 0 {
this.Headers.Set(key, value)
pr.Headers.Set(key, value)
} else {
this.Headers.Add(key, value)
pr.Headers.Add(key, value)
}
}
}
Expand All @@ -125,7 +125,7 @@ func (this *PrepareRequest) Prepare_headers(headers *http.Header) error {
}

// 预处理body
func (this *PrepareRequest) Prepare_body(data *url.Values, files *url.Files, json map[string]interface{}) error {
func (pr *PrepareRequest) Prepare_body(data *url.Values, files *url.Files, json map[string]interface{}) error {
var body string
var content_type string
var err error
Expand Down Expand Up @@ -157,37 +157,37 @@ func (this *PrepareRequest) Prepare_body(data *url.Values, files *url.Files, jso
content_type = "application/x-www-form-urlencoded"
body = data.Encode()
}
this.prepare_content_length(body)
if content_type != "" && this.Headers.Get("Content-Type") == "" {
this.Headers.Set("Content-Type", content_type)
pr.prepare_content_length(body)
if content_type != "" && pr.Headers.Get("Content-Type") == "" {
pr.Headers.Set("Content-Type", content_type)
}
this.Body = ioutil.NopCloser(strings.NewReader(body))
pr.Body = ioutil.NopCloser(strings.NewReader(body))
return nil
}

// 预处理body大小
func (this *PrepareRequest) prepare_content_length(body string) {
func (pr *PrepareRequest) prepare_content_length(body string) {
if body != "" {
length := len(body)
if length > 0 {
this.Headers.Set("Content-Length", strconv.Itoa(length))
pr.Headers.Set("Content-Length", strconv.Itoa(length))
}
} else if (this.Method != "GET" || this.Method != "HEAD") && this.Headers.Get("Content-Length") == "" {
this.Headers.Set("Content-Length", "0")
} else if (pr.Method != "GET" || pr.Method != "HEAD") && pr.Headers.Get("Content-Length") == "" {
pr.Headers.Set("Content-Length", "0")
}
}

// 预处理cookie
func (this *PrepareRequest) Prepare_cookies(cookies *cookiejar.Jar) {
func (pr *PrepareRequest) Prepare_cookies(cookies *cookiejar.Jar) {
if cookies != nil {
this.Cookies = cookies
pr.Cookies = cookies
} else {
this.Cookies, _ = cookiejar.New(nil)
pr.Cookies, _ = cookiejar.New(nil)
}
}

// 预处理auth
func (this *PrepareRequest) Prepare_auth(auth []string, rawurl string) error {
func (pr *PrepareRequest) Prepare_auth(auth []string, rawurl string) error {
if auth == nil {
urls, err := url.Parse(rawurl)
if err != nil {
Expand All @@ -203,7 +203,7 @@ func (this *PrepareRequest) Prepare_auth(auth []string, rawurl string) error {
}
}
if auth != nil && len(auth) == 2 {
this.Headers.Set("Authorization", "Basic " + base64.StdEncoding.EncodeToString([]byte(strings.Join(auth, ":"))))
pr.Headers.Set("Authorization", "Basic " + base64.StdEncoding.EncodeToString([]byte(strings.Join(auth, ":"))))
}
return nil
}
20 changes: 10 additions & 10 deletions models/Request.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ type Request struct {
Auth []string
}

func (this *Request) Prepare() *PrepareRequest {
func (req *Request) Prepare() *PrepareRequest {
p := &PrepareRequest{}
p.Prepare(
this.Method,
this.Url,
this.Params,
this.Headers,
this.Cookies,
this.Data,
this.Files,
this.Json,
this.Auth,
req.Method,
req.Url,
req.Params,
req.Headers,
req.Cookies,
req.Data,
req.Files,
req.Json,
req.Auth,
)
return p
}
18 changes: 9 additions & 9 deletions models/Response.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@ type Response struct {
}

// 使用自带库JSON解析
func (this *Response) Json() (map[string]interface{}, error) {
func (res *Response) Json() (map[string]interface{}, error) {
js := make(map[string]interface{})
err := json.Unmarshal(this.Content, &js)
err := json.Unmarshal(res.Content, &js)
return js, err
}

// 使用go-simplejson解析
func (this *Response) SimpleJson() (*simplejson.Json, error) {
return simplejson.NewFromReader(this.Body)
func (res *Response) SimpleJson() (*simplejson.Json, error) {
return simplejson.NewFromReader(res.Body)
}

// 状态码是否错误
func (this *Response) RaiseForStatus() error {
func (res *Response) RaiseForStatus() error {
var err error
if this.StatusCode >= 400 && this.StatusCode < 500 {
err = errors.New(fmt.Sprintf("%d Client Error", this.StatusCode))
} else if this.StatusCode >= 500 && this.StatusCode < 600 {
err = errors.New(fmt.Sprintf("%d Server Error", this.StatusCode))
if res.StatusCode >= 400 && res.StatusCode < 500 {
err = errors.New(fmt.Sprintf("%d Client Error", res.StatusCode))
} else if res.StatusCode >= 500 && res.StatusCode < 600 {
err = errors.New(fmt.Sprintf("%d Server Error", res.StatusCode))
}
return err
}
Loading

0 comments on commit 1fbf028

Please sign in to comment.