Add support for storing RDP licenses from Windows Desktops #51250
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
probakowski
requested review from
klizhentas,
russjones,
r0mant,
fheinecke,
camscale,
tcsc,
rosstimothy and
codingllama
as code owners
probakowski
force-pushed
the
probakowski/license
branch
from
1341a7a to
75379f9
Compare
zmb3
approved these changes
Jan 20, 2025
codingllama
reviewed
Jan 22, 2025
| item := backend.Item{ | ||
| Key: p.rdpLicenseKey(version, issuer, company, productID), | ||
| Value: license, | ||
| Expires: p.BackendStorage.Clock().Now().Add(28 * 24 * time.Hour), |
There was a problem hiding this comment.
Any particular reason behind the 28d expiration? Maybe add a comment?
rosstimothy
reviewed
Jan 22, 2025
codingllama
reviewed
Jan 22, 2025
|
Looks good, just waiting for a resolution on #51250 (comment). |
Co-authored-by: Alan Parra <[email protected]>
codingllama
approved these changes
Jan 23, 2025
public-teleport-github-review-bot
bot
removed request for
bl-nero and
nklaassen
rosstimothy
reviewed
Jan 23, 2025
| @@ -543,3 +543,11 @@ func checkNameAndScreenSize(name string, screenSize *Resolution) error { | |||
| } | |||
| return nil | |||
| } | |||
|
|
|||
| // RDPLicenseKey is struct for retrieving licenses from backend cache, used only internally | |||
There was a problem hiding this comment.
If this type is only used internally then it probably shouldn't exist in the api module.
codingllama
reviewed
Jan 23, 2025
|
|
||
| // WriteRDPLicense writes an RDP license to local storage. | ||
| func (p *ProcessStorage) WriteRDPLicense(ctx context.Context, key *types.RDPLicenseKey, license []byte) error { | ||
| value, err := json.Marshal(rdpLicense{Data: license}) |
There was a problem hiding this comment.
If you are still working here it's worth checking if key is nil, both in this method and the Read.
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
|
@probakowski See the table below for backport results.
|
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.
Windows desktop can send license during initial exchange, the client should store it and send it again during future connections. We have this already implemented in v14 in rdp-rs, this change adds it to the newer versions using recent changes in IronRDP (Devolutions/IronRDP#634).
Storing and retrieving licenses on the Go side inspired by #47634
changelog: Add support for storing RDP licenses from Windows Desktops