Skip to content

fix: URL encoding parameters not decompiled #2409

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

Merged
shaohuzhang1 merged 1 commit into from
Feb 26, 2025
Merged

fix: URL encoding parameters not decompiled #2409

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
28 changes: 26 additions & 2 deletions ui/src/components/ai-chat/component/user-form/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,18 +286,42 @@ const checkInputParam = () => {
let msg = []
for (let f of apiInputFieldList.value) {
if (!api_form_data_context.value[f.field]) {
api_form_data_context.value[f.field] = route.query[f.field]
let _value = route.query[f.field]
if (_value != null) {
if (_value instanceof Array) {
_value = _value
.map((item) => {
if (item != null) {
return decodeQuery(item)
}
return null
})
.filter((item) => item != null)
} else {
_value = decodeQuery(_value)
}
api_form_data_context.value[f.field] = _value
}
}
if (f.required && !api_form_data_context.value[f.field]) {
msg.push(f.field)
}
}
if (msg.length > 0) {
MsgWarning(`${t('chat.tip.inputParamMessage1')} ${msg.join('、')}${t('chat.tip.inputParamMessage2')}`)
MsgWarning(
`${t('chat.tip.inputParamMessage1')} ${msg.join('、')}${t('chat.tip.inputParamMessage2')}`
)
return false
}
return true
}
const decodeQuery = (query: string) => {
try {
return decodeURIComponent(query)
} catch (e) {
return query
}
}
defineExpose({ checkInputParam })
onMounted(() => {
handleInputFieldList()
Copy link
Copy Markdown
Contributor Author

@shaohuzhang1 shaohuzhang1 Feb 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The provided code has some minor issues that can be addressed:

Issues Identified

  1. Duplicate Code: The decodeQuery function is declared twice, which should not duplicate functionality.
  2. Comment Formatting: The comments need to be formatted consistently and properly.
  3. Variable Naming: There's a redundant const _value = route.query[f.field]; line that can be removed before the assignment.

Optimization Suggestions

  1. Avoid Unnecessary Mapping: If you know the type of array elements (e.g., objects), avoid filtering out null values when mapping them back.

    if (_value instanceof Array) {
  _value = _value.map((item) => decodeURIComponent(item));
  // Remove duplicates if they exist
  // _value = [...new Set(_value)];
} else {
  _value = decodeURIComponent(_value);
}

  2. Handle Edge Cases: Ensure that edge cases like empty strings or non-string query parameters are correctly handled during decoding.

Revised Code

Here's the revised version with these suggestions applied:

@@ -286,28 +286,45 @@ const checkInputParam = () => {
     for (let f of apiInputFieldList.value) {
         if (!api_form_data_context.value[f.field]) {
             let _value = route.query[f.field];
             if (_value != null) {
                 if (_value instanceof Array) {
                     _value = _value.map((item) => decodeURIComponent(item));
                     api_form_data_context.value[f.field] = [...uniqueValues];
                 } else {
                     try {
                         _value = decodeURIComponent(_value);
                     } catch (e) {
                         console.error('Error decoding query parameter:', e);
                         _value = null;
                     }
                 }
             } else {
                 _value = route.query[f.field]
             }
             api_form_data_context.value[f.field] = _value;
         }

         if (f.required && !api_form_data_context.value[f.field]) {
             msg.push(f.field)
         }
     }
 
     if (msg.length > 0) {
-        MsgWarning(`${t('chat.tip.inputParamMessage1')} ${msg.join('、')}${t('chat.tip.inputParamMessage2')}`)
+        MsgWarning(
+            `${t('chat.tip.inputParamMessage1')} ${msg.join('、')}${t('chat.tip.inputParamMessage2')}`
+        );
         return false
     }
     return true;
 }

const decodeQuery = (query: string) => {
    let decodedValue = '';
    try {
        decodedValue = decodeURIComponent(query);
    } catch (e) {
        console.error('Error decoding URI component', e);
    }
    return decodedValue;
}

defineExpose({checkInputParam})
onMounted(() => {
    handleInputFieldList();
});

This revision ensures that the codeDecodeUriComponent() is only called once and also handles potential errors in URL decoding more gracefully. Additionally, it uses []([...array].concat(array)) to remove duplicates from an array.

Expand Down