9989237150

Committed 18 Jul 2024 09:42AM UTC coverage: 66.365% (+0.005%) from 66.36%

Build # 9989237150

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #14478 from omoerbeek/backport-14404-to-rec-5.1.x

rec: Backport 14404 to rec 5.1.x: Yahttp router: avoid unsigned underflow in match()

Run Details

16575 of 34960 branches covered (47.41%)

Branch coverage included in aggregate %.

11 of 17 new or added lines in 1 file covered. (64.71%)

40 existing lines in 11 files now uncovered.

56795 of 75595 relevant lines covered (75.13%)

3945075.6 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

56.22

/ext/yahttp/yahttp/router.cpp

/* @file
 * @brief Concrete implementation of Router 
 */
#include "yahttp.hpp"
#include "router.hpp"

namespace YaHTTP {
  // router is defined here.
  YaHTTP::Router Router::router;

  void Router::map(const std::string& method, const std::string& url, THandlerFunction handler, const std::string& name) {
    std::string method2 = method;
    bool isopen=false;
    // add into vector
    for(std::string::const_iterator i = url.begin(); i != url.end(); i++) {
       if (*i == '<' && isopen) throw Error("Invalid URL mask, cannot have < after <");
       if (*i == '<') isopen = true;
       if (*i == '>' && !isopen) throw Error("Invalid URL mask, cannot have > without < first");
       if (*i == '>') isopen = false;
    }
    std::transform(method2.begin(), method2.end(), method2.begin(), ::toupper); 
    routes.push_back(funcptr::make_tuple(method2, url, handler, name));
  };

  bool Router::match(const std::string& route, const URL& requrl, std::map<std::string, TDelim> &params) {
     size_t rpos = 0;
     size_t upos = 0;
     size_t npos = 0;
     size_t nstart = 0;
     size_t nend = 0;
     std::string pname;
     for(; rpos < route.size() && upos < requrl.path.size(); ) {
        if (route[rpos] == '<') {
          nstart = upos;
          npos = rpos+1;
          // start of parameter
          while(rpos < route.size() && route[rpos] != '>') {
            rpos++;
          }
          pname = std::string(route.begin()+static_cast<long>(npos), route.begin()+static_cast<long>(rpos));
          // then we also look it on the url
          if (pname[0] == '*') {
            pname = pname.substr(1);
            // this matches whatever comes after it, basically end of string
            nend = requrl.path.size();
            if (!pname.empty()) {
              params[pname] = funcptr::tie(nstart,nend);
            }
            rpos = route.size();
            upos = requrl.path.size();
            break;
          }
          // match until url[upos] or next / if pattern is at end
          while (upos < requrl.path.size()) {
            if (route[rpos+1] == '\0' && requrl.path[upos] == '/') {
              break;
            }
            if (requrl.path[upos] == route[rpos+1]) {
              break;
            }
            upos++;
          }
          nend = upos;
          params[pname] = funcptr::tie(nstart, nend);
          if (upos > 0) {
            upos--;
          }
          else {
            // If upos is zero, do not decrement it and then increment at bottom of loop, this disturbs Coverity.
            // Only increment rpos and continue loop
            rpos++;
            continue;
          }
        }
        else if (route[rpos] != requrl.path[upos]) {
          break;
        }

        rpos++; upos++;
      }
      return route[rpos] == requrl.path[upos];
  }

  RoutingResult Router::route(Request *req, THandlerFunction& handler) {
    std::map<std::string, TDelim> params;
    bool matched = false;
    bool seen = false;
    std::string rname;

    // iterate routes
    for (auto& route: routes) {
      std::string method;
      std::string url;
      funcptr::tie(method, url, handler, rname) = route;

      // see if we can't match the url
      params.clear();
      // simple matcher func
      matched = match(url, req->url, params);

      if (matched && !method.empty() && req->method != method) {
         // method did not match, record it though so we can return correct result
         matched = false;
         seen = true;
         continue;
      }
      if (matched) {
        break;
      }
    }

    if (!matched) {
      if (seen) {
        return RouteNoMethod;
      }
      // no route
      return RouteNotFound;
    }

    req->parameters.clear();

    for (const auto& param: params) {
      int nstart = 0;
      int nend = 0;
      funcptr::tie(nstart, nend) = param.second;
      std::string value(req->url.path.begin() + nstart, req->url.path.begin() + nend);
      value = Utility::decodeURL(value);
      req->parameters[param.first] = std::move(value);
    }

    req->routeName = std::move(rname);

    return RouteFound;
  };

  void Router::printRoutes(std::ostream &os) {
    for(TRouteList::iterator i = routes.begin(); i != routes.end(); i++) {
#if __cplusplus >= 201103L
      std::streamsize ss = os.width();
      std::ios::fmtflags ff = os.setf(std::ios::left);
      os.width(10);
      os << std::get<0>(*i);
      os.width(50);
      os << std::get<1>(*i);
      os.width(ss);
      os.setf(ff);
      os << "    " << std::get<3>(*i);
      os << std::endl;
#else
      os << i->get<0>() << "    " << i->get<1>() << "    " << i->get<3>() << std::endl;
#endif
    } 
  };

