Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio
### Fixes

- **Cron Scaler**: Fix metric name generation so cron expressions with comma-separated values no longer produce invalid metric names ([#7448](https://github.com/kedacore/keda/issues/7448))
- TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX))
- **Solr Scaler**: Use net/url to safely encode query parameters ([#7467](https://github.com/kedacore/keda/pull/7467))

### Deprecations

Expand Down
14 changes: 11 additions & 3 deletions pkg/scalers/solr_scaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"io"
"net/http"
"net/url"

"github.com/go-logr/logr"
v2 "k8s.io/api/autoscaling/v2"
Expand Down Expand Up @@ -91,10 +92,17 @@ func (s *solrScaler) getItemCount(ctx context.Context) (float64, error) {
var SolrResponse1 *solrResponse
var itemCount float64

url := fmt.Sprintf("%s/solr/%s/select?q=%s&wt=json",
s.metadata.Host, s.metadata.Collection, s.metadata.Query)
baseURL, err := url.Parse(fmt.Sprintf("%s/solr/%s/select", s.metadata.Host, s.metadata.Collection))
if err != nil {
return -1, fmt.Errorf("error parsing solr URL: %w", err)
}

params := url.Values{}
params.Set("q", s.metadata.Query)
params.Set("wt", "json")
baseURL.RawQuery = params.Encode()

req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
req, err := http.NewRequestWithContext(ctx, "GET", baseURL.String(), nil)
if err != nil {
return -1, err
}
Expand Down
Loading