Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow setting URI host and port by ntsa::Endpoint #209

Merged
merged 1 commit into from
Aug 27, 2024
Merged

Allow setting URI host and port by ntsa::Endpoint #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions groups/nts/ntsa/ntsa_host.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,13 @@ ntsa::IpAddress& Host::ip()
return d_ip.object();
}

NTSCFG_INLINE
ntsa::LocalName& Host::localName()
{
BSLS_ASSERT(d_type == ntsa::HostType::e_LOCAL_NAME);
return d_localName.object();
}

NTSCFG_INLINE
const ntsa::DomainName& Host::domainName() const
{
Expand All @@ -314,6 +321,13 @@ const ntsa::IpAddress& Host::ip() const
return d_ip.object();
}

NTSCFG_INLINE
const ntsa::LocalName& Host::localName() const
{
BSLS_ASSERT(d_type == ntsa::HostType::e_LOCAL_NAME);
return d_localName.object();
}

NTSCFG_INLINE
ntsa::HostType::Value Host::type() const
{
Expand All @@ -338,6 +352,12 @@ bool Host::isIp() const
return (d_type == ntsa::HostType::e_IP);
}

NTSCFG_INLINE
bool Host::isLocalName() const
{
return (d_type == ntsa::HostType::e_LOCAL_NAME);
}

NTSCFG_INLINE
bsl::ostream& operator<<(bsl::ostream& stream, const Host& object)
{
Expand Down
89 changes: 79 additions & 10 deletions groups/nts/ntsa/ntsa_uri.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,40 @@ ntsa::Error UriAuthority::setPort(ntsa::Port value)
return ntsa::Error();
}

ntsa::Error UriAuthority::setEndpoint(const ntsa::Endpoint& endpoint)
{
if (endpoint.isIp()) {
if (d_host.isNull()) {
d_host.makeValue().makeIp(endpoint.ip().host());
}
else {
d_host.value().makeIp(endpoint.ip().host());
}

if (d_port.isNull()) {
d_port.makeValue(endpoint.ip().port());
}
else {
d_port.value() = endpoint.ip().port();
}
}
else if (endpoint.isLocal()) {
if (d_host.isNull()) {
d_host.makeValue().makeLocalName(endpoint.local());
}
else {
d_host.value().makeLocalName(endpoint.local());
}

d_port.reset();
}
else {
return ntsa::Error(ntsa::Error::e_INVALID);
}

return ntsa::Error();
}

