fix: bad keys (#7)

* fix: escape keys * fix: attachment upload key
fedstackjs · Jan 6, 2024 · b1be683 · b1be683
1 parent 6c24df3
commit b1be683
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/.yarn/versions/96fd40a9.yml b/.yarn/versions/96fd40a9.yml
@@ -0,0 +1,2 @@
+declined:
+  - "@aoi-js/frontend"
diff --git a/apps/frontend/src/components/contest/ProblemTabAttachments.vue b/apps/frontend/src/components/contest/ProblemTabAttachments.vue
@@ -37,6 +37,7 @@ const props = defineProps<{
 }>()
 
 async function downloadFile(key: string) {
+  key = encodeURIComponent(key)
   const resp = await http.get(
     `contest/${props.contestId}/problem/${props.problem._id}/attachment/${key}/url/download`
   )

diff --git a/apps/frontend/src/components/contest/RanklistExportBtn.vue b/apps/frontend/src/components/contest/RanklistExportBtn.vue
@@ -38,7 +38,9 @@ async function getProfile(_id: string) {
 async function exportRanklist() {
   toast.info(t('start-generating'))
   try {
-    const endpoint = `contest/${props.contestId}/ranklist/${props.ranklistKey}/url/download`
+    const endpoint =
+      `contest/${props.contestId}/` +
+      `ranklist/${encodeURIComponent(props.ranklistKey)}/url/download`
     const { url } = await http.get(endpoint).json<{ url: string }>()
     const jsondata = await ky.get(url).json<Ranklist>()
     const workbook = xlsx.utils.book_new()

diff --git a/apps/frontend/src/components/contest/RanklistSettings.vue b/apps/frontend/src/components/contest/RanklistSettings.vue
@@ -3,7 +3,9 @@
     <VCardSubtitle>
       {{ t('term.schedule') }}
     </VCardSubtitle>
-    <SettingsEditor :endpoint="`contest/${contestId}/ranklist/${props.ranklistKey}/settings`">
+    <SettingsEditor
+      :endpoint="`contest/${contestId}/ranklist/${encodeURIComponent(props.ranklistKey)}/settings`"
+    >
       <template v-slot="scoped">
         <RanklistSettingsInput v-model="scoped.value" />
       </template>
@@ -56,7 +58,7 @@ const emit = defineEmits<{
 }>()
 
 async function deleteRanklist() {
-  await http.delete(`contest/${props.contestId}/ranklist/${props.ranklistKey}`)
+  await http.delete(`contest/${props.contestId}/ranklist/${encodeURIComponent(props.ranklistKey)}`)
   router.push(`/org/${props.orgId}/contest/${props.contestId}/ranklist`)
   emit('updated')
 }

diff --git a/apps/frontend/src/pages/org/[orgId]/contest/[contestId]/attachment.vue b/apps/frontend/src/pages/org/[orgId]/contest/[contestId]/attachment.vue
@@ -86,13 +86,15 @@ const attachments = useAsyncState(async () => {
 const canManage = computed(() => hasCapability(props.contest.capability, 1))
 
 async function downloadFile(key: string) {
+  key = encodeURIComponent(key)
   const resp = await http.get(`contest/${props.contestId}/attachment/${key}/url/download`)
   const { url } = await resp.json<{ url: string }>()
   window.open(url)
 }
 
 async function deleteFile(key: string) {
   try {
+    key = encodeURIComponent(key)
     const resp = await http.get(`contest/${props.contestId}/attachment/${key}/url/delete`)
     const { url } = await resp.json<{ url: string }>()
     await fetch(url, { method: 'DELETE' })
@@ -122,9 +124,8 @@ watch(
 
 async function uploadFile() {
   try {
-    const resp = await http.get(
-      `contest/${props.contestId}/attachment/${uploadInfo.key}/url/upload`
-    )
+    const key = encodeURIComponent(uploadInfo.key)
+    const resp = await http.get(`contest/${props.contestId}/attachment/${key}/url/upload`)
     const { url } = await resp.json<{ url: string }>()
     await fetch(url, {
       method: 'PUT',

diff --git a/apps/frontend/src/pages/org/[orgId]/contest/[contestId]/ranklist/[ranklistKey].vue b/apps/frontend/src/pages/org/[orgId]/contest/[contestId]/ranklist/[ranklistKey].vue
@@ -48,7 +48,7 @@ const { t } = useI18n()
 const currentTab = ref()
 const admin = useContestCapability('admin')
 
-const endpoint = `contest/${props.contestId}/ranklist/${props.ranklistKey}/url`
+const endpoint = `contest/${props.contestId}/ranklist/${encodeURIComponent(props.ranklistKey)}/url`
 </script>
 <i18n>
 en:

diff --git a/apps/frontend/src/pages/org/[orgId]/problem/[problemId]/attachment.vue b/apps/frontend/src/pages/org/[orgId]/problem/[problemId]/attachment.vue
@@ -94,13 +94,15 @@ const snackbarText = ref('')
 const canManage = computed(() => hasCapability(props.problem.capability, 1))
 
 async function downloadFile(key: string) {
+  key = encodeURIComponent(key)
   const resp = await http.get(`problem/${props.problem._id}/attachment/${key}/url/download`)
   const { url } = await resp.json<{ url: string }>()
   window.open(url)
 }
 
 async function deleteFile(key: string) {
   try {
+    key = encodeURIComponent(key)
     const resp = await http.get(`problem/${props.problem._id}/attachment/${key}/url/delete`)
     const { url } = await resp.json<{ url: string }>()
     await fetch(url, { method: 'DELETE' })
@@ -121,9 +123,8 @@ const uploadInfo = reactive({
 
 async function uploadFile() {
   try {
-    const resp = await http.get(
-      `problem/${props.problem._id}/attachment/${uploadInfo.key}/url/upload`
-    )
+    const key = encodeURIComponent(uploadInfo.key)
+    const resp = await http.get(`problem/${props.problem._id}/attachment/${key}/url/upload`)
     const { url } = await resp.json<{ url: string }>()
     await fetch(url, {
       method: 'PUT',