Permalink
Browse files

CHEF-2102 Properly URI escape/decode the search query string

  • Loading branch information...
Nuo Yan
Nuo Yan committed Mar 11, 2011
1 parent 2a19de2 commit 71d918de87dea4d741344923ed74a9b6483bd1f4
Showing with 24 additions and 24 deletions.
  1. +13 −13 chef-server-webui/app/controllers/search.rb
  2. +8 −8 chef/lib/chef/knife/search.rb
  3. +3 −3 chef/lib/chef/solr_query.rb
@@ -6,9 +6,9 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,10 +19,10 @@
require 'chef' / 'search' / 'query'
class Search < Application
provides :html
before :login_required
before :login_required
def index
@s = Chef::Search::Query.new
@search_indexes = begin
@@ -31,20 +31,20 @@ def index
Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
@_message = {:error => "Could not list search indexes"}
{}
end
end
render
end
def show
begin
@s = Chef::Search::Query.new
query = params[:q].nil? ? "*:*" : (params[:q].empty? ? "*:*" : params[:q])
@results = @s.search(params[:id], query)
query = (params[:q].nil? || params[:q].empty?) ? "*:*" : URI.escape(params[:q], Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
@results = @s.search(params[:id], query)
@type = if params[:id].to_s == "node" || params[:id].to_s == "role" || params[:id].to_s == "client"
params[:id]
else
"databag"
end
else
"databag"
end
@results = @results - @results.last(2)
@results.each do |result|
result.delete(nil)
@@ -56,7 +56,7 @@ def show
@_message = { :error => "Unable to find the #{params[:id]}. (#{$!})" }
@search_indexes = @s.list_indexes
render :index
end
end
end
end
@@ -6,9 +6,9 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,14 +31,14 @@ class Search < Knife
:description => "The order to sort the results in",
:default => nil
option :start,
option :start,
:short => "-b ROW",
:long => "--start ROW",
:description => "The row to start returning results at",
:default => 0,
:proc => lambda { |i| i.to_i }
option :rows,
option :rows,
:short => "-R INT",
:long => "--rows INT",
:description => "The number of rows to return",
@@ -60,14 +60,14 @@ class Search < Knife
:long => "--id-only",
:description => "Show only the ID of matching objects"
def run
def run
q = Chef::Search::Query.new
display = { :total => 0, :start => config[:start] ? config[:start] : 0, :rows => [ ] }
q.search(@name_args[0], @name_args[1], config[:sort], config[:start] ? config[:start] : 0, config[:rows] ? config[:rows] : 20) do |item|
q.search(@name_args[0], URI.escape(@name_args[1], Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")), config[:sort], config[:start] ? config[:start] : 0, config[:rows] ? config[:rows] : 20) do |item|
formatted_item = format_for_display(item)
if formatted_item.respond_to?(:has_key?) && !formatted_item.has_key?('id')
formatted_item['id'] = item.has_key?('id') ? item['id'] : item.name
formatted_item['id'] = item.has_key?('id') ? item['id'] : item.name
end
display[:rows] << formatted_item
display[:total] += 1
@@ -79,7 +79,7 @@ def run
puts row[config[:attribute]] if row.has_key?(config[:attribute]) && !row[config[:attribute]].nil?
end
else
puts display[:rows].join("\n")
puts display[:rows].join("\n")
end
else
output(display)
@@ -39,7 +39,7 @@ class SolrQuery
attr_accessor :query
attr_accessor :params
# Create a new Query object - takes the solr_url and optional
# Chef::CouchDB object to inflate objects into.
def initialize(couchdb = nil)
@@ -58,7 +58,7 @@ def initialize(couchdb = nil)
@database = couchdb.couchdb_database
@couchdb = couchdb
end
end
end
end
def self.from_params(params, couchdb=nil)
@@ -97,7 +97,7 @@ def update_filter_query_from_params
end
def update_query_from_params
original_query = params.delete(:q) || "*:*"
original_query = URI.decode(params.delete(:q) || "*:*")
@query = Chef::SolrQuery::QueryTransform.transform(original_query)
end

0 comments on commit 71d918d

Please sign in to comment.