validate CSMS-URL: opt. schema must fit with security-profile; chargepoint-ID deprecated in URL #201

Dominik-K · 2023-09-28T16:25:03Z

No description provided.

Signed-off-by: Dominik K <dominik@pionix.de>

…e errors Signed-off-by: Dominik K <dominik@pionix.de>

Pietfried · 2023-09-29T06:05:13Z

So far it was required to include the chargepoint_id in the configured CentralSystemURI (v16) or ocppCsmsUrl (v201, as part of the NetworkConnectionProfiles variable). This is indeed redundant so I like this initiative!

For v16 we can append the internal configuration key ChargePointId (like implemented in this PR) and for v201 we need to use the variable "Identity" from the "SecurityCtrlr", so this line is currently not correct:
https://github.com/EVerest/libocpp/blob/main/lib/ocpp/v201/charge_point.cpp#L585

Please add this to the PR.

include/ocpp/helpers/uri.hpp

lib/ocpp/common/websocket/websocket_tls.cpp

Signed-off-by: Dominik K <dominik@pionix.de>

Dominik-K · 2023-10-04T14:28:42Z

Next I'll use a Uri::set_path to allow backwards-compatibility with current URLs which contain the CP-ID as path.

Signed-off-by: Dominik K <dominik@pionix.de>

include/ocpp/common/websocket/websocket_uri.hpp

lib/ocpp/common/websocket/websocket_plain.cpp

Signed-off-by: Dominik K <dominik@pionix.de>

Dominik-K · 2023-10-19T09:25:19Z

@Pietfried It's ready now. I'll do the returning an error/std::expected in a follow-up PR.

Signed-off-by: Dominik K <dominik@pionix.de>

lib/ocpp/common/websocket/websocket_uri.cpp

Signed-off-by: Dominik K <dominik@pionix.de>

lib/ocpp/common/websocket/websocket_plain.cpp

Signed-off-by: Dominik K <dominik@pionix.de>

include/ocpp/common/websocket/websocket_uri.hpp

lib/ocpp/v16/charge_point_impl.cpp

Pietfried · 2023-11-09T09:03:55Z

lib/ocpp/v201/charge_point.cpp

