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.

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

[entraid] store entra appId in plugin settings #48754

Merged
merged 2 commits into from
Nov 12, 2024

Conversation

tigrato
Copy link
Contributor

@tigrato tigrato commented Nov 11, 2024

This PR stores the Entra ID appID of the application used for SSO in Entra ID plugin settings. This field filled in a best effort scenario and might be empty for old Entra Plugins. Newly created plugins will make the field mandatory.

@tigrato tigrato added no-changelog Indicates that a PR does not require a changelog entry backport/branch/v16 backport/branch/v17 labels Nov 11, 2024
@github-actions github-actions bot added size/sm tctl tctl - Teleport admin tool labels Nov 11, 2024
Copy link

This pull request is automatically being deployed by Amplify Hosting (learn more).

Access this pull request here: https://pr-48754.d3pp5qlev8mo18.amplifyapp.com

This PR stores the Entra ID appID of the application used for SSO in Entra ID plugin settings.
This field filled in a best effort scenario and might be empty for old Entra Plugins.
Newly created plugins will make the field mandatory.

Signed-off-by: Tiago Silva <[email protected]>
@tigrato tigrato force-pushed the tigrato/entra-id-expose-appid branch from fe49e4b to d29aeed Compare November 11, 2024 17:12
Copy link
Contributor

@codingllama codingllama left a comment

Choose a reason for hiding this comment

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

Looks good.

// app_id refers to the Azure Application ID that supports the SSO for "sso_connector_id".
// This field is populated on a best-effort basis for legacy plugins but mandatory for plugins created after its introduction.
// For existing plugins, it is filled in using the entity descriptor url when utilized.
string app_id = 5;
Copy link
Contributor

Choose a reason for hiding this comment

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

WDYT about azure_app_id ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

renamed to entra_app_id

lib/msgraph/models.go Show resolved Hide resolved
api/proto/teleport/legacy/types/types.proto Outdated Show resolved Hide resolved
Comment on lines +105 to +108
Essential *bool `json:"essential,omitempty"`
Name *string `json:"name,omitempty"`
Source *string `json:"source,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: Godoc would be helpful here to understand what kind of data/value are we expecting for each field. For example, what could be the possible value for Source?

@tigrato tigrato force-pushed the tigrato/entra-id-expose-appid branch from 4fc0fa9 to 5a0f3dd Compare November 12, 2024 09:42
@tigrato tigrato enabled auto-merge November 12, 2024 09:42
@tigrato tigrato added this pull request to the merge queue Nov 12, 2024
Merged via the queue into master with commit 0ebaf18 Nov 12, 2024
43 checks passed
@tigrato tigrato deleted the tigrato/entra-id-expose-appid branch November 12, 2024 10:19
@public-teleport-github-review-bot

@tigrato See the table below for backport results.

Branch Result
branch/v16 Failed
branch/v17 Failed

@public-teleport-github-review-bot

@tigrato See the table below for backport results.

Branch Result
branch/v16 Failed
branch/v17 Failed

@public-teleport-github-review-bot

@tigrato See the table below for backport results.

Branch Result
branch/v16 Failed
branch/v17 Create PR

tigrato added a commit that referenced this pull request Nov 12, 2024
* [entraid] store entra `appId` in plugin settings

This PR stores the Entra ID appID of the application used for SSO in Entra ID plugin settings.
This field filled in a best effort scenario and might be empty for old Entra Plugins.
Newly created plugins will make the field mandatory.

Signed-off-by: Tiago Silva <[email protected]>

* handle code review comments

---------

Signed-off-by: Tiago Silva <[email protected]>
github-merge-queue bot pushed a commit that referenced this pull request Nov 12, 2024
* [entraid] store entra `appId` in plugin settings

This PR stores the Entra ID appID of the application used for SSO in Entra ID plugin settings.
This field filled in a best effort scenario and might be empty for old Entra Plugins.
Newly created plugins will make the field mandatory.



* handle code review comments

---------

Signed-off-by: Tiago Silva <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/branch/v16 backport/branch/v17 no-changelog Indicates that a PR does not require a changelog entry size/sm tctl tctl - Teleport admin tool
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants