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

Move OIDC Provider list to be publicly accessible #2625

Merged
merged 1 commit into from
Aug 8, 2022
Merged

Move OIDC Provider list to be publicly accessible #2625

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [1.18.1] - 2022-08-01

### Changed
- Migrates OIDC Provider list to be accessable via an unauthentated
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lists should be surrounded by blank lines

endpoint. This is not a concern as logins using this endpoint already
display the redirect endpoint on the login page.
[cyberark/conjur#2625](https://github.com/cyberark/conjur/pull/2625)

## [1.18.0] - 2022-08-01

### Added
Expand Down
14 changes: 2 additions & 12 deletions app/controllers/providers_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# frozen_string_literal: true

class ProvidersController < RestController
include FindResource
include AssumedRole
include CurrentUser

class ProvidersController < ApplicationController
def index
namespace = Authentication::Util::NamespaceSelector.select(
authenticator_type: params[:authenticator]
Expand All @@ -16,14 +12,8 @@ def index
).find_all(
account: params[:account],
type: params[:authenticator]
).select { |authenticator| role&.allowed_to?(:read, ::Resource[authenticator.resource_id]) }
)
)
)
end

# The v5 API currently sends +acting_as+ when listing resources
# for a role other than the current user.
def role
assumed_role(params[:role].presence) || assumed_role(params[:acting_as].presence)
end
end
1 change: 1 addition & 0 deletions config/initializers/rack_middleware.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
%r{^/public_keys/}
],
except: [
%r{^/authn-oidc/.*/providers},
%r{^/authn-[^/]+/.*/authenticate$},
%r{^/authn/.*/authenticate$},
%r{^/host_factories/hosts$},
Expand Down
8 changes: 1 addition & 7 deletions cucumber/authenticators_oidc/features/list_authenticators.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,4 @@ Feature: A user can view the various authenticators they can use.
Then I can add a secret to variable resource "conjur/authn-oidc/okta/state"
When I log in as user "admin"
Then the list of authenticators contains the service-id "oidceast"
Then the list of authenticators contains the service-id "okta"
When I log in as user "alice"
Then the list of authenticators contains the service-id "oidceast"
Then the list of authenticators does not contain the service-id "okta"
When I log in as user "bob"
Then the list of authenticators does not contain the service-id "oidceast"
Then the list of authenticators does not contain the service-id "okta"
Then the list of authenticators contains the service-id "okta"
2 changes: 1 addition & 1 deletion cucumber/policy/features/support/client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def fetch_roles(kind:, id:)
end

def fetch_authenticators
resource(uri('authn-oidc', 'providers')).get(auth_header)
resource(uri('authn-oidc', 'providers')).get
end

def fetch_public_keys(username:)
Expand Down