Skip to content
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

fix(api): add a global timeout when checking network requirement #5070

Merged
merged 1 commit into from
Mar 20, 2020
Merged

fix(api): add a global timeout when checking network requirement #5070

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion sdk/requirement.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package sdk

import (
"context"
"net"
"time"
)
Expand Down Expand Up @@ -177,7 +178,11 @@ func (a *Action) Requirement(name string, t string, value string) *Action {

// CheckNetworkAccessRequirement returns true if req.Value can Dial
func CheckNetworkAccessRequirement(req Requirement) bool {
conn, err := net.DialTimeout("tcp", req.Value, 10*time.Second)
d := net.Dialer{Timeout: 10 * time.Second}
ctx, cancel := context.WithTimeout(context.Background(), d.Timeout)
defer cancel()

conn, err := d.DialContext(ctx, "tcp", req.Value)
if err != nil {
return false
}
Expand Down