Commit Graph

64 Commits

Author SHA1 Message Date
Marc Mültin 9abd5ae729 Updated version number from 1.2.5 to 1.2.6 2020-07-23 17:41:52 +01:00
Marc Mültin b3ff868ad5
Merge pull request #51 from mrbig/f/better_stop_handling
Treat DC Shutdown status as valid when STOP power delivery is requested
2020-05-02 14:16:58 +02:00
Marc Mültin 7a8e3a9a23
Update WaitForPowerDeliveryReq.java
Changed the error log into  a warn log an EVSE-initiated shutdown could be the cause for the corresponding DC_EVSE_StatusCode.
2020-05-02 14:15:25 +02:00
Marc Mültin 1d4d22b3f1
Merge pull request #48 from CommentSectionScientist/RemovesUnusedDuplicatedMethod
Removes unused Getter and renames Setter
2020-05-02 13:51:45 +02:00
Marc Mültin 7fb507a075 Added comment on how to make sure only the name elliptic curve "secp256r1" is allowed for ECDH(E). 2020-05-02 12:14:01 +02:00
Nagy Attila Gabor 5446786323 Treat DC Shutdown status codes as valid when STOP power delivery is requested
When an EVSE side shutdown is initated it's hard to tell from
the controller point of view wich exact state is requested. So in
WaitForPowerDeliveryReq we treat EVSE_SHUTDOWN and similar status codes
as valid when the EV requested a stop
2020-04-26 22:30:33 +02:00
CommentSectionScientist 048d06f6b9 Removes unused Getter and renames Setter 2020-04-10 20:05:49 +02:00
Marc Mültin 5aa6cd3179 Modified pom.xml files regarding project version 2019-10-08 17:15:45 +02:00
Marc Mültin 2ae27ebeb5 Updated the version number of the pom.xml files to the newest release 1.2.5 2019-10-01 12:12:35 +02:00
Marc Mültin e6f7b4fd4e Implemented a working mechanism for pausing and resuming a charging session 2019-10-01 11:30:09 +02:00
Marc Mültin c1140f98e7 Fixed copyright header (date) 2019-09-28 18:14:15 +02:00
Marc Mültin 4546e0e229 Added a check for unreasonably high payloads 2019-09-28 17:48:58 +02:00
Marc Mültin e5e2b55f9c Made SECC not request MeteringReceipt after each charging loop 2019-08-17 18:59:39 +02:00
Marc Mültin 70b0d19824 Added logging information about whether EV wants to pause or terminate the charging session with a SessionStopReq 2019-06-24 12:40:03 +02:00
Marc Mültin d3485324fe Modified pom.xml files to reflect new version 1.2.4 of RISE V2G 2019-03-21 09:34:42 +01:00
Marc Mültin df3838b3f6 Updated pom.xml files to reflect the new version 1.2.4 2019-03-20 20:59:42 +01:00
Marc Mültin 693fbcc97a Addressed ISO 15118 User Group issue #50 (http://extmgmt.kn.e-technik.tu-dortmund.de/issues/50): the SECC will wait 5 seconds after sending a SessionStopRes or any response message with a negative response code before closing the TCP/TLS socket connection.
Also fixed an issue with reading the moSubCA2.pkcs8.der file (an encrypted private key which is provided in a PKCS#8 DER-encoded container.
2019-03-20 20:53:25 +01:00
Marc Mültin 0bf6d51748
Merge pull request #30 from mrbig/f/dynamic_implementation_loader
Made implementation classes configurable from the respective properties file
2019-02-09 18:15:59 +01:00
Marc Mültin 950e27d5af
Merge pull request #28 from poohsen/master
make signature of encryptContractCertPrivateKey more specific
2019-02-09 18:08:08 +01:00
Nagy Attila Gabor 6e1d7fbcb7 Refactored controllers to use a default constructor
This makes the instantiation much cleaner, and also makes the
responsibility of the controller more clear.

Now we pass the communication session to the controller right
after instantiation inside the ImplementationFactory
2019-02-08 22:10:45 +01:00
Nagy Attila Gabor 5ccf4ceaad Fixed typos in documentation and exception 2019-02-07 20:25:08 +01:00
Nagy Attila Gabor 339cc722ac Made implementation classes configurable from the respective properties file
This way implementation classes for EV/SE side controllers could be
replaced without touching the mainline code. I believe this will
simplify forking and extending the project.
2019-01-26 18:07:48 +01:00
Nagy Attila Gabor 52d5ee093b Removed unused removeV2GCommunicationSession method
It was never used, and it contained an error, that could cause problems
if someone were using this method.
2019-01-24 18:50:55 +01:00
Nagy Attila Gabor d559f168d9 Addedd suppresswarnings to some of the unused fields and methods
These methods are likely to be used later or in actual implementations, so
the removal is not preferred at the moment
2019-01-24 18:40:00 +01:00
Nagy Attila Gabor 5c5b25eaef Removed unused general evseController
Seems like this is a leftover from an earlier version
2019-01-24 18:34:18 +01:00
Nagy Attila Gabor 39cb8a895b Fixed trivial raw type assignments 2019-01-24 18:15:56 +01:00
Christoph Zwirello ebccfa5a06 make signature of encryptContractCertPrivateKey more specific 2018-11-15 12:18:13 +01:00
Marc Mültin a15e4ff29e Rewrote the generateCertificates script 2018-08-15 12:30:36 +02:00
Marc Mültin cba5e041f6 - TargetCurrent in DummyEVController, used in PreChargeReq message, was set to 2A to comply to IEC 61851-23
- The necessary change from State C to State B during a renegotiation in DC charging is now correctly implemented
- Added the EV setting "voltage.accuracy" to allow for a percentage of deviation from the target current in PreCharge
2018-04-25 10:14:34 +02:00
Marc Mültin 0e4b838f8d Fixes issues #18 (chargingLoop counter was disregarded when sending MeteringReceiptRes) and #19 (error in DER encoding of ECDSA signature) 2018-01-12 10:32:30 +02:00
Marc Mültin d1056e6168 Fix for previous release v1.2. Still missed one additional instantiation of MessageHandler in V2GCommuicationSessionHandlerSECC that needs to be removed. 2018-01-03 09:57:11 +02:00
Marc Mültin 6f6be89a09 Improved the performance of RISE V2G by converting the MessageHandler into a Singleton. When instantiating the MessageHandler, the JAXB Context is set which is a pretty time-consuming task. Before the improvement, the MessageHandler was instantiated by the V2GCommunicationSessionHandlerSECC and the V2GCommunicationSessionHandlerSECC class.
Additionally, the MessageHandler was instantiated each time a new communication session was initiated by the EVCC.

Now, MessageHandler is initialized only once at startup of RISE V2G, saving a few seconds processing time on a slow embedded controller.
Credit goes to Advantics for pointing this out! Thanks. :)

