ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-27 08:22:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'open/master' into ags_2018-03-29

Browse Source
This commit is contained in:
ags 2018-03-29 09:22:10 +01:00
commit ed9a31522b
No known key found for this signature in database
GPG Key ID: 79EBE5A3D6E758E4
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/changelog.rst
View File

@ -34,6 +34,8 @@ from the previous milestone release.
* Introduced a placeholder for custom properties within ``node.conf``; the property key is "custom". * Introduced a placeholder for custom properties within ``node.conf``; the property key is "custom".
* Property keys with double quotes (e.g. `"key"`) in ``node.conf`` are no longer allowed, for rationale refer to :doc:`corda-configuration-file`.
* java.math.BigInteger serialization support added. * java.math.BigInteger serialization support added.
* java.security.cert.CRLReason added to the default Whitelist. * java.security.cert.CRLReason added to the default Whitelist.

11
docs/source/corda-configuration-file.rst
View File

@ -22,6 +22,15 @@ Format
The Corda configuration file uses the HOCON format which is superset of JSON. Please visit The Corda configuration file uses the HOCON format which is superset of JSON. Please visit
`<https://github.com/typesafehub/config/blob/master/HOCON.md>`_ for further details. `<https://github.com/typesafehub/config/blob/master/HOCON.md>`_ for further details.
Please do NOT use double quotes (``"``) in configuration keys.
Node setup will log `Config files should not contain \" in property names. Please fix: [key]` as error
when it founds double quotes around keys.
This prevents configuration errors when mixing keys containing ``.`` wrapped with double quotes and without them
e.g.:
The property `"dataSourceProperties.dataSourceClassName" = "val"` in ``reference.conf``
would be not overwritten by the property `dataSourceProperties.dataSourceClassName = "val2"` in ``node.conf``.
Defaults Defaults
-------- --------
A set of default configuration options are loaded from the built-in resource file ``/node/src/main/resources/reference.conf``. A set of default configuration options are loaded from the built-in resource file ``/node/src/main/resources/reference.conf``.
@ -286,4 +295,4 @@ Longer term these keys will be managed in secure hardware devices.
:permissions: A list of permissions for starting flows via RPC. To give the user the permission to start the flow :permissions: A list of permissions for starting flows via RPC. To give the user the permission to start the flow
``foo.bar.FlowClass``, add the string ``StartFlow.foo.bar.FlowClass`` to the list. If the list ``foo.bar.FlowClass``, add the string ``StartFlow.foo.bar.FlowClass`` to the list. If the list
contains the string ``ALL``, the user can start any flow via RPC. This value is intended for administrator contains the string ``ALL``, the user can start any flow via RPC. This value is intended for administrator
users and for development. users and for development.

6
docs/source/example-code/src/main/resources/example-node.conf
View File

@ -3,9 +3,9 @@ keyStorePassword : "cordacadevpass"
trustStorePassword : "trustpass" trustStorePassword : "trustpass"
dataSourceProperties : { dataSourceProperties : {
dataSourceClassName : org.h2.jdbcx.JdbcDataSource dataSourceClassName : org.h2.jdbcx.JdbcDataSource
"dataSource.url" : "jdbc:h2:file:"${baseDirectory}"/persistence" dataSource.url : "jdbc:h2:file:"${baseDirectory}"/persistence"
"dataSource.user" : sa dataSource.user : sa
"dataSource.password" : "" dataSource.password : ""
} }
p2pAddress : "my-corda-node:10002" p2pAddress : "my-corda-node:10002"
rpcSettings = { rpcSettings = {

9
node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
View File

@ -58,7 +58,16 @@ object ConfigHelper {
.withFallback(appConfig) .withFallback(appConfig)
.withFallback(defaultConfig) .withFallback(defaultConfig)
.resolve() .resolve()
log.info("Config:\n${finalConfig.root().render(ConfigRenderOptions.defaults())}") log.info("Config:\n${finalConfig.root().render(ConfigRenderOptions.defaults())}")
val entrySet = finalConfig.entrySet().filter { entry -> entry.key.contains("\"") }
for (mutableEntry in entrySet) {
val key = mutableEntry.key
log.error("Config files should not contain \" in property names. Please fix: ${key}")
}
return finalConfig return finalConfig
} }