Skip to content

Fix SSL certificate trust nudge on non-English Windows #2932

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

Merged
bcotrim merged 5 commits into from
Apr 7, 2026
Merged

Fix SSL certificate trust nudge on non-English Windows #2932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6bff89
Fix cert trust check on non-English Windows by using OID instead of l…
bcotrim Mar 27, 2026
173f20d
Merge branch 'trunk' into fix-windows-cert-trust
bcotrim Mar 27, 2026
b304a50
Use non-localized certutil constants for cert trust check on Windows
bcotrim Apr 6, 2026
edccd30
Merge branch 'trunk' into fix-windows-cert-trust
bcotrim Apr 6, 2026
ac81349
Merge branch 'trunk' into fix-windows-cert-trust
bcotrim Apr 7, 2026
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions apps/cli/lib/certificate-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import fs from 'node:fs';
import path from 'node:path';
import { domainToASCII } from 'node:url';
import { promisify } from 'node:util';
import { CERT_UNTRUSTED_ROOT, SERVER_AUTH_OID } from '@studio/common/constants';
import { getCertificatesPath } from '@studio/common/lib/well-known-paths';
import sudo from '@vscode/sudo-prompt';
import { __ } from '@wordpress/i18n';
Expand Down Expand Up @@ -159,15 +160,12 @@ export async function isRootCATrusted(): Promise< boolean > {

if ( process.platform === 'win32' ) {
try {
// Execute certutil with more specific validation
const { stdout } = await execFilePromise( 'certutil', [ '-verify', CA_CERT_PATH ] );

const hasValidPolicies =
stdout.includes( 'Verified Application Policies:' ) &&
stdout.includes( 'Server Authentication' );
const isTrusted = ! stdout.includes( CERT_UNTRUSTED_ROOT );
const hasServerAuthPolicy = stdout.includes( SERVER_AUTH_OID );

// Only consider the certificate trusted if it has the Server Authentication policy.
return hasValidPolicies;
return isTrusted && hasServerAuthPolicy;
} catch ( error ) {
return false;
}
Expand Down
10 changes: 4 additions & 6 deletions apps/studio/src/lib/certificate-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import fs from 'node:fs';
import path from 'node:path';
import { promisify } from 'node:util';
import * as Sentry from '@sentry/electron/main';
import { CERT_UNTRUSTED_ROOT, SERVER_AUTH_OID } from '@studio/common/constants';
import { getCertificatesPath } from '@studio/common/lib/well-known-paths';
import sudo from '@vscode/sudo-prompt';

Expand All @@ -27,15 +28,12 @@ export async function isRootCATrusted(): Promise< boolean > {

if ( process.platform === 'win32' ) {
try {
// Execute certutil with more specific validation
const { stdout } = await execFilePromise( 'certutil', [ '-verify', CA_CERT_PATH ] );

const hasValidPolicies =
stdout.includes( 'Verified Application Policies:' ) &&
stdout.includes( 'Server Authentication' );
const isTrusted = ! stdout.includes( CERT_UNTRUSTED_ROOT );
const hasServerAuthPolicy = stdout.includes( SERVER_AUTH_OID );

// Only consider the certificate trusted if it has the Server Authentication policy.
return hasValidPolicies;
return isTrusted && hasServerAuthPolicy;
} catch ( error ) {
return false;
}
Expand Down
5 changes: 5 additions & 0 deletions tools/common/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ export const PLAYGROUND_CLI_INACTIVITY_TIMEOUT = 2 * 60 * 1000; // 2 minutes of
export const PLAYGROUND_CLI_MAX_TIMEOUT = 10 * 60 * 1000; // 10 minutes absolute maximum
export const PLAYGROUND_CLI_ACTIVITY_CHECK_INTERVAL = 5 * 1000; // Check for inactivity every 5 seconds

// Certificate validation — we use these instead of human-readable labels
// because Windows localizes certutil output on non-English systems.
export const SERVER_AUTH_OID = '1.3.6.1.5.5.7.3.1'; // RFC 5280 §4.2.1.12 (id-kp-serverAuth)
export const CERT_UNTRUSTED_ROOT = 'CERT_TRUST_IS_UNTRUSTED_ROOT'; // Windows API constant

// Custom domains
export const DEFAULT_CUSTOM_DOMAIN_SUFFIX = '.wp.local';

Expand Down
Loading