diff --git a/docker-compose.yml b/docker-compose.yml index 6627a9af..f0409292 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -134,7 +134,10 @@ services: - NEO4J_PASSWORD=${NEO4J_PASSWORD:-password} - TENANT_AES_KEY=${TENANT_AES_KEY:-} - SYSTEM_AES_KEY=${SYSTEM_AES_KEY:-} - - SSRF_WHITELIST=${SSRF_WHITELIST:-searxng} + - SSRF_WHITELIST=${SSRF_WHITELIST:-} + # Always allow the optional searxng sidecar (compose service hostname); + # merged on top of SSRF_WHITELIST so user overrides don't clobber it. + - SSRF_WHITELIST_EXTRA=${SSRF_WHITELIST_EXTRA:-searxng} - CONCURRENCY_POOL_SIZE=${CONCURRENCY_POOL_SIZE:-5} - JWT_SECRET=${JWT_SECRET:-} # Crypto: 主密钥和盐值,用于 AppSecret 等敏感字段的 AES-256 加密 diff --git a/frontend/src/i18n/locales/en-US.ts b/frontend/src/i18n/locales/en-US.ts index 1b906d78..5d752236 100755 --- a/frontend/src/i18n/locales/en-US.ts +++ b/frontend/src/i18n/locales/en-US.ts @@ -824,6 +824,8 @@ export default { proxyUrlPlaceholder: 'e.g. http://proxy.example.com:3128 (optional; http/https only)', proxyUrlHelp: 'Use when outbound access to the search API requires a proxy; leave empty to rely on HTTP_PROXY/HTTPS_PROXY environment variables.', apiKeyLabel: 'API Key', + baseUrlLabel: 'Instance URL', + baseUrlPlaceholder: 'https://searxng.example.com', apiKeyDescription: 'Enter the API key for the selected search provider', apiKeyPlaceholder: 'Enter API key', maxResultsLabel: 'Maximum Results', diff --git a/frontend/src/i18n/locales/ko-KR.ts b/frontend/src/i18n/locales/ko-KR.ts index a9fba5dd..3af15844 100755 --- a/frontend/src/i18n/locales/ko-KR.ts +++ b/frontend/src/i18n/locales/ko-KR.ts @@ -702,6 +702,8 @@ export default { proxyUrlPlaceholder: "예: http://127.0.0.1:7890 (선택 사항)", proxyUrlHelp: "검색 API 접근에 프록시가 필요한 경우 입력합니다. 비우면 HTTP_PROXY/HTTPS_PROXY를 사용합니다.", apiKeyLabel: "API 키", + baseUrlLabel: "인스턴스 URL", + baseUrlPlaceholder: "https://searxng.example.com", apiKeyDescription: "선택한 검색 엔진의 API 키 입력", apiKeyPlaceholder: "API 키를 입력하세요", maxResultsLabel: "최대 결과 수", diff --git a/frontend/src/i18n/locales/ru-RU.ts b/frontend/src/i18n/locales/ru-RU.ts index db346926..6dbe1dc0 100755 --- a/frontend/src/i18n/locales/ru-RU.ts +++ b/frontend/src/i18n/locales/ru-RU.ts @@ -807,6 +807,8 @@ export default { proxyUrlPlaceholder: 'Напр. http://127.0.0.1:7890 (необязательно)', proxyUrlHelp: 'Укажите, если доступ к API поиска нужен через прокси; иначе используются переменные HTTP_PROXY/HTTPS_PROXY.', apiKeyLabel: 'API-ключ', + baseUrlLabel: 'URL экземпляра', + baseUrlPlaceholder: 'https://searxng.example.com', apiKeyDescription: 'Введите API-ключ выбранного провайдера поиска', apiKeyPlaceholder: 'Введите API-ключ', maxResultsLabel: 'Максимум результатов', diff --git a/frontend/src/i18n/locales/zh-CN.ts b/frontend/src/i18n/locales/zh-CN.ts index e850f10f..37f9df8d 100755 --- a/frontend/src/i18n/locales/zh-CN.ts +++ b/frontend/src/i18n/locales/zh-CN.ts @@ -701,6 +701,8 @@ export default { proxyUrlPlaceholder: "例如 http://proxy.example.com:3128(可选,仅支持 http/https)", proxyUrlHelp: "若环境访问搜索 API 需代理,在此填写;留空则使用系统环境变量 HTTP(S)_PROXY。", apiKeyLabel: "API 密钥", + baseUrlLabel: "实例地址", + baseUrlPlaceholder: "https://searxng.example.com", apiKeyDescription: "输入所选搜索引擎的 API 密钥", apiKeyPlaceholder: "请输入 API 密钥", maxResultsLabel: "最大结果数", diff --git a/frontend/src/views/settings/WebSearchSettings.vue b/frontend/src/views/settings/WebSearchSettings.vue index efb90c6c..2e42586b 100644 --- a/frontend/src/views/settings/WebSearchSettings.vue +++ b/frontend/src/views/settings/WebSearchSettings.vue @@ -92,10 +92,10 @@ - + diff --git a/internal/application/service/web_search_provider.go b/internal/application/service/web_search_provider.go index 4180c442..f64d6e03 100644 --- a/internal/application/service/web_search_provider.go +++ b/internal/application/service/web_search_provider.go @@ -122,11 +122,8 @@ func validateProviderParameters(provider types.WebSearchProviderType, params typ case types.WebSearchProviderTypeDuckDuckGo: // No API key required case types.WebSearchProviderTypeSearxng: - if params.BaseURL == "" { - return fmt.Errorf("base_url is required for SearXNG provider") - } - if err := infra_web_search.ValidateProxyURL(params.BaseURL); err != nil { - return fmt.Errorf("invalid SearXNG base_url: %w", err) + if err := infra_web_search.ValidateSearxngBaseURL(params.BaseURL); err != nil { + return err } } if err := validateOptionalProxyURL(params.ProxyURL); err != nil { diff --git a/internal/infrastructure/web_search/searxng.go b/internal/infrastructure/web_search/searxng.go index 63fe3f87..00ad1217 100644 --- a/internal/infrastructure/web_search/searxng.go +++ b/internal/infrastructure/web_search/searxng.go @@ -33,21 +33,33 @@ type SearxngProvider struct { apiKey string } -// NewSearxngProvider builds a SearXNG provider from tenant parameters. -func NewSearxngProvider(params types.WebSearchProviderParameters) (interfaces.WebSearchProvider, error) { - base := strings.TrimSpace(params.BaseURL) +// ValidateSearxngBaseURL validates a SearXNG instance URL: must be a non-empty, +// absolute http(s) URL, and must pass the SSRF whitelist check. Shared between +// the service-layer parameter validation and the provider constructor so that +// "save" and "use" never disagree. +func ValidateSearxngBaseURL(rawURL string) error { + base := strings.TrimSpace(rawURL) if base == "" { - return nil, fmt.Errorf("base_url is required for SearXNG provider") - } - if err := utils.ValidateURLForSSRF(base); err != nil { - return nil, fmt.Errorf("invalid SearXNG base_url: %w", err) + return fmt.Errorf("base_url is required for SearXNG provider") } parsed, err := url.Parse(base) if err != nil || parsed.Scheme == "" || parsed.Host == "" { - return nil, fmt.Errorf("invalid SearXNG base_url: must be an absolute http(s) URL") + return fmt.Errorf("invalid SearXNG base_url: must be an absolute http(s) URL") } if parsed.Scheme != "http" && parsed.Scheme != "https" { - return nil, fmt.Errorf("invalid SearXNG base_url scheme: %s", parsed.Scheme) + return fmt.Errorf("invalid SearXNG base_url scheme: %s", parsed.Scheme) + } + if err := utils.ValidateURLForSSRF(base); err != nil { + return fmt.Errorf("invalid SearXNG base_url: %w", err) + } + return nil +} + +// NewSearxngProvider builds a SearXNG provider from tenant parameters. +func NewSearxngProvider(params types.WebSearchProviderParameters) (interfaces.WebSearchProvider, error) { + base := strings.TrimSpace(params.BaseURL) + if err := ValidateSearxngBaseURL(base); err != nil { + return nil, err } client, err := NewSearchHTTPClient(defaultSearxngTimeout, params.ProxyURL) @@ -82,8 +94,11 @@ func (p *SearxngProvider) Search( q := url.Values{} q.Set("q", query) q.Set("format", "json") - q.Set("safesearch", "1") - q.Set("language", "auto") + // Use "all" (SearXNG's documented value for "no language filter") instead + // of "auto", which is a UI-side default and not a valid /search parameter. + // safesearch is intentionally not set here so the value configured in the + // instance's settings.yml is honored. + q.Set("language", "all") reqURL := p.baseURL + "/search?" + q.Encode() logger.Infof(ctx, "[WebSearch][SearXNG] query=%q maxResults=%d url=%s", query, maxResults, p.baseURL) @@ -131,16 +146,46 @@ func (p *SearxngProvider) Search( Source: "searxng", } if includeDate && r.PublishedDate != "" { - if t, err := time.Parse(time.RFC3339, r.PublishedDate); err == nil { + if t, ok := parseSearxngDate(r.PublishedDate); ok { item.PublishedAt = &t + } else { + logger.Debugf(ctx, "[WebSearch][SearXNG] unparsable publishedDate=%q", r.PublishedDate) } } results = append(results, item) } + if len(results) == 0 && len(data.UnresponsiveEngines) > 0 { + logger.Warnf(ctx, "[WebSearch][SearXNG] empty results, unresponsive_engines=%v", data.UnresponsiveEngines) + } logger.Infof(ctx, "[WebSearch][SearXNG] returned %d results", len(results)) return results, nil } +// searxngDateLayouts covers the formats different SearXNG engines emit for +// publishedDate. Order matters only for performance; first match wins. +var searxngDateLayouts = []string{ + time.RFC3339, + time.RFC3339Nano, + "2006-01-02T15:04:05", + "2006-01-02 15:04:05", + "2006-01-02", + time.RFC1123Z, + time.RFC1123, +} + +func parseSearxngDate(s string) (time.Time, bool) { + s = strings.TrimSpace(s) + if s == "" { + return time.Time{}, false + } + for _, layout := range searxngDateLayouts { + if t, err := time.Parse(layout, s); err == nil { + return t, true + } + } + return time.Time{}, false +} + type searxngResponse struct { Query string `json:"query"` Results []struct { @@ -149,4 +194,8 @@ type searxngResponse struct { Content string `json:"content"` PublishedDate string `json:"publishedDate,omitempty"` } `json:"results"` + // UnresponsiveEngines is a list of [engine, reason] tuples returned by + // SearXNG when one or more upstream engines fail. We surface it on empty + // result sets to aid debugging. + UnresponsiveEngines [][]string `json:"unresponsive_engines,omitempty"` } diff --git a/internal/utils/security.go b/internal/utils/security.go index 139434f5..729bec29 100644 --- a/internal/utils/security.go +++ b/internal/utils/security.go @@ -880,9 +880,21 @@ func loadSSRFWhitelist() *ssrfWhitelistConfig { exactHosts: make(map[string]bool), } raw := os.Getenv("SSRF_WHITELIST") - if raw == "" { + // SSRF_WHITELIST_EXTRA is merged in addition to SSRF_WHITELIST so that + // deployment-managed defaults (e.g. docker-compose injected sidecar host + // names like "searxng") aren't accidentally clobbered when an operator + // overrides SSRF_WHITELIST in their .env. + extra := os.Getenv("SSRF_WHITELIST_EXTRA") + if raw == "" && extra == "" { return } + if extra != "" { + if raw == "" { + raw = extra + } else { + raw = raw + "," + extra + } + } for _, entry := range strings.Split(raw, ",") { entry = strings.TrimSpace(entry) if entry == "" {