summaryrefslogtreecommitdiffstats
path: root/vespalib
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@oath.com>2018-11-13 13:09:30 +0000
committerTor Brede Vekterli <vekterli@oath.com>2018-11-13 13:09:30 +0000
commit9e5a54463dd08d861e068ec5ea3bb9b194a0e481 (patch)
tree551dd4cb9fb03508e485ba99e3c50dbf36e3d90e /vespalib
parent43d60d7b360a1e164772acb29988f433105d28db (diff)
`Cursor` -> `Inspector` for parsing
Diffstat (limited to 'vespalib')
-rw-r--r--vespalib/src/vespa/vespalib/net/tls/transport_security_options_reading.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/vespalib/src/vespa/vespalib/net/tls/transport_security_options_reading.cpp b/vespalib/src/vespa/vespalib/net/tls/transport_security_options_reading.cpp
index afc0982973e..f14ad78dc91 100644
--- a/vespalib/src/vespa/vespalib/net/tls/transport_security_options_reading.cpp
+++ b/vespalib/src/vespa/vespalib/net/tls/transport_security_options_reading.cpp
@@ -61,7 +61,7 @@ void verify_referenced_file_exists(const vespalib::string& file_path) {
}
}
-vespalib::string load_file_referenced_by_field(const Cursor& cursor, const char* field) {
+vespalib::string load_file_referenced_by_field(const Inspector& cursor, const char* field) {
auto file_path = cursor[field].asString().make_string();
if (file_path.empty()) {
throw IllegalArgumentException(make_string("TLS config field '%s' has not been set", field));
@@ -70,7 +70,7 @@ vespalib::string load_file_referenced_by_field(const Cursor& cursor, const char*
return File::readAll(file_path);
}
-RequiredPeerCredential parse_peer_credential(const Cursor& req_entry) {
+RequiredPeerCredential parse_peer_credential(const Inspector& req_entry) {
auto field_string = req_entry["field"].asString().make_string();
RequiredPeerCredential::Field field;
if (field_string == "CN") {
@@ -86,7 +86,7 @@ RequiredPeerCredential parse_peer_credential(const Cursor& req_entry) {
return RequiredPeerCredential(field, std::move(match));
}
-PeerPolicy parse_peer_policy(const Cursor& peer_entry) {
+PeerPolicy parse_peer_policy(const Inspector& peer_entry) {
auto& creds = peer_entry["required-credentials"];
if (creds.children() == 0) {
throw IllegalArgumentException("\"required-credentials\" array can't be empty (would allow all peers)");
@@ -98,7 +98,7 @@ PeerPolicy parse_peer_policy(const Cursor& peer_entry) {
return PeerPolicy(std::move(required_creds));
}
-AllowedPeers parse_allowed_peers(const Cursor& allowed_peers) {
+AllowedPeers parse_allowed_peers(const Inspector& allowed_peers) {
if (!allowed_peers.valid()) {
// If there's no "allowed-peers" object, valid CA signing is sufficient.
return AllowedPeers::allow_all_authenticated();