Skip to content

🐛Fix(tcyun): compatible tencent cos bucket with strict signature mode… #182

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: dev
Choose a base branch
from
Open

🐛Fix(tcyun): compatible tencent cos bucket with strict signature mode… #182

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
30 changes: 22 additions & 8 deletions src/plugins/uploader/tcyun.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,20 @@ export interface ISignature {
signTime: string
}

const generateSignature = (options: ITcyunConfig, fileName: string): ISignature => {
const cosSafeUrlEncode = (str: string): string => {
return encodeURIComponent(str)
.replace(/!/g, '%21')
.replace(/'/g, '%27')
.replace(/\(/g, '%28')
.replace(/\)/g, '%29')
.replace(/\*/g, '%2A')
}

const generateContentType = (fileName: string): string => {
return mime.lookup(fileName) || 'application/octet-stream'
}

const generateSignature = (options: ITcyunConfig, fileName: string, contentType: string, contentLength: number): ISignature => {
const secretId = options.secretId
const secretKey = options.secretKey
const appId = options.appId
Expand All @@ -37,7 +50,7 @@ const generateSignature = (options: ITcyunConfig, fileName: string): ISignature
signTime = `${today};${tomorrow}`
const signKey = crypto.createHmac('sha1', secretKey).update(signTime).digest('hex')
const endpoint = options.endpoint ? options.endpoint : `cos.${options.area}.myqcloud.com`
const httpString = `put\n/${options.path}${fileName}\n\nhost=${options.bucket}.${endpoint}\n`
const httpString = `put\n/${options.path}${fileName}\n\ncontent-length=${contentLength}&content-type=${cosSafeUrlEncode(contentType)}&host=${options.bucket}.${endpoint}\n`
const sha1edHttpString = crypto.createHash('sha1').update(httpString).digest('hex')
const stringToSign = `sha1\n${signTime}\n${sha1edHttpString}\n`
signature = crypto.createHmac('sha1', signKey).update(stringToSign).digest('hex')
Expand Down Expand Up @@ -78,8 +91,9 @@ const postOptions = (options: ITcyunConfig, fileName: string, signature: ISignat
url: `http://${options.bucket}.${endpoint}/${encodeURI(path)}${encodeURIComponent(fileName)}`,
headers: {
Host: `${options.bucket}.${endpoint}`,
Authorization: `q-sign-algorithm=sha1&q-ak=${options.secretId}&q-sign-time=${signature.signTime}&q-key-time=${signature.signTime}&q-header-list=host&q-url-param-list=&q-signature=${signature.signature}`,
contentType: mime.lookup(fileName),
Authorization: `q-sign-algorithm=sha1&q-ak=${options.secretId}&q-sign-time=${signature.signTime}&q-key-time=${signature.signTime}&q-header-list=content-length;content-type;host&q-url-param-list=&q-signature=${signature.signature}`,
contentType: generateContentType(fileName),
contentLength: image.byteLength,
'User-Agent': `PicGo;${version};null;null`
},
body: image,
Expand All @@ -100,14 +114,14 @@ const handle = async (ctx: IPicGo): Promise<IPicGo | boolean> => {
const useV4 = !tcYunOptions.version || tcYunOptions.version === 'v4'
for (const img of imgList) {
if (img.fileName && img.buffer) {
const signature = generateSignature(tcYunOptions, img.fileName)
if (!signature) {
return false
}
let image = img.buffer
if (!image && img.base64Image) {
image = Buffer.from(img.base64Image, 'base64')
}
const signature = generateSignature(tcYunOptions, img.fileName, generateContentType(img.fileName), image.byteLength)
if (!signature) {
return false
}
const options = postOptions(tcYunOptions, img.fileName, signature, image, ctx.GUI_VERSION || ctx.VERSION)
const res = await ctx.request(options)
.then((res: any) => res)
Expand Down