8231341702

Committed 11 Mar 2024 10:33AM UTC coverage: 59.192% (+0.02%) from 59.176%

Build # 8231341702

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #13205 from mind04/auth-catalog-group

auth: catalog, include groups in hash calculation

Run Details

32489 of 88110 branches covered (36.87%)

Branch coverage included in aggregate %.

1 of 5 new or added lines in 1 file covered. (20.0%)

21 existing lines in 5 files now uncovered.

113636 of 158757 relevant lines covered (71.58%)

3107081.92 hits per line

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

78.18

/pdns/auth-catalogzone.cc

/*
 * This file is part of PowerDNS or dnsdist.
 * Copyright -- PowerDNS.COM B.V. and its contributors
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of version 2 of the GNU General Public License as
 * published by the Free Software Foundation.
 *
 * In addition, for the avoidance of any doubt, permission is granted to
 * link this program with OpenSSL and to (re)distribute the binaries
 * produced as the result of such linking.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

#include "dnsbackend.hh"

void CatalogInfo::fromJson(const std::string& json, CatalogType type)
{
  d_type = type;
  if (d_type == CatalogType::None) {
    throw std::runtime_error("CatalogType is set to None");
  }
  if (json.empty()) {
    return;
  }
  std::string err;
  d_doc = json11::Json::parse(json, err);
  if (!d_doc.is_null()) {
    if (!d_doc[getTypeString(d_type)].is_null()) {
      auto items = d_doc[getTypeString(type)].object_items();
      if (!items["coo"].is_null()) {
        if (items["coo"].is_string()) {
          if (!items["coo"].string_value().empty()) {
            d_coo = DNSName(items["coo"].string_value());
          }
        }
        else {
          throw std::out_of_range("Key 'coo' is not a string");
        }
      }
      if (!items["unique"].is_null()) {
        if (items["unique"].is_string()) {
          if (!items["unique"].string_value().empty()) {
            d_unique = DNSName(items["unique"].string_value());
          }
        }
        else {
          throw std::out_of_range("Key 'unique' is not a string");
        }
      }
      if (!items["group"].is_null()) {
        if (items["group"].is_array()) {
          for (const auto& value : items["group"].array_items()) {
            d_group.insert(value.string_value());
          }
        }
        else {
          throw std::out_of_range("Key 'group' is not an array");
        }
      }
    }
  }
  else {
    throw std::runtime_error("Parsing of JSON options failed: " + err);
  }
}

std::string CatalogInfo::toJson() const
{
  if (d_type == CatalogType::None) {
    throw std::runtime_error("CatalogType is set to None");
  }
  json11::Json::object object;
  if (!d_coo.empty()) {
    object["coo"] = d_coo.toString();
  }
  if (!d_unique.empty()) {
    if (d_unique.countLabels() > 1) {
      throw std::out_of_range("Multiple labels in a unique value are not allowed");
    }
    object["unique"] = d_unique.toString();
  }
  if (!d_group.empty()) {
    json11::Json::array entries;
    for (const auto& group : d_group) {
      entries.push_back(group);
    }
    object["group"] = entries;
  }
  auto tmp = d_doc.object_items();
  tmp[getTypeString(d_type)] = object;
  const json11::Json ret = tmp;
  return ret.dump();
}

void CatalogInfo::updateHash(CatalogHashMap& hashes, const DomainInfo& di) const
{
  hashes[di.catalog].process(std::to_string(di.id) + di.zone.toLogString() + string("\0", 1) + d_coo.toLogString() + string("\0", 1) + d_unique.toLogString());
  for (const auto& group : d_group) {
    hashes[di.catalog].process(std::to_string(group.length()) + group);
  }
}

DNSZoneRecord CatalogInfo::getCatalogVersionRecord(const DNSName& zone)
{
  DNSZoneRecord dzr;
  dzr.dr.d_name = DNSName("version") + zone;
  dzr.dr.d_ttl = 0;
  dzr.dr.d_type = QType::TXT;
  dzr.dr.setContent(std::make_shared<TXTRecordContent>("2"));
  return dzr;
}

void CatalogInfo::toDNSZoneRecords(const DNSName& zone, vector<DNSZoneRecord>& dzrs) const
{
  DNSName prefix;
  if (d_unique.empty()) {
    prefix = getUnique();
  }
  else {
    prefix = d_unique;
  }
  prefix += DNSName("zones") + zone;

  DNSZoneRecord dzr;
  dzr.dr.d_name = prefix;
  dzr.dr.d_ttl = 0;
  dzr.dr.d_type = QType::PTR;
  dzr.dr.setContent(std::make_shared<PTRRecordContent>(d_zone.toString()));
  dzrs.emplace_back(dzr);

  if (!d_coo.empty()) {
    dzr.dr.d_name = DNSName("coo") + prefix;
    dzr.dr.d_ttl = 0;
    dzr.dr.d_type = QType::PTR;
    dzr.dr.setContent(std::make_shared<PTRRecordContent>(d_coo));
    dzrs.emplace_back(dzr);
  }

  for (const auto& group : d_group) {
    dzr.dr.d_name = DNSName("group") + prefix;
    dzr.dr.d_ttl = 0;
    dzr.dr.d_type = QType::TXT;
    dzr.dr.setContent(std::make_shared<TXTRecordContent>("\"" + group + "\""));
    dzrs.emplace_back(dzr);
  }
}

1	/*
2	* This file is part of PowerDNS or dnsdist.
3	* Copyright -- PowerDNS.COM B.V. and its contributors
4	*
5	* This program is free software; you can redistribute it and/or modify
6	* it under the terms of version 2 of the GNU General Public License as
7	* published by the Free Software Foundation.
8	*
9	* In addition, for the avoidance of any doubt, permission is granted to
10	* link this program with OpenSSL and to (re)distribute the binaries
11	* produced as the result of such linking.
12	*
13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.
17	*
18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software
20	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
21	*/
22
23	#ifdef HAVE_CONFIG_H
24	#include "config.h"
25	#endif
26
27	#include "dnsbackend.hh"
28
29	void CatalogInfo::fromJson(const std::string& json, CatalogType type)
30	{	756✔
31	d_type = type;	756✔
32	if (d_type == CatalogType::None) {	756!
33	throw std::runtime_error("CatalogType is set to None");	×
34	}	×
35	if (json.empty()) {	756✔
36	return;	608✔
37	}	608✔
38	std::string err;	148✔
39	d_doc = json11::Json::parse(json, err);	148✔
40	if (!d_doc.is_null()) {	148!
41	if (!d_doc[getTypeString(d_type)].is_null()) {	148!
42	auto items = d_doc[getTypeString(type)].object_items();	148✔
43	if (!items["coo"].is_null()) {	148✔
44	if (items["coo"].is_string()) {	88!
45	if (!items["coo"].string_value().empty()) {	88!
46	d_coo = DNSName(items["coo"].string_value());	88✔
47	}	88✔
48	}	88✔
49	else {	×
50	throw std::out_of_range("Key 'coo' is not a string");	×
51	}	×
52	}	88✔
53	if (!items["unique"].is_null()) {	148✔
54	if (items["unique"].is_string()) {	84!
55	if (!items["unique"].string_value().empty()) {	84!
56	d_unique = DNSName(items["unique"].string_value());	84✔
57	}	84✔
58	}	84✔
59	else {	×
60	throw std::out_of_range("Key 'unique' is not a string");	×
61	}	×
62	}	84✔
63	if (!items["group"].is_null()) {	148✔
64	if (items["group"].is_array()) {	36!
65	for (const auto& value : items["group"].array_items()) {	72✔
66	d_group.insert(value.string_value());	72✔
67	}	72✔
68	}	36✔
69	else {	×
70	throw std::out_of_range("Key 'group' is not an array");	×
71	}	×
72	}	36✔
73	}	148✔
74	}	148✔
75	else {	×
76	throw std::runtime_error("Parsing of JSON options failed: " + err);	×
77	}	×
78	}	148✔
79
80	std::string CatalogInfo::toJson() const
81	{	272✔
82	if (d_type == CatalogType::None) {	272!
83	throw std::runtime_error("CatalogType is set to None");	×
84	}	×
85	json11::Json::object object;	272✔
86	if (!d_coo.empty()) {	272✔
87	object["coo"] = d_coo.toString();	68✔
88	}	68✔
89	if (!d_unique.empty()) {	272✔
90	if (d_unique.countLabels() > 1) {	232!
91	throw std::out_of_range("Multiple labels in a unique value are not allowed");	×
92	}	×
93	object["unique"] = d_unique.toString();	232✔
94	}	232✔
95	if (!d_group.empty()) {	272✔
96	json11::Json::array entries;	24✔
97	for (const auto& group : d_group) {	48✔
98	entries.push_back(group);	48✔
99	}	48✔
100	object["group"] = entries;	24✔
101	}	24✔
102	auto tmp = d_doc.object_items();	272✔
103	tmp[getTypeString(d_type)] = object;	272✔
104	const json11::Json ret = tmp;	272✔
105	return ret.dump();	272✔
106	}	272✔
107
108	void CatalogInfo::updateHash(CatalogHashMap& hashes, const DomainInfo& di) const
109	{	×
NEW 110	hashes[di.catalog].process(std::to_string(di.id) + di.zone.toLogString() + string("\0", 1) + d_coo.toLogString() + string("\0", 1) + d_unique.toLogString());	×
NEW 111	for (const auto& group : d_group) {	×
NEW 112	hashes[di.catalog].process(std::to_string(group.length()) + group);	×
NEW 113	}	×
UNCOV 114	}	×
115
116	DNSZoneRecord CatalogInfo::getCatalogVersionRecord(const DNSName& zone)
117	{	36✔
118	DNSZoneRecord dzr;	36✔
119	dzr.dr.d_name = DNSName("version") + zone;	36✔
120	dzr.dr.d_ttl = 0;	36✔
121	dzr.dr.d_type = QType::TXT;	36✔
122	dzr.dr.setContent(std::make_shared<TXTRecordContent>("2"));	36✔
123	return dzr;	36✔
124	}	36✔
125
126	void CatalogInfo::toDNSZoneRecords(const DNSName& zone, vector<DNSZoneRecord>& dzrs) const
127	{	600✔
128	DNSName prefix;	600✔
129	if (d_unique.empty()) {	600✔
130	prefix = getUnique();	564✔
131	}	564✔
132	else {	36✔
133	prefix = d_unique;	36✔
134	}	36✔
135	prefix += DNSName("zones") + zone;	600✔
136
137	DNSZoneRecord dzr;	600✔
138	dzr.dr.d_name = prefix;	600✔
139	dzr.dr.d_ttl = 0;	600✔
140	dzr.dr.d_type = QType::PTR;	600✔
141	dzr.dr.setContent(std::make_shared<PTRRecordContent>(d_zone.toString()));	600✔
142	dzrs.emplace_back(dzr);	600✔
143
144	if (!d_coo.empty()) {	600✔
145	dzr.dr.d_name = DNSName("coo") + prefix;	36✔
146	dzr.dr.d_ttl = 0;	36✔
147	dzr.dr.d_type = QType::PTR;	36✔
148	dzr.dr.setContent(std::make_shared<PTRRecordContent>(d_coo));	36✔
149	dzrs.emplace_back(dzr);	36✔
150	}	36✔
151
152	for (const auto& group : d_group) {	600✔
153	dzr.dr.d_name = DNSName("group") + prefix;	72✔
154	dzr.dr.d_ttl = 0;	72✔
155	dzr.dr.d_type = QType::TXT;	72✔
156	dzr.dr.setContent(std::make_shared<TXTRecordContent>("\"" + group + "\""));	72✔
157	dzrs.emplace_back(dzr);	72✔
158	}	72✔
159	}	600✔

PowerDNS / pdns / 8231341702

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