Further changes: minor editorial edits and an additional logging message in the ConnectionHandler stating the length of the V2GTP payload as stated by the V2GTP header (helps for debugging purposes)
2018-01-01 21:35:44 +02:00
Marc Mültin babd2ee114 Changelog 13.10.17:
- Changed package name from org.v2gclarity.risev2g to com.v2gclarity.risev2g
- Changed pom.xml and bin.xml files for creating deployable .jar files with Maven
- Added RISE-V2G-Parent project folder for Maven to facilitate an easy build process that has now be reworked in this version
2017-10-13 12:30:15 +02:00
Marc Mültin 374e06e843 Changelog:
- Removed some unused imports
- Bugfix in MessageHandler's getJaxbElement when creating the JAXBElement for SalesTariff. Corrected the namespace to create the QName object from MsgBody to MsgDataTypes
- Removed the libs folder in RISE-V2G-SHARED as it is not needed with Maven
2017-09-26 12:26:50 +02:00
Marc Mültin d8c9fc7bcd Changelog commit 15.9.17
- Added copyNewCertsAndKeys.bat and generateCertificates.bat to RISE-V2G-Certificates in order to port the already existing Unix shell scripts to Windows systems
- Corrected an error in V2GCommunicationSessionHandlerEVCC.java which ensures that the SDP procedure continues to work correctly even if there is a false SDP response coming from the SECC
- Changed the signature of the method generateDigest() (in SecurityUtils.java) to have more logging information about the ID of the element for which the digest is generated
- Made sure that the PreCharge timeout and CableCheck timeout are triggered exactly (there was a possible delay of 2s)
- Changed logging level of TCP server and client from debug to info
- Added debugging logging functionality with new EVCC and SECC property HexAndBase64RepresentationOfMessages which will log the hexadecimal and Base64 encoding of each message being sent
- Small change in log4j2.xml files enabling highlighting of logging level (you need to have ANSI Console installed in Eclipse IDE for this change to take effect)
- Shifted the process of reading the MO Sub-CA 2 private key from the keystore from the method getMOSubCA2PrivateKey to the constructor of DummyBackendInterface.java in order to avoid timeouts when processing the ChargeParameterDiscoveryReq on embedded devices
- Updated the EXIficient_V2G_CI_MsgDef.java (serialized version of the XSD grammar) as there was an bug before that caused an incomplete deserialization of an EXI byte stream to an XML message
- Updated log4j from 2.1 to 2.9
2017-09-15 16:15:25 +02:00
Marc Mültin 7cd067c118 Added property "EXICodec" in EVCCConfig.properties and SECCConfig.properties to set the EXI codec. Changed the handling in the constructor of the MessageHandler.java accordingly. 2017-08-30 18:32:09 +02:00
Marc Mültin ee5756c592 Minor changes in transport layer classes and main method 2017-08-29 17:34:52 +02:00
Marc Mültin d2287e7355 Added test data for CertificateInstallationRes to verify one's own implementation of creating and verifying XML-based signatures 2017-08-27 13:18:40 +02:00
Marc Mültin 777a2934ba Some minor bugfixing after a successful test session with Verisco. SECC part is now fully tested with good and error test cases and has now very high probability to being fully conform to the ISO 15118-2 standard. 2017-08-21 22:13:09 +02:00
Marc Mültin 788280cd68 - Replaced System.currentTimeMillis() by System.nanoTime() for timing tasks.
- Changed the way how JAXBElements are created due to particularities with the creation of the XML Reference elements for the CertificateInstallationRes and CertificateUpdateRes messages. The JAXBContext is now set exactly for the message or field that is to be marshaled into XML. As a result, the JAXBContext is no more set in the EXI codec, but in the MessageHandler
- SecurityUtils.java has been partly rewritten with regards to the verification of certificate chains. See also verifyCertificateChain(…) method.
- Requirement [V2G2-812] is not implemented.
- When the EVCC sends a message out of the correct order which would induce a FAILED_SequenceError message, the SECC now sends the response message corresponding to the request message sent by the EVCC instead of the response message corresponding to the message the SECC would expect. As a result, ServerState.java has partly been rewritten and all SECC states have been adapted to it.
- Charge parameter provided by ChargeParameterDisoveryReq message are now thoroughly checked by the SECC. See also verifyChargeParameter(…) method.
- Charging profile provided by PowerDeliveryReq message is now thoroughly checked by SECC. See also isChargingProfileValid(…) method.
- New enum class PKI is added to shared.enumerations package. Needed for certificate chain checks in SecurityUtils.java.
- Some bugfixes in V2GTPMessage so that headers are not checked correctly.
2017-08-20 23:26:22 +02:00
Stefan Wahren 49a350173f Make sure MO Sub-CA 2 PKCS#8 file is added to package, because it's
required by SECC dummy backend

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
2017-08-04 11:11:48 +02:00
Marc Mültin d61fde3264 Changed package structure from org.eclipse.risev2g to org.v2gclarity.risev2g 2017-07-22 19:20:04 +02:00
Marc Mültin b0c4b6d657 Changed license from EPL to MIT and updated README.md 2017-07-20 21:06:26 +02:00
Marc Mültin 6b366610bc Commit-Nachricht für RISE V2G
- Signature creation and verification has been fixed and works now properly. Has been tested against various industry OEMs and suppliers.
SecurityUtils.java class was substantially revised as part of fixing the signature creation and verification process and extended signature logging

