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

Harden handles against invalid connector id range #882

Merged
merged 8 commits into from
Dec 4, 2024
Merged

Harden handles against invalid connector id range #882

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c284baa
Reject setcharing profile if connectorID out of range
Matthias-NIDEC Nov 27, 2024
c1519a6
unsupported for unlockconnector
Matthias-NIDEC Nov 27, 2024
cf876fe
reject for getcompositeschedule
Matthias-NIDEC Nov 27, 2024
e2729c1
reject for clearchargingprofile
Matthias-NIDEC Nov 27, 2024
e4219d2
reject for reservenow
Matthias-NIDEC Nov 27, 2024
a4100fa
reject for remotestart
Matthias-NIDEC Nov 27, 2024
97cd2d4
Modification related to clang format
Matthias-NIDEC Nov 28, 2024
d83d169
* Code style changes
Pietfried Dec 4, 2024
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
10 changes: 6 additions & 4 deletions lib/ocpp/v16/charge_point_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1931,8 +1931,10 @@ void ChargePointImpl::handleRemoteStartTransactionRequest(ocpp::Call<RemoteStart
std::vector<int32_t> referenced_connectors;

if (call.msg.connectorId) {
if (call.msg.connectorId.value() <= 0) {
EVLOG_warning << "Received RemoteStartTransactionRequest with connector id <= 0";
if (call.msg.connectorId.value() <= 0 or
call.msg.connectorId.value() > this->configuration->getNumberOfConnectors()) {
EVLOG_warning << "Received RemoteStartTransactionRequest with connector id <= 0 or > "
<< this->configuration->getNumberOfConnectors();
response.status = RemoteStartStopStatus::Rejected;
ocpp::CallResult<RemoteStartTransactionResponse> call_result(response, call.uniqueId);
this->message_dispatcher->dispatch_call_result(call_result);
Expand Down Expand Up @@ -2243,7 +2245,7 @@ void ChargePointImpl::handleUnlockConnectorRequest(ocpp::Call<UnlockConnectorReq

UnlockConnectorResponse response;
auto connector = call.msg.connectorId;
if (connector == 0 || connector > this->configuration->getNumberOfConnectors()) {
if (connector <= 0 or connector > this->configuration->getNumberOfConnectors()) {
response.status = UnlockStatus::NotSupported;
} else {
// this message is not intended to remotely stop a transaction, but if a transaction is still ongoing it is
Expand Down Expand Up @@ -2335,7 +2337,7 @@ void ChargePointImpl::handleGetCompositeScheduleRequest(ocpp::Call<GetCompositeS
const auto connector_id = call.msg.connectorId;
const auto allowed_charging_rate_units = this->configuration->getChargingScheduleAllowedChargingRateUnitVector();

if ((size_t)connector_id >= this->connectors.size() or connector_id < 0) {
if (connector_id > this->configuration->getNumberOfConnectors() or connector_id < 0) {
response.status = GetCompositeScheduleStatus::Rejected;
} else if (call.msg.chargingRateUnit and
std::find(allowed_charging_rate_units.begin(), allowed_charging_rate_units.end(),
Expand Down
Loading