Fix the new license flow #43
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zmb3
force-pushed
the
zmb3/fix-newlicense-flow
branch
4 times, most recently
from
8f382cf
to
a2274ea
Compare
zmb3
force-pushed
the
zmb3/enhance-license-parsing
branch
from
b87a883
to
b14690c
Compare
zmb3
force-pushed
the
zmb3/fix-newlicense-flow
branch
3 times, most recently
from
de2196f
to
42efb5f
Compare
espadolini
reviewed
Oct 17, 2024
src/core/license.rs
Outdated
| return Err(Error::RdpError(RdpError::new( | ||
| RdpErrorKind::InvalidData, | ||
| "SEC: Invalid Licence packet", | ||
| format!("SEC: Invalid Licence packet (flag={:x})", security_flag).as_str(), |
There was a problem hiding this comment.
Suggested change
| format!("SEC: Invalid Licence packet (flag={:x})", security_flag).as_str(), | |
| &format!("SEC: Invalid Licence packet (flag={security_flag:x})"), |
| /// ServerNewLicense message. | ||
| /// | ||
| /// See MS-RDPELE section 2.2.2.6. | ||
| type ServerUpgradeLicense = ServerNewLicense; | ||
|
|
||
| /// License data that has been obtained from the sever | ||
| #[allow(dead_code)] |
There was a problem hiding this comment.
Suggested change
| #[allow(dead_code)] |
| ]; | ||
|
|
||
| message.read(raw)?; | ||
| let server_random = cast!(DataType::Slice, message["ServerRandom"])?; | ||
| let version = cast!(DataType::U32, message["dwVersion"])?; | ||
| let server_certificate = cast!(DataType::Component, message["ServerCertificate"])?; | ||
| let mut blob_data = cast!(DataType::Slice, server_certificate["blobData"])?; | ||
| let scope_count = cast!(DataType::U32, message["ScopeCount"])?; | ||
|
|
||
| let mut scopes = Vec::with_capacity(scope_count as usize); |
There was a problem hiding this comment.
Where is that ScopeCount coming from? Is it trustworthy?
There was a problem hiding this comment.
It's coming from the Windows server that is requesting a license from us.
I've never seen anything other than 1, but I don't have a very sophisticated setup. Maybe we should put some reasonable maximum (100?) here to avoid unbounded allocations?
(Now that you point this out, the with_capacity doesn't do much because thats the number of scopes, not any sort of byte-length).
probakowski
approved these changes
Oct 18, 2024
zmb3
force-pushed
the
zmb3/fix-newlicense-flow
branch
from
42efb5f
to
06379dd
Compare
Fixes several bugs with the new license flow and allows us to successfully obtain a license. Additionally, use a client-provided UUID to identify the client instead of using the Windows domain (which isn't unique per-agent).
zmb3
force-pushed
the
zmb3/fix-newlicense-flow
branch
from
06379dd
to
b5dc810
Compare
zmb3
force-pushed
the
zmb3/fix-newlicense-flow
branch
from
cd3ca30
to
bf453b1
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes several bugs with the new license flow and allows us to successfully obtain a license. The next step will be to add hooks to save this license so that we can reuse it for the upgrade license flow on subsequent attempts.
Additionally, uses a client-provided UUID to identify itself to the RDP server for licensing purposes (we were previously using the Windows domain, which would cause all Teleport RDP clients to appear identical to the server).