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

Jump to bottom

Fixes #17239 - Increase scap content validation timeout #227

Merged
merged 1 commit into from
Dec 14, 2016
Merged

Fixes #17239 - Increase scap content validation timeout #227

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/lib/proxy_api/openscap.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ def initialize(args)
@url = args[:url] + '/compliance/'
super args
@connect_params[:headers].merge!(:content_type => :xml)
@connect_params[:timeout] = timeout
end

def fetch_policies_for_scap_content(scap_file)
Expand All @@ -12,6 +13,8 @@ def fetch_policies_for_scap_content(scap_file)

def validate_scap_content(scap_file)
parse(post(scap_file, "scap_content/validator"))
rescue RestClient::RequestTimeout => e
raise ::ProxyAPI::ProxyException.new(url, e, N_("Request timed out. Please try increasing Settings -> proxy_request_timeout"))
end

def policy_html_guide(scap_file, policy)
Expand Down Expand Up @@ -46,5 +49,11 @@ def destroy_report(report, cname)
false
end
end

private

def timeout
Setting[:proxy_request_timeout] && Setting[:proxy_request_timeout] > 120 ? Setting[:proxy_request_timeout] : 120
end
end
end