6d6872063d
The parameters in the request holds the path parameters. The current implementation based on unorder_map has a few downside: 1. Because path parameters are sometime used to mark a file path and they can extend to multiple url section (may contain /) the value will always contain the leading slash. Though this is true for files, for the common case, it would be easier to return the value without it. 2. The []operator of the hash map is non const, this mean that it cannot be used in the common case where the request object is passed as a const reference. 3. There is no exists method in an ordered_map - Usually query parameters are mandatory, still it is usefull to have an easy way of testing if a parameter is found. This series wrap the unordered_map implementation in a manner more suitable for the request. The [] operator will be const and retrun a copy of the parameter value without the leading slash. The at method will keep the old meaning. For clearer code, a path method was added to indicate that the return value has a leading slash. A set method is used for assignment. Older code will continue to work without changes. Signed-off-by: Amnon Heiman <amnon@cloudius-systems.com>
71 lines
2.1 KiB
C++
71 lines
2.1 KiB
C++
/*
|
|
* This file is open source software, licensed to you under the terms
|
|
* of the Apache License, Version 2.0 (the "License"). See the NOTICE file
|
|
* distributed with this work for additional information regarding copyright
|
|
* ownership. 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. See the License for the
|
|
* specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
/*
|
|
* Copyright 2015 Cloudius Systems
|
|
*/
|
|
|
|
#include "matcher.hh"
|
|
|
|
#include <iostream>
|
|
|
|
namespace httpd {
|
|
|
|
using namespace std;
|
|
|
|
/**
|
|
* Search for the end of the url parameter.
|
|
* @param url the url to search
|
|
* @param ind the position in the url
|
|
* @param entire_path when set to true, take all the reminaing url
|
|
* when set to false, search for the next slash
|
|
* @return the position in the url of the end of the parameter
|
|
*/
|
|
static size_t find_end_param(const sstring& url, size_t ind, bool entire_path) {
|
|
size_t pos = (entire_path) ? url.length() : url.find('/', ind + 1);
|
|
if (pos == sstring::npos) {
|
|
return url.length();
|
|
}
|
|
return pos;
|
|
}
|
|
|
|
size_t param_matcher::match(const sstring& url, size_t ind, parameters& param) {
|
|
size_t last = find_end_param(url, ind, _entire_path);
|
|
if (last == ind) {
|
|
/*
|
|
* empty parameter allows only for the case of entire_path
|
|
*/
|
|
if (_entire_path) {
|
|
param.set(_name, "");
|
|
return ind;
|
|
}
|
|
return sstring::npos;
|
|
}
|
|
param.set(_name, url.substr(ind, last - ind));
|
|
return last;
|
|
}
|
|
|
|
size_t str_matcher::match(const sstring& url, size_t ind, parameters& param) {
|
|
if (url.length() >= _len + ind && (url.find(_cmp, ind) == ind)
|
|
&& (url.length() == _len + ind || url.at(_len + ind) == '/')) {
|
|
return _len + ind;
|
|
}
|
|
return sstring::npos;
|
|
}
|
|
|
|
}
|