  std::pair<std::string,std::string> Router::urlFor(const std::string &name, const strstr_map_t& arguments) {
    std::ostringstream path;
    std::string mask,method,result;
    int k1,k2,k3;

    bool found = false;
    for(TRouteList::iterator i = routes.begin(); !found && i != routes.end(); i++) {
#if __cplusplus >= 201103L
      if (std::get<3>(*i) == name) { mask = std::get<1>(*i); method = std::get<0>(*i); found = true; }
#else
      if (i->get<3>() == name) { mask = i->get<1>(); method = i->get<0>(); found = true; }
#endif
    }

    if (!found)
      throw Error("Route not found");

    for(k1=0,k3=0;k1<static_cast<int>(mask.size());k1++) {
      if (mask[k1] == '<') {
        std::string pname;
        strstr_map_t::const_iterator pptr;
        k2=k1;
        while(k1<static_cast<int>(mask.size()) && mask[k1]!='>') k1++;
        path << mask.substr(k3,k2-k3);
        if (mask[k2+1] == '*')
          pname = std::string(mask.begin() + k2 + 2, mask.begin() + k1);
        else 
          pname = std::string(mask.begin() + k2 + 1, mask.begin() + k1);
        if ((pptr = arguments.find(pname)) != arguments.end()) 
          path << Utility::encodeURL(pptr->second);
        k3 = k1+1;
      }
      else if (mask[k1] == '*') {
        // ready 
        k3++;
        continue;
      }
    }
    path << mask.substr(k3);
    result = path.str();
    return std::make_pair(method, result);
  }
};

