-
Notifications
You must be signed in to change notification settings - Fork 157
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.
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
Additions to cross-layer interfaces according to the ETSI standards #105
Open
glmax
wants to merge
6
commits into
riebl:master
Choose a base branch
from
glmax:cross-layer-interfaces
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d0e1f8b
security: add permissions and security profile to btp/gn/encap request
glmax 40a92d2
socktap: copy maximum hop limit from request in application
glmax 7db2f3c
geonet/btp: use LongPositionVector (instead of short) in indications
glmax 9d1ed77
geonet/btp: add security report and certificate id to indications
glmax 8a43439
btp: add GN transport type and remaining hop limit to indication
glmax 52d158e
geonet: do not init security_report for packets without secure header
glmax File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
#include <vanetza/btp/data_indication.hpp> | ||
#include <vanetza/btp/data_request.hpp> | ||
#include <vanetza/common/byte_buffer.hpp> | ||
#include <vanetza/common/its_aid.hpp> | ||
#include <vanetza/common/position_fix.hpp> | ||
#include <vanetza/common/runtime.hpp> | ||
|
@@ -23,6 +24,7 @@ | |
#include <vanetza/geonet/transport_interface.hpp> | ||
#include <vanetza/geonet/extended_pdu.hpp> | ||
#include <vanetza/geonet/secured_pdu.hpp> | ||
#include <boost/optional.hpp> | ||
#include <boost/units/cmath.hpp> | ||
#include <functional> | ||
#include <stdexcept> | ||
|
@@ -40,10 +42,14 @@ struct ControlInfo | |
{ | ||
ControlInfo(const DataRequest request) : | ||
communication_profile(request.communication_profile), | ||
its_aid(request.its_aid) {} | ||
security_profile(request.security_profile), | ||
its_aid(request.its_aid), | ||
permissions(request.permissions) {} | ||
|
||
const CommunicationProfile communication_profile; | ||
const decltype(security::EncapRequest::sec_services) security_profile; | ||
const ItsAid its_aid; | ||
const boost::optional<ByteBuffer> permissions; | ||
}; | ||
|
||
template<typename PDU> | ||
|
@@ -229,8 +235,14 @@ DataConfirm Router::request(const ShbDataRequest& request, DownPacketPtr payload | |
pdu->extended().source_position = m_local_position_vector; | ||
|
||
// step 2: encapsulate packet by security | ||
if (m_mib.itsGnSecurity) { | ||
payload = encap_packet(ctrl.its_aid, *pdu, std::move(payload)); | ||
if (m_mib.itsGnSecurity && ctrl.security_profile) { | ||
auto encap_result = encap_packet(ctrl.security_profile, ctrl.its_aid, *ctrl.permissions, *pdu, std::move(payload)); | ||
if (encap_result) { | ||
payload = std::move(encap_result.get()); | ||
} else { | ||
// TODO: How to throw an error here? | ||
return; | ||
} | ||
} | ||
|
||
// step 5: execute media-dependent procedures | ||
|
@@ -293,9 +305,15 @@ DataConfirm Router::request(const GbcDataRequest& request, DownPacketPtr payload | |
pdu->extended().source_position = m_local_position_vector; | ||
|
||
// step 5: apply security | ||
if (m_mib.itsGnSecurity) { | ||
if (m_mib.itsGnSecurity && ctrl.security_profile) { | ||
assert(pdu->basic().next_header == NextHeaderBasic::Secured); | ||
payload = encap_packet(ctrl.its_aid, *pdu, std::move(payload)); | ||
auto encap_result = encap_packet(ctrl.security_profile, ctrl.its_aid, *ctrl.permissions, *pdu, std::move(payload)); | ||
if (encap_result) { | ||
payload = std::move(encap_result.get()); | ||
} else { | ||
// TODO: How to throw an error here? | ||
return; | ||
} | ||
} | ||
|
||
// step 6: repetition is already set-up before | ||
|
@@ -707,10 +725,19 @@ void Router::on_beacon_timer_expired() | |
// Beacons originate in GeoNet layer, therefore no upper layer payload | ||
DownPacketPtr payload { new DownPacket() }; | ||
auto pdu = create_beacon_pdu(); | ||
// GN-MGMT has no SSP defined | ||
auto permissions = ByteBuffer {}; | ||
|
||
if (m_mib.itsGnSecurity) { | ||
pdu->basic().next_header = NextHeaderBasic::Secured; | ||
payload = encap_packet(aid::GN_MGMT, *pdu, std::move(payload)); | ||
// Use default security profile for beacons, see ETSI EN 302 636-4-1 v1.2.1, table 22 | ||
auto encap_result = encap_packet(security::SecurityProfile::Default, aid::GN_MGMT, permissions, *pdu, std::move(payload)); | ||
if (!encap_result) { | ||
// TODO: Throw an error here? If so, how? | ||
return; | ||
} else { | ||
payload = std::move(encap_result.get()); | ||
} | ||
} else { | ||
pdu->basic().next_header = NextHeaderBasic::Common; | ||
} | ||
|
@@ -1209,26 +1236,32 @@ std::unique_ptr<GbcPdu> Router::create_gbc_pdu(const GbcDataRequest& request) | |
return pdu; | ||
} | ||
|
||
Router::DownPacketPtr Router::encap_packet(ItsAid its_aid, Pdu& pdu, DownPacketPtr packet) | ||
boost::optional<Router::DownPacketPtr> Router::encap_packet(boost::optional<security::SecurityProfile> security_profile, ItsAid its_aid, ByteBuffer permissions, Pdu& pdu, DownPacketPtr packet) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. return an empty pointer instead of a boost::optional? |
||
{ | ||
security::EncapRequest encap_request; | ||
|
||
DownPacket sec_payload; | ||
sec_payload[OsiLayer::Network] = SecuredPdu(pdu); | ||
sec_payload.merge(*packet, OsiLayer::Transport, max_osi_layer()); | ||
encap_request.plaintext_payload = std::move(sec_payload); | ||
encap_request.sec_services = security_profile; | ||
encap_request.its_aid = its_aid; | ||
encap_request.permissions = permissions; | ||
|
||
if (m_security_entity) { | ||
security::EncapConfirm confirm = m_security_entity->encapsulate_packet(std::move(encap_request)); | ||
pdu.secured(std::move(confirm.sec_packet)); | ||
if (confirm.sec_packet) { | ||
pdu.secured(std::move(*confirm.sec_packet)); | ||
} else { | ||
return boost::none; | ||
} | ||
} else { | ||
throw std::runtime_error("security entity unavailable"); | ||
} | ||
|
||
assert(size(*packet, OsiLayer::Transport, max_osi_layer()) == 0); | ||
assert(pdu.basic().next_header == NextHeaderBasic::Secured); | ||
return packet; | ||
return std::move(packet); | ||
} | ||
|
||
std::string stringify(Router::PacketDropReason pdr) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As far as I know, no error reporting is foreseen at this point by specifications.
We may invoke a hook here so custom error logging can be realised without hassle.