Open
Conversation
|
E2E Tests 🚀 |
Contributor
There was a problem hiding this comment.
Pull request overview
Updates Positron Server’s RSA license-file handling to prefer activating licenses via license-manager (instead of relying on evaluation periods) so startup “days left” reflects the actual license term.
Changes:
- Switch RSA license-file path from
validateWithManagertoactivateWithManagerduring server startup license handling. - Implement an activation flow in
licenseManager.ts(initialize if needed → activate-file → interpret status/days-left). - Add
license-manager.confassets under Linux activation resources (x86_64 + aarch64).
Reviewed changes
Copilot reviewed 2 out of 8 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| src/vs/server/node/remoteLicenseKey.ts | Routes RSA license files through activation flow instead of verification-only. |
| src/vs/server/node/licenseManager.ts | Adds JSON-command helpers + activation/verification logic and exports activateWithManager. |
| resources/activation/linux/x86_64/license-manager.conf | Adds a license-manager companion config/blob for x86_64. |
| resources/activation/linux/aarch64/license-manager.conf | Adds a license-manager companion config/blob for aarch64. |
Comment on lines
137
to
+159
| /** | ||
| * Validates a license file. | ||
| * | ||
| * @param connectionToken The connection token. | ||
| * @param licenseFile The path to the license file. | ||
| * @returns The license validation result. | ||
| */ | ||
| export async function validateLicenseFile(connectionToken: string, licenseFile: string): Promise<ILicenseValidationResult> { | ||
| if (!fs.existsSync(licenseFile)) { | ||
| console.error('License file does not exist: ', licenseFile); | ||
| return { valid: false }; | ||
| } | ||
| // Read the contents of the license file into a string. | ||
| try { | ||
| const contents = fs.readFileSync(licenseFile, 'utf8'); | ||
| // Check if this looks like a JSON file (trimmed content starts with '{') | ||
| const trimmedContents = contents.trim(); | ||
| if (trimmedContents.startsWith('{')) { | ||
| return validateLicense(connectionToken, contents); | ||
| } else if (trimmedContents.startsWith('-----BEGIN RSTUDIO LICENSE-----')) { | ||
| // This is an RSA license file, let the license manager handle it. | ||
| const installPath = path.join(FileAccess.asFileUri('').fsPath, '..'); | ||
| return await validateWithManager(installPath, licenseFile); | ||
| return await activateWithManager(installPath, licenseFile); |
Comment on lines
+25
to
+29
| /** | ||
| * Grace period in days after license expiration. | ||
| */ | ||
| const GRACE_PERIOD_DAYS = 30; | ||
|
|
Comment on lines
+162
to
+177
| const status = result.status?.toLowerCase() || ''; | ||
| const daysLeft = result['days-left'] ?? 0; | ||
|
|
||
| // Only accept active or evaluation licenses | ||
| if (status !== 'active' && status !== 'evaluation') { | ||
| throw new Error(`Invalid license status: ${output.status}`); | ||
| // Handle expired licenses | ||
| if (status === 'expired') { | ||
| // Check grace period | ||
| if (daysLeft < -GRACE_PERIOD_DAYS) { | ||
| throw new Error('License has expired beyond the grace period. Please renew your license.'); | ||
| } | ||
| console.warn(`License expired but within ${GRACE_PERIOD_DAYS}-day grace period.`); | ||
| } else if (status !== 'activated' && status !== 'evaluation') { | ||
| throw new Error(`Invalid license status: ${status}`); | ||
| } | ||
|
|
||
| // License is valid | ||
| const daysLeftMsg = daysLeft !== undefined ? `Days left: ${daysLeft}` : 'Days left: unknown'; | ||
| console.log(`Successfully validated Positron license (Status: ${output.status}, ${daysLeftMsg})`); | ||
| const daysLeftMsg = daysLeft !== undefined ? `Days left: ${daysLeft}` : ''; | ||
| console.log(`Successfully activated Positron license (Status: ${status}${daysLeftMsg ? ', ' + daysLeftMsg : ''})`); |
Comment on lines
+188
to
+194
| async verifyLicenseFile(licenseFilePath: string): Promise<ILicenseValidationResult> { | ||
| if (!fs.existsSync(licenseFilePath)) { | ||
| throw new Error(`License file not found: ${licenseFilePath}`); | ||
| } | ||
|
|
||
| const result = await this.statusOffline(); | ||
|
|
This file contains hidden or 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
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.
Currently, we are only
verifying if licenses are available and not expired. This has been working since the licenses come with evaluation periods, so they can be used without activation so long as that eval period has not expired. However, what we actually want is to activate the license file, if possible, and not use the eval period.Release Notes
New Features
Bug Fixes
QA Notes
In logs when Positron Server is starting up, you should see a "days left" log that is reflective of days left in the license, not the evaluation period (which is 45 days).