ntsa::Error UriAuthority::setTransport(ntsa::Transport::Value value)
{
if (d_transport.isNull()) {
Expand Down Expand Up @@ -1041,6 +1075,26 @@ ntsa::Error Uri::setPort(ntsa::Port value)
return ntsa::Error();
}

ntsa::Error Uri::setEndpoint(const ntsa::Endpoint& value)
{
ntsa::Error error;

if (d_authority.isNull()) {
error = d_authority.makeValue().setEndpoint(value);
if (error) {
return error;
}
}
else {
error = d_authority.value().setEndpoint(value);
if (error) {
return error;
}
}

return ntsa::Error();
}

ntsa::Error Uri::setTransport(ntsa::Transport::Value value)
{
ntsa::Error error;
Expand Down Expand Up @@ -1496,21 +1550,36 @@ bsl::ostream& Uri::print(bsl::ostream& stream,
}

if (!d_authority.value().user().isNull()) {
if (d_authority.value().user().value().empty()) {
return stream;
}
if (!d_authority.value().user().value().empty()) {
bsl::string user;
error = encodeUrl(&user, d_authority.value().user().value());
if (error) {
return stream;
}

bsl::string user;
error = encodeUrl(&user, d_authority.value().user().value());
if (error) {
return stream;
stream << user << '@';
}

stream << user << '@';
}

if (!d_authority.value().host().isNull()) {
stream << d_authority.value().host().value();
if (d_authority.value().host().value().isDomainName()) {
stream << d_authority.value().host().value().domainName();
}
else if (d_authority.value().host().value().isIp()) {
if (d_authority.value().host().value().ip().isV4()) {
stream << d_authority.value().host().value().ip().v4();
}
else if (d_authority.value().host().value().ip().isV6()) {
stream << '['
<< d_authority.value().host().value().ip().v6()
<< ']';
}
}
else if (d_authority.value().host().value().isLocalName()) {
stream << '@'
<< d_authority.value().host().value().localName()
<< '@';
}
}

if (!d_authority.value().port().isNull()) {
Expand Down
24 changes: 17 additions & 7 deletions groups/nts/ntsa/ntsa_uri.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,29 +84,35 @@ class UriAuthority
ntsa::Error setUser(const bslstl::StringRef& value);

/// Set the host specified in the authority portion of the URI to the
/// // specified 'value'. Return the error.
/// specified 'value'. Return the error.
ntsa::Error setHost(const ntsa::Host& value);

/// Set the host specified in the authority portion of the URI to the
/// // specified 'value'. Return the error.
/// specified 'value'. Return the error.
ntsa::Error setHost(const bslstl::StringRef& value);

/// Set the host specified in the authority portion of the URI to the
/// // specified 'value'. Return the error.
/// specified 'value'. Return the error.
ntsa::Error setHost(const ntsa::IpAddress& value);

/// Set the host specified in the authority portion of the URI to the
/// // specified 'value'. Return the error.
/// specified 'value'. Return the error.
ntsa::Error setHost(const ntsa::Ipv4Address& value);

/// Set the host specified in the authority portion of the URI to the
/// // specified 'value'. Return the error.
/// specified 'value'. Return the error.
ntsa::Error setHost(const ntsa::Ipv6Address& value);

/// Set the port specified in the authority portion of the URI.
/// Set the port specified in the authority portion of the URI to the
/// specified 'value'. Return the error.
ntsa::Error setPort(ntsa::Port value);

/// Set the transport specified in the authority portion of the URI.
/// Set the host and port in the authority portion of the URI to the
/// specified 'value'. Return the error.
ntsa::Error setEndpoint(const ntsa::Endpoint& value);

/// Set the transport specified in the authority portion of the URI to the
/// specified 'value'. Return the error.
ntsa::Error setTransport(ntsa::Transport::Value value);

/// Return the user specified in the authority portion of the URI.
Expand Down Expand Up @@ -490,6 +496,10 @@ class Uri
/// specified 'value'. Return the error.
ntsa::Error setPort(ntsa::Port value);

/// Set the host and port in the authority portion of the URI to the
/// specified 'value'. Return the error.
ntsa::Error setEndpoint(const ntsa::Endpoint& value);

/// Set the transport specified in the authority portion of the URI to the
/// specified 'value'. Return the error.
ntsa::Error setTransport(ntsa::Transport::Value value);
Expand Down
131 changes: 131 additions & 0 deletions groups/nts/ntsa/ntsa_uri.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,9 +677,140 @@ NTSCFG_TEST_CASE(2)
NTSCFG_TEST_ASSERT(ta.numBlocksInUse() == 0);
}

NTSCFG_TEST_CASE(3)
{
ntscfg::TestAllocator ta;
{
ntsa::Error error;

{
ntsa::Endpoint endpoint(
ntsa::IpEndpoint(ntsa::Ipv4Address::loopback(), 80));

ntsa::Uri uri(&ta);

error = uri.setEndpoint(endpoint);
NTSCFG_TEST_OK(error);

error = uri.setPath("path/to/resource");
NTSCFG_TEST_OK(error);

if (NTSCFG_TEST_VERBOSITY) {
bsl::cout << "URI: " << uri.text()
<< " (endpoint: " << endpoint << ")" << bsl::endl;
}
}

{
ntsa::Endpoint endpoint(
ntsa::IpEndpoint(ntsa::Ipv4Address::loopback(), 80));

ntsa::Uri uri(&ta);

error = uri.setScheme("http");
NTSCFG_TEST_OK(error);

error = uri.setEndpoint(endpoint);
NTSCFG_TEST_OK(error);

error = uri.setPath("path/to/resource");
NTSCFG_TEST_OK(error);

if (NTSCFG_TEST_VERBOSITY) {
bsl::cout << "URI: " << uri.text()
<< " (endpoint: " << endpoint << ")" << bsl::endl;
}
}

{
ntsa::Endpoint endpoint(
ntsa::IpEndpoint(ntsa::Ipv6Address::loopback(), 80));

ntsa::Uri uri(&ta);

error = uri.setEndpoint(endpoint);
NTSCFG_TEST_OK(error);

error = uri.setPath("path/to/resource");
NTSCFG_TEST_OK(error);

if (NTSCFG_TEST_VERBOSITY) {
bsl::cout << "URI: " << uri.text()
<< " (endpoint: " << endpoint << ")" << bsl::endl;
}
}

{
ntsa::Endpoint endpoint(
ntsa::IpEndpoint(ntsa::Ipv6Address::loopback(), 80));

ntsa::Uri uri(&ta);

error = uri.setScheme("http");
NTSCFG_TEST_OK(error);

error = uri.setEndpoint(endpoint);
NTSCFG_TEST_OK(error);

error = uri.setPath("path/to/resource");
NTSCFG_TEST_OK(error);

if (NTSCFG_TEST_VERBOSITY) {
bsl::cout << "URI: " << uri.text()
<< " (endpoint: " << endpoint << ")" << bsl::endl;
}
}

{
ntsa::LocalName localName;
localName.setValue("/tmp/ntf/socket");

ntsa::Endpoint endpoint(localName);

ntsa::Uri uri(&ta);

error = uri.setEndpoint(endpoint);
NTSCFG_TEST_OK(error);

error = uri.setPath("path/to/resource");
NTSCFG_TEST_OK(error);

if (NTSCFG_TEST_VERBOSITY) {
bsl::cout << "URI: " << uri.text()
<< " (endpoint: " << endpoint << ")" << bsl::endl;
}
}

{
ntsa::LocalName localName;
localName.setValue("/tmp/ntf/socket");

ntsa::Endpoint endpoint(localName);

ntsa::Uri uri(&ta);

error = uri.setScheme("http");
NTSCFG_TEST_OK(error);

error = uri.setEndpoint(endpoint);
NTSCFG_TEST_OK(error);

error = uri.setPath("path/to/resource");
NTSCFG_TEST_OK(error);

if (NTSCFG_TEST_VERBOSITY) {
bsl::cout << "URI: " << uri.text()
<< " (endpoint: " << endpoint << ")" << bsl::endl;
}
}
}
NTSCFG_TEST_ASSERT(ta.numBlocksInUse() == 0);
}

NTSCFG_TEST_DRIVER
{
NTSCFG_TEST_REGISTER(1);
NTSCFG_TEST_REGISTER(2);
NTSCFG_TEST_REGISTER(3);
}
NTSCFG_TEST_DRIVER_END;
Loading