Skip to content

Fixes #32513 - Check certificate serial only when in standalone mode #79

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

Merged
ekohl merged 1 commit into from
May 5, 2021
Merged

Fixes #32513 - Check certificate serial only when in standalone mode #79

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
15 changes: 14 additions & 1 deletion lib/smart_proxy_dynflow_core/api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
require 'sinatra/base'
require 'multi_json'

# rubocop:disable Lint/HandleExceptions
begin
require 'proxy/log'
require 'proxy/helpers'
require 'sinatra/authorization'
rescue LoadError
end
# rubocop:enable Lint/HandleExceptions

module SmartProxyDynflowCore
class Api < ::Sinatra::Base
TASK_UPDATE_REGEXP_PATH = %r{/tasks/(\S+)/(update|done)}
helpers Helpers

include ::Sinatra::Authorization::Helpers if defined?(::Sinatra::Authorization::Helpers)

configure do
if Settings.instance.standalone
::Sinatra::Base.set :logging, false
Expand All @@ -19,8 +30,10 @@ class Api < ::Sinatra::Base
task_id = match[1]
action = match[2]
authorize_with_token(task_id: task_id, clear: action == 'done')
else
elsif Settings.instance.standalone
authorize_with_ssl_client
else
do_authorize_any
end
content_type :json
end
Expand Down