fix(web,admin): 이미지 URL을 upload CDN으로 통일 #510
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| const UPLOAD_CDN_ORIGIN = "https://cdn.upload.solid-connection.com"; | ||
| const UPLOAD_CDN_HOSTNAME = "cdn.upload.solid-connection.com"; | ||
| const DEFAULT_CDN_HOSTNAME = "cdn.default.solid-connection.com"; | ||
| const LEGACY_BUCKET_NAME = "solid-connection"; | ||
|
|
||
| const s3PathStyleHostRegex = /^s3([.-][a-z0-9-]+)?\.amazonaws\.com$/i; | ||
| const legacyS3VirtualHostRegex = new RegExp( | ||
| `^${LEGACY_BUCKET_NAME.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&")}\\.s3([.-][a-z0-9-]+)?\\.amazonaws\\.com$`, | ||
| "i", | ||
| ); | ||
|
|
||
| const normalizeOrigin = (value: string | undefined) => { | ||
| if (!value) return undefined; | ||
| const trimmed = value.trim(); | ||
| if (!trimmed) return undefined; | ||
|
|
||
| try { | ||
| const parsed = new URL(trimmed); | ||
| return `${parsed.protocol}//${parsed.host}`.replace(/\/+$/, ""); | ||
| } catch { | ||
| return undefined; | ||
| } | ||
| }; | ||
|
|
||
| const getHostname = (value: string | undefined) => { | ||
| if (!value) return undefined; | ||
|
|
||
| try { | ||
| return new URL(value).hostname.toLowerCase(); | ||
| } catch { | ||
| return undefined; | ||
| } | ||
| }; | ||
|
|
||
| const runtimeEnv = (import.meta as ImportMeta & { env?: Record<string, string | undefined> }).env; | ||
| const envUploadOrigin = normalizeOrigin(runtimeEnv?.VITE_UPLOADED_IMAGE_URL); | ||
| const envS3BaseOrigin = normalizeOrigin(runtimeEnv?.VITE_S3_BASE_URL); | ||
| const uploadOrigin = envUploadOrigin ?? UPLOAD_CDN_ORIGIN; | ||
|
|
||
| const cdnHostnames = new Set( | ||
| [UPLOAD_CDN_HOSTNAME, DEFAULT_CDN_HOSTNAME, getHostname(envUploadOrigin), getHostname(envS3BaseOrigin)].filter( | ||
| (hostname): hostname is string => Boolean(hostname), | ||
| ), | ||
| ); | ||
|
|
||
| const joinUploadOrigin = (path: string, search = "", hash = "") => { | ||
| const normalizedPath = path.startsWith("/") ? path : `/${path}`; | ||
| return `${uploadOrigin}${normalizedPath}${search}${hash}`; | ||
| }; | ||
|
|
||
| const getLegacyS3ObjectPath = (pathname: string) => { | ||
| const prefix = `/${LEGACY_BUCKET_NAME}/`; | ||
| if (pathname.startsWith(prefix)) { | ||
| return pathname.slice(prefix.length - 1); | ||
| } | ||
|
|
||
| if (pathname === `/${LEGACY_BUCKET_NAME}`) { | ||
| return "/"; | ||
| } | ||
|
|
||
| return null; | ||
| }; | ||
|
|
||
| const isHttpUrl = (value: string) => value.startsWith("http://") || value.startsWith("https://"); | ||
|
|
||
| export const normalizeImageUrlToUploadCdn = (url: string | null | undefined): string => { | ||
| if (!url) return ""; | ||
|
|
||
| const trimmed = url.trim(); | ||
| if (!trimmed) return ""; | ||
|
|
||
| if (trimmed.startsWith("blob:") || trimmed.startsWith("data:") || trimmed.startsWith("/")) { | ||
| return trimmed; | ||
| } | ||
|
|
||
| if (trimmed.startsWith("//")) { | ||
| return normalizeImageUrlToUploadCdn(`https:${trimmed}`); | ||
| } | ||
|
|
||
| if (!isHttpUrl(trimmed)) { | ||
| return joinUploadOrigin(trimmed.replace(/^\/+/, "")); | ||
| } | ||
|
|
||
| let parsed: URL; | ||
| try { | ||
| parsed = new URL(trimmed); | ||
| } catch { | ||
| return trimmed; | ||
| } | ||
|
|
||
| const hostname = parsed.hostname.toLowerCase(); | ||
|
|
||
| if (cdnHostnames.has(hostname)) { | ||
| return joinUploadOrigin(parsed.pathname, parsed.search, parsed.hash); | ||
| } | ||
|
|
||
| if (legacyS3VirtualHostRegex.test(hostname)) { | ||
| return joinUploadOrigin(parsed.pathname, parsed.search, parsed.hash); | ||
| } | ||
|
|
||
| if (s3PathStyleHostRegex.test(hostname)) { | ||
| const objectPath = getLegacyS3ObjectPath(parsed.pathname); | ||
| if (objectPath) { | ||
| return joinUploadOrigin(objectPath, parsed.search, parsed.hash); | ||
| } | ||
| } | ||
|
|
||
| return trimmed; | ||
| }; | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| const UPLOAD_CDN_ORIGIN = "https://cdn.upload.solid-connection.com"; | ||
| const UPLOAD_CDN_HOSTNAME = "cdn.upload.solid-connection.com"; | ||
| const DEFAULT_CDN_HOSTNAME = "cdn.default.solid-connection.com"; | ||
| const LEGACY_BUCKET_NAME = "solid-connection"; | ||
|
|
||
| const LOCAL_STATIC_PREFIXES = ["/images/", "/svgs/"]; | ||
|
|
||
| const isHttpUrl = (value: string) => value.startsWith("http://") || value.startsWith("https://"); | ||
|
|
||
| const normalizeOrigin = (value: string | undefined) => { | ||
| if (!value) return undefined; | ||
| const trimmed = value.trim(); | ||
| if (!trimmed) return undefined; | ||
|
|
||
| try { | ||
| const parsed = new URL(trimmed); | ||
| return `${parsed.protocol}//${parsed.host}`.replace(/\/+$/, ""); | ||
| } catch { | ||
| return undefined; | ||
| } | ||
| }; | ||
|
|
||
| const getHostname = (value: string | undefined) => { | ||
| if (!value) return undefined; | ||
|
|
||
| try { | ||
| return new URL(value).hostname.toLowerCase(); | ||
| } catch { | ||
| return undefined; | ||
| } | ||
| }; | ||
|
|
||
| const envUploadOrigin = normalizeOrigin(process.env.NEXT_PUBLIC_UPLOADED_IMAGE_URL); | ||
| const envDefaultOrigin = normalizeOrigin(process.env.NEXT_PUBLIC_IMAGE_URL); | ||
|
|
||
| const uploadOrigin = envUploadOrigin ?? UPLOAD_CDN_ORIGIN; | ||
|
|
||
| const cdnHostnames = new Set( | ||
| [UPLOAD_CDN_HOSTNAME, DEFAULT_CDN_HOSTNAME, getHostname(envUploadOrigin), getHostname(envDefaultOrigin)].filter( | ||
| (hostname): hostname is string => Boolean(hostname), | ||
| ), | ||
| ); | ||
|
|
||
| const legacyS3VirtualHostRegex = new RegExp( | ||
| `^${LEGACY_BUCKET_NAME.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&")}\\.s3([.-][a-z0-9-]+)?\\.amazonaws\\.com$`, | ||
| "i", | ||
| ); | ||
|
|
||
| const s3PathStyleHostRegex = /^s3([.-][a-z0-9-]+)?\.amazonaws\.com$/i; | ||
|
|
||
| const joinUploadOrigin = (path: string, search = "", hash = "") => { | ||
| const normalizedPath = path.startsWith("/") ? path : `/${path}`; | ||
| return `${uploadOrigin}${normalizedPath}${search}${hash}`; | ||
| }; | ||
|
|
||
| const getLegacyS3ObjectPath = (pathname: string) => { | ||
| const prefix = `/${LEGACY_BUCKET_NAME}/`; | ||
| if (pathname.startsWith(prefix)) { | ||
| return pathname.slice(prefix.length - 1); | ||
| } | ||
|
|
||
| if (pathname === `/${LEGACY_BUCKET_NAME}`) { | ||
| return "/"; | ||
| } | ||
|
|
||
| return null; | ||
| }; | ||
|
|
||
| const shouldKeepAsLocalStaticPath = (value: string) => { | ||
| return LOCAL_STATIC_PREFIXES.some((prefix) => value.startsWith(prefix)); | ||
| }; | ||
|
|
||
| /** | ||
| * 이미지 URL을 upload CDN 기준으로 정규화한다. | ||
| * - 상대 경로(key)는 upload CDN으로 변환 | ||
| * - legacy default CDN/S3 URL은 upload CDN으로 변환 | ||
| * - 로컬 정적 경로(/images, /svgs), blob/data, 외부 도메인은 유지 | ||
| */ | ||
| export const normalizeImageUrlToUploadCdn = (url: string | null | undefined): string => { | ||
| if (!url) return ""; | ||
|
|
||
| const trimmed = url.trim(); | ||
| if (!trimmed) return ""; | ||
|
|
||
| if (trimmed.startsWith("blob:") || trimmed.startsWith("data:")) { | ||
| return trimmed; | ||
| } | ||
|
|
||
| if (trimmed.startsWith("//")) { | ||
| return normalizeImageUrlToUploadCdn(`https:${trimmed}`); | ||
| } | ||
|
|
||
| if (trimmed.startsWith("/")) { | ||
| if (shouldKeepAsLocalStaticPath(trimmed)) { | ||
| return trimmed; | ||
| } | ||
|
|
||
| return trimmed; | ||
| } | ||
|
|
||
| if (!isHttpUrl(trimmed)) { | ||
| return joinUploadOrigin(trimmed.replace(/^\/+/, "")); | ||
| } | ||
|
|
||
| let parsed: URL; | ||
| try { | ||
| parsed = new URL(trimmed); | ||
| } catch { | ||
| return trimmed; | ||
| } | ||
|
|
||
| const hostname = parsed.hostname.toLowerCase(); | ||
|
|
||
| if (cdnHostnames.has(hostname)) { | ||
| return joinUploadOrigin(parsed.pathname, parsed.search, parsed.hash); | ||
| } | ||
|
|
||
| if (legacyS3VirtualHostRegex.test(hostname)) { | ||
| return joinUploadOrigin(parsed.pathname, parsed.search, parsed.hash); | ||
| } | ||
|
|
||
| if (s3PathStyleHostRegex.test(hostname)) { | ||
| const objectPath = getLegacyS3ObjectPath(parsed.pathname); | ||
| if (objectPath) { | ||
| return joinUploadOrigin(objectPath, parsed.search, parsed.hash); | ||
| } | ||
| } | ||
|
|
||
| return trimmed; | ||
| }; | ||
|
|
||
| export const getUploadCdnOrigin = () => uploadOrigin; |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The admin URL normalizer treats any value starting with
/as already-resolved and returns it unchanged. After this commit, GPA/language report links use this helper, so slash-prefixed report keys (for example/scores/report.pdf) now open against the admin app origin instead of the CDN object URL. Previously these links were explicitly prefixed withVITE_S3_BASE_URL, so this change can break report downloads for relative-path data.Useful? React with 👍 / 👎.