+    auto security_profile = network_connection_profile.securityProfile;
+    auto uri = Uri::parse_and_validate(
+        network_connection_profile.ocppCsmsUrl.get(),
+        this->device_model->get_value<std::string>(ControllerComponentVariables::SecurityCtrlrIdentity),


Identity is defined as not required in OCPP2.0.1 spec (so it should be requested from storage with get_optional_value). This seems to be a problem with the spec. Lets define Identity as requried in config/ and keep requesting storage with get_value

Is there sth. more needed except adding Identity to required: in SecurityCtrlr.json?

lib/ocpp/v201/charge_point.cpp

include/ocpp/common/types.hpp

lib/ocpp/common/websocket/websocket_plain.cpp

Signed-off-by: Dominik K <dominik@pionix.de>

Dominik-K added 4 commits September 28, 2023 18:13

new helpers::URIAppendPath()

d590bae

Signed-off-by: Dominik K <dominik@pionix.de>

append chargepoint ID to CSMS-URI

28a3d52

Signed-off-by: Dominik K <dominik@pionix.de>

rename cs_uri to csms_uri

ad9f9dc

Signed-off-by: Dominik K <dominik@pionix.de>

fix in websocket_plain.cpp; consolidate both to avoid copy and past…

ed1495c

…e errors Signed-off-by: Dominik K <dominik@pionix.de>

Pietfried requested changes Sep 29, 2023

View reviewed changes

include/ocpp/helpers/uri.hpp Outdated Show resolved Hide resolved

include/ocpp/helpers/uri.hpp Outdated Show resolved Hide resolved

lib/ocpp/common/websocket/websocket_tls.cpp Outdated Show resolved Hide resolved

Dominik-K added 4 commits September 29, 2023 18:06

move Uri-struct to websocket_common.cpp

ec0d20d

Signed-off-by: Dominik K <dominik@pionix.de>

v201: use SecurityCtrlrIdentity instead ChargePointId

5a7103f

Signed-off-by: Dominik K <dominik@pionix.de>

Merge branch 'main' into fix/websockets/CP-ID

54e4f1c

Signed-off-by: Dominik K <dominik@pionix.de>

merge fix

6062783

Signed-off-by: Dominik K <dominik@pionix.de>

Dominik-K added 5 commits October 13, 2023 13:39

use set_path(), use websocketpp with workaround

f2d05dd

Signed-off-by: Dominik K <dominik@pionix.de>

transfer uri around to avoid re-parsing

fb54d8f

Signed-off-by: Dominik K <dominik@pionix.de>

rename to websocket_uri.*pp

d4323ed

Signed-off-by: Dominik K <dominik@pionix.de>

reworked with static Uri::parse_from_string()

977c6d1

Signed-off-by: Dominik K <dominik@pionix.de>

use set_connection_options() generically

88b8abd

Signed-off-by: Dominik K <dominik@pionix.de>

Dominik-K changed the title ~~Fix/websockets/CP-ID~~ deprecate chargepoint-ID in CSMS-URL config-field Oct 18, 2023

Dominik-K commented Oct 18, 2023

View reviewed changes

include/ocpp/common/websocket/websocket_uri.hpp Outdated Show resolved Hide resolved

Dominik-K commented Oct 18, 2023

View reviewed changes

lib/ocpp/common/websocket/websocket_plain.cpp Outdated Show resolved Hide resolved

Dominik-K self-assigned this Oct 18, 2023

Dominik-K marked this pull request as ready for review October 18, 2023 13:49

Dominik-K requested a review from Pietfried October 18, 2023 13:50

Dominik-K added 4 commits October 18, 2023 18:29

find . -iname '*.*pp' | xargs clang-format -i

606a26b

Signed-off-by: Dominik K <dominik@pionix.de>

fix linter issues

3143cba

Signed-off-by: Dominik K <dominik@pionix.de>

Codacy & own PR-reviews

bbfafbf

Signed-off-by: Dominik K <dominik@pionix.de>

clang-format again :-(

8b5b665

Signed-off-by: Dominik K <dominik@pionix.de>

Dominik-K added 3 commits October 19, 2023 11:26

make Codacy happy again!?!

79994bb

Signed-off-by: Dominik K <dominik@pionix.de>

Merge branch 'main' into fix/websockets/CP-ID

1651642

remove typedef Chargepoint

f2f3f0a

Signed-off-by: Dominik K <dominik@pionix.de>

Dominik-K added 11 commits October 31, 2023 13:39

WIP: check CP-ID against path-base instead of full path

a919540

Signed-off-by: Dominik K <dominik@pionix.de>

remove CP-ID from path if last segment

3bd6d62

Signed-off-by: Dominik K <dominik@pionix.de>

WIP: check OCPP1.6 with security-profile=1

8b8e269

Signed-off-by: Dominik K <dominik@pionix.de>

remove optional last slash

fbfcae7

Signed-off-by: Dominik K <dominik@pionix.de>

Merge branch 'main' into fix/websockets/CP-ID

39ddcc4

fix correct path splitting

bf9bdc6

Signed-off-by: Dominik K <dominik@pionix.de>

fix fallthrough in switch

f5f0091

Signed-off-by: Dominik K <dominik@pionix.de>

1.6: connection to SteVe working

75a1705

Signed-off-by: Dominik K <dominik@pionix.de>

path normalization

fe08ff2

Signed-off-by: Dominik K <dominik@pionix.de>

Merge branch 'main' into fix/websockets/CP-ID

30e81e2

(merge) fixes

3af51e3

Signed-off-by: Dominik K <dominik@pionix.de>

Dominik-K force-pushed the fix/websockets/CP-ID branch from 6ed8c58 to 3af51e3 Compare November 7, 2023 14:43

make clang-format happy again

e9263b1

Signed-off-by: Dominik K <dominik@pionix.de>

maaikez reviewed Nov 8, 2023

View reviewed changes

lib/ocpp/common/websocket/websocket_uri.cpp Show resolved Hide resolved

re-format touched JSONs with new .editorconfig

11c0a93

Signed-off-by: Dominik K <dominik@pionix.de>

Dominik-K commented Nov 8, 2023

View reviewed changes

lib/ocpp/common/websocket/websocket_plain.cpp Show resolved Hide resolved

fix doubled last_segment

2bfa19e

Signed-off-by: Dominik K <dominik@pionix.de>

Dominik-K changed the title ~~deprecate chargepoint-ID in CSMS-URL config-field~~ validate CSMS-URL: opt. schema must fit with security-profile; chargepoint-ID deprecated in URL Nov 8, 2023

Dominik-K requested a review from Pietfried November 8, 2023 21:16

Pietfried requested changes Nov 9, 2023

View reviewed changes

Dominik-K added 6 commits November 9, 2023 10:59

Merge branch 'main' into fix/websockets/CP-ID

151dcd6

use Doxygen comments

2cb761d

Signed-off-by: Dominik K <dominik@pionix.de>

allow SecurityProfile = 0 for OCPP 1.6

ae3922a

Signed-off-by: Dominik K <dominik@pionix.de>

require SecurityCtrlr.Identity

5375b55

Signed-off-by: Dominik K <dominik@pionix.de>

Merge branch 'main' into fix/websockets/CP-ID

5295347

make clang-format happy again

bcc88df

Signed-off-by: Dominik K <dominik@pionix.de>

Dominik-K requested a review from Pietfried November 9, 2023 15:14

Pietfried approved these changes Nov 13, 2023

View reviewed changes

Dominik-K merged commit 271e025 into main Nov 13, 2023

Dominik-K deleted the fix/websockets/CP-ID branch November 13, 2023 12:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

validate CSMS-URL: opt. schema must fit with security-profile; chargepoint-ID deprecated in URL #201

validate CSMS-URL: opt. schema must fit with security-profile; chargepoint-ID deprecated in URL #201

Uh oh!

Dominik-K commented Sep 28, 2023

Uh oh!

Pietfried commented Sep 29, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Dominik-K commented Oct 4, 2023

Uh oh!

Uh oh!

Uh oh!

Dominik-K commented Oct 19, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Pietfried Nov 9, 2023

Uh oh!

Dominik-K Nov 9, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

validate CSMS-URL: opt. schema must fit with security-profile; chargepoint-ID deprecated in URL #201

validate CSMS-URL: opt. schema must fit with security-profile; chargepoint-ID deprecated in URL #201

Uh oh!

Conversation

Dominik-K commented Sep 28, 2023

Uh oh!

Pietfried commented Sep 29, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Dominik-K commented Oct 4, 2023

Uh oh!

Uh oh!

Uh oh!

Dominik-K commented Oct 19, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Pietfried Nov 9, 2023

Choose a reason for hiding this comment

Uh oh!

Dominik-K Nov 9, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants