Skip to content

SAML: replace first number with random alphabet if request ID starts with a number #6165

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
Merged
merged 1 commit into from
Mar 30, 2022
Merged

SAML: replace first number with random alphabet if request ID starts with a number #6165

merged 1 commit into from
Mar 30, 2022

Conversation

weizhouapache
Copy link
Member

Description

This PR fixes #5548

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

@weizhouapache weizhouapache added this to the 4.17.0.0 milestone Mar 25, 2022
@weizhouapache weizhouapache linked an issue Mar 25, 2022 that may be closed by this pull request
SAML2 authentication with MS Azure AD intermittently fails with error AADSTS7500529 #5548
Closed
@nvazquez
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

@nvazquez a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

rohityadavcloud
rohityadavcloud reviewed Mar 25, 2022
View reviewed changes
plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLUtils.java
public class SAMLUtils {
public static final Logger s_logger = Logger.getLogger(SAMLUtils.class);

static final String charset = "abcdefghijklmnopqrstuvwxyz";
Copy link
Member

Choose a reason for hiding this comment

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

should we also have A-Z (i.e. a-z in upper case too) @weizhouapache ?

Copy link
Member Author

Choose a reason for hiding this comment

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

@rohityadavcloud
I have checked hundreds of request IDs, all are composed by digits (0 to 9) or lower case alphabet (a to z).

@blueorangutan
Copy link

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 2986

@nvazquez
Copy link
Contributor

@blueorangutan test

@blueorangutan
Copy link

@nvazquez a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan
Copy link

Trillian test result (tid-3727)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35587 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6165-t3727-kvm-centos7.zip
Smoke tests completed. 77 look OK, 2 have errors
Only failed tests results shown below:

Test Result Time (s) Test File
test_01_add_primary_storage_disabled_host Error 0.75 test_primary_storage.py
test_01_primary_storage_nfs Error 0.13 test_primary_storage.py
ContextSuite context=TestStorageTags>:setup Error 0.22 test_primary_storage.py
test_03_deploy_and_scale_kubernetes_cluster Failure 32.09 test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster Failure 51.34 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Failure 31.99 test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster Failure 0.04 test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown Error 76.89 test_kubernetes_clusters.py

@weizhouapache
Copy link
Member Author

@blueorangutan test

@weizhouapache weizhouapache marked this pull request as ready for review March 29, 2022 08:09
@rohityadavcloud
Copy link
Member

@blueorangutan test

@blueorangutan
Copy link

@rohityadavcloud a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan
Copy link

Trillian test result (tid-3750)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 31981 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6165-t3750-kvm-centos7.zip
Smoke tests completed. 92 look OK, 0 have errors
Only failed tests results shown below:

Test Result Time (s) Test File

nvazquez
nvazquez approved these changes Mar 30, 2022
View reviewed changes
Copy link
Contributor

@nvazquez nvazquez left a comment

Choose a reason for hiding this comment

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

LGTM

@nvazquez nvazquez merged commit ee27708 into apache:4.16 Mar 30, 2022
@kohrar
Copy link
Contributor

kohrar commented Mar 30, 2022

That looks great. Thank-you for implementing the fix, @weizhouapache.

rohityadavcloud pushed a commit to shapeblue/cloudstack that referenced this pull request May 18, 2022
@weizhouapache @rohityadavcloud
SAML: replace first number with random alphabet if request ID starts …
7eb14b5 
…with a number (apache#6165)

(cherry picked from commit ee27708)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
@weizhouapache weizhouapache deleted the 4.16-fix-saml-request-id branch December 9, 2022 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rohityadavcloud rohityadavcloud rohityadavcloud approved these changes

@nvazquez nvazquez nvazquez approved these changes

@Pearl1594 Pearl1594 Awaiting requested review from Pearl1594

Assignees
No one assigned
Labels
component:saml type:bug
Projects
No open projects
Apache CloudStack 4.17.0
Status: Done
Milestone
4.17.0.0
Development

Successfully merging this pull request may close these issues.

SAML2 authentication with MS Azure AD intermittently fails with error AADSTS7500529
5 participants
@weizhouapache @nvazquez @blueorangutan @rohityadavcloud @kohrar