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

Correct identity token encryption by setting the correct security policy for the user token. #2976

Merged
merged 2 commits into from
Jan 30, 2025

Conversation

mrsuciu
Copy link
Contributor

@mrsuciu mrsuciu commented Jan 29, 2025

Correct identity token encryption by setting the correct security policy for the user token in client session UpdateSession.

Proposed changes

Correct identity token encryption by setting the correct security policy for the user token in client session UpdateSession.

Related Issues

  • Fixes #

Types of changes

What types of changes does your code introduce?
Put an x in the boxes that apply. You can also fill these out after creating the PR.

  • Bugfix (non-breaking change which fixes an issue)
  • Enhancement (non-breaking change which adds functionality)
  • Test enhancement (non-breaking change to increase test coverage)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected, requires version increase of Nuget packages)
  • Documentation Update (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • I have read the CONTRIBUTING doc.
  • I have signed the CLA.
  • I ran tests locally with my changes, all passed.
  • I fixed all failing tests in the CI pipelines.
  • I fixed all introduced issues with CodeQL and LGTM.
  • I have added tests that prove my fix is effective or that my feature works and increased code coverage.
  • I have added necessary documentation (if appropriate).
  • Any dependent changes have been merged and published in downstream modules.

Further comments

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...

@mrsuciu mrsuciu requested review from romanett and mregen January 29, 2025 18:43
Copy link

codecov bot commented Jan 29, 2025

Codecov Report

Attention: Patch coverage is 96.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 55.40%. Comparing base (fcc3b74) to head (f6d9f5a).
Report is 2 commits behind head on master.

Files with missing lines Patch % Lines
Libraries/Opc.Ua.Client/Session/Session.cs 95.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2976      +/-   ##
==========================================
- Coverage   55.46%   55.40%   -0.06%     
==========================================
  Files         352      352              
  Lines       67853    67851       -2     
  Branches    13904    13904              
==========================================
- Hits        37634    37593      -41     
- Misses      26100    26130      +30     
- Partials     4119     4128       +9     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@romanett romanett requested a review from marcschier January 29, 2025 19:21
@@ -2654,6 +2654,8 @@ public void UpdateSession(IUserIdentity identity, StringCollection preferredLoca
identityToken.PolicyId = identityPolicy.PolicyId;
userTokenSignature = identityToken.Sign(dataToSign, securityPolicyUri);

m_userTokenSecurityPolicyUri = securityPolicyUri;
Copy link
Contributor

Choose a reason for hiding this comment

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

All other fields are only updated after the activate Session call, not shure if this is the right place to Update?

Copy link
Contributor Author

@mrsuciu mrsuciu Jan 30, 2025

Choose a reason for hiding this comment

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

The m_userTokenSecurityPolicyUri value is used inside the Encrypt method. securityPolicy can be passed directly also and the m_userTokenSecurityPolicyUri be updated after but all places where Encrypt is called call it this way

Copy link
Contributor

Choose a reason for hiding this comment

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

I think whats confusing here is that the same variable is used for different purposes, first for client signature, then user signature, which can have a different Uri. Having a new var for the second use case would make it easier to understand.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, I've separated them

@mrsuciu mrsuciu merged commit cf82847 into OPCFoundation:master Jan 30, 2025
76 of 77 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants