Merge pull request #2510 from LenAnderson/proxy-confirm ask user to confirm proxy connections

2232a4fbd75563503d8039eedd8827100ece8170

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/scripts/openai.js+63 -5 Viewed

     getFileText,
     getImageSizeFromDataURL,
     getSortableDelay,
 +    getStringHash,
     isDataURL,
     parseJsonFile,
     resetScrollHeight,

 import { ARGUMENT_TYPE, SlashCommandArgument } from './slash-commands/SlashCommandArgument.js';
 import { renderTemplateAsync } from './templates.js';
 import { SlashCommandEnumValue } from './slash-commands/SlashCommandEnumValue.js';
 +import { Popup, POPUP_RESULT } from './popup.js';
 export {
     openai_messages_count,

     CLAUDE: 'claude',
 };
 +const sensitiveFields = [
 +    'reverse_proxy',
 +    'proxy_password',
 +    'custom_url',
 +    'custom_include_body',
 +    'custom_exclude_body',
 +    'custom_include_headers',
 +];
++
 function getPrefixMap() {
     return selected_group ? {
         assistant: '',

 let promptManager = null;
 async function validateReverseProxy() {
     if (!oai_settings.reverse_proxy) {
         return;
+    }

         resultCheckStatus();
         throw err;
+    }
 +    const rememberKey = `Proxy_SkipConfirm_${getStringHash(oai_settings.reverse_proxy)}`;
 +    const skipConfirm = localStorage.getItem(rememberKey) === 'true';
++
 +    const confirmation = skipConfirm || await Popup.show.confirm('Connecting To Proxy', `<span>Are you sure you want to connect to the following proxy URL?</span><var>${DOMPurify.sanitize(oai_settings.reverse_proxy)}</var>`);
++
 +    if (!confirmation) {
 +        toastr.error('Update or remove your reverse proxy settings.');
 +        setOnlineStatus('no_connection');
 +        resultCheckStatus();
 +        throw new Error('Proxy connection denied.');
 +    }
++
 +    localStorage.setItem(rememberKey, String(true));
+}
 /**

     // Proxy is only supported for Claude, OpenAI, Mistral, and Google MakerSuite
     if (oai_settings.reverse_proxy && [chat_completion_sources.CLAUDE, chat_completion_sources.OPENAI, chat_completion_sources.MISTRALAI, chat_completion_sources.MAKERSUITE].includes(oai_settings.chat_completion_source)) {
         await validateReverseProxy();
         generate_data['reverse_proxy'] = oai_settings.reverse_proxy;
         generate_data['proxy_password'] = oai_settings.proxy_password;
+    }

     };
     if (oai_settings.reverse_proxy && (oai_settings.chat_completion_source === chat_completion_sources.OPENAI || oai_settings.chat_completion_source === chat_completion_sources.CLAUDE)) {
         await validateReverseProxy();
+    }
     if (oai_settings.chat_completion_source === chat_completion_sources.CUSTOM) {

         return;
+    }
 +    const fields = sensitiveFields.filter(field => presetBody[field]).map(field => `<b>${field}</b>`);
 +    const shouldConfirm = fields.length > 0;
++
 +    if (shouldConfirm) {
 +        const textHeader = 'The imported preset contains proxy and/or custom endpoint settings.';
 +        const textMessage = fields.join('<br>');
 +        const cancelButton = { text: 'Cancel import', result: POPUP_RESULT.CANCELLED, appendAtEnd: true };
 +        const popupOptions = { customButtons: [cancelButton], okButton: 'Remove them', cancelButton: 'Import as-is' };
 +        const popupResult = await Popup.show.confirm(textHeader, textMessage, popupOptions);
++
 +        if (popupResult === POPUP_RESULT.CANCELLED) {
 +            console.log('Import cancelled by user');
 +            return;
 +        }
++
 +        if (popupResult === POPUP_RESULT.AFFIRMATIVE) {
 +            sensitiveFields.forEach(field => delete presetBody[field]);
 +        }
 +    }
++
     if (name in openai_setting_names) {
         const confirm = await callPopup('Preset name already exists. Overwrite?', 'confirm');

     const preset = structuredClone(openai_settings[openai_setting_names[oai_settings.preset_settings_openai]]);
 -    delete preset.reverse_proxy;
 +    const fieldValues = sensitiveFields.filter(field => preset[field]).map(field => `<b>${field}</b>: <code>${preset[field]}</code>`);
 -    delete preset.proxy_password;
 +    const shouldConfirm = fieldValues.length > 0;
 +    const textHeader = 'Your preset contains proxy and/or custom endpoint settings.';
 +    const textMessage = `<div>Do you want to remove these fields before exporting?</div><br>${DOMPurify.sanitize(fieldValues.join('<br>'))}`;
 +    const cancelButton = { text: 'Cancel', result: POPUP_RESULT.CANCELLED, appendAtEnd: true };
 +    const popupOptions = { customButtons: [cancelButton] };
 +    const popupResult = await Popup.show.confirm(textHeader, textMessage, popupOptions);
++
 +    if (popupResult === POPUP_RESULT.CANCELLED) {
 +        console.log('Export cancelled by user');
 +        return;
 +    }
++
 +    if (!shouldConfirm || popupResult === POPUP_RESULT.AFFIRMATIVE) {
 +        sensitiveFields.forEach(field => delete preset[field]);
 +    }
     const presetJsonString = JSON.stringify(preset, null, 4);
     const presetFileName = `${oai_settings.preset_settings_openai}.json`;