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

GUACAMOLE-1881: Add parameter token containing the domain of LDAP/AD usernames. #987

Merged
merged 4 commits into from
Aug 18, 2024

Conversation

mike-jumper
Copy link
Contributor

This change is intended to supersede the changes proposed by poor @josnabattula via PR #931 that I have been very slow to review. It builds off the original commit (27bbd35) by:

  • Removing unnecessary use of TokenName.canonicalize() (there's no need to dynamically derive the token name of a static value).
  • Decoupling the concept of extracting the domain from the concept of using that domain to create a token (getDomainToken() renamed and redocumented as getUserDomain()).
  • Removing unnecessary recompilation of the domain extraction Pattern (there's no need to repeatedly recompile the regex each time a user logs in - it never changes).

@josnabattula
Copy link

@mike-jumper Can we get these changes into next release, its been months since I have raise pull request.

@josnabattula
Copy link

@mike-jumper any plans to look into this pull request? it's been more than 6 months.

@mike-jumper
Copy link
Contributor Author

@josnabattula Are you able to see Nick's comments above?

@josnabattula
Copy link

josnabattula commented Jul 29, 2024

@josnabattula Are you able to see Nick's comments above?

I can see. But those comments are on your branch you have refactored after my commit cheery-picked. I am thinking you are going to resolve it.

@mike-jumper
Copy link
Contributor Author

Oof, right - that was silly of me. Sorry about that, @josnabattula.

@mike-jumper mike-jumper changed the base branch from main to staging/1.6.0 July 31, 2024 21:37
@josnabattula
Copy link

@necouchman Could you review again? All review comments are resolved now. thanks.

@necouchman necouchman merged commit fedda30 into apache:staging/1.6.0 Aug 18, 2024
1 check passed
@mike-jumper mike-jumper deleted the ldap-domain-token branch August 19, 2024 21:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants