ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2025-10-19 01:54:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add IPv6 support for hostnames (#807)

Browse Source
This commit is contained in:
Fengrui Liu
2024-02-01 21:44:29 +08:00
committed by GitHub
parent 9188752b41
commit fc19c4cf09
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/service/support/permission/auth/common.ts
View File

@@ -2,6 +2,7 @@ import { AuthUserTypeEnum } from '@fastgpt/global/support/permission/constant';
import { parseHeaderCert } from '../controller'; import { parseHeaderCert } from '../controller';
import { AuthModeType } from '../type'; import { AuthModeType } from '../type';
import { authOutLinkValid } from './outLink'; import { authOutLinkValid } from './outLink';
import { isIPv6 } from 'net';
export const authCert = async (props: AuthModeType) => { export const authCert = async (props: AuthModeType) => {
const result = await parseHeaderCert(props); const result = await parseHeaderCert(props);
@@ -34,7 +35,11 @@ export async function authCertOrShareId({
/* auth the request from local service */ /* auth the request from local service */
export const authRequestFromLocal = ({ req }: AuthModeType) => { export const authRequestFromLocal = ({ req }: AuthModeType) => {
const host = `${process.env.HOSTNAME || 'localhost'}:${process.env.PORT || 3000}`; const host =
process.env.HOSTNAME && isIPv6(process.env.HOSTNAME)
? `[${process.env.HOSTNAME}]:${process.env.PORT || 3000}`
: `${process.env.HOSTNAME || 'localhost'}:${process.env.PORT || 3000}`;
if (host !== req.headers.host) { if (host !== req.headers.host) {
return Promise.reject('Invalid request'); return Promise.reject('Invalid request');
} }

9
projects/app/src/service/common/api/request.ts
View File

@@ -1,5 +1,5 @@
import axios, { Method, InternalAxiosRequestConfig, AxiosResponse } from 'axios'; import axios, { Method, InternalAxiosRequestConfig, AxiosResponse } from 'axios';
import { isIPv6 } from 'net';
interface ConfigType { interface ConfigType {
headers?: { [key: string]: string }; headers?: { [key: string]: string };
hold?: boolean; hold?: boolean;
@@ -78,7 +78,12 @@ export function request(url: string, data: any, config: ConfigType, method: Meth
return instance return instance
.request({ .request({
baseURL: `http://${process.env.HOSTNAME || 'localhost'}:${process.env.PORT || 3000}`, baseURL: `http://${
process.env.HOSTNAME && isIPv6(process.env.HOSTNAME)
? `[${process.env.HOSTNAME}]:${process.env.PORT || 3000}`
: `${process.env.HOSTNAME || 'localhost'}:${process.env.PORT || 3000}`
}`,
url, url,
method, method,
data: ['POST', 'PUT'].includes(method) ? data : null, data: ['POST', 'PUT'].includes(method) ? data : null,

8
projects/app/src/service/moduleDispatch/tools/http.ts
View File

@@ -3,6 +3,7 @@ import type { ModuleDispatchProps } from '@fastgpt/global/core/module/type.d';
import { ModuleInputKeyEnum, ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants'; import { ModuleInputKeyEnum, ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants';
import axios from 'axios'; import axios from 'axios';
import { flatDynamicParams } from '../utils'; import { flatDynamicParams } from '../utils';
import { isIPv6 } from 'net';
export type HttpRequestProps = ModuleDispatchProps<{ export type HttpRequestProps = ModuleDispatchProps<{
[ModuleInputKeyEnum.abandon_httpUrl]: string; [ModuleInputKeyEnum.abandon_httpUrl]: string;
@@ -132,7 +133,12 @@ async function fetchData({
}): Promise<Record<string, any>> { }): Promise<Record<string, any>> {
const { data: response } = await axios<Record<string, any>>({ const { data: response } = await axios<Record<string, any>>({
method, method,
baseURL: `http://${process.env.HOSTNAME || 'localhost'}:${process.env.PORT || 3000}`, baseURL: `http://${
process.env.HOSTNAME && isIPv6(process.env.HOSTNAME)
? `[${process.env.HOSTNAME}]:${process.env.PORT || 3000}`
: `${process.env.HOSTNAME || 'localhost'}:${process.env.PORT || 3000}`
}`,
url, url,
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',