mirror of
https://github.com/miniflux/v2.git
synced 2024-10-02 07:11:18 +02:00
7a03291442
The recent HTTP client refactor in 14e25ab9fe
introduced a bug in which the global default User-Agent is no longer
used for requests. Unless a per-feed User-Agent exists, the Go standard
library's default User-Agent is used, which looks something like
"Go-http-client/1.1". To fix this, make RequestBuilder.WithUserAgent
take an additional argument, the default User-Agent, which will be used
if there is no per-feed User-Agent (i.e. it is an empty string).
Fixes #2188
Fixes #2189
63 lines
2.1 KiB
Go
63 lines
2.1 KiB
Go
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package api // import "miniflux.app/v2/internal/api"
|
|
|
|
import (
|
|
json_parser "encoding/json"
|
|
"net/http"
|
|
|
|
"miniflux.app/v2/internal/config"
|
|
"miniflux.app/v2/internal/http/request"
|
|
"miniflux.app/v2/internal/http/response/json"
|
|
"miniflux.app/v2/internal/model"
|
|
"miniflux.app/v2/internal/reader/fetcher"
|
|
"miniflux.app/v2/internal/reader/subscription"
|
|
"miniflux.app/v2/internal/validator"
|
|
)
|
|
|
|
func (h *handler) discoverSubscriptions(w http.ResponseWriter, r *http.Request) {
|
|
var subscriptionDiscoveryRequest model.SubscriptionDiscoveryRequest
|
|
if err := json_parser.NewDecoder(r.Body).Decode(&subscriptionDiscoveryRequest); err != nil {
|
|
json.BadRequest(w, r, err)
|
|
return
|
|
}
|
|
|
|
if validationErr := validator.ValidateSubscriptionDiscovery(&subscriptionDiscoveryRequest); validationErr != nil {
|
|
json.BadRequest(w, r, validationErr.Error())
|
|
return
|
|
}
|
|
|
|
var rssbridgeURL string
|
|
intg, err := h.store.Integration(request.UserID(r))
|
|
if err == nil && intg != nil && intg.RSSBridgeEnabled {
|
|
rssbridgeURL = intg.RSSBridgeURL
|
|
}
|
|
|
|
requestBuilder := fetcher.NewRequestBuilder()
|
|
requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout())
|
|
requestBuilder.WithProxy(config.Opts.HTTPClientProxy())
|
|
requestBuilder.WithUserAgent(subscriptionDiscoveryRequest.UserAgent, config.Opts.HTTPClientUserAgent())
|
|
requestBuilder.WithCookie(subscriptionDiscoveryRequest.Cookie)
|
|
requestBuilder.WithUsernameAndPassword(subscriptionDiscoveryRequest.Username, subscriptionDiscoveryRequest.Password)
|
|
requestBuilder.UseProxy(subscriptionDiscoveryRequest.FetchViaProxy)
|
|
requestBuilder.IgnoreTLSErrors(subscriptionDiscoveryRequest.AllowSelfSignedCertificates)
|
|
|
|
subscriptions, localizedError := subscription.NewSubscriptionFinder(requestBuilder).FindSubscriptions(
|
|
subscriptionDiscoveryRequest.URL,
|
|
rssbridgeURL,
|
|
)
|
|
|
|
if localizedError != nil {
|
|
json.ServerError(w, r, localizedError.Error())
|
|
return
|
|
}
|
|
|
|
if len(subscriptions) == 0 {
|
|
json.NotFound(w, r)
|
|
return
|
|
}
|
|
|
|
json.OK(w, r, subscriptions)
|
|
}
|