- Introduced a new abstract method setMandatoryFieldsForFailedRes() in ServerState which makes sure that for each response the mandatory fields are set properly according to the standard in case a FAILED response code is sent

- Introduced a fix in WaitForAuthorizationReq which makes sure that a possible challenge is only checked for if the chosen payment option is „Contract“ (and TLS is used)

- Saves now the payment option selected by the EVCC (in state WaitForPaymentServiceSelectionReq) in the SECCs communication session for later reference

- To avoid possible race conditions, the transport layer threads needed to be started AFTER the SECC session handler has been initialized. Otherwise the situation might occur that the UDPServer is receiving a UDP client packet and tries to access the MessageHandler object before this object has been created by the SECC session handler.

- generateCertificates.sh Shell-Script now includes variables to ease the setting of certificates’ validity periods. Renaming of some certificates (e.g. provLeaf.cert -> cpsLeaf.cert) and keys. All certificates are now also generated in DER encoded form. MOSubCA2 private key is now also created as a PKCS#8 DER encoded file as RISE V2G needs this format to read the private key from file and sign SalesTariffs.

- EVCCConfig.properties and SECCConfig.properties have additional property „SignatureVerificationLog“ which enables extended logging information to debug signature creation and verification processes

- Catched a (theoretically) possible ClassCastException in WaitForChargeParameterDiscoveryRes in case the EVCC signalizes an EnergyTransferMode (AC or DC) which does not fit to the EVSEChargeParameter sent by the SECC later on