1	/* @file
2	* @brief Concrete implementation of Router
3	*/
4	#include "yahttp.hpp"
5	#include "router.hpp"
6
7	namespace YaHTTP {
8	// router is defined here.
9	YaHTTP::Router Router::router;
10
11	void Router::map(const std::string& method, const std::string& url, THandlerFunction handler, const std::string& name) {	476✔
12	std::string method2 = method;	476✔
13	bool isopen=false;	476✔
14	// add into vector
15	for(std::string::const_iterator i = url.begin(); i != url.end(); i++) {	11,634✔
16	if (*i == '<' && isopen) throw Error("Invalid URL mask, cannot have < after <");	11,158!
17	if (*i == '<') isopen = true;	11,158✔
18	if (*i == '>' && !isopen) throw Error("Invalid URL mask, cannot have > without < first");	11,158!
19	if (*i == '>') isopen = false;	11,158✔
20	}	11,158✔
21	std::transform(method2.begin(), method2.end(), method2.begin(), ::toupper);	476✔
22	routes.push_back(funcptr::make_tuple(method2, url, handler, name));	476✔
23	};	476✔
24
25	bool Router::match(const std::string& route, const URL& requrl, std::map<std::string, TDelim> &params) {	1,672✔
26	size_t rpos = 0;	1,672✔
27	size_t upos = 0;	1,672✔
28	size_t npos = 0;	1,672✔
29	size_t nstart = 0;	1,672✔
30	size_t nend = 0;	1,672✔
31	std::string pname;	1,672✔
32	for(; rpos < route.size() && upos < requrl.path.size(); ) {	33,904✔
33	if (route[rpos] == '<') {	33,503✔
34	nstart = upos;	148✔
35	npos = rpos+1;	148✔
36	// start of parameter
37	while(rpos < route.size() && route[rpos] != '>') {	870!
38	rpos++;	722✔
39	}	722✔
40	pname = std::string(route.begin()+static_cast<long>(npos), route.begin()+static_cast<long>(rpos));	148✔
41	// then we also look it on the url
42	if (pname[0] == '*') {	148✔
43	pname = pname.substr(1);	139✔
44	// this matches whatever comes after it, basically end of string
45	nend = requrl.path.size();	139✔
46	if (!pname.empty()) {	139!
47	params[pname] = funcptr::tie(nstart,nend);	139✔
48	}	139✔
49	rpos = route.size();	139✔
50	upos = requrl.path.size();	139✔
51	break;	139✔
52	}	139✔
53	// match until url[upos] or next / if pattern is at end
54	while (upos < requrl.path.size()) {	173✔
55	if (route[rpos+1] == '\0' && requrl.path[upos] == '/') {	164!
NEW 56	break;	×
NEW 57	}	×
58	if (requrl.path[upos] == route[rpos+1]) {	164!
NEW 59	break;	×
UNCOV 60	}	×
61	upos++;	164✔
62	}	164✔
63	nend = upos;	9✔
64	params[pname] = funcptr::tie(nstart, nend);	9✔
65	if (upos > 0) {	9!
66	upos--;	9✔
67	}	9✔
NEW 68	else {	×
69	// If upos is zero, do not decrement it and then increment at bottom of loop, this disturbs Coverity.
70	// Only increment rpos and continue loop
NEW 71	rpos++;	×
NEW 72	continue;	×
UNCOV 73	}	×
74	}	9✔
75	else if (route[rpos] != requrl.path[upos]) {	33,355✔
76	break;	1,132✔
77	}	1,132✔
78
79	rpos++; upos++;	32,232✔
80	}	32,232✔
81	return route[rpos] == requrl.path[upos];	1,672✔
82	}	1,672✔
83
84	RoutingResult Router::route(Request *req, THandlerFunction& handler) {	142✔
85	std::map<std::string, TDelim> params;	142✔
86	bool matched = false;	142✔
87	bool seen = false;	142✔
88	std::string rname;	142✔
89
90	// iterate routes
91	for (auto& route: routes) {	1,573!
92	std::string method;	1,573✔
93	std::string url;	1,573✔
94	funcptr::tie(method, url, handler, rname) = route;	1,573✔
95
96	// see if we can't match the url
97	params.clear();	1,573✔
98	// simple matcher func
99	matched = match(url, req->url, params);	1,573✔
100
101	if (matched && !method.empty() && req->method != method) {	1,573!
102	// method did not match, record it though so we can return correct result
103	matched = false;	153✔
104	seen = true;	153✔
105	continue;	153✔
106	}	153✔
107	if (matched) {	1,420✔
108	break;	142✔
109	}	142✔
110	}	1,420✔
111
112	if (!matched) {	142!
113	if (seen) {	×
114	return RouteNoMethod;	×
115	}	×
116	// no route
117	return RouteNotFound;	×
118	}	×
119
120	req->parameters.clear();	142✔
121
122	for (const auto& param: params) {	142✔
123	int nstart = 0;	6✔
124	int nend = 0;	6✔
125	funcptr::tie(nstart, nend) = param.second;	6✔
126	std::string value(req->url.path.begin() + nstart, req->url.path.begin() + nend);	6✔
127	value = Utility::decodeURL(value);	6✔
128	req->parameters[param.first] = std::move(value);	6✔
129	}	6✔
130
131	req->routeName = std::move(rname);	142✔
132
133	return RouteFound;	142✔
134	};	142✔
135
136	void Router::printRoutes(std::ostream &os) {	×
137	for(TRouteList::iterator i = routes.begin(); i != routes.end(); i++) {	×
138	#if __cplusplus >= 201103L	×
139	std::streamsize ss = os.width();	×
140	std::ios::fmtflags ff = os.setf(std::ios::left);	×
141	os.width(10);	×
142	os << std::get<0>(*i);	×
143	os.width(50);	×
144	os << std::get<1>(*i);	×
145	os.width(ss);	×
146	os.setf(ff);	×
147	os << " " << std::get<3>(*i);	×
148	os << std::endl;	×
149	#else
150	os << i->get<0>() << " " << i->get<1>() << " " << i->get<3>() << std::endl;
151	#endif
152	}	×
153	};	×
154
155	std::pair<std::string,std::string> Router::urlFor(const std::string &name, const strstr_map_t& arguments) {	×
156	std::ostringstream path;	×
157	std::string mask,method,result;	×
158	int k1,k2,k3;	×
159
160	bool found = false;	×
161	for(TRouteList::iterator i = routes.begin(); !found && i != routes.end(); i++) {	×
162	#if __cplusplus >= 201103L	×
163	if (std::get<3>(i) == name) { mask = std::get<1>(i); method = std::get<0>(*i); found = true; }	×
164	#else
165	if (i->get<3>() == name) { mask = i->get<1>(); method = i->get<0>(); found = true; }
166	#endif
167	}	×
168
169	if (!found)	×
170	throw Error("Route not found");	×
171
172	for(k1=0,k3=0;k1<static_cast<int>(mask.size());k1++) {	×
173	if (mask[k1] == '<') {	×
174	std::string pname;	×
175	strstr_map_t::const_iterator pptr;	×
176	k2=k1;	×
177	while(k1<static_cast<int>(mask.size()) && mask[k1]!='>') k1++;	×
178	path << mask.substr(k3,k2-k3);	×
179	if (mask[k2+1] == '*')	×
180	pname = std::string(mask.begin() + k2 + 2, mask.begin() + k1);	×
181	else	×
182	pname = std::string(mask.begin() + k2 + 1, mask.begin() + k1);	×
183	if ((pptr = arguments.find(pname)) != arguments.end())	×
184	path << Utility::encodeURL(pptr->second);	×
185	k3 = k1+1;	×
186	}	×
187	else if (mask[k1] == '*') {	×
188	// ready
189	k3++;	×
190	continue;	×
191	}	×
192	}	×
193	path << mask.substr(k3);	×
194	result = path.str();	×
195	return std::make_pair(method, result);	×
196	}	×
197	};

PowerDNS / pdns / 9989237150

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous