mirror of
https://github.com/compiler-explorer/compiler-explorer.git
synced 2026-09-11 02:09:40 -04:00
Reapplies #8755, which was reverted in 463e3e70f after it broke the
staging deploy:
```
error: Top-level error (shutting down): Missing branding assets for extraBodyClass='staging'
in /infra/.deploy/static: favicon-staging.ico, site-logo-staging.svg
```
### What went wrong
`validateBrandingAssets` checked `staticPath` on the local filesystem.
That's correct for dev and local prod runs, but AWS deploys ship **two**
packages (`build-dist.sh`): the node app tarball (no `static/` at all)
and the static bundle, which goes to the CDN
(`staticUrl=https://static.ce-cdn.net/`). Production nodes never have
the branding files on disk, so any env with `extraBodyClass` set
(staging, beta, win\*) died at startup. Prod itself has an empty
`extraBodyClass`, which is why the check short-circuited there and the
bug only surfaced on the staging deploy.
### The fix (second commit)
The webpack manifest **does** ship with the node app, and lists every
asset copied from `public/` into the static bundle. So in production,
validate the derived `favicon-<class>.ico` / `site-logo-<class>.svg`
names against **manifest keys** instead of the filesystem; dev keeps the
on-disk check against `public/`. This preserves the fail-fast-on-typo
behaviour #8755 wanted, checking the thing that actually describes what
shipped to the CDN. If the manifest can't be loaded we're already on the
existing warn-and-fall-back handler, so validation is skipped rather
than fatal.
`setupStaticMiddleware` now takes the parsed manifest (loaded once in
`setupWebServer` via new `loadStaticManifest`) instead of reading it
itself.
### Verification
- Fresh **production** webpack build: all six env asset pairs (dev,
beta, staging, winprod, winstaging, wintest) appear as plain-name keys
in `manifest.json` (the win\* symlink placeholders are dereferenced on
copy).
- Booted the built `out/dist` server code in the exact deploy layout
(`staticUrl` set, nonexistent `staticPath`, `extraBodyClass=staging`):
boots cleanly and renders `favicon-staging.ico` +
`site-logo-staging.svg`; a mistyped class still fails startup with a
clear error.
- New regression tests pin both behaviours at the `setupWebServer` level
with a shipped-manifest-only layout.
⚠️ Merge timing: prod's empty `extraBodyClass` never exercises this path
— the real test is the next **staging** deploy, so this should merge
when someone (me) is ready to deploy staging and watch it.
cc @partouf — sorry again for the breakage; this validates against the
manifest rather than expecting the CDN bundle's files on local disk.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
---------
Co-authored-by: mattgodbolt-molty <mattgodbolt-molty@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
170 lines
6.3 KiB
TypeScript
170 lines
6.3 KiB
TypeScript
// Copyright (c) 2025, Compiler Explorer Authors
|
|
// All rights reserved.
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without
|
|
// modification, are permitted provided that the following conditions are met:
|
|
//
|
|
// * Redistributions of source code must retain the above copyright notice,
|
|
// this list of conditions and the following disclaimer.
|
|
// * Redistributions in binary form must reproduce the above copyright
|
|
// notice, this list of conditions and the following disclaimer in the
|
|
// documentation and/or other materials provided with the distribution.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
|
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
// POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
import express, {Request, Response} from 'express';
|
|
import _ from 'underscore';
|
|
|
|
import type {Options as FrontendOptions} from '../../static/options.interfaces.js';
|
|
import * as normalizer from '../clientstate-normalizer.js';
|
|
import {GoldenLayoutRootStruct} from '../clientstate-normalizer.js';
|
|
import type {ShortLinkMetaData} from '../handlers/handler.interfaces.js';
|
|
import type {ClientOptionsType} from '../options-handler.js';
|
|
import * as utils from '../utils.js';
|
|
import {
|
|
PugRequireHandler,
|
|
RenderConfig,
|
|
RenderConfigFunction,
|
|
RenderGoldenLayoutHandler,
|
|
ServerDependencies,
|
|
ServerOptions,
|
|
} from './server.interfaces.js';
|
|
import {getFaviconFilename, getLogoOverlayFilename} from './static-assets.js';
|
|
import {isMobileViewer} from './url-handlers.js';
|
|
|
|
// Heavy fields (compilers, libs, tools, ...) are absent on purpose — they are lazy-loaded.
|
|
const FRONTEND_INLINE_OPTION_KEYS = [
|
|
'sharingEnabled',
|
|
'urlShortenService',
|
|
'supportsExecute',
|
|
'supportsLibraryCodeFilter',
|
|
'sentryDsn',
|
|
'sentryEnvironment',
|
|
'release',
|
|
'gitReleaseCommit',
|
|
'cookieDomainRe',
|
|
'localStoragePrefix',
|
|
'cvCompilerCountMax',
|
|
'defaultFontScale',
|
|
'doCache',
|
|
'thirdPartyIntegrationEnabled',
|
|
'statusTrackingEnabled',
|
|
'compilerVersionsUrl',
|
|
'policies',
|
|
'motdUrl',
|
|
'pageloadUrl',
|
|
'explainApiEndpoint',
|
|
] as const satisfies readonly (keyof ClientOptionsType & keyof FrontendOptions)[];
|
|
|
|
export function createRenderHandlers(
|
|
pugRequireHandler: PugRequireHandler,
|
|
options: ServerOptions,
|
|
dependencies: ServerDependencies,
|
|
): {
|
|
renderConfig: RenderConfigFunction;
|
|
renderGoldenLayout: RenderGoldenLayoutHandler;
|
|
embeddedHandler: express.Handler;
|
|
} {
|
|
const {clientOptionsHandler, storageSolution, sponsorConfig} = dependencies;
|
|
const {httpRoot, staticRoot, extraBodyClass} = options;
|
|
|
|
/**
|
|
* Renders configuration for templates
|
|
*/
|
|
const renderConfig: RenderConfigFunction = (
|
|
extra: Record<string, any>,
|
|
urlOptions?: Record<string, any>,
|
|
): RenderConfig => {
|
|
const urlOptionsAllowed = ['readOnly', 'hideEditorToolbars', 'language'];
|
|
const filteredUrlOptions = _.mapObject(_.pick(urlOptions || {}, urlOptionsAllowed), val =>
|
|
utils.toProperty(val),
|
|
);
|
|
const allExtraOptions = _.extend({}, filteredUrlOptions, extra);
|
|
|
|
if (allExtraOptions.mobileViewer && allExtraOptions.config) {
|
|
const clnormalizer = new normalizer.ClientStateNormalizer();
|
|
clnormalizer.fromGoldenLayout(allExtraOptions.config);
|
|
const clientstate = clnormalizer.normalized;
|
|
|
|
const glnormalizer = new normalizer.ClientStateGoldenifier();
|
|
allExtraOptions.slides = glnormalizer.generatePresentationModeMobileViewerSlides(clientstate);
|
|
}
|
|
|
|
const all = clientOptionsHandler.get();
|
|
const options: RenderConfig = _.extend({}, allExtraOptions, all);
|
|
options.optionsHash = clientOptionsHandler.getHash();
|
|
const inlinedClientOptions: Partial<ClientOptionsType> = {};
|
|
for (const k of FRONTEND_INLINE_OPTION_KEYS) {
|
|
(inlinedClientOptions as any)[k] = all[k];
|
|
}
|
|
options.compilerExplorerOptions = JSON.stringify({...inlinedClientOptions, ...allExtraOptions});
|
|
options.extraBodyClass = options.embedded ? 'embedded' : extraBodyClass;
|
|
options.httpRoot = httpRoot;
|
|
options.staticRoot = staticRoot;
|
|
options.storageSolution = options.storageSolution || storageSolution;
|
|
options.require = pugRequireHandler;
|
|
options.sponsors = sponsorConfig;
|
|
options.faviconFilename = getFaviconFilename(extraBodyClass);
|
|
options.logoOverlayFilename = getLogoOverlayFilename(extraBodyClass);
|
|
return options;
|
|
};
|
|
|
|
/**
|
|
* Renders GoldenLayout for a given configuration
|
|
*/
|
|
const renderGoldenLayout = (
|
|
config: GoldenLayoutRootStruct,
|
|
metadata: ShortLinkMetaData,
|
|
req: Request,
|
|
res: Response,
|
|
) => {
|
|
const embedded = req.query.embedded === 'true';
|
|
|
|
res.render(
|
|
embedded ? 'embed' : 'index',
|
|
renderConfig(
|
|
{
|
|
embedded: embedded,
|
|
mobileViewer: isMobileViewer(req),
|
|
config: config,
|
|
metadata: metadata,
|
|
storedStateId: req.params.id || false,
|
|
},
|
|
req.query,
|
|
),
|
|
);
|
|
};
|
|
|
|
/**
|
|
* Handles rendering embedded pages
|
|
*/
|
|
const embeddedHandler = (req: Request, res: Response) => {
|
|
res.render(
|
|
'embed',
|
|
renderConfig(
|
|
{
|
|
embedded: true,
|
|
mobileViewer: isMobileViewer(req),
|
|
},
|
|
req.query,
|
|
),
|
|
);
|
|
};
|
|
|
|
return {
|
|
renderConfig,
|
|
renderGoldenLayout,
|
|
embeddedHandler,
|
|
};
|
|
}
|