- Made sure that by default the sum of the individual time intervals described in the PMaxSchedule and SalesTariff provided in the ChargeParameterDiscoveryRes message are equal to 24 hours as demanded by a requirement.

- Renaming of some methods in IBackendInterface for clarity and consistency

- Provided a correctly formatted EVSE-ID in DummyACEVSEController and DummyDCEVSEController

- Corrected the service name of CertificateUpdate service and CertificateInstallation service to „Service“ according to the standard

- Edited GlobalValues so that the string value returned for each global value only needs to be edited once in this file (less error prone)
2017-07-20 15:50:43 +02:00
Marc Mültin 0047027eea minor changes 2016-11-29 18:49:05 +08:00
Marc Mültin fd20302604 - added signature creation when sending MeteringReceiptReq during DC charging
- added a fix that prevents a NullPointerException in case MeterInfo element is not present when checked on SECC while processing MeteringReceiptReq
2016-11-29 18:46:42 +08:00
Marc Mültin 7cd7bde429 - made sure that no ServiceDetailReq is sent for the ChargeService (for which no ServiceParameterList is available)
- added error logger message in case FAILED_No_NEGOTIATION is sent as response code in supportedAppProtocolRes
2016-11-26 17:41:41 +08:00
Marc Mültin 2ec832c1d7 - Bugfix: The signature key for signing SalesTariff elements was wrong (not the provisioning service certificate private key but the MO Sub-CA 2 certificate private key needs to be used here).
- Modified DummyBackendInterface and IBackendInterface to introduce method getMOSubCA2CertificatePrivateKey()
- New function in SecurityUtils introduced to read .key private key file.
- Added warning logger message on SECC side in case the SAScheduleTupleID in PowerDeliveryReq message is null (parameter is mandatory, although setting it is actually useless when PowerDeliveryReq with ChargeProgress set to 'Stop' is set).
2016-11-10 15:08:17 +09:00
Marc Mültin 0fc64963f7 minor debugging and error catching changes 2016-11-06 19:19:48 +09:00
Marc Mültin e0f2d36bbc Merge branch 'master' into develop
# Conflicts:
#	RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/evController/DummyEVController.java
#	RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/session/V2GCommunicationSessionEVCC.java
#	RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForChargeParameterDiscoveryRes.java
#	RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/session/V2GCommunicationSessionSECC.java
#	RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/utils/SecurityUtils.java
2016-07-28 15:03:04 +02:00