Skip to content

Normalize path #14

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Normalize path #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ const stripLeadingSlash = (s: string) =>
s.indexOf('/') === 0 ? s.substring(1) : s
const stripEndingSlash = (s: string) =>
s.indexOf('/') === s.length - 1 ? s.substring(0, s.length - 1) : s
const normalizePath = (filePath) => {
return filePath.replace(/\\/g, '/');
};

type Config = {
accessKeyId?: string
Expand Down Expand Up @@ -86,7 +89,7 @@ class S3Storage extends StorageBase {
defaultHost

this.pathPrefix = stripLeadingSlash(
process.env.GHOST_STORAGE_ADAPTER_S3_PATH_PREFIX || pathPrefix || ''
normalizePath(process.env.GHOST_STORAGE_ADAPTER_S3_PATH_PREFIX || pathPrefix || '')
)
this.endpoint =
process.env.GHOST_STORAGE_ADAPTER_S3_ENDPOINT || endpoint || ''
Expand All @@ -101,7 +104,7 @@ class S3Storage extends StorageBase {
try {
await this.s3().deleteObject({
Bucket: this.bucket,
Key: stripLeadingSlash(join(directory, fileName)),
Key: stripLeadingSlash(normalizePath(join(directory, fileName))),
})
} catch {
return false
Expand All @@ -114,7 +117,7 @@ class S3Storage extends StorageBase {
await this.s3().getObject({
Bucket: this.bucket,
Key: stripLeadingSlash(
targetDir ? join(targetDir, fileName) : fileName
normalizePath(targetDir ? join(targetDir, fileName) : fileName)
),
})
} catch {
Expand Down Expand Up @@ -162,7 +165,7 @@ class S3Storage extends StorageBase {
Bucket: this.bucket,
CacheControl: `max-age=${30 * 24 * 60 * 60}`,
ContentType: image.type,
Key: stripLeadingSlash(fileName),
Key: stripLeadingSlash(normalizePath(fileName)),
}
await this.s3().putObject(config)

Expand All @@ -174,7 +177,7 @@ class S3Storage extends StorageBase {
try {
const output = await this.s3().getObject({
Bucket: this.bucket,
Key: stripLeadingSlash(stripEndingSlash(this.pathPrefix) + req.path),
Key: stripLeadingSlash(stripEndingSlash(this.pathPrefix) + normalizePath(req.path)),
})

const headers: { [key: string]: string } = {}
Expand Down Expand Up @@ -213,7 +216,7 @@ class S3Storage extends StorageBase {

const response = await this.s3().getObject({
Bucket: this.bucket,
Key: stripLeadingSlash(path),
Key: stripLeadingSlash(normalizePath(path)),
})
const stream = response.Body as Readable